A few bug fixes for CLL closed-loop operation.

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json

index 795a741..9697f14 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,223 +1,199 @@
  [\r
      {\r
-        "id": "2395bbe0.4b8ec4",\r
+        "id": "a7aee3f0.b04268",\r
          "type": "save",\r
          "name": "get all-vpn-bindings from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 361,\r
-        "y": 348,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 400.566650390625,\r
+        "y": 374,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7a4b4c32.339f0c",\r
-                "476b558f.0cf4e4",\r
-                "c5f863d4.faa76"\r
+                "96c8722a.b993c",\r
+                "e5061783.573db8",\r
+                "6a27552b.ad1ba4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a4b4c32.339f0c",\r
+        "id": "96c8722a.b993c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 549,\r
-        "y": 361,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 588.566650390625,\r
+        "y": 387,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "477b4d49.40f0ec"\r
+                "41e4d89f.ed1468"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "476b558f.0cf4e4",\r
+        "id": "e5061783.573db8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 549.490966796875,\r
-        "y": 406.57403564453125,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 596.0575866699219,\r
+        "y": 429.57403564453125,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
-            [\r
-                "9391f816.87a258"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "c5f863d4.faa76",\r
+        "id": "6a27552b.ad1ba4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 547,\r
-        "y": 450,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 586.566650390625,\r
+        "y": 476,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7e716c79.c4ee54"\r
+                "a92b97b8.4129e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "477b4d49.40f0ec",\r
+        "id": "41e4d89f.ed1468",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 722,\r
-        "y": 359,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 761.566650390625,\r
+        "y": 385,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "de48ad25.e4a568"\r
+                "cbc7d636.2def18"\r
              ]\r
          ]\r
      },\r
      {\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": 712.0623779296875,\r
-        "y": 406.8597717285156,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": []\r
-    },\r
-    {\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": 714,\r
-        "y": 449,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "de48ad25.e4a568",\r
+        "id": "cbc7d636.2def18",\r
          "type": "for",\r
          "name": "for vpnidx in all-vpn-bindings",\r
          "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 951,\r
-        "y": 360,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 990.566650390625,\r
+        "y": 386,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1fd8993c.e83297"\r
+                "39ab6bfa.74801c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1fd8993c.e83297",\r
+        "id": "39ab6bfa.74801c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1166,\r
-        "y": 361,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1205.566650390625,\r
+        "y": 387,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "33755ee2.127952"\r
+                "e124b2ef.0bfdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "edb565df.2fd588",\r
+        "id": "f6144c8.446efb",\r
          "type": "switchNode",\r
          "name": "switch vpnuuid is for this slice",\r
          "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1420,\r
-        "y": 283,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1459.566650390625,\r
+        "y": 309,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d9f77b89.2576a8",\r
-                "d1a41641.7e8658"\r
+                "dc53b823.c6e998",\r
+                "b2e345a3.6b81"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d9f77b89.2576a8",\r
+        "id": "dc53b823.c6e998",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1637,\r
-        "y": 262,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1676.566650390625,\r
+        "y": 288,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "33755ee2.127952"\r
+                "e124b2ef.0bfdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d1a41641.7e8658",\r
+        "id": "b2e345a3.6b81",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1637,\r
-        "y": 311,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1676.566650390625,\r
+        "y": 337,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "33755ee2.127952",\r
+        "id": "e124b2ef.0bfdc8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1821,\r
-        "y": 348,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1860.566650390625,\r
+        "y": 374,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9647ef19.c8c25",\r
-                "b3842f71.731b38",\r
-                "ca01ca51.23bb98"\r
+                "2ac81333.5163cc",\r
+                "ce04a89c.bde61",\r
+                "b01d3963.8ea8b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48081245.456c3c",\r
+        "id": "daba1b59.df55a",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 180,\r
-        "y": 89,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 219.566650390625,\r
+        "y": 115,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "226f6982.562f5e"\r
+                "53bce33c.ae731c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "226f6982.562f5e",\r
+        "id": "53bce33c.ae731c",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -225,3560 +201,3712 @@
          "comments": "",\r
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 464.2856903076172,\r
-        "y": 150.23810863494873,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 503.8523406982422,\r
+        "y": 176.23810863494873,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f533e2ec.f849f"\r
+                "13dd53c4.ce4fbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f533e2ec.f849f",\r
+        "id": "13dd53c4.ce4fbc",\r
          "type": "method",\r
          "name": "method cll-vnf-topology-operation-cll-F1-Activate",\r
          "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 470.42860412597656,\r
-        "y": 235.00003051757812,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 509.99525451660156,\r
+        "y": 261.0000305175781,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "15848be5.af4ba4"\r
+                "60b5835f.a436c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15848be5.af4ba4",\r
+        "id": "60b5835f.a436c4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 780.238037109375,\r
-        "y": 226.66668701171875,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 819.8046875,\r
+        "y": 252.66668701171875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2395bbe0.4b8ec4",\r
-                "5c62cbf5.952894",\r
-                "4957906b.cb3908",\r
-                "25a3d5e5.55ea62",\r
-                "624a734b.81957c"\r
+                "a7aee3f0.b04268",\r
+                "6d17c7fb.4906d8",\r
+                "7de7f253.4369ac",\r
+                "731e9165.7bfe5",\r
+                "c3d34fd5.00b8e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9647ef19.c8c25",\r
+        "id": "2ac81333.5163cc",\r
          "type": "set",\r
          "name": "set tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
          "comments": "",\r
-        "x": 2038,\r
-        "y": 286,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2077.566650390625,\r
+        "y": 312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "927e2807.47e1",\r
+        "id": "581b9833.ca5308",\r
          "type": "set",\r
          "name": "set attachment_param for OTN A",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 4207,\r
-        "y": 172,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4246.566650390625,\r
+        "y": 198,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71f8cbde.7b70ec",\r
+        "id": "c57ed1b4.089b78",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4288,\r
-        "y": 487,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4327.566650390625,\r
+        "y": 513,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "dca0592f.f2f0f8",\r
-                "7abf945b.d3630c"\r
+                "6866347a.b34054",\r
+                "d9ef66bb.b2e3a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dca0592f.f2f0f8",\r
+        "id": "6866347a.b34054",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4597.5,\r
-        "y": 456,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4637.066650390625,\r
+        "y": 482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4d6d008.1dd328"\r
+                "351f2ca1.efff8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7abf945b.d3630c",\r
+        "id": "d9ef66bb.b2e3a",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4602.5,\r
-        "y": 521,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4642.066650390625,\r
+        "y": 547,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6ddc3bc2.826894"\r
+                "7ec1daf0.49ebbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d6d008.1dd328",\r
+        "id": "351f2ca1.efff8c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4773.5,\r
-        "y": 456,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4813.066650390625,\r
+        "y": 482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ddc3bc2.826894",\r
+        "id": "7ec1daf0.49ebbc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4769,\r
-        "y": 521,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4808.566650390625,\r
+        "y": 547,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "639d74a6.1d8f04",\r
+        "id": "fe354f09.d7eaa",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
          "comments": "",\r
-        "x": 4152.5,\r
-        "y": 741,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4192.066650390625,\r
+        "y": 767,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9456183.6b2d68",\r
+        "id": "f82c7890.c5a3a",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4306.5,\r
-        "y": 789,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4346.066650390625,\r
+        "y": 815,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3efbdf9b.54682",\r
-                "243cc169.72316e"\r
+                "66ca2f72.5d0ea",\r
+                "384ae824.cd397"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3efbdf9b.54682",\r
+        "id": "66ca2f72.5d0ea",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4652,\r
-        "y": 770,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4691.566650390625,\r
+        "y": 796,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ba970949.4ab53"\r
+                "8897aa30.2d04c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "243cc169.72316e",\r
+        "id": "384ae824.cd397",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4656,\r
-        "y": 810,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4695.566650390625,\r
+        "y": 836,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4891a43f.02e58c"\r
+                "e98f7531.5d07d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ba970949.4ab53",\r
+        "id": "8897aa30.2d04c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4810,\r
-        "y": 770,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4849.566650390625,\r
+        "y": 796,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4891a43f.02e58c",\r
+        "id": "e98f7531.5d07d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4813.5,\r
-        "y": 810,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4853.066650390625,\r
+        "y": 836,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "388beb56.7c7234",\r
-                "eb334e0f.b54c3"\r
+                "3b168b09.265424",\r
+                "f9e9fb1f.d5d228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "388beb56.7c7234",\r
+        "id": "3b168b09.265424",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5144,\r
-        "y": 775,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5183.566650390625,\r
+        "y": 801,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d196af8c.f36ae8",\r
+        "id": "293d08cf.5ba9b",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 5008,\r
-        "y": 734,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5047.566650390625,\r
+        "y": 760,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb334e0f.b54c3",\r
+        "id": "f9e9fb1f.d5d228",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5071,\r
-        "y": 821,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5110.566650390625,\r
+        "y": 847,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "51361643.15e97",\r
+        "id": "5b448e3f.d6f97",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4145,\r
-        "y": 220,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4184.566650390625,\r
+        "y": 246,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7074e291.428a74",\r
+        "id": "11357d7a.7ec893",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4171,\r
-        "y": 337,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4210.566650390625,\r
+        "y": 363,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fd9f25cd.b6ab9",\r
-                "13f82e43.b47822",\r
-                "a1ba843c.92fa78"\r
+                "9cee4545.4afd2",\r
+                "c87207dc.1fc4c8",\r
+                "a541f904.08a73"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd9f25cd.b6ab9",\r
+        "id": "9cee4545.4afd2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4366.5001220703125,\r
-        "y": 289,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4406.0667724609375,\r
+        "y": 315,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "10d11922.59185f"\r
+                "174041c6.ef00ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13f82e43.b47822",\r
+        "id": "c87207dc.1fc4c8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4358.5001220703125,\r
-        "y": 344,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4398.0667724609375,\r
+        "y": 370,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "19650434.8dad4c"\r
+                "2578a714.32fd88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10d11922.59185f",\r
+        "id": "174041c6.ef00ae",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4510.8824462890625,\r
-        "y": 288.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4550.4490966796875,\r
+        "y": 314.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "777ae9c7.6a278"\r
+                "44c47bf6.544e84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "391ce87d.ba3df8",\r
+        "id": "416e074e.1652a8",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5093,\r
-        "y": 291,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5132.566650390625,\r
+        "y": 317,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "65b820ac.17e0d"\r
+                "77699d71.cb9cbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "777ae9c7.6a278",\r
+        "id": "44c47bf6.544e84",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4695,\r
-        "y": 287,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4734.566650390625,\r
+        "y": 313,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f4f1a808.b22bc"\r
+                "ec3ad4d7.e6b51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4f1a808.b22bc",\r
+        "id": "ec3ad4d7.e6b51",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4890,\r
-        "y": 287,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4929.566650390625,\r
+        "y": 313,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "391ce87d.ba3df8"\r
+                "416e074e.1652a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1ba843c.92fa78",\r
+        "id": "a541f904.08a73",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4363.5001220703125,\r
-        "y": 401,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4403.0667724609375,\r
+        "y": 427,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a6d9e4b5.ea0fd8"\r
+                "44c8faa6.17201c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6d9e4b5.ea0fd8",\r
+        "id": "44c8faa6.17201c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4515.5001220703125,\r
-        "y": 402,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4555.0667724609375,\r
+        "y": 428,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "19650434.8dad4c",\r
+        "id": "2578a714.32fd88",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4526.5001220703125,\r
-        "y": 345,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4566.0667724609375,\r
+        "y": 371,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d042a1f.c8fb44",\r
+        "id": "157b4f1e.ec4409",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5478,\r
-        "y": 304,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5517.566650390625,\r
+        "y": 330,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8c0f87c1.0cfa88",\r
-                "96b96977.b4fed8",\r
-                "6ce026da.737ea"\r
+                "5eb578c.a510488",\r
+                "646e1345.d32534",\r
+                "d2cac0b5.69fe18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "65b820ac.17e0d",\r
+        "id": "77699d71.cb9cbc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5272,\r
-        "y": 291,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5311.566650390625,\r
+        "y": 317,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1918c44c.117ae4",\r
-                "5d042a1f.c8fb44"\r
+                "e5b6fb7a.6fa868",\r
+                "157b4f1e.ec4409"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1918c44c.117ae4",\r
+        "id": "e5b6fb7a.6fa868",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5508,\r
-        "y": 252,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5547.566650390625,\r
+        "y": 278,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8c0f87c1.0cfa88",\r
+        "id": "5eb578c.a510488",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5688,\r
-        "y": 295,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5727.566650390625,\r
+        "y": 321,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e1aae278.d9aab"\r
+                "e92c3ae0.67c78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96b96977.b4fed8",\r
+        "id": "646e1345.d32534",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5680,\r
-        "y": 350,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5719.566650390625,\r
+        "y": 376,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a74826f7.daef6"\r
+                "bbc83f99.73f6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ce026da.737ea",\r
+        "id": "d2cac0b5.69fe18",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5685,\r
-        "y": 407,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5724.566650390625,\r
+        "y": 433,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "80c7718d.f0881"\r
+                "2b4662b0.39c236"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80c7718d.f0881",\r
+        "id": "2b4662b0.39c236",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5837,\r
-        "y": 408,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5876.566650390625,\r
+        "y": 434,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a74826f7.daef6",\r
+        "id": "bbc83f99.73f6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5848,\r
-        "y": 353,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5887.566650390625,\r
+        "y": 379,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e1aae278.d9aab",\r
+        "id": "e92c3ae0.67c78",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5832.38232421875,\r
-        "y": 292.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5871.948974609375,\r
+        "y": 318.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b6fb5857.56d2c"\r
+                "79f8358f.b45374"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b6fb5857.56d2c",\r
+        "id": "79f8358f.b45374",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 6047,\r
-        "y": 289,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 6086.566650390625,\r
+        "y": 315,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "881ac3d.2b73cc",\r
+        "id": "ffd19574.4197a8",\r
          "type": "set",\r
          "name": "set attachment_param for OTN B",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 3614,\r
-        "y": 1629,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3653.566650390625,\r
+        "y": 1655,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f942fe34.857118",\r
+        "id": "bd3c5166.6aead",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3677,\r
-        "y": 1958,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3716.566650390625,\r
+        "y": 1984,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d6aba815.0c0b98",\r
-                "fb15fc4f.27732"\r
+                "85a267fb.c74d5",\r
+                "1abf40e9.7b1f1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6aba815.0c0b98",\r
+        "id": "85a267fb.c74d5",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3972.5,\r
-        "y": 1925,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4012.066650390625,\r
+        "y": 1951,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f7e9b7f6.cb6cf8"\r
+                "8944bada.8beb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb15fc4f.27732",\r
+        "id": "1abf40e9.7b1f1f",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3977.5,\r
-        "y": 1990,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4017.066650390625,\r
+        "y": 2016,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e7e93f9f.05e6f8"\r
+                "fa8bf7ac.5ecf28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7e9b7f6.cb6cf8",\r
+        "id": "8944bada.8beb4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4140.5,\r
-        "y": 1925,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4180.066650390625,\r
+        "y": 1951,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7e93f9f.05e6f8",\r
+        "id": "fa8bf7ac.5ecf28",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4151,\r
-        "y": 1990,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4190.566650390625,\r
+        "y": 2016,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c6f7c9bc.a78ea8",\r
+        "id": "e3d71f0.616b0e",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3553,\r
-        "y": 1686,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3592.566650390625,\r
+        "y": 1712,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f243ad6.97dd38",\r
+        "id": "5f81a64c.5bf2a",\r
          "type": "get-resource",\r
          "name": "get-resource dst pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3573,\r
-        "y": 1783,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3612.566650390625,\r
+        "y": 1809,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a8e6c84d.0f237",\r
-                "3ee8ddc2.b7378a",\r
-                "311698c.6883b68"\r
+                "1781a1bd.0348ce",\r
+                "e03bcd54.697738",\r
+                "94b9ef51.5409d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8e6c84d.0f237",\r
+        "id": "1781a1bd.0348ce",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3775.5001220703125,\r
-        "y": 1736,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3815.0667724609375,\r
+        "y": 1762,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6ef9124f.c91bc4"\r
+                "a95165c1.f614f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee8ddc2.b7378a",\r
+        "id": "e03bcd54.697738",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3767.5001220703125,\r
-        "y": 1791,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3807.0667724609375,\r
+        "y": 1817,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9b01e4a.2bf7598"\r
+                "b5b6c797.75de6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ef9124f.c91bc4",\r
+        "id": "a95165c1.f614f8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3919.8824462890625,\r
-        "y": 1733.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3959.4490966796875,\r
+        "y": 1759.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8bd570a1.9b5908"\r
+                "5bb225c8.c4c70c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8bd570a1.9b5908",\r
+        "id": "5bb225c8.c4c70c",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4104,\r
-        "y": 1748,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4143.566650390625,\r
+        "y": 1774,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5951fb7a.778dbc"\r
+                "7747e85a.705d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "311698c.6883b68",\r
+        "id": "94b9ef51.5409d",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3772.5001220703125,\r
-        "y": 1848,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3812.0667724609375,\r
+        "y": 1874,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "25fe1469.5e13bc"\r
+                "9d4f33d7.c972d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25fe1469.5e13bc",\r
+        "id": "9d4f33d7.c972d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3924.5001220703125,\r
-        "y": 1849,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3964.0667724609375,\r
+        "y": 1875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b01e4a.2bf7598",\r
+        "id": "b5b6c797.75de6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3935.5001220703125,\r
-        "y": 1794,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3975.0667724609375,\r
+        "y": 1820,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a9a3100d.7e9a38",\r
+        "id": "7641eade.641374",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4502,\r
-        "y": 1752,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4541.566650390625,\r
+        "y": 1778,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "15a6f6cf.b80121"\r
+                "745d7190.9cf208"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5951fb7a.778dbc",\r
+        "id": "7747e85a.705d5",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4299,\r
-        "y": 1748,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4338.566650390625,\r
+        "y": 1774,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a9a3100d.7e9a38"\r
+                "7641eade.641374"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b462757e.f97cf",\r
+        "id": "95464c66.d9ff8",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4887,\r
-        "y": 1751,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4926.566650390625,\r
+        "y": 1777,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f548cd5f.cf97e8",\r
-                "7bf2c309.936484",\r
-                "37200156.6e45ae"\r
+                "bb6dbaba.ff1548",\r
+                "a59e3175.15a9b",\r
+                "4bc34556.41323c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15a6f6cf.b80121",\r
+        "id": "745d7190.9cf208",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4679,\r
-        "y": 1744,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4718.566650390625,\r
+        "y": 1770,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "24625031.3ccbb",\r
-                "b462757e.f97cf"\r
+                "80afd84e.d6bdd8",\r
+                "95464c66.d9ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24625031.3ccbb",\r
+        "id": "80afd84e.d6bdd8",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4917,\r
-        "y": 1699,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4956.566650390625,\r
+        "y": 1725,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3717e4c0.7e91fc",\r
+        "id": "42edd12e.5451d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5246,\r
-        "y": 1855,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5285.566650390625,\r
+        "y": 1881,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ebaf4cad.7f7ac",\r
+        "id": "ea697aed.d1f358",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5257,\r
-        "y": 1800,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5296.566650390625,\r
+        "y": 1826,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "95133e26.a5c4",\r
+        "id": "edcb3571.8c6728",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5241.38232421875,\r
-        "y": 1739.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5280.948974609375,\r
+        "y": 1765.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "74fa69d9.12322"\r
+                "6d55462a.8f8fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74fa69d9.12322",\r
+        "id": "6d55462a.8f8fa8",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5456,\r
-        "y": 1736,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5495.566650390625,\r
+        "y": 1762,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f548cd5f.cf97e8",\r
+        "id": "bb6dbaba.ff1548",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5097,\r
-        "y": 1742,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5136.566650390625,\r
+        "y": 1768,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "95133e26.a5c4"\r
+                "edcb3571.8c6728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bf2c309.936484",\r
+        "id": "a59e3175.15a9b",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5089,\r
-        "y": 1797,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5128.566650390625,\r
+        "y": 1823,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ebaf4cad.7f7ac"\r
+                "ea697aed.d1f358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37200156.6e45ae",\r
+        "id": "4bc34556.41323c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5094,\r
-        "y": 1854,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5133.566650390625,\r
+        "y": 1880,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3717e4c0.7e91fc"\r
+                "42edd12e.5451d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4573661e.19551",\r
+        "id": "64ebcb8e.6a273c",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has dst-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3128,\r
-        "y": 700,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3167.566650390625,\r
+        "y": 726,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e3a931ba.d41978",\r
-                "cce98769.66d2f"\r
+                "635bfedd.0eff1",\r
+                "4466b072.e153e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3a931ba.d41978",\r
+        "id": "635bfedd.0eff1",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3342,\r
-        "y": 737,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3381.566650390625,\r
+        "y": 763,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "83f7a2a0.47e4a"\r
+                "f20f4b09.4270d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cce98769.66d2f",\r
+        "id": "4466b072.e153e8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3344,\r
-        "y": 675,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3383.566650390625,\r
+        "y": 701,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a3a1c771.fa4dc8"\r
+                "388a019b.9b73c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83f7a2a0.47e4a",\r
+        "id": "f20f4b09.4270d8",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2922,\r
-        "y": 1980,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2961.566650390625,\r
+        "y": 2006,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b17cf12.c5b4e9",\r
-                "375f750c.523c3a"\r
+                "69af1ba1.41260c",\r
+                "13b2b9f.1f67dc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b17cf12.c5b4e9",\r
+        "id": "69af1ba1.41260c",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3175,\r
-        "y": 2014,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3214.566650390625,\r
+        "y": 2040,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b574ded7.ea26d"\r
+                "c8858f37.c3f05"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "375f750c.523c3a",\r
+        "id": "13b2b9f.1f67dc6",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3175,\r
-        "y": 1958,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3214.566650390625,\r
+        "y": 1984,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3eeb971b.8e101"\r
+                "be4790f9.3bf898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b574ded7.ea26d",\r
+        "id": "c8858f37.c3f05",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3326,\r
-        "y": 2014,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3365.566650390625,\r
+        "y": 2040,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "27c7cf1.51adcb",\r
+        "id": "7a5e210e.9e5d48",\r
          "type": "set",\r
          "name": "set vpn-bindingA and connectivityA",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 4202,\r
-        "y": 112,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4241.566650390625,\r
+        "y": 138,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e24e0a9e.a7db8",\r
+        "id": "163461bd.87a87e",\r
          "type": "set",\r
          "name": "set vpn-bindingB and connectivityB",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
          "comments": "",\r
-        "x": 3610,\r
-        "y": 1571,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3649.566650390625,\r
+        "y": 1597,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6b14e6ca.05c05",\r
+        "id": "354c57ea.e71ee8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3893,\r
-        "y": 369,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3932.566650390625,\r
+        "y": 395,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\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
+                "7a5e210e.9e5d48",\r
+                "581b9833.ca5308",\r
+                "5b448e3f.d6f97",\r
+                "11357d7a.7ec893",\r
+                "c57ed1b4.089b78",\r
+                "5d6e99f5.a1e2d",\r
+                "1771c9d3.36c546",\r
+                "d9cf64bd.4ed12"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3eeb971b.8e101",\r
+        "id": "be4790f9.3bf898",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3326,\r
-        "y": 1957,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3365.566650390625,\r
+        "y": 1983,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\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
+                "163461bd.87a87e",\r
+                "ffd19574.4197a8",\r
+                "e3d71f0.616b0e",\r
+                "5f81a64c.5bf2a",\r
+                "bd3c5166.6aead",\r
+                "b596d9f.c7daaa8",\r
+                "2308c235.08d20e",\r
+                "5a0cb184.9cdf98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f87bcfd0.50c8c",\r
+        "id": "12d5b667.53ec1a",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
          "comments": "",\r
-        "x": 3564,\r
-        "y": 2256,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3603.566650390625,\r
+        "y": 2282,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab6e58b.3c55528",\r
+        "id": "b0af817e.3df5c",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3718,\r
-        "y": 2304,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3757.566650390625,\r
+        "y": 2330,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "eff9a19.776a7e",\r
-                "ddb717fb.d9a6d8"\r
+                "8bd672ae.f97518",\r
+                "171382a6.de96c5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eff9a19.776a7e",\r
+        "id": "8bd672ae.f97518",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4063.5,\r
-        "y": 2285,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4103.066650390625,\r
+        "y": 2311,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "59a2ea1f.0d3f14"\r
+                "26f501a4.aaf356"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ddb717fb.d9a6d8",\r
+        "id": "171382a6.de96c5",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4067.5,\r
-        "y": 2325,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4107.066650390625,\r
+        "y": 2351,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "81b55fda.fb8e98"\r
+                "81506f95.53e78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59a2ea1f.0d3f14",\r
+        "id": "26f501a4.aaf356",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4221.5,\r
-        "y": 2285,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4261.066650390625,\r
+        "y": 2311,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "81b55fda.fb8e98",\r
+        "id": "81506f95.53e78",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4225,\r
-        "y": 2325,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4264.566650390625,\r
+        "y": 2351,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1bcc30a0.546397",\r
-                "1eaaa262.028326"\r
+                "8a72bd7f.2b673",\r
+                "2efc6876.725c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bcc30a0.546397",\r
+        "id": "8a72bd7f.2b673",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4565,\r
-        "y": 2324,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4604.566650390625,\r
+        "y": 2350,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "68a7db89.5a89fc",\r
+        "id": "52aaed09.836384",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4423,\r
-        "y": 2282,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4462.566650390625,\r
+        "y": 2308,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1eaaa262.028326",\r
+        "id": "2efc6876.725c8",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4494,\r
-        "y": 2373,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4533.566650390625,\r
+        "y": 2399,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "71f36947.989c9",\r
+        "id": "601ee7c2.7cf4c8",\r
          "type": "set",\r
          "name": "set attachment_param (gfp-n) for OTN",\r
          "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
          "comments": "",\r
-        "x": 3119,\r
-        "y": 640,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3158.566650390625,\r
+        "y": 666,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24508e5.8723172",\r
+        "id": "f8b99cf2.a93e78",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3714,\r
-        "y": 326,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3753.566650390625,\r
+        "y": 352,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f3eaab4d.9a827",\r
+        "id": "ba2b5c4f.29126",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3271,\r
-        "y": 1904,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3310.566650390625,\r
+        "y": 1930,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3a1c771.fa4dc8",\r
+        "id": "388a019b.9b73c6",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3450,\r
-        "y": 488,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3489.566650390625,\r
+        "y": 514,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6921df6d.0bad7",\r
-                "5859006e.3869c8"\r
+                "60287d21.a15fac",\r
+                "e673bc57.d2c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5859006e.3869c8",\r
+        "id": "e673bc57.d2c08",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3692,\r
-        "y": 1077,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3731.566650390625,\r
+        "y": 1103,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6a1db5bd.d7e224"\r
+                "8e141356.94256"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6921df6d.0bad7",\r
+        "id": "60287d21.a15fac",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3686,\r
-        "y": 368,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3725.566650390625,\r
+        "y": 394,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6b14e6ca.05c05"\r
+                "354c57ea.e71ee8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a1db5bd.d7e224",\r
+        "id": "8e141356.94256",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3850,\r
-        "y": 1076,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3889.566650390625,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e8ac2c73.115cc",\r
-                "de077050.d3ab3",\r
-                "d36a1b80.8692c8",\r
-                "73f78d36.ab931c",\r
-                "8ec0e69e.0bdfb8",\r
-                "4004366.ff0b5c8"\r
+                "660dd4a0.d8f1f4",\r
+                "bd6ec24f.7d2838",\r
+                "2d50a497.118c24",\r
+                "60d7ef05.f89ff8",\r
+                "feec0e79.04d7e8",\r
+                "6270f9ff.6a6b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de077050.d3ab3",\r
+        "id": "bd6ec24f.7d2838",\r
          "type": "set",\r
          "name": "set attachment_param for OTN G",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 4114,\r
-        "y": 959,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4153.566650390625,\r
+        "y": 985,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8ec0e69e.0bdfb8",\r
+        "id": "feec0e79.04d7e8",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4195,\r
-        "y": 1274,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4234.566650390625,\r
+        "y": 1300,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a8d20b89.8deb88",\r
-                "ebe8f709.819288"\r
+                "1829c13e.6c182f",\r
+                "cdc3e429.be6fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8d20b89.8deb88",\r
+        "id": "1829c13e.6c182f",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4504.5,\r
-        "y": 1243,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4544.066650390625,\r
+        "y": 1269,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f56a0e73.901ac"\r
+                "5b91a7ec.2e4658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebe8f709.819288",\r
+        "id": "cdc3e429.be6fa",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4509.5,\r
-        "y": 1308,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4549.066650390625,\r
+        "y": 1334,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8bcbb353.d66038"\r
+                "8046aee4.83e438"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f56a0e73.901ac",\r
+        "id": "5b91a7ec.2e4658",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4680.5,\r
-        "y": 1243,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4720.066650390625,\r
+        "y": 1269,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8bcbb353.d66038",\r
+        "id": "8046aee4.83e438",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4676,\r
-        "y": 1308,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4715.566650390625,\r
+        "y": 1334,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d36a1b80.8692c8",\r
+        "id": "2d50a497.118c24",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4052,\r
-        "y": 1007,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4091.566650390625,\r
+        "y": 1033,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "73f78d36.ab931c",\r
+        "id": "60d7ef05.f89ff8",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4078,\r
-        "y": 1124,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4117.566650390625,\r
+        "y": 1150,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e0243648.484bc",\r
-                "e14aa09.d5d416",\r
-                "5447b1d0.03a8b"\r
+                "684da58c.28fc44",\r
+                "7420bdce.6aab1c",\r
+                "21d55314.ed559c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0243648.484bc",\r
+        "id": "684da58c.28fc44",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4273.5001220703125,\r
-        "y": 1076,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4313.0667724609375,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "94135ed.07ea02"\r
+                "64489fc6.c8241"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e14aa09.d5d416",\r
+        "id": "7420bdce.6aab1c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4265.5001220703125,\r
-        "y": 1131,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4305.0667724609375,\r
+        "y": 1157,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1628394b.83cd8f"\r
+                "92f1b89c.1ab69"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94135ed.07ea02",\r
+        "id": "64489fc6.c8241",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4417.8824462890625,\r
-        "y": 1075.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4457.4490966796875,\r
+        "y": 1101.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fdedf72e.2dd36"\r
+                "48d2ac4e.25f6b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdedf72e.2dd36",\r
+        "id": "48d2ac4e.25f6b4",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4602,\r
-        "y": 1074,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4641.566650390625,\r
+        "y": 1100,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f99d2e19.85b668"\r
+                "714ce556.4f2fcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f99d2e19.85b668",\r
+        "id": "714ce556.4f2fcc",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4797,\r
-        "y": 1074,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4836.566650390625,\r
+        "y": 1100,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ff4cc7a8.15eb18"\r
+                "2076535.8c263ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5447b1d0.03a8b",\r
+        "id": "21d55314.ed559c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4270.5001220703125,\r
-        "y": 1188,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4310.0667724609375,\r
+        "y": 1214,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "74603a77.be9d34"\r
+                "45f37411.31ce94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74603a77.be9d34",\r
+        "id": "45f37411.31ce94",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4422.5001220703125,\r
-        "y": 1189,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4462.0667724609375,\r
+        "y": 1215,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1628394b.83cd8f",\r
+        "id": "92f1b89c.1ab69",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4433.5001220703125,\r
-        "y": 1132,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4473.0667724609375,\r
+        "y": 1158,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e8ac2c73.115cc",\r
+        "id": "660dd4a0.d8f1f4",\r
          "type": "set",\r
          "name": "set vpn-bindingG and connectivityG",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 4109,\r
-        "y": 899,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4148.566650390625,\r
+        "y": 925,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff4cc7a8.15eb18",\r
+        "id": "2076535.8c263ac",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5000,\r
-        "y": 1078,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5039.566650390625,\r
+        "y": 1104,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8469558b.e4d748"\r
+                "f782ae02.7309d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf8a4c78.37fe58",\r
+        "id": "4c7d2512.5b4fb4",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5385,\r
-        "y": 1091,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5424.566650390625,\r
+        "y": 1117,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "44cef850.3e64a",\r
-                "9337c3a8.6f7408",\r
-                "6a44b1b.7cb45d"\r
+                "f27cc561.589478",\r
+                "533a9a4e.562074",\r
+                "f04fcd62.bdef1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8469558b.e4d748",\r
+        "id": "f782ae02.7309d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5179,\r
-        "y": 1078,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5218.566650390625,\r
+        "y": 1104,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "82428162.54c128",\r
-                "cf8a4c78.37fe58"\r
+                "eec3155e.2bcec8",\r
+                "4c7d2512.5b4fb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "82428162.54c128",\r
+        "id": "eec3155e.2bcec8",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainG id",\r
          "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5415,\r
-        "y": 1039,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5454.566650390625,\r
+        "y": 1065,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "44cef850.3e64a",\r
+        "id": "f27cc561.589478",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5595,\r
-        "y": 1082,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5634.566650390625,\r
+        "y": 1108,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ffb7eeb1.dda348"\r
+                "20cc7528.d35caa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9337c3a8.6f7408",\r
+        "id": "533a9a4e.562074",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5587,\r
-        "y": 1137,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5626.566650390625,\r
+        "y": 1163,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "28235dd8.9620aa"\r
+                "a99b13d6.7a5b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a44b1b.7cb45d",\r
+        "id": "f04fcd62.bdef1",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5592,\r
-        "y": 1194,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5631.566650390625,\r
+        "y": 1220,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a95b4d04.8ebfb"\r
+                "76e3f44a.1be574"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a95b4d04.8ebfb",\r
+        "id": "76e3f44a.1be574",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5744,\r
-        "y": 1195,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5783.566650390625,\r
+        "y": 1221,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28235dd8.9620aa",\r
+        "id": "a99b13d6.7a5b4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5755,\r
-        "y": 1140,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5794.566650390625,\r
+        "y": 1166,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ffb7eeb1.dda348",\r
+        "id": "20cc7528.d35caa",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5739.38232421875,\r
-        "y": 1079.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5778.948974609375,\r
+        "y": 1105.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "eb1ea22e.dc12c"\r
+                "52e6acc9.c6278c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb1ea22e.dc12c",\r
+        "id": "52e6acc9.c6278c",\r
          "type": "set",\r
          "name": "set controller domainG data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5954,\r
-        "y": 1076,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5993.566650390625,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "47e1e7c7.6cadf",\r
+        "id": "7dd287b6.719d08",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3728,\r
-        "y": 1017,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3767.566650390625,\r
+        "y": 1043,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3842f71.731b38",\r
+        "id": "ce04a89c.bde61",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
          "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2290,\r
-        "y": 744,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2329.566650390625,\r
+        "y": 770,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fe4cd4cf.21da1",\r
-                "8d3265c3.ddab38"\r
+                "f4c77699.53d898",\r
+                "9865c4e0.3bcc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8d3265c3.ddab38",\r
+        "id": "9865c4e0.3bcc6",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2697,\r
-        "y": 762,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2736.566650390625,\r
+        "y": 788,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "418df61.fe2be08"\r
+                "ad8883f5.8e3298"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe4cd4cf.21da1",\r
+        "id": "f4c77699.53d898",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2697,\r
-        "y": 707,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2736.566650390625,\r
+        "y": 733,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8b0dea0b.e78e98"\r
+                "e8f3ed6f.2eafd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b0dea0b.e78e98",\r
+        "id": "e8f3ed6f.2eafd",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2853,\r
-        "y": 705,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2892.566650390625,\r
+        "y": 731,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "71f36947.989c9",\r
-                "4573661e.19551"\r
+                "601ee7c2.7cf4c8",\r
+                "64ebcb8e.6a273c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "418df61.fe2be08",\r
+        "id": "ad8883f5.8e3298",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2830,\r
-        "y": 763,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2869.566650390625,\r
+        "y": 789,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5c62cbf5.952894",\r
+        "id": "6d17c7fb.4906d8",\r
          "type": "set",\r
          "name": "unset tmp.aai.all-vpn-bindings",\r
          "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",\r
          "comments": "",\r
-        "x": 1007,\r
-        "y": 179,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1046.566650390625,\r
+        "y": 205,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a7fd19a0.011a5",\r
+        "id": "c6c6f64f.fccbe8",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 4124,\r
-        "y": 597,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4163.566650390625,\r
+        "y": 623,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41c50446.37f104",\r
+        "id": "5d6e99f5.a1e2d",\r
          "type": "set",\r
          "name": "set leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 4184,\r
-        "y": 636,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4223.566650390625,\r
+        "y": 662,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4957906b.cb3908",\r
+        "id": "7de7f253.4369ac",\r
          "type": "set",\r
          "name": "unset leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 1000,\r
-        "y": 87,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1039.566650390625,\r
+        "y": 113,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5277b309.13aef4",\r
+        "id": "9d19ef7b.02af28",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 3536,\r
-        "y": 2113,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3575.566650390625,\r
+        "y": 2139,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "51d22e16.357968",\r
+        "id": "b596d9f.c7daaa8",\r
          "type": "set",\r
          "name": "set root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 3592,\r
-        "y": 2162,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3631.566650390625,\r
+        "y": 2188,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8191f581.e3e888",\r
+        "id": "aeebae01.261168",\r
          "type": "set",\r
          "name": "unset root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 1000,\r
-        "y": 126,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1039.566650390625,\r
+        "y": 152,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25a3d5e5.55ea62",\r
+        "id": "731e9165.7bfe5",\r
          "type": "execute",\r
          "name": "execute properties",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1031,\r
-        "y": 227,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1070.566650390625,\r
+        "y": 253,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "624a734b.81957c",\r
+        "id": "c3d34fd5.00b8e8",\r
          "type": "save",\r
          "name": "get service-instance from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 241,\r
-        "y": 702,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 280.566650390625,\r
+        "y": 728,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2ff4bd45.763852",\r
-                "237ce68a.9b5a2a",\r
-                "86bae4d8.c51f3"\r
+                "39350f2.499cf7",\r
+                "6ce2e49e.7b3484",\r
+                "5333638f.7ecf8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff4bd45.763852",\r
+        "id": "39350f2.499cf7",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 460,\r
-        "y": 640,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 499.566650390625,\r
+        "y": 666,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2f347c57.a92144"\r
+                "36841c29.6decdc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "237ce68a.9b5a2a",\r
+        "id": "6ce2e49e.7b3484",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 469.490966796875,\r
-        "y": 682.5740356445312,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 509.0576171875,\r
+        "y": 708.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
-            [\r
-                "196b18f9.87f4a7"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "86bae4d8.c51f3",\r
+        "id": "5333638f.7ecf8c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 458,\r
-        "y": 729,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 497.566650390625,\r
+        "y": 755,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d6f02bd7.9f988"\r
+                "3e93247c.aebb34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2f347c57.a92144",\r
+        "id": "36841c29.6decdc",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 657,\r
-        "y": 636,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 696.566650390625,\r
+        "y": 662,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "408bfafb.b2f244"\r
+                "1f2c86c7.cadda9"\r
              ]\r
          ]\r
      },\r
      {\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": 623.0623779296875,\r
-        "y": 685.8597717285156,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "d6f02bd7.9f988",\r
+        "id": "3e93247c.aebb34",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 627,\r
-        "y": 730,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 666.566650390625,\r
+        "y": 756,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "408bfafb.b2f244",\r
+        "id": "1f2c86c7.cadda9",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 880.33349609375,\r
-        "y": 635.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 919.900146484375,\r
+        "y": 661.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7d8f8b2e.4aa30c"\r
+                "a1cbb7bd.24594"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d8f8b2e.4aa30c",\r
+        "id": "a1cbb7bd.24594",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1081.0001335144043,\r
-        "y": 637.000020980835,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1120.5667839050293,\r
+        "y": 663.000020980835,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bd2be559.7e491"\r
+                "1f60fbe4.6df234"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd2be559.7e491",\r
+        "id": "1f60fbe4.6df234",\r
          "type": "save",\r
          "name": "get connectivity from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 211,\r
-        "y": 899,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 250.566650390625,\r
+        "y": 925,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "97323d62.80248",\r
-                "afdba634.5389a8",\r
-                "c784d901.2500c8"\r
+                "63c00e4f.b84e58",\r
+                "13815c78.95eb5c",\r
+                "e5780368.e11db"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97323d62.80248",\r
+        "id": "63c00e4f.b84e58",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 419,\r
-        "y": 863,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 458.566650390625,\r
+        "y": 889,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "dc950dad.bba8c8"\r
+                "c1076b8e.81d988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afdba634.5389a8",\r
+        "id": "13815c78.95eb5c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 419.490966796875,\r
-        "y": 908.5740356445312,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 459.0576171875,\r
+        "y": 934.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
-            [\r
-                "f09199a5.a037f"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "c784d901.2500c8",\r
+        "id": "e5780368.e11db",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 417,\r
-        "y": 952,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 456.566650390625,\r
+        "y": 978,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a903bba8.c7f45"\r
+                "96cea788.4bc5b"\r
              ]\r
          ]\r
      },\r
      {\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": 582.0623779296875,\r
-        "y": 908.8597717285156,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "a903bba8.c7f45",\r
+        "id": "96cea788.4bc5b",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 586,\r
-        "y": 953,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 625.566650390625,\r
+        "y": 979,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c4e5acdc.5eea4",\r
+        "id": "ec5bb05c.091188",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 558,\r
-        "y": 1447,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 597.566650390625,\r
+        "y": 1473,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f2e2cc22.a529f"\r
+                "19a0d254.b680d6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2e2cc22.a529f",\r
+        "id": "19a0d254.b680d6",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 761,\r
-        "y": 1459,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 800.566650390625,\r
+        "y": 1485,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c09b72f6.aeae98"\r
+                "5cf33a37.92a98c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c09b72f6.aeae98",\r
+        "id": "5cf33a37.92a98c",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 927,\r
-        "y": 1456,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 966.566650390625,\r
+        "y": 1482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bfe2cfaf.5416a"\r
+                "60d055a9.95f0c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfe2cfaf.5416a",\r
+        "id": "60d055a9.95f0c4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1088,\r
-        "y": 1453,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1127.566650390625,\r
+        "y": 1479,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ed44bd0b.bb6278",\r
-                "85af841c.633c5",\r
-                "785dd3f1.f249ac",\r
-                "b8d52cff.f0dcb",\r
-                "4915b2e4.5fd2dc"\r
+                "325c2337.f5bbac",\r
+                "282c70ac.7ebb8",\r
+                "790547b3.03e69",\r
+                "be332a4a.d8db58",\r
+                "88b6396e.dee88",\r
+                "3f4654a9.b7d9fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85af841c.633c5",\r
+        "id": "282c70ac.7ebb8",\r
          "type": "set",\r
          "name": "unset tmp.aai.uni",\r
          "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
          "comments": "",\r
-        "x": 1292,\r
-        "y": 1411,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1333.566650390625,\r
+        "y": 1078.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ed44bd0b.bb6278",\r
+        "id": "325c2337.f5bbac",\r
          "type": "save",\r
          "name": "get uni from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1289,\r
-        "y": 1456,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1330.566650390625,\r
+        "y": 1123.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6b32d7eb.72211",\r
-                "7343128c.f923b4",\r
-                "b9b05d3.e5ae12"\r
+                "5ebf3dd3.403df4",\r
+                "df8620f2.fcde78",\r
+                "4f82abb0.8dd704"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7343128c.f923b4",\r
+        "id": "df8620f2.fcde78",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1484.490966796875,\r
-        "y": 1429.573974609375,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1526.0576171875,\r
+        "y": 1097.5739135742188,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5dcee0f6.9162a8"\r
+                "f317bbdf.6454e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9b05d3.e5ae12",\r
+        "id": "4f82abb0.8dd704",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1480,\r
-        "y": 1473.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1521.566650390625,\r
+        "y": 1141.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b7ed6a74.25237"\r
+                "ba985891.b5d178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5dcee0f6.9162a8",\r
+        "id": "f317bbdf.6454e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1647.0625,\r
-        "y": 1428.8596801757812,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1688.629150390625,\r
+        "y": 1096.859619140625,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7ed6a74.25237",\r
+        "id": "ba985891.b5d178",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 1648,\r
-        "y": 1473.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1689.566650390625,\r
+        "y": 1141.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfdfa822.c47e1",\r
+        "id": "d594aca6.9a4aa",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1650,\r
-        "y": 1520.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1691.566650390625,\r
+        "y": 1188.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6b32d7eb.72211",\r
+        "id": "5ebf3dd3.403df4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1481,\r
-        "y": 1520.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": [\r
-            [\r
-                "dfdfa822.c47e1"\r
-            ]\r
-        ]\r
-    },\r
-    {\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": 170.5,\r
-        "y": 1118,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": [\r
-            [\r
-                "3e9a846b.aac024",\r
-                "fd2eac9f.aa3be8",\r
-                "81d85b97.ec18c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3d4d11fc.e19976",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 281.5,\r
-        "y": 1474,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "3e9a846b.aac024",\r
-        "type": "outcome",\r
-        "name": "leaf",\r
-        "xml": "<outcome value='leaf'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 156.5,\r
-        "y": 1364,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": [\r
-            [\r
-                "186f4361.0093b5"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fd2eac9f.aa3be8",\r
-        "type": "outcome",\r
-        "name": "root",\r
-        "xml": "<outcome value='root'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 157.5,\r
-        "y": 1422,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": [\r
-            [\r
-                "a8f57470.dafb1"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "81d85b97.ec18c",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 159.5,\r
-        "y": 1476,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1522.566650390625,\r
+        "y": 1188.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3d4d11fc.e19976"\r
+                "d594aca6.9a4aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17f45567.72d3f3",\r
+        "id": "f22d69be.3697f8",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 1265,\r
-        "y": 1684,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1304.566650390625,\r
+        "y": 1710,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "785dd3f1.f249ac",\r
+        "id": "790547b3.03e69",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
          "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1356,\r
-        "y": 1738,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1395.566650390625,\r
+        "y": 1764,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a8f57470.dafb1",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 273.5,\r
-        "y": 1418,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": [\r
-            [\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": "186f4361.0093b5",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 286.5,\r
-        "y": 1360,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": [\r
-            [\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": "b5d90017.45ce98",\r
+        "id": "a6f0acc2.4c1e8",\r
          "type": "set",\r
          "name": "unset ethernet-srv-end-points-list",\r
          "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
          "comments": "",\r
-        "x": 577.5,\r
-        "y": 1240,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2072.066650390625,\r
+        "y": 1177,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d0b5941.55c8f8",\r
+        "id": "ff492e23.69ead8",\r
          "type": "set",\r
          "name": "unset ethernet-srv-end-points-list",\r
          "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
          "comments": "",\r
-        "x": 594.5,\r
-        "y": 1334,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2077.066650390625,\r
+        "y": 1279,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c378a6a3.2e4c8",\r
+        "id": "f2cd3854.ada88",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 521,\r
-        "y": 1703,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 560.566650390625,\r
+        "y": 1729,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3613e1a4.3cd206"\r
+                "6040df7.067df2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3613e1a4.3cd206",\r
+        "id": "6040df7.067df2",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 753,\r
-        "y": 1702,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 792.566650390625,\r
+        "y": 1728,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c46d21fc.7c5088"\r
+                "f4813036.0e422"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c46d21fc.7c5088",\r
+        "id": "f4813036.0e422",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 965,\r
-        "y": 1703,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1004.566650390625,\r
+        "y": 1729,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "41d3d62e.c810a8"\r
+                "21d7816d.cb9a2e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41d3d62e.c810a8",\r
+        "id": "21d7816d.cb9a2e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 221,\r
-        "y": 1859,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 260.566650390625,\r
+        "y": 1885,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "24bb38a6.cf0a88",\r
-                "80203aa0.6c8a6"\r
+                "99bd9d6a.34096",\r
+                "25dea7fd.0f37b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80203aa0.6c8a6",\r
+        "id": "25dea7fd.0f37b",\r
          "type": "set",\r
          "name": "unset tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
          "comments": "",\r
-        "x": 456,\r
-        "y": 1846,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 495.566650390625,\r
+        "y": 1872,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24bb38a6.cf0a88",\r
+        "id": "99bd9d6a.34096",\r
          "type": "save",\r
          "name": "get vpn-binding from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 446,\r
-        "y": 1907,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 485.566650390625,\r
+        "y": 1933,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e7df9a86.a02dd8",\r
-                "d754cb82.42f37",\r
-                "80509f91.59bce8"\r
+                "74a706a.d47d878",\r
+                "7274c8e3.f8fec8",\r
+                "b6208f6.4c1eb7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d754cb82.42f37",\r
+        "id": "7274c8e3.f8fec8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 659.490966796875,\r
-        "y": 1891.5740356445312,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 699.0576171875,\r
+        "y": 1917.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "31b91fbf.39fff8"\r
+                "7f886391.998a1c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80509f91.59bce8",\r
+        "id": "b6208f6.4c1eb7",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 655,\r
-        "y": 1936,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 694.566650390625,\r
+        "y": 1962,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "312541a.87b29be"\r
+                "3f233556.698682"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7df9a86.a02dd8",\r
+        "id": "74a706a.d47d878",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 657,\r
-        "y": 1996,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 696.566650390625,\r
+        "y": 2022,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f19203b2.563a88"\r
+                "721ed34e.4f1714"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "31b91fbf.39fff8",\r
+        "id": "7f886391.998a1c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 822.0625,\r
-        "y": 1890.8597412109375,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 861.629150390625,\r
+        "y": 1916.8597412109375,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "312541a.87b29be",\r
+        "id": "3f233556.698682",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 823,\r
-        "y": 1936,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 862.566650390625,\r
+        "y": 1962,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f19203b2.563a88",\r
+        "id": "721ed34e.4f1714",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 826,\r
-        "y": 1995,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 865.566650390625,\r
+        "y": 2021,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "70164d90.2f08c4",\r
-                "27824a25.86f05e"\r
+                "fb6c612a.831f28",\r
+                "af0310e2.931fe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2e88ff.3380b7",\r
+        "id": "a05b5003.46c7e8",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
          "comments": "",\r
-        "x": 225,\r
-        "y": 2494,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 285.566650390625,\r
+        "y": 2523,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3026fc23.0fd5f4",\r
+        "id": "c5885881.921d18",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 368,\r
-        "y": 2554,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 407.566650390625,\r
+        "y": 2580,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a9d1707f.7a88c8",\r
-                "8ab460b7.633638"\r
+                "1736d2be.a7f385",\r
+                "11bf3fb5.747c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9d1707f.7a88c8",\r
+        "id": "1736d2be.a7f385",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 680.5,\r
-        "y": 2531,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 720.066650390625,\r
+        "y": 2557,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8ab460b7.633638",\r
+        "id": "11bf3fb5.747c4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 684.5,\r
-        "y": 2571,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 724.066650390625,\r
+        "y": 2597,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7ddc0654.bb96f8"\r
+                "9fa6731e.bfdda"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1d8045c.1b61e8",\r
+        "id": "d975bee8.cbb1b8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 860.5,\r
-        "y": 2535,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 900.066650390625,\r
+        "y": 2561,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7ddc0654.bb96f8",\r
+        "id": "9fa6731e.bfdda",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 876,\r
-        "y": 2589,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 915.566650390625,\r
+        "y": 2615,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1eddd66c.da478a"\r
+                "26102eb4.5bf9d2",\r
+                "a5cf86e7.fd2ae8",\r
+                "94107493.94d3e8",\r
+                "c85f3994.bd81f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cee3e55d.189dc",\r
+        "id": "3a7c38a3.d1311",\r
          "type": "save",\r
          "name": "update vpn-binding resource (aka. OTN ) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1171.5,\r
-        "y": 2558,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1211.066650390625,\r
+        "y": 2584,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bb915427.f0582",\r
+        "id": "d5ebfe0.284f7",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 2638.5,\r
-        "y": 1909,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2678.066650390625,\r
+        "y": 1935,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1eddd66c.da478a",\r
+        "id": "26102eb4.5bf9d2",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1133.5,\r
-        "y": 2600,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1173.066650390625,\r
+        "y": 2626,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "913d2a70.ccfd3",\r
+        "id": "eaf51112.30b59",\r
          "type": "set",\r
          "name": "set leafOrRootAccess",\r
          "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
          "comments": "",\r
-        "x": 543.5,\r
-        "y": 1278,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2038.066650390625,\r
+        "y": 1215,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e47dbd3.f7afc4",\r
+        "id": "77e27285.394bfc",\r
          "type": "set",\r
          "name": "set leafOrRootAccess",\r
          "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
          "comments": "",\r
-        "x": 556.5,\r
-        "y": 1374,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2039.066650390625,\r
+        "y": 1319,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e5881b35.2a2bf8",\r
+        "id": "1771c9d3.36c546",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4293,\r
-        "y": 550,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4332.566650390625,\r
+        "y": 576,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4004366.ff0b5c8",\r
+        "id": "6270f9ff.6a6b4",\r
          "type": "save",\r
          "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4196,\r
-        "y": 1369,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4235.566650390625,\r
+        "y": 1395,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8caebf31.dc028",\r
+        "id": "2308c235.08d20e",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3690,\r
-        "y": 2041,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3729.566650390625,\r
+        "y": 2067,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dc950dad.bba8c8",\r
+        "id": "c1076b8e.81d988",\r
          "type": "switchNode",\r
          "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
          "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 791,\r
-        "y": 849,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 830.566650390625,\r
+        "y": 875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "28d7875f.122df",\r
-                "47ffeb93.7b808c"\r
+                "451a757.6fc508c",\r
+                "8b0542af.2f9d78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28d7875f.122df",\r
+        "id": "451a757.6fc508c",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1154,\r
-        "y": 872,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1193.566650390625,\r
+        "y": 898,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f3fb6a94.133bb"\r
+                "f1ea0737.b79178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "47ffeb93.7b808c",\r
+        "id": "8b0542af.2f9d78",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1154,\r
-        "y": 821,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1193.566650390625,\r
+        "y": 847,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3da0dc2.736e6a4"\r
+                "3e6bbe33.acc602"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f3fb6a94.133bb",\r
+        "id": "f1ea0737.b79178",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1310,\r
-        "y": 870,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1349.566650390625,\r
+        "y": 896,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9ed7a6be.5472c"\r
+                "cb3a4052.881008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3da0dc2.736e6a4",\r
+        "id": "3e6bbe33.acc602",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1287,\r
-        "y": 822,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1326.566650390625,\r
+        "y": 848,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ca01ca51.23bb98",\r
+        "id": "b01d3963.8ea8b8",\r
          "type": "set",\r
          "name": "unset tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",\r
          "comments": "",\r
-        "x": 2047,\r
-        "y": 220,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2086.566650390625,\r
+        "y": 246,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ccc1a6d.d89cd4",\r
+        "id": "5a0cb184.9cdf98",\r
          "type": "set",\r
          "name": "set root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 3589,\r
-        "y": 2201,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3628.566650390625,\r
+        "y": 2227,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ceaa1f2c.697ad",\r
+        "id": "d9cf64bd.4ed12",\r
          "type": "set",\r
          "name": "set leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 4179,\r
-        "y": 674,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4218.566650390625,\r
+        "y": 700,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8d52cff.f0dcb",\r
+        "id": "be332a4a.d8db58",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
          "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1353,\r
-        "y": 1780,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1392.566650390625,\r
+        "y": 1806,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "901c32b.8d67fd",\r
+        "id": "3501da3.a014526",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
          "comments": "",\r
-        "x": 532,\r
-        "y": 1514,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 571.566650390625,\r
+        "y": 1540,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d142c0f2.700e98",\r
+        "id": "2c2649c2.53ac7e",\r
          "type": "execute",\r
          "name": "execute printContext",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 563,\r
-        "y": 1554,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 602.566650390625,\r
+        "y": 1580,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70164d90.2f08c4",\r
+        "id": "fb6c612a.831f28",\r
          "type": "set",\r
          "name": "set otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1111,\r
-        "y": 1962,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1150.566650390625,\r
+        "y": 1988,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "27824a25.86f05e",\r
+        "id": "af0310e2.931fe8",\r
          "type": "set",\r
          "name": "set otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1114,\r
-        "y": 2004,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1153.566650390625,\r
+        "y": 2030,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f24a5646.1c02c8",\r
+        "id": "694d6c2f.8edccc",\r
          "type": "set",\r
          "name": "unset otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 557,\r
-        "y": 1644,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 596.566650390625,\r
+        "y": 1670,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db09832f.86c758",\r
+        "id": "4b32fbef.652bc4",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
          "comments": "",\r
-        "x": 312,\r
-        "y": 2023,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 351.566650390625,\r
+        "y": 2049,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3c14b8ea.b96268",\r
+        "id": "caa8a64f.1936",\r
          "type": "execute",\r
          "name": "execute printContext",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 320,\r
-        "y": 2080,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 359.566650390625,\r
+        "y": 2106,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4915b2e4.5fd2dc",\r
+        "id": "88b6396e.dee88",\r
          "type": "execute",\r
          "name": "execute split tp-id to get pnf-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1331,\r
-        "y": 1629,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1370.566650390625,\r
+        "y": 1655,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bfcf3bba.b5daa",\r
-                "9b18409e.c203c8"\r
+                "45e3fdbe.201574",\r
+                "86940004.bfdd7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b18409e.c203c8",\r
+        "id": "86940004.bfdd7",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1554,\r
-        "y": 1584,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1593.566650390625,\r
+        "y": 1610,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5afaf397.e20c3c"\r
+                "c31b8cce.808f08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfcf3bba.b5daa",\r
+        "id": "45e3fdbe.201574",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1556,\r
-        "y": 1648,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1595.566650390625,\r
+        "y": 1674,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f7de9867.a0fd38"\r
+                "1cc861e4.834c36"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5afaf397.e20c3c",\r
+        "id": "c31b8cce.808f08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1719,\r
-        "y": 1581,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1758.566650390625,\r
+        "y": 1607,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "cdcfe3c8.962368"\r
+                "b2423aca.7a4fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7de9867.a0fd38",\r
+        "id": "1cc861e4.834c36",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 1718,\r
-        "y": 1644,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1757.566650390625,\r
+        "y": 1670,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cdcfe3c8.962368",\r
+        "id": "b2423aca.7a4fa8",\r
          "type": "set",\r
          "name": "set tmp.uni-node-id-short",\r
-        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />\n",\r
+        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
          "comments": "",\r
-        "x": 1939,\r
-        "y": 1595,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1978.566650390625,\r
+        "y": 1621,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d07bcb7.ffff34",\r
+        "id": "45f30159.842648",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1484,\r
-        "y": 2320,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1523.566650390625,\r
+        "y": 2346,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9547fb43.8165f"\r
+                "195465ca.996e92"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "261f721d.19cda6",\r
+        "id": "ac9df433.f2c8",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1869,\r
-        "y": 2333,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1908.566650390625,\r
+        "y": 2359,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a4fad359.d63e7",\r
-                "d7202a06.97a2a8",\r
-                "d2a1d22e.b2ed6"\r
+                "565cac1f.04fa64",\r
+                "e43b7ac1.fcb9e",\r
+                "7ad49b0d.e0614c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9547fb43.8165f",\r
+        "id": "195465ca.996e92",\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
+        "x": 1702.566650390625,\r
+        "y": 2346,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9b0cdae9.5834e8",\r
-                "261f721d.19cda6"\r
+                "94dbb559.adb488",\r
+                "ac9df433.f2c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b0cdae9.5834e8",\r
+        "id": "94dbb559.adb488",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainConn id",\r
          "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 1899,\r
-        "y": 2281,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1938.566650390625,\r
+        "y": 2307,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4fad359.d63e7",\r
+        "id": "565cac1f.04fa64",\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
+        "x": 2118.566650390625,\r
+        "y": 2350,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ce2ed097.248ac"\r
+                "b1dc084c.7cde9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7202a06.97a2a8",\r
+        "id": "e43b7ac1.fcb9e",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2071,\r
-        "y": 2379,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2110.566650390625,\r
+        "y": 2405,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "15f2754c.6e5b2b"\r
+                "385c483c.3ef568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2a1d22e.b2ed6",\r
+        "id": "7ad49b0d.e0614c",\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
+        "x": 2115.566650390625,\r
+        "y": 2462,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fe7bb44f.f58b7"\r
+                "35f4b5a3.f8aa4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe7bb44f.f58b7",\r
+        "id": "35f4b5a3.f8aa4a",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2228,\r
-        "y": 2437,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2267.566650390625,\r
+        "y": 2463,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15f2754c.6e5b2b",\r
+        "id": "385c483c.3ef568",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2239,\r
-        "y": 2382,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2278.566650390625,\r
+        "y": 2408,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ce2ed097.248ac",\r
+        "id": "b1dc084c.7cde9",\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
+        "x": 2262.948974609375,\r
+        "y": 2347.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1c2a2a5a.6d8256"\r
+                "5d32a434.f7be54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c2a2a5a.6d8256",\r
+        "id": "5d32a434.f7be54",\r
          "type": "set",\r
          "name": "set controller domainConn data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 2438,\r
-        "y": 2318,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2477.566650390625,\r
+        "y": 2344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9710382e.112c58",\r
+        "id": "51bc490a.0719c",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 562,\r
-        "y": 2366,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 601.566650390625,\r
+        "y": 2392,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "afc311a9.64a498",\r
-                "1b364ee.7270531",\r
-                "aa64b78b.7ab17"\r
+                "9a98fb41.58116",\r
+                "d11dcfed.810438",\r
+                "f803d5ab.85238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afc311a9.64a498",\r
+        "id": "9a98fb41.58116",\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
+        "x": 797.0667724609375,\r
+        "y": 2344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7cd619d5.a4e8c"\r
+                "98bce7a3.da5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1b364ee.7270531",\r
+        "id": "d11dcfed.810438",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 749.5001220703125,\r
-        "y": 2373,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 789.0667724609375,\r
+        "y": 2399,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7127ee10.2a0b4"\r
+                "71f2762f.659628"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7cd619d5.a4e8c",\r
+        "id": "98bce7a3.da5e",\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
+        "x": 941.4490966796875,\r
+        "y": 2343.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fd5a5a0.ad9b128"\r
+                "c67046c0.c64788"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd5a5a0.ad9b128",\r
+        "id": "c67046c0.c64788",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1086,\r
-        "y": 2316,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1125.566650390625,\r
+        "y": 2342,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8c513405.b809e8"\r
+                "5f0a1eb2.b2273"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c513405.b809e8",\r
+        "id": "5f0a1eb2.b2273",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1281,\r
-        "y": 2316,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1320.566650390625,\r
+        "y": 2342,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6d07bcb7.ffff34"\r
+                "45f30159.842648"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa64b78b.7ab17",\r
+        "id": "f803d5ab.85238",\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
+        "x": 794.0667724609375,\r
+        "y": 2456,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "22a641d1.a7babe"\r
+                "33262ba5.8d682c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "22a641d1.a7babe",\r
+        "id": "33262ba5.8d682c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 906.5001220703125,\r
-        "y": 2431,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 946.0667724609375,\r
+        "y": 2457,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7127ee10.2a0b4",\r
+        "id": "71f2762f.659628",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 917.5001220703125,\r
-        "y": 2374,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 957.0667724609375,\r
+        "y": 2400,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41c682cf.a83f2c",\r
+        "id": "808535b.d0bfd48",\r
          "type": "set",\r
          "name": "set tmp.pnf-name-forUrl",\r
          "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 552,\r
-        "y": 2278,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 591.566650390625,\r
+        "y": 2304,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7cb304b.f39168",\r
+        "id": "6e3ab27b.a7f37c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 297,\r
-        "y": 2409,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 336.566650390625,\r
+        "y": 2435,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "41c682cf.a83f2c",\r
-                "9710382e.112c58"\r
+                "808535b.d0bfd48",\r
+                "51bc490a.0719c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d390d070.3dc4c",\r
+        "id": "dc357fe5.d2f6d8",\r
          "type": "comment",\r
          "name": "Temporary skipping this check - to support multiple instances in one slice",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1511.9666748046875,\r
-        "y": 226.88333129882812,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1551.5333251953125,\r
+        "y": 252.88333129882812,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a92b97b8.4129e8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 753.566650390625,\r
+        "y": 475,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "baa368e2.d0057",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 313.066650390625,\r
+        "y": 1444,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "ec5bb05c.091188",\r
+                "f2cd3854.ada88",\r
+                "3501da3.a014526",\r
+                "2c2649c2.53ac7e",\r
+                "a05b5003.46c7e8",\r
+                "c5885881.921d18",\r
+                "694d6c2f.8edccc",\r
+                "4b32fbef.652bc4",\r
+                "caa8a64f.1936",\r
+                "6e3ab27b.a7f37c",\r
+                "5a72a2f9.fe54bc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3f4654a9.b7d9fc",\r
+        "type": "switchNode",\r
+        "name": "switch uni type",\r
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1343.566650390625,\r
+        "y": 1282,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "118223c9.ee1e8c",\r
+                "5e72886e.16b82",\r
+                "9ad14e96.a683a8",\r
+                "b20e668c.49e0a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "118223c9.ee1e8c",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1508.566650390625,\r
+        "y": 1264,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "4829f132.924c9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e72886e.16b82",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1511.566650390625,\r
+        "y": 1303,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "1b6bbf84.2b9b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b20e668c.49e0a",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1505.566650390625,\r
+        "y": 1381,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "23f70279.3c530e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9ad14e96.a683a8",\r
+        "type": "outcome",\r
+        "name": "root-secondary",\r
+        "xml": "<outcome value='root-secondary'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1528.566650390625,\r
+        "y": 1344,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "690a7c3c.e28bc4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "34596fcc.944e58",\r
+        "type": "set",\r
+        "name": "unset ethernet-srv-end-points-list",\r
+        "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
+        "comments": "",\r
+        "x": 2074.566650390625,\r
+        "y": 1377,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "36c4b896.3cd558",\r
+        "type": "set",\r
+        "name": "set leafOrRootAccess",\r
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",\r
+        "comments": "",\r
+        "x": 2036.566650390625,\r
+        "y": 1417,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "23f70279.3c530e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1657.566650390625,\r
+        "y": 1402,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a5cf86e7.fd2ae8",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1247.1500244140625,\r
+        "y": 2701.3336181640625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4829f132.924c9",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1643.4832763671875,\r
+        "y": 1260.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "eaf51112.30b59"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1b6bbf84.2b9b8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1645.4832763671875,\r
+        "y": 1298.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "77e27285.394bfc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "690a7c3c.e28bc4",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1688.4832763671875,\r
+        "y": 1345.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "36c4b896.3cd558"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "94107493.94d3e8",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishSubscription",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1215.1500244140625,\r
+        "y": 2773.33349609375,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c85f3994.bd81f",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1245.1500244140625,\r
+        "y": 2835.33349609375,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "5a72a2f9.fe54bc",\r
+        "type": "set",\r
+        "name": "unset ethernet-srv-end-points-list",\r
+        "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
+        "comments": "",\r
+        "x": 638.566650390625,\r
+        "y": 1382.166748046875,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cb3a4052.881008",\r
+        "type": "switchNode",\r
+        "name": "switch conn type",\r
+        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 179.56666564941406,\r
+        "y": 1093.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "f5718cb9.775688",\r
+                "eaa991b9.45489"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eaa991b9.45489",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 364.566650390625,\r
+        "y": 1267.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "baa368e2.d0057"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f5718cb9.775688",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 367.566650390625,\r
+        "y": 1222.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "baa368e2.d0057"\r
+            ]\r
+        ]\r
      }\r
  ]
 \ No newline at end of file