Adding support for connecting a single ONU port to multiple clouds with different...

[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..1828f87 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": "4a53e986.e1345",\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": 401.8833312988281,\r
+        "y": 341,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7a4b4c32.339f0c",\r
-                "476b558f.0cf4e4",\r
-                "c5f863d4.faa76"\r
+                "bee28b81.87faf8",\r
+                "2e0d3206.b3958e",\r
+                "2caa6605.779652"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a4b4c32.339f0c",\r
+        "id": "bee28b81.87faf8",\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": 589.8833312988281,\r
+        "y": 354,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "477b4d49.40f0ec"\r
+                "db2a2eb9.c4729"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "476b558f.0cf4e4",\r
+        "id": "2e0d3206.b3958e",\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": 597.374267578125,\r
+        "y": 396.57403564453125,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
-            [\r
-                "9391f816.87a258"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "c5f863d4.faa76",\r
+        "id": "2caa6605.779652",\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": 587.8833312988281,\r
+        "y": 443,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7e716c79.c4ee54"\r
+                "9a0e1ef7.428b9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "477b4d49.40f0ec",\r
+        "id": "db2a2eb9.c4729",\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": 762.8833312988281,\r
+        "y": 352,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "de48ad25.e4a568"\r
+                "b1233538.ceab4"\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": "b1233538.ceab4",\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": 991.8833312988281,\r
+        "y": 353,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1fd8993c.e83297"\r
+                "f68da0c8.dc2638"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1fd8993c.e83297",\r
+        "id": "f68da0c8.dc2638",\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": 1206.8833312988281,\r
+        "y": 354,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "33755ee2.127952"\r
+                "947d4965.a799f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "edb565df.2fd588",\r
+        "id": "ab775a4c.a509d",\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": 1460.8833312988281,\r
+        "y": 276,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d9f77b89.2576a8",\r
-                "d1a41641.7e8658"\r
+                "1ae0d7f3.280b18",\r
+                "b7c135fb.7fc808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d9f77b89.2576a8",\r
+        "id": "1ae0d7f3.280b18",\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": 1677.8833312988281,\r
+        "y": 255,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "33755ee2.127952"\r
+                "947d4965.a799f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d1a41641.7e8658",\r
+        "id": "b7c135fb.7fc808",\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": 1677.8833312988281,\r
+        "y": 304,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "33755ee2.127952",\r
+        "id": "947d4965.a799f8",\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": 1861.8833312988281,\r
+        "y": 341,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9647ef19.c8c25",\r
-                "b3842f71.731b38",\r
-                "ca01ca51.23bb98"\r
+                "7307d136.f98668",\r
+                "d6d93ab.df041c8",\r
+                "ed4d0298.cdb578"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48081245.456c3c",\r
+        "id": "d12da893.5808e",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 180,\r
-        "y": 89,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 220.88333129882812,\r
+        "y": 82,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "226f6982.562f5e"\r
+                "ba22940.68974f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "226f6982.562f5e",\r
+        "id": "ba22940.68974f",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -225,3560 +201,3545 @@
          "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": 505.1690216064453,\r
+        "y": 143.23810863494873,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f533e2ec.f849f"\r
+                "f0aeb23e.8f1f7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f533e2ec.f849f",\r
+        "id": "f0aeb23e.8f1f7",\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": 511.3119354248047,\r
+        "y": 228.00003051757812,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "15848be5.af4ba4"\r
+                "849eab75.e48858"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15848be5.af4ba4",\r
+        "id": "849eab75.e48858",\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": 821.1213684082031,\r
+        "y": 219.66668701171875,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2395bbe0.4b8ec4",\r
-                "5c62cbf5.952894",\r
-                "4957906b.cb3908",\r
-                "25a3d5e5.55ea62",\r
-                "624a734b.81957c"\r
+                "4a53e986.e1345",\r
+                "9dad0003.283738",\r
+                "47e937a3.3ee608",\r
+                "fa83bc41.1d8b08",\r
+                "39b1b2.d055464e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9647ef19.c8c25",\r
+        "id": "7307d136.f98668",\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": 2078.883331298828,\r
+        "y": 279,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "927e2807.47e1",\r
+        "id": "5be24b21.11ebc4",\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": 4247.883331298828,\r
+        "y": 165,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71f8cbde.7b70ec",\r
+        "id": "66c2f1fa.df4e",\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": 4328.883331298828,\r
+        "y": 480,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "dca0592f.f2f0f8",\r
-                "7abf945b.d3630c"\r
+                "78ae8a16.bcde6c",\r
+                "163e60b5.f624ef"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dca0592f.f2f0f8",\r
+        "id": "78ae8a16.bcde6c",\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": 4638.383331298828,\r
+        "y": 449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4d6d008.1dd328"\r
+                "a86780cc.869ba"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7abf945b.d3630c",\r
+        "id": "163e60b5.f624ef",\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": 4643.383331298828,\r
+        "y": 514,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6ddc3bc2.826894"\r
+                "496a02d9.361154"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d6d008.1dd328",\r
+        "id": "a86780cc.869ba",\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": 4814.383331298828,\r
+        "y": 449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ddc3bc2.826894",\r
+        "id": "496a02d9.361154",\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": 4809.883331298828,\r
+        "y": 514,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "639d74a6.1d8f04",\r
+        "id": "4c8b1659.abc1b",\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": 4193.383331298828,\r
+        "y": 734,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9456183.6b2d68",\r
+        "id": "902cb9fb.0d496",\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": 4347.383331298828,\r
+        "y": 782,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3efbdf9b.54682",\r
-                "243cc169.72316e"\r
+                "f961065e.0e576",\r
+                "6ca1f611.56dee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3efbdf9b.54682",\r
+        "id": "f961065e.0e576",\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": 4692.883331298828,\r
+        "y": 763,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ba970949.4ab53"\r
+                "6296fab8.967dac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "243cc169.72316e",\r
+        "id": "6ca1f611.56dee",\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": 4696.883331298828,\r
+        "y": 803,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4891a43f.02e58c"\r
+                "ef7067c4.7ea328"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ba970949.4ab53",\r
+        "id": "6296fab8.967dac",\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": 4850.883331298828,\r
+        "y": 763,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4891a43f.02e58c",\r
+        "id": "ef7067c4.7ea328",\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": 4854.383331298828,\r
+        "y": 803,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "388beb56.7c7234",\r
-                "eb334e0f.b54c3"\r
+                "ee477ca2.a65568",\r
+                "5e527e99.1f4728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "388beb56.7c7234",\r
+        "id": "ee477ca2.a65568",\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": 5184.883331298828,\r
+        "y": 768,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d196af8c.f36ae8",\r
+        "id": "f9d5afb7.0291b",\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": 5048.883331298828,\r
+        "y": 727,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb334e0f.b54c3",\r
+        "id": "5e527e99.1f4728",\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": 5111.883331298828,\r
+        "y": 814,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "51361643.15e97",\r
+        "id": "48c30a65.f0f584",\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": 4185.883331298828,\r
+        "y": 213,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7074e291.428a74",\r
+        "id": "bc523ecb.f956a8",\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": 4211.883331298828,\r
+        "y": 330,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fd9f25cd.b6ab9",\r
-                "13f82e43.b47822",\r
-                "a1ba843c.92fa78"\r
+                "a72840b5.dc70e",\r
+                "54e4a8de.9445f8",\r
+                "4012660e.b55b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd9f25cd.b6ab9",\r
+        "id": "a72840b5.dc70e",\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": 4407.383453369141,\r
+        "y": 282,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "10d11922.59185f"\r
+                "9d071aa.9c29c68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13f82e43.b47822",\r
+        "id": "54e4a8de.9445f8",\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": 4399.383453369141,\r
+        "y": 337,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "19650434.8dad4c"\r
+                "3662c50c.d754d2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10d11922.59185f",\r
+        "id": "9d071aa.9c29c68",\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": 4551.765777587891,\r
+        "y": 281.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "777ae9c7.6a278"\r
+                "c1155c42.4dc2e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "391ce87d.ba3df8",\r
+        "id": "a3b68f87.0c3248",\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": 5133.883331298828,\r
+        "y": 284,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "65b820ac.17e0d"\r
+                "e6d1f56a.1147f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "777ae9c7.6a278",\r
+        "id": "c1155c42.4dc2e8",\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": 4735.883331298828,\r
+        "y": 280,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f4f1a808.b22bc"\r
+                "e3565ab9.0a825"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4f1a808.b22bc",\r
+        "id": "e3565ab9.0a825",\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": 4930.883331298828,\r
+        "y": 280,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "391ce87d.ba3df8"\r
+                "a3b68f87.0c3248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1ba843c.92fa78",\r
+        "id": "4012660e.b55b2",\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": 4404.383453369141,\r
+        "y": 394,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a6d9e4b5.ea0fd8"\r
+                "7e9c03d8.c41c7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6d9e4b5.ea0fd8",\r
+        "id": "7e9c03d8.c41c7c",\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": 4556.383453369141,\r
+        "y": 395,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "19650434.8dad4c",\r
+        "id": "3662c50c.d754d2",\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": 4567.383453369141,\r
+        "y": 338,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d042a1f.c8fb44",\r
+        "id": "99fa8e6f.e803d8",\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": 5518.883331298828,\r
+        "y": 297,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8c0f87c1.0cfa88",\r
-                "96b96977.b4fed8",\r
-                "6ce026da.737ea"\r
+                "a38e0436.5aedc",\r
+                "80f6747e.265c78",\r
+                "c370b7ba.84a26"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "65b820ac.17e0d",\r
+        "id": "e6d1f56a.1147f8",\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": 5312.883331298828,\r
+        "y": 284,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1918c44c.117ae4",\r
-                "5d042a1f.c8fb44"\r
+                "4599703a.c42f3",\r
+                "99fa8e6f.e803d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1918c44c.117ae4",\r
+        "id": "4599703a.c42f3",\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": 5548.883331298828,\r
+        "y": 245,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8c0f87c1.0cfa88",\r
+        "id": "a38e0436.5aedc",\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": 5728.883331298828,\r
+        "y": 288,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e1aae278.d9aab"\r
+                "8c88cbf0.e09b1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96b96977.b4fed8",\r
+        "id": "80f6747e.265c78",\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": 5720.883331298828,\r
+        "y": 343,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a74826f7.daef6"\r
+                "e2be9acb.77d62"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ce026da.737ea",\r
+        "id": "c370b7ba.84a26",\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": 5725.883331298828,\r
+        "y": 400,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "80c7718d.f0881"\r
+                "856ee89c.2898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80c7718d.f0881",\r
+        "id": "856ee89c.2898",\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": 5877.883331298828,\r
+        "y": 401,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a74826f7.daef6",\r
+        "id": "e2be9acb.77d62",\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": 5888.883331298828,\r
+        "y": 346,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e1aae278.d9aab",\r
+        "id": "8c88cbf0.e09b1",\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": 5873.265655517578,\r
+        "y": 285.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b6fb5857.56d2c"\r
+                "a4a57efc.888ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b6fb5857.56d2c",\r
+        "id": "a4a57efc.888ff8",\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": 6087.883331298828,\r
+        "y": 282,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "881ac3d.2b73cc",\r
+        "id": "172d91c5.a78676",\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": 3654.883331298828,\r
+        "y": 1622,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f942fe34.857118",\r
+        "id": "f13d198f.d5c79",\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": 3717.883331298828,\r
+        "y": 1951,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d6aba815.0c0b98",\r
-                "fb15fc4f.27732"\r
+                "3640aede.8913a2",\r
+                "f1b1c8d.9945bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6aba815.0c0b98",\r
+        "id": "3640aede.8913a2",\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": 4013.383331298828,\r
+        "y": 1918,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f7e9b7f6.cb6cf8"\r
+                "4b0d0deb.6577e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb15fc4f.27732",\r
+        "id": "f1b1c8d.9945bb8",\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": 4018.383331298828,\r
+        "y": 1983,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e7e93f9f.05e6f8"\r
+                "5da14040.cb50b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7e9b7f6.cb6cf8",\r
+        "id": "4b0d0deb.6577e4",\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": 4181.383331298828,\r
+        "y": 1918,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7e93f9f.05e6f8",\r
+        "id": "5da14040.cb50b8",\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": 4191.883331298828,\r
+        "y": 1983,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c6f7c9bc.a78ea8",\r
+        "id": "1e50105a.a8b96",\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": 3593.883331298828,\r
+        "y": 1679,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f243ad6.97dd38",\r
+        "id": "dfe45c65.d48f6",\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": 3613.883331298828,\r
+        "y": 1776,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a8e6c84d.0f237",\r
-                "3ee8ddc2.b7378a",\r
-                "311698c.6883b68"\r
+                "56d2f84a.b524e8",\r
+                "43f5b436.ace8b4",\r
+                "a9c884c3.3b2c18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8e6c84d.0f237",\r
+        "id": "56d2f84a.b524e8",\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": 3816.3834533691406,\r
+        "y": 1729,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6ef9124f.c91bc4"\r
+                "10cf7345.17615d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee8ddc2.b7378a",\r
+        "id": "43f5b436.ace8b4",\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": 3808.3834533691406,\r
+        "y": 1784,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9b01e4a.2bf7598"\r
+                "40e41e98.b2ab3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ef9124f.c91bc4",\r
+        "id": "10cf7345.17615d",\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": 3960.7657775878906,\r
+        "y": 1726.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8bd570a1.9b5908"\r
+                "69889215.886b4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8bd570a1.9b5908",\r
+        "id": "69889215.886b4c",\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": 4144.883331298828,\r
+        "y": 1741,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "5951fb7a.778dbc"\r
+                "3c1ff953.79a23e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "311698c.6883b68",\r
+        "id": "a9c884c3.3b2c18",\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": 3813.3834533691406,\r
+        "y": 1841,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "25fe1469.5e13bc"\r
+                "8ab7ecfb.f03ee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25fe1469.5e13bc",\r
+        "id": "8ab7ecfb.f03ee",\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": 3965.3834533691406,\r
+        "y": 1842,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b01e4a.2bf7598",\r
+        "id": "40e41e98.b2ab3",\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": 3976.3834533691406,\r
+        "y": 1787,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a9a3100d.7e9a38",\r
+        "id": "37ef2104.1e9d5e",\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": 4542.883331298828,\r
+        "y": 1745,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "15a6f6cf.b80121"\r
+                "901dac81.52118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5951fb7a.778dbc",\r
+        "id": "3c1ff953.79a23e",\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": 4339.883331298828,\r
+        "y": 1741,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a9a3100d.7e9a38"\r
+                "37ef2104.1e9d5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b462757e.f97cf",\r
+        "id": "86b8c4cb.c3747",\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": 4927.883331298828,\r
+        "y": 1744,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f548cd5f.cf97e8",\r
-                "7bf2c309.936484",\r
-                "37200156.6e45ae"\r
+                "b5f45931.a1805",\r
+                "34bcb3b6.e69b1c",\r
+                "d4cc1381.862c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15a6f6cf.b80121",\r
+        "id": "901dac81.52118",\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": 4719.883331298828,\r
+        "y": 1737,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "24625031.3ccbb",\r
-                "b462757e.f97cf"\r
+                "81cd4229.29ba8",\r
+                "86b8c4cb.c3747"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24625031.3ccbb",\r
+        "id": "81cd4229.29ba8",\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": 4957.883331298828,\r
+        "y": 1692,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3717e4c0.7e91fc",\r
+        "id": "a6f965e8.0bb248",\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": 5286.883331298828,\r
+        "y": 1848,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ebaf4cad.7f7ac",\r
+        "id": "3b503e2a.8c5dd2",\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": 5297.883331298828,\r
+        "y": 1793,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "95133e26.a5c4",\r
+        "id": "a84f2510.1ebf08",\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": 5282.265655517578,\r
+        "y": 1732.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "74fa69d9.12322"\r
+                "f83738f1.e5e14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74fa69d9.12322",\r
+        "id": "f83738f1.e5e14",\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": 5496.883331298828,\r
+        "y": 1729,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f548cd5f.cf97e8",\r
+        "id": "b5f45931.a1805",\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": 5137.883331298828,\r
+        "y": 1735,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "95133e26.a5c4"\r
+                "a84f2510.1ebf08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bf2c309.936484",\r
+        "id": "34bcb3b6.e69b1c",\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": 5129.883331298828,\r
+        "y": 1790,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ebaf4cad.7f7ac"\r
+                "3b503e2a.8c5dd2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37200156.6e45ae",\r
+        "id": "d4cc1381.862c48",\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": 5134.883331298828,\r
+        "y": 1847,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3717e4c0.7e91fc"\r
+                "a6f965e8.0bb248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4573661e.19551",\r
+        "id": "4a95df1.67c3fa",\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": 3168.883331298828,\r
+        "y": 693,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e3a931ba.d41978",\r
-                "cce98769.66d2f"\r
+                "60b8b463.e4925c",\r
+                "5e23be29.1eb6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3a931ba.d41978",\r
+        "id": "60b8b463.e4925c",\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": 3382.883331298828,\r
+        "y": 730,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "83f7a2a0.47e4a"\r
+                "4d4203c4.4fd81c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cce98769.66d2f",\r
+        "id": "5e23be29.1eb6a",\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": 3384.883331298828,\r
+        "y": 668,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a3a1c771.fa4dc8"\r
+                "402d5674.bb5698"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83f7a2a0.47e4a",\r
+        "id": "4d4203c4.4fd81c",\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": 2962.883331298828,\r
+        "y": 1973,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b17cf12.c5b4e9",\r
-                "375f750c.523c3a"\r
+                "4155de88.54a1f",\r
+                "11e38b5d.85c715"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b17cf12.c5b4e9",\r
+        "id": "4155de88.54a1f",\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": 3215.883331298828,\r
+        "y": 2007,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b574ded7.ea26d"\r
+                "97b4f973.8f85a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "375f750c.523c3a",\r
+        "id": "11e38b5d.85c715",\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": 3215.883331298828,\r
+        "y": 1951,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3eeb971b.8e101"\r
+                "4bdf7725.9cef3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b574ded7.ea26d",\r
+        "id": "97b4f973.8f85a8",\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": 3366.883331298828,\r
+        "y": 2007,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "27c7cf1.51adcb",\r
+        "id": "15e2350c.3f989b",\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": 4242.883331298828,\r
+        "y": 105,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e24e0a9e.a7db8",\r
+        "id": "22f55219.d9af6e",\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": 3650.883331298828,\r
+        "y": 1564,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6b14e6ca.05c05",\r
+        "id": "9157e39e.50973",\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": 3933.883331298828,\r
+        "y": 362,\r
+        "z": "db287b1f.2984a8",\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
+                "15e2350c.3f989b",\r
+                "5be24b21.11ebc4",\r
+                "48c30a65.f0f584",\r
+                "bc523ecb.f956a8",\r
+                "66c2f1fa.df4e",\r
+                "738a4fa7.5a68d",\r
+                "9521e4ca.a61af",\r
+                "224f4283.917d26"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3eeb971b.8e101",\r
+        "id": "4bdf7725.9cef3",\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": 3366.883331298828,\r
+        "y": 1950,\r
+        "z": "db287b1f.2984a8",\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
+                "22f55219.d9af6e",\r
+                "172d91c5.a78676",\r
+                "1e50105a.a8b96",\r
+                "dfe45c65.d48f6",\r
+                "f13d198f.d5c79",\r
+                "78f084cb.41e754",\r
+                "e35a6c95.6b3d6",\r
+                "1ced8517.ce35e3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f87bcfd0.50c8c",\r
+        "id": "e7e7eca7.931088",\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": 3604.883331298828,\r
+        "y": 2249,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab6e58b.3c55528",\r
+        "id": "5544b67f.df3238",\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": 3758.883331298828,\r
+        "y": 2297,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "eff9a19.776a7e",\r
-                "ddb717fb.d9a6d8"\r
+                "b36c5e4.a4b982",\r
+                "75e03418.7b0a3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eff9a19.776a7e",\r
+        "id": "b36c5e4.a4b982",\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": 4104.383331298828,\r
+        "y": 2278,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "59a2ea1f.0d3f14"\r
+                "996a2de3.86ff68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ddb717fb.d9a6d8",\r
+        "id": "75e03418.7b0a3c",\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": 4108.383331298828,\r
+        "y": 2318,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "81b55fda.fb8e98"\r
+                "1787d971.8d0d67"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59a2ea1f.0d3f14",\r
+        "id": "996a2de3.86ff68",\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": 4262.383331298828,\r
+        "y": 2278,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "81b55fda.fb8e98",\r
+        "id": "1787d971.8d0d67",\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": 4265.883331298828,\r
+        "y": 2318,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1bcc30a0.546397",\r
-                "1eaaa262.028326"\r
+                "79bbcc28.d4fd3c",\r
+                "137b8fb9.4aaa78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bcc30a0.546397",\r
+        "id": "79bbcc28.d4fd3c",\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": 4605.883331298828,\r
+        "y": 2317,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "68a7db89.5a89fc",\r
+        "id": "9aab71de.3f671",\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": 4463.883331298828,\r
+        "y": 2275,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1eaaa262.028326",\r
+        "id": "137b8fb9.4aaa78",\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": 4534.883331298828,\r
+        "y": 2366,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "71f36947.989c9",\r
+        "id": "e7a16254.b52678",\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": 3159.883331298828,\r
+        "y": 633,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24508e5.8723172",\r
+        "id": "b98d7c04.aadb6",\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": 3754.883331298828,\r
+        "y": 319,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f3eaab4d.9a827",\r
+        "id": "f9466402.70d608",\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": 3311.883331298828,\r
+        "y": 1897,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3a1c771.fa4dc8",\r
+        "id": "402d5674.bb5698",\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": 3490.883331298828,\r
+        "y": 481,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6921df6d.0bad7",\r
-                "5859006e.3869c8"\r
+                "40174504.12275c",\r
+                "483f6800.997ef8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5859006e.3869c8",\r
+        "id": "483f6800.997ef8",\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": 3732.883331298828,\r
+        "y": 1070,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6a1db5bd.d7e224"\r
+                "f91cd9b2.b4ebc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6921df6d.0bad7",\r
+        "id": "40174504.12275c",\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": 3726.883331298828,\r
+        "y": 361,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6b14e6ca.05c05"\r
+                "9157e39e.50973"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a1db5bd.d7e224",\r
+        "id": "f91cd9b2.b4ebc8",\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": 3890.883331298828,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e8ac2c73.115cc",\r
-                "de077050.d3ab3",\r
-                "d36a1b80.8692c8",\r
-                "73f78d36.ab931c",\r
-                "8ec0e69e.0bdfb8",\r
-                "4004366.ff0b5c8"\r
+                "e0a89dfb.b97bd8",\r
+                "356efc92.1be0c4",\r
+                "b98c51bd.b1df7",\r
+                "c9386596.fb5188",\r
+                "99a335d9.47dc9",\r
+                "1d1e23b2.17cb04"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de077050.d3ab3",\r
+        "id": "356efc92.1be0c4",\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": 4154.883331298828,\r
+        "y": 952,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8ec0e69e.0bdfb8",\r
+        "id": "99a335d9.47dc9",\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": 4235.883331298828,\r
+        "y": 1267,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a8d20b89.8deb88",\r
-                "ebe8f709.819288"\r
+                "2ae3d84f.15cb3",\r
+                "a0cd8374.ae65d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8d20b89.8deb88",\r
+        "id": "2ae3d84f.15cb3",\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": 4545.383331298828,\r
+        "y": 1236,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f56a0e73.901ac"\r
+                "d03fdf1c.3b45d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebe8f709.819288",\r
+        "id": "a0cd8374.ae65d8",\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": 4550.383331298828,\r
+        "y": 1301,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8bcbb353.d66038"\r
+                "f8c3fa12.5c834"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f56a0e73.901ac",\r
+        "id": "d03fdf1c.3b45d",\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": 4721.383331298828,\r
+        "y": 1236,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8bcbb353.d66038",\r
+        "id": "f8c3fa12.5c834",\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": 4716.883331298828,\r
+        "y": 1301,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d36a1b80.8692c8",\r
+        "id": "b98c51bd.b1df7",\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": 4092.883331298828,\r
+        "y": 1000,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "73f78d36.ab931c",\r
+        "id": "c9386596.fb5188",\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": 4118.883331298828,\r
+        "y": 1117,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e0243648.484bc",\r
-                "e14aa09.d5d416",\r
-                "5447b1d0.03a8b"\r
+                "312e9154.f9dbd6",\r
+                "38e6d39b.3fc964",\r
+                "d52b1c1f.8a6ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0243648.484bc",\r
+        "id": "312e9154.f9dbd6",\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": 4314.383453369141,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "94135ed.07ea02"\r
+                "6d3eafaf.02fb48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e14aa09.d5d416",\r
+        "id": "38e6d39b.3fc964",\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": 4306.383453369141,\r
+        "y": 1124,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1628394b.83cd8f"\r
+                "3519bfd5.fa4b3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94135ed.07ea02",\r
+        "id": "6d3eafaf.02fb48",\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": 4458.765777587891,\r
+        "y": 1068.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fdedf72e.2dd36"\r
+                "6a66b1f9.955598"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdedf72e.2dd36",\r
+        "id": "6a66b1f9.955598",\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": 4642.883331298828,\r
+        "y": 1067,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f99d2e19.85b668"\r
+                "43b05855.517cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f99d2e19.85b668",\r
+        "id": "43b05855.517cf",\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": 4837.883331298828,\r
+        "y": 1067,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ff4cc7a8.15eb18"\r
+                "c21a24cd.dd2528"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5447b1d0.03a8b",\r
+        "id": "d52b1c1f.8a6ca8",\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": 4311.383453369141,\r
+        "y": 1181,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "74603a77.be9d34"\r
+                "db81dd24.8006b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74603a77.be9d34",\r
+        "id": "db81dd24.8006b",\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": 4463.383453369141,\r
+        "y": 1182,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1628394b.83cd8f",\r
+        "id": "3519bfd5.fa4b3",\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": 4474.383453369141,\r
+        "y": 1125,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e8ac2c73.115cc",\r
+        "id": "e0a89dfb.b97bd8",\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": 4149.883331298828,\r
+        "y": 892,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff4cc7a8.15eb18",\r
+        "id": "c21a24cd.dd2528",\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": 5040.883331298828,\r
+        "y": 1071,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8469558b.e4d748"\r
+                "f7c609f5.0c2d28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf8a4c78.37fe58",\r
+        "id": "dff3e5ec.9273",\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": 5425.883331298828,\r
+        "y": 1084,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "44cef850.3e64a",\r
-                "9337c3a8.6f7408",\r
-                "6a44b1b.7cb45d"\r
+                "2769bc77.6b9fa4",\r
+                "7925966f.3df658",\r
+                "161a4207.178c96"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8469558b.e4d748",\r
+        "id": "f7c609f5.0c2d28",\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": 5219.883331298828,\r
+        "y": 1071,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "82428162.54c128",\r
-                "cf8a4c78.37fe58"\r
+                "3634d6f2.f94292",\r
+                "dff3e5ec.9273"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "82428162.54c128",\r
+        "id": "3634d6f2.f94292",\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": 5455.883331298828,\r
+        "y": 1032,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "44cef850.3e64a",\r
+        "id": "2769bc77.6b9fa4",\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": 5635.883331298828,\r
+        "y": 1075,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ffb7eeb1.dda348"\r
+                "8b0e2b2b.7a21d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9337c3a8.6f7408",\r
+        "id": "7925966f.3df658",\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": 5627.883331298828,\r
+        "y": 1130,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "28235dd8.9620aa"\r
+                "b9107d6e.7c0358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a44b1b.7cb45d",\r
+        "id": "161a4207.178c96",\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": 5632.883331298828,\r
+        "y": 1187,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a95b4d04.8ebfb"\r
+                "d5598bab.3dfb58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a95b4d04.8ebfb",\r
+        "id": "d5598bab.3dfb58",\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": 5784.883331298828,\r
+        "y": 1188,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28235dd8.9620aa",\r
+        "id": "b9107d6e.7c0358",\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": 5795.883331298828,\r
+        "y": 1133,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ffb7eeb1.dda348",\r
+        "id": "8b0e2b2b.7a21d",\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": 5780.265655517578,\r
+        "y": 1072.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "eb1ea22e.dc12c"\r
+                "f80d31a9.31f3d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb1ea22e.dc12c",\r
+        "id": "f80d31a9.31f3d",\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": 5994.883331298828,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "47e1e7c7.6cadf",\r
+        "id": "d718b282.287ca",\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": 3768.883331298828,\r
+        "y": 1010,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3842f71.731b38",\r
+        "id": "d6d93ab.df041c8",\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": 2330.883331298828,\r
+        "y": 737,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fe4cd4cf.21da1",\r
-                "8d3265c3.ddab38"\r
+                "7d753f63.af1d7",\r
+                "7719dbd9.957fc4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8d3265c3.ddab38",\r
+        "id": "7719dbd9.957fc4",\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": 2737.883331298828,\r
+        "y": 755,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "418df61.fe2be08"\r
+                "2b5dce30.392f92"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe4cd4cf.21da1",\r
+        "id": "7d753f63.af1d7",\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": 2737.883331298828,\r
+        "y": 700,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8b0dea0b.e78e98"\r
+                "155f7f13.57fce1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b0dea0b.e78e98",\r
+        "id": "155f7f13.57fce1",\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": 2893.883331298828,\r
+        "y": 698,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "71f36947.989c9",\r
-                "4573661e.19551"\r
+                "e7a16254.b52678",\r
+                "4a95df1.67c3fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "418df61.fe2be08",\r
+        "id": "2b5dce30.392f92",\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": 2870.883331298828,\r
+        "y": 756,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5c62cbf5.952894",\r
+        "id": "9dad0003.283738",\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": 1047.8833312988281,\r
+        "y": 172,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a7fd19a0.011a5",\r
+        "id": "a6d3cb9.27687b8",\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": 4164.883331298828,\r
+        "y": 590,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41c50446.37f104",\r
+        "id": "738a4fa7.5a68d",\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": 4224.883331298828,\r
+        "y": 629,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4957906b.cb3908",\r
+        "id": "47e937a3.3ee608",\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": 1040.8833312988281,\r
+        "y": 80,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5277b309.13aef4",\r
+        "id": "6f67cdff.5c5554",\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": 3576.883331298828,\r
+        "y": 2106,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "51d22e16.357968",\r
+        "id": "78f084cb.41e754",\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": 3632.883331298828,\r
+        "y": 2155,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8191f581.e3e888",\r
+        "id": "912dde6.9b60fa",\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": 1040.8833312988281,\r
+        "y": 119,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25a3d5e5.55ea62",\r
+        "id": "fa83bc41.1d8b08",\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": 1071.8833312988281,\r
+        "y": 220,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "624a734b.81957c",\r
+        "id": "39b1b2.d055464e",\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": 281.8833312988281,\r
+        "y": 695,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2ff4bd45.763852",\r
-                "237ce68a.9b5a2a",\r
-                "86bae4d8.c51f3"\r
+                "e70c3582.89ad08",\r
+                "3aeaa08a.574a",\r
+                "1322af3c.bc6319"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff4bd45.763852",\r
+        "id": "e70c3582.89ad08",\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": 500.8833312988281,\r
+        "y": 633,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2f347c57.a92144"\r
+                "9c476365.2b909"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "237ce68a.9b5a2a",\r
+        "id": "3aeaa08a.574a",\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": 510.3742980957031,\r
+        "y": 675.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
-            [\r
-                "196b18f9.87f4a7"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "86bae4d8.c51f3",\r
+        "id": "1322af3c.bc6319",\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": 498.8833312988281,\r
+        "y": 722,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d6f02bd7.9f988"\r
+                "23db95da.1941e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2f347c57.a92144",\r
+        "id": "9c476365.2b909",\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": 697.8833312988281,\r
+        "y": 629,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "408bfafb.b2f244"\r
+                "1a5a20de.60b4cf"\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": "23db95da.1941e2",\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": 667.8833312988281,\r
+        "y": 723,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "408bfafb.b2f244",\r
+        "id": "1a5a20de.60b4cf",\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": 921.2168273925781,\r
+        "y": 628.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7d8f8b2e.4aa30c"\r
+                "59a859e2.c48ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d8f8b2e.4aa30c",\r
+        "id": "59a859e2.c48ca8",\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": 1121.8834648132324,\r
+        "y": 630.000020980835,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "bd2be559.7e491"\r
+                "ae28be96.a81b18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd2be559.7e491",\r
+        "id": "ae28be96.a81b18",\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": 251.88333129882812,\r
+        "y": 892,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "97323d62.80248",\r
-                "afdba634.5389a8",\r
-                "c784d901.2500c8"\r
+                "4595d435.587aa4",\r
+                "60a8c3ff.237aec",\r
+                "18e77ed.3460901"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97323d62.80248",\r
+        "id": "4595d435.587aa4",\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": 459.8833312988281,\r
+        "y": 856,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "dc950dad.bba8c8"\r
+                "9c5806bb.83c05"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afdba634.5389a8",\r
+        "id": "60a8c3ff.237aec",\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": 460.3742980957031,\r
+        "y": 901.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
-            [\r
-                "f09199a5.a037f"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "c784d901.2500c8",\r
+        "id": "18e77ed.3460901",\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": 457.8833312988281,\r
+        "y": 945,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a903bba8.c7f45"\r
+                "a170b783.101ed"\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": "a170b783.101ed",\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": 626.8833312988281,\r
+        "y": 946,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c4e5acdc.5eea4",\r
+        "id": "aaf101ae.84a298",\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": 598.8833312988281,\r
+        "y": 1440,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f2e2cc22.a529f"\r
+                "48f75925.f13078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2e2cc22.a529f",\r
+        "id": "48f75925.f13078",\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": 801.8833312988281,\r
+        "y": 1452,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c09b72f6.aeae98"\r
+                "dc596581.8a224"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c09b72f6.aeae98",\r
+        "id": "dc596581.8a224",\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": 967.8833312988281,\r
+        "y": 1449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "bfe2cfaf.5416a"\r
+                "63611a55.44e3fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfe2cfaf.5416a",\r
+        "id": "63611a55.44e3fc",\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": 1128.8833312988281,\r
+        "y": 1446,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ed44bd0b.bb6278",\r
-                "85af841c.633c5",\r
-                "785dd3f1.f249ac",\r
-                "b8d52cff.f0dcb",\r
-                "4915b2e4.5fd2dc"\r
+                "155181d9.def56e",\r
+                "450c0202.9562fc",\r
+                "e522d7e8.f0b6d",\r
+                "b85bac18.623698",\r
+                "d97c4e37.51bad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85af841c.633c5",\r
+        "id": "450c0202.9562fc",\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": 1332.8833312988281,\r
+        "y": 1404,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ed44bd0b.bb6278",\r
+        "id": "155181d9.def56e",\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": 1329.8833312988281,\r
+        "y": 1449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6b32d7eb.72211",\r
-                "7343128c.f923b4",\r
-                "b9b05d3.e5ae12"\r
+                "c73d859f.d40f2",\r
+                "cdecbb41.644898",\r
+                "ca040aae.e9fa08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7343128c.f923b4",\r
+        "id": "cdecbb41.644898",\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": 1525.3742980957031,\r
+        "y": 1422.573974609375,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "5dcee0f6.9162a8"\r
+                "dcd0fdd9.1c84f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9b05d3.e5ae12",\r
+        "id": "ca040aae.e9fa08",\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": 1520.8833312988281,\r
+        "y": 1466.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b7ed6a74.25237"\r
+                "7c23dd25.00653c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5dcee0f6.9162a8",\r
+        "id": "dcd0fdd9.1c84f",\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": 1687.9458312988281,\r
+        "y": 1421.8596801757812,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7ed6a74.25237",\r
+        "id": "7c23dd25.00653c",\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": 1688.8833312988281,\r
+        "y": 1466.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfdfa822.c47e1",\r
+        "id": "c84187cf.6e6008",\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": 1690.8833312988281,\r
+        "y": 1513.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6b32d7eb.72211",\r
+        "id": "c73d859f.d40f2",\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
+        "x": 1521.8833312988281,\r
+        "y": 1513.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "dfdfa822.c47e1"\r
+                "c84187cf.6e6008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ed7a6be.5472c",\r
+        "id": "a7f36b9f.f75b88",\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
+        "x": 211.38333129882812,\r
+        "y": 1111,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3e9a846b.aac024",\r
-                "fd2eac9f.aa3be8",\r
-                "81d85b97.ec18c"\r
+                "b58d5b5e.9a197",\r
+                "5c723a86.22c16c",\r
+                "fb40210e.8c5be8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d4d11fc.e19976",\r
+        "id": "ce504b34.d68ac8",\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
+        "x": 322.3833312988281,\r
+        "y": 1467,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3e9a846b.aac024",\r
+        "id": "b58d5b5e.9a197",\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
+        "x": 197.38333129882812,\r
+        "y": 1357,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "186f4361.0093b5"\r
+                "67ff853e.386644"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd2eac9f.aa3be8",\r
+        "id": "5c723a86.22c16c",\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
+        "x": 198.38333129882812,\r
+        "y": 1415,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a8f57470.dafb1"\r
+                "402699af.4c591"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81d85b97.ec18c",\r
+        "id": "fb40210e.8c5be8",\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": 200.38333129882812,\r
+        "y": 1469,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3d4d11fc.e19976"\r
+                "ce504b34.d68ac8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17f45567.72d3f3",\r
+        "id": "5d006f15.710a08",\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": 1305.8833312988281,\r
+        "y": 1677,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "785dd3f1.f249ac",\r
+        "id": "e522d7e8.f0b6d",\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": 1396.8833312988281,\r
+        "y": 1731,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a8f57470.dafb1",\r
+        "id": "402699af.4c591",\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
+        "x": 314.3833312988281,\r
+        "y": 1411,\r
+        "z": "db287b1f.2984a8",\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
+                "784b1e5c.92c77",\r
+                "aaf101ae.84a298",\r
+                "dfffb0d0.b2d2d",\r
+                "3502903c.982ab",\r
+                "5524ecac.5cf47c",\r
+                "a12bd239.f8368",\r
+                "f8f2651c.3a035",\r
+                "f84d6f72.692148",\r
+                "5d1396ed.19b6f8",\r
+                "1b4871a6.1cd8a6",\r
+                "48083140.e99758",\r
+                "d94511cd.5d63f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "186f4361.0093b5",\r
+        "id": "67ff853e.386644",\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
+        "x": 326.3833312988281,\r
+        "y": 1348,\r
+        "z": "db287b1f.2984a8",\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
+                "aaf101ae.84a298",\r
+                "80e8f9a6.45b808",\r
+                "70ed09af.22122",\r
+                "3502903c.982ab",\r
+                "5524ecac.5cf47c",\r
+                "a12bd239.f8368",\r
+                "f8f2651c.3a035",\r
+                "f84d6f72.692148",\r
+                "5d1396ed.19b6f8",\r
+                "1b4871a6.1cd8a6",\r
+                "48083140.e99758",\r
+                "d94511cd.5d63f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b5d90017.45ce98",\r
+        "id": "80e8f9a6.45b808",\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": 618.3833312988281,\r
+        "y": 1233,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d0b5941.55c8f8",\r
+        "id": "784b1e5c.92c77",\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": 635.3833312988281,\r
+        "y": 1327,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c378a6a3.2e4c8",\r
+        "id": "3502903c.982ab",\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": 561.8833312988281,\r
+        "y": 1696,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3613e1a4.3cd206"\r
+                "2dc7d020.0f01c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3613e1a4.3cd206",\r
+        "id": "2dc7d020.0f01c8",\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": 793.8833312988281,\r
+        "y": 1695,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c46d21fc.7c5088"\r
+                "9a9b2fc1.cfc378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c46d21fc.7c5088",\r
+        "id": "9a9b2fc1.cfc378",\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": 1005.8833312988281,\r
+        "y": 1696,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "41d3d62e.c810a8"\r
+                "3ee84e3e.71c9c2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41d3d62e.c810a8",\r
+        "id": "3ee84e3e.71c9c2",\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": 261.8833312988281,\r
+        "y": 1852,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "24bb38a6.cf0a88",\r
-                "80203aa0.6c8a6"\r
+                "a6f3ac42.8fbf28",\r
+                "c5253df7.0ed11"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80203aa0.6c8a6",\r
+        "id": "c5253df7.0ed11",\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": 496.8833312988281,\r
+        "y": 1839,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24bb38a6.cf0a88",\r
+        "id": "a6f3ac42.8fbf28",\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": 486.8833312988281,\r
+        "y": 1900,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e7df9a86.a02dd8",\r
-                "d754cb82.42f37",\r
-                "80509f91.59bce8"\r
+                "b27c66fe.f461f8",\r
+                "d86a808d.b5d38",\r
+                "51be47ba.06369"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d754cb82.42f37",\r
+        "id": "d86a808d.b5d38",\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": 700.3742980957031,\r
+        "y": 1884.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "31b91fbf.39fff8"\r
+                "40ccd27e.7bf8ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80509f91.59bce8",\r
+        "id": "51be47ba.06369",\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": 695.8833312988281,\r
+        "y": 1929,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "312541a.87b29be"\r
+                "10ad75eb.cd3092"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7df9a86.a02dd8",\r
+        "id": "b27c66fe.f461f8",\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": 697.8833312988281,\r
+        "y": 1989,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f19203b2.563a88"\r
+                "f72f31f7.42e17"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "31b91fbf.39fff8",\r
+        "id": "40ccd27e.7bf8ec",\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": 862.9458312988281,\r
+        "y": 1883.8597412109375,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "312541a.87b29be",\r
+        "id": "10ad75eb.cd3092",\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": 863.8833312988281,\r
+        "y": 1929,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f19203b2.563a88",\r
+        "id": "f72f31f7.42e17",\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": 866.8833312988281,\r
+        "y": 1988,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "70164d90.2f08c4",\r
-                "27824a25.86f05e"\r
+                "c01095c8.c5a848",\r
+                "1e0b480.37d7ab8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2e88ff.3380b7",\r
+        "id": "f8f2651c.3a035",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
          "comments": "",\r
-        "x": 225,\r
-        "y": 2494,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 265.8833312988281,\r
+        "y": 2487,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3026fc23.0fd5f4",\r
+        "id": "f84d6f72.692148",\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": 408.8833312988281,\r
+        "y": 2547,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a9d1707f.7a88c8",\r
-                "8ab460b7.633638"\r
+                "7174c4fb.4236d4",\r
+                "3df090d7.e28cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9d1707f.7a88c8",\r
+        "id": "7174c4fb.4236d4",\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": 721.3833312988281,\r
+        "y": 2524,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8ab460b7.633638",\r
+        "id": "3df090d7.e28cf",\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": 725.3833312988281,\r
+        "y": 2564,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7ddc0654.bb96f8"\r
+                "bbef1ecc.7916"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1d8045c.1b61e8",\r
+        "id": "4d6cfe8e.59e2a",\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": 901.3833312988281,\r
+        "y": 2528,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7ddc0654.bb96f8",\r
+        "id": "bbef1ecc.7916",\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": 916.8833312988281,\r
+        "y": 2582,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1eddd66c.da478a"\r
+                "b94bbfec.158258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cee3e55d.189dc",\r
+        "id": "b2dda6de.cb3b28",\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": 1212.3833312988281,\r
+        "y": 2551,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bb915427.f0582",\r
+        "id": "1cb10652.ba5e0a",\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": 2679.383331298828,\r
+        "y": 1902,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1eddd66c.da478a",\r
+        "id": "b94bbfec.158258",\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": 1174.3833312988281,\r
+        "y": 2593,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "913d2a70.ccfd3",\r
+        "id": "70ed09af.22122",\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": 584.3833312988281,\r
+        "y": 1271,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e47dbd3.f7afc4",\r
+        "id": "dfffb0d0.b2d2d",\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": 597.3833312988281,\r
+        "y": 1367,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e5881b35.2a2bf8",\r
+        "id": "9521e4ca.a61af",\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": 4333.883331298828,\r
+        "y": 543,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4004366.ff0b5c8",\r
+        "id": "1d1e23b2.17cb04",\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": 4236.883331298828,\r
+        "y": 1362,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8caebf31.dc028",\r
+        "id": "e35a6c95.6b3d6",\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": 3730.883331298828,\r
+        "y": 2034,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dc950dad.bba8c8",\r
+        "id": "9c5806bb.83c05",\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": 831.8833312988281,\r
+        "y": 842,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "28d7875f.122df",\r
-                "47ffeb93.7b808c"\r
+                "24382f34.66808",\r
+                "ea56d949.8ce4b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28d7875f.122df",\r
+        "id": "24382f34.66808",\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": 1194.8833312988281,\r
+        "y": 865,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f3fb6a94.133bb"\r
+                "d7ed30c6.74c9b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "47ffeb93.7b808c",\r
+        "id": "ea56d949.8ce4b",\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": 1194.8833312988281,\r
+        "y": 814,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3da0dc2.736e6a4"\r
+                "3707e8cf.65827"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f3fb6a94.133bb",\r
+        "id": "d7ed30c6.74c9b",\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": 1350.8833312988281,\r
+        "y": 863,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9ed7a6be.5472c"\r
+                "a7f36b9f.f75b88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3da0dc2.736e6a4",\r
+        "id": "3707e8cf.65827",\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": 1327.8833312988281,\r
+        "y": 815,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ca01ca51.23bb98",\r
+        "id": "ed4d0298.cdb578",\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": 2087.883331298828,\r
+        "y": 213,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ccc1a6d.d89cd4",\r
+        "id": "1ced8517.ce35e3",\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": 3629.883331298828,\r
+        "y": 2194,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ceaa1f2c.697ad",\r
+        "id": "224f4283.917d26",\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": 4219.883331298828,\r
+        "y": 667,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8d52cff.f0dcb",\r
+        "id": "b85bac18.623698",\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": 1393.8833312988281,\r
+        "y": 1773,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "901c32b.8d67fd",\r
+        "id": "5524ecac.5cf47c",\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": 572.8833312988281,\r
+        "y": 1507,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d142c0f2.700e98",\r
+        "id": "a12bd239.f8368",\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": 603.8833312988281,\r
+        "y": 1547,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70164d90.2f08c4",\r
+        "id": "c01095c8.c5a848",\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": 1151.8833312988281,\r
+        "y": 1955,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "27824a25.86f05e",\r
+        "id": "1e0b480.37d7ab8",\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": 1154.8833312988281,\r
+        "y": 1997,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f24a5646.1c02c8",\r
+        "id": "5d1396ed.19b6f8",\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": 597.8833312988281,\r
+        "y": 1637,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db09832f.86c758",\r
+        "id": "1b4871a6.1cd8a6",\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": 352.8833312988281,\r
+        "y": 2016,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3c14b8ea.b96268",\r
+        "id": "48083140.e99758",\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": 360.8833312988281,\r
+        "y": 2073,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4915b2e4.5fd2dc",\r
+        "id": "d97c4e37.51bad8",\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": 1371.8833312988281,\r
+        "y": 1622,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "bfcf3bba.b5daa",\r
-                "9b18409e.c203c8"\r
+                "3df77641.8d727a",\r
+                "f024d61d.5a31c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b18409e.c203c8",\r
+        "id": "f024d61d.5a31c",\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": 1594.8833312988281,\r
+        "y": 1577,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "5afaf397.e20c3c"\r
+                "3c67000e.e921c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfcf3bba.b5daa",\r
+        "id": "3df77641.8d727a",\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": 1596.8833312988281,\r
+        "y": 1641,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f7de9867.a0fd38"\r
+                "de64177a.8916f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5afaf397.e20c3c",\r
+        "id": "3c67000e.e921c",\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": 1759.8833312988281,\r
+        "y": 1574,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "cdcfe3c8.962368"\r
+                "9bea7c66.5f62c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7de9867.a0fd38",\r
+        "id": "de64177a.8916f",\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": 1758.8833312988281,\r
+        "y": 1637,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cdcfe3c8.962368",\r
+        "id": "9bea7c66.5f62c8",\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": 1979.8833312988281,\r
+        "y": 1588,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d07bcb7.ffff34",\r
+        "id": "7a38583b.020a88",\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": 1524.8833312988281,\r
+        "y": 2313,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9547fb43.8165f"\r
+                "c388a6bf.f87f3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "261f721d.19cda6",\r
+        "id": "a2f5b878.ad169",\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": 1909.8833312988281,\r
+        "y": 2326,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a4fad359.d63e7",\r
-                "d7202a06.97a2a8",\r
-                "d2a1d22e.b2ed6"\r
+                "7866488b.2039a8",\r
+                "bdc692ef.1c0858",\r
+                "823a852f.40d29"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9547fb43.8165f",\r
+        "id": "c388a6bf.f87f3",\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": 1703.8833312988281,\r
+        "y": 2313,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9b0cdae9.5834e8",\r
-                "261f721d.19cda6"\r
+                "5c79d6d8.a6a8e",\r
+                "a2f5b878.ad169"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b0cdae9.5834e8",\r
+        "id": "5c79d6d8.a6a8e",\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": 1939.8833312988281,\r
+        "y": 2274,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4fad359.d63e7",\r
+        "id": "7866488b.2039a8",\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": 2119.883331298828,\r
+        "y": 2317,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ce2ed097.248ac"\r
+                "4da79570.cd80cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7202a06.97a2a8",\r
+        "id": "bdc692ef.1c0858",\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": 2111.883331298828,\r
+        "y": 2372,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "15f2754c.6e5b2b"\r
+                "5ef7fec5.5efb98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2a1d22e.b2ed6",\r
+        "id": "823a852f.40d29",\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": 2116.883331298828,\r
+        "y": 2429,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fe7bb44f.f58b7"\r
+                "57488074.1d65e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe7bb44f.f58b7",\r
+        "id": "57488074.1d65e",\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": 2268.883331298828,\r
+        "y": 2430,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15f2754c.6e5b2b",\r
+        "id": "5ef7fec5.5efb98",\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": 2279.883331298828,\r
+        "y": 2375,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ce2ed097.248ac",\r
+        "id": "4da79570.cd80cc",\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": 2264.265655517578,\r
+        "y": 2314.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1c2a2a5a.6d8256"\r
+                "69f8caaf.bba51c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c2a2a5a.6d8256",\r
+        "id": "69f8caaf.bba51c",\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": 2478.883331298828,\r
+        "y": 2311,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9710382e.112c58",\r
+        "id": "53cc84ce.e1faf4",\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": 602.8833312988281,\r
+        "y": 2359,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "afc311a9.64a498",\r
-                "1b364ee.7270531",\r
-                "aa64b78b.7ab17"\r
+                "bb343bdc.881868",\r
+                "8bc84f5e.0473d8",\r
+                "78444b47.33ec34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afc311a9.64a498",\r
+        "id": "bb343bdc.881868",\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": 798.3834533691406,\r
+        "y": 2311,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7cd619d5.a4e8c"\r
+                "bf3ecbb9.4dd008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1b364ee.7270531",\r
+        "id": "8bc84f5e.0473d8",\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": 790.3834533691406,\r
+        "y": 2366,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7127ee10.2a0b4"\r
+                "ef40b092.bc09e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7cd619d5.a4e8c",\r
+        "id": "bf3ecbb9.4dd008",\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": 942.7657775878906,\r
+        "y": 2310.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fd5a5a0.ad9b128"\r
+                "1285266.d4ce8da"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd5a5a0.ad9b128",\r
+        "id": "1285266.d4ce8da",\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": 1126.8833312988281,\r
+        "y": 2309,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8c513405.b809e8"\r
+                "640d04c1.8428dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c513405.b809e8",\r
+        "id": "640d04c1.8428dc",\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": 1321.8833312988281,\r
+        "y": 2309,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6d07bcb7.ffff34"\r
+                "7a38583b.020a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa64b78b.7ab17",\r
+        "id": "78444b47.33ec34",\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": 795.3834533691406,\r
+        "y": 2423,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "22a641d1.a7babe"\r
+                "b417de17.8b3a6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "22a641d1.a7babe",\r
+        "id": "b417de17.8b3a6",\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": 947.3834533691406,\r
+        "y": 2424,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7127ee10.2a0b4",\r
+        "id": "ef40b092.bc09e",\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": 958.3834533691406,\r
+        "y": 2367,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41c682cf.a83f2c",\r
+        "id": "fc4eafc.4810e5",\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": 592.8833312988281,\r
+        "y": 2271,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7cb304b.f39168",\r
+        "id": "d94511cd.5d63f",\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": 337.8833312988281,\r
+        "y": 2402,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "41c682cf.a83f2c",\r
-                "9710382e.112c58"\r
+                "fc4eafc.4810e5",\r
+                "53cc84ce.e1faf4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d390d070.3dc4c",\r
+        "id": "1a955b8d.047dd4",\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": 1552.8500061035156,\r
+        "y": 219.88333129882812,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9a0e1ef7.428b9",\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": 754.8833312988281,\r
+        "y": 442,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      }\r
  ]
 \ No newline at end of file