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 81e0415..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": "ee012476.423b98",\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": 339,\r
-        "y": 363,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 401.8833312988281,\r
+        "y": 341,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2b361ed4.488d22",\r
-                "8a293b14.096a28",\r
-                "e711b658.aa0458"\r
+                "bee28b81.87faf8",\r
+                "2e0d3206.b3958e",\r
+                "2caa6605.779652"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b361ed4.488d22",\r
+        "id": "bee28b81.87faf8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 527,\r
-        "y": 376,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 589.8833312988281,\r
+        "y": 354,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d45a4635.eb8678"\r
+                "db2a2eb9.c4729"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a293b14.096a28",\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": 527.490966796875,\r
-        "y": 421.57403564453125,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 597.374267578125,\r
+        "y": 396.57403564453125,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
-            [\r
-                "abb54833.f0129"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "e711b658.aa0458",\r
+        "id": "2caa6605.779652",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 525,\r
-        "y": 465,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 587.8833312988281,\r
+        "y": 443,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f29b4663.f669b"\r
+                "9a0e1ef7.428b9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d45a4635.eb8678",\r
+        "id": "db2a2eb9.c4729",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 700,\r
-        "y": 374,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 762.8833312988281,\r
+        "y": 352,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f31c0d53.86d7f8"\r
+                "b1233538.ceab4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "abb54833.f0129",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
-        "comments": "",\r
-        "x": 690.0623779296875,\r
-        "y": 421.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "f29b4663.f669b",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
-        "comments": "",\r
-        "x": 692,\r
-        "y": 464,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "f31c0d53.86d7f8",\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": 929,\r
-        "y": 375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 991.8833312988281,\r
+        "y": 353,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b49d17ad.574c7"\r
+                "f68da0c8.dc2638"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b49d17ad.574c7",\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": 1144,\r
-        "y": 376,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1206.8833312988281,\r
+        "y": 354,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "59104900.730b5"\r
+                "947d4965.a799f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59104900.730b5",\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": 1388,\r
-        "y": 375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1460.8833312988281,\r
+        "y": 276,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a081cc3f.ed90c8",\r
-                "c86127b7.79d09"\r
+                "1ae0d7f3.280b18",\r
+                "b7c135fb.7fc808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a081cc3f.ed90c8",\r
+        "id": "1ae0d7f3.280b18",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1605,\r
-        "y": 354,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1677.8833312988281,\r
+        "y": 255,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "99d2c91.f0beeb8"\r
+                "947d4965.a799f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c86127b7.79d09",\r
+        "id": "b7c135fb.7fc808",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1605,\r
-        "y": 403,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1677.8833312988281,\r
+        "y": 304,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "99d2c91.f0beeb8",\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": 1799,\r
-        "y": 363,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1861.8833312988281,\r
+        "y": 341,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1cc75cf0.e01a9b",\r
-                "171d3657.f2327a",\r
-                "e9e324cf.d34fa8"\r
+                "7307d136.f98668",\r
+                "d6d93ab.df041c8",\r
+                "ed4d0298.cdb578"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63d9b9e3.c39a3",\r
+        "id": "d12da893.5808e",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 158,\r
-        "y": 104,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 220.88333129882812,\r
+        "y": 82,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "13826703.6fe8f9"\r
+                "ba22940.68974f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13826703.6fe8f9",\r
+        "id": "ba22940.68974f",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -225,3221 +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": 442.2856903076172,\r
-        "y": 165.23810863494873,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 505.1690216064453,\r
+        "y": 143.23810863494873,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a18ada65.df1b6"\r
+                "f0aeb23e.8f1f7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a18ada65.df1b6",\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": 448.42860412597656,\r
-        "y": 250.00003051757812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 511.3119354248047,\r
+        "y": 228.00003051757812,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e68623b.1ed71e"\r
+                "849eab75.e48858"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e68623b.1ed71e",\r
+        "id": "849eab75.e48858",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 758.238037109375,\r
-        "y": 241.66668701171875,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 821.1213684082031,\r
+        "y": 219.66668701171875,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ee012476.423b98",\r
-                "1d423866.3abba8",\r
-                "63268214.354d14",\r
-                "2b86835c.8d9024",\r
-                "5a6a7d0e.a2f89c"\r
+                "4a53e986.e1345",\r
+                "9dad0003.283738",\r
+                "47e937a3.3ee608",\r
+                "fa83bc41.1d8b08",\r
+                "39b1b2.d055464e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1cc75cf0.e01a9b",\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": 2016,\r
-        "y": 301,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2078.883331298828,\r
+        "y": 279,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "acb2a33f.d7ec9",\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": 4185,\r
-        "y": 187,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4247.883331298828,\r
+        "y": 165,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1a2b69e5.bdb2ae",\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": 4266,\r
-        "y": 502,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4328.883331298828,\r
+        "y": 480,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c13bac2.6ce225",\r
-                "54c65da.56603a4"\r
+                "78ae8a16.bcde6c",\r
+                "163e60b5.f624ef"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c13bac2.6ce225",\r
+        "id": "78ae8a16.bcde6c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4575.5,\r
-        "y": 471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4638.383331298828,\r
+        "y": 449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9c791a1e.520a28"\r
+                "a86780cc.869ba"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "54c65da.56603a4",\r
+        "id": "163e60b5.f624ef",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4580.5,\r
-        "y": 536,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4643.383331298828,\r
+        "y": 514,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b016fce4.beba"\r
+                "496a02d9.361154"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c791a1e.520a28",\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": 4751.5,\r
-        "y": 471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4814.383331298828,\r
+        "y": 449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b016fce4.beba",\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": 4747,\r
-        "y": 536,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4809.883331298828,\r
+        "y": 514,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2227e8a2.0665b8",\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": 4130.5,\r
-        "y": 756,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4193.383331298828,\r
+        "y": 734,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f70fce2d.7485",\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": 4284.5,\r
-        "y": 804,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4347.383331298828,\r
+        "y": 782,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8ffe5287.d9d0e8",\r
-                "5f6b3e31.55961"\r
+                "f961065e.0e576",\r
+                "6ca1f611.56dee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ffe5287.d9d0e8",\r
+        "id": "f961065e.0e576",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4630,\r
-        "y": 785,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4692.883331298828,\r
+        "y": 763,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8c837eb9.336b9"\r
+                "6296fab8.967dac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f6b3e31.55961",\r
+        "id": "6ca1f611.56dee",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4634,\r
-        "y": 825,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4696.883331298828,\r
+        "y": 803,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "575c5f0f.3503d8"\r
+                "ef7067c4.7ea328"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c837eb9.336b9",\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": 4788,\r
-        "y": 785,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4850.883331298828,\r
+        "y": 763,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "575c5f0f.3503d8",\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": 4791.5,\r
-        "y": 825,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4854.383331298828,\r
+        "y": 803,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "25e6aa4e.9a9cde",\r
-                "1cebed54.09e3f3"\r
+                "ee477ca2.a65568",\r
+                "5e527e99.1f4728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25e6aa4e.9a9cde",\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": 5122,\r
-        "y": 790,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5184.883331298828,\r
+        "y": 768,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "57cb404e.88a3a8",\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": 4986,\r
-        "y": 749,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5048.883331298828,\r
+        "y": 727,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1cebed54.09e3f3",\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": 5049,\r
-        "y": 836,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5111.883331298828,\r
+        "y": 814,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "adcc0fc7.59b628",\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": 4123,\r
-        "y": 235,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4185.883331298828,\r
+        "y": 213,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "36f9f62e.004372",\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": 4149,\r
-        "y": 352,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4211.883331298828,\r
+        "y": 330,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "37680b24.ccfd7c",\r
-                "da1cdd66.16c98",\r
-                "923405db.542c"\r
+                "a72840b5.dc70e",\r
+                "54e4a8de.9445f8",\r
+                "4012660e.b55b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37680b24.ccfd7c",\r
+        "id": "a72840b5.dc70e",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4344.5001220703125,\r
-        "y": 304,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4407.383453369141,\r
+        "y": 282,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3021ee1b.904b12"\r
+                "9d071aa.9c29c68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "da1cdd66.16c98",\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": 4336.5001220703125,\r
-        "y": 359,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4399.383453369141,\r
+        "y": 337,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "12605fae.863058"\r
+                "3662c50c.d754d2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3021ee1b.904b12",\r
+        "id": "9d071aa.9c29c68",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4488.8824462890625,\r
-        "y": 303.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4551.765777587891,\r
+        "y": 281.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "dd5c14b5.d1837"\r
+                "c1155c42.4dc2e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67c4003.ef8f28",\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": 5071,\r
-        "y": 306,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5133.883331298828,\r
+        "y": 284,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "108d04fa.bf4053"\r
+                "e6d1f56a.1147f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd5c14b5.d1837",\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": 4673,\r
-        "y": 302,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4735.883331298828,\r
+        "y": 280,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d5f86c5d.16c4"\r
+                "e3565ab9.0a825"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5f86c5d.16c4",\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": 4868,\r
-        "y": 302,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4930.883331298828,\r
+        "y": 280,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "67c4003.ef8f28"\r
+                "a3b68f87.0c3248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "923405db.542c",\r
+        "id": "4012660e.b55b2",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4341.5001220703125,\r
-        "y": 416,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4404.383453369141,\r
+        "y": 394,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b180d8b0.c43f88"\r
+                "7e9c03d8.c41c7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b180d8b0.c43f88",\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": 4493.5001220703125,\r
-        "y": 417,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4556.383453369141,\r
+        "y": 395,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "12605fae.863058",\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": 4504.5001220703125,\r
-        "y": 360,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4567.383453369141,\r
+        "y": 338,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f9899c24.7b705",\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": 5456,\r
-        "y": 319,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5518.883331298828,\r
+        "y": 297,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d378bd87.63a5c8",\r
-                "5261c81e.fbb5b8",\r
-                "634ff531.a525f4"\r
+                "a38e0436.5aedc",\r
+                "80f6747e.265c78",\r
+                "c370b7ba.84a26"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "108d04fa.bf4053",\r
+        "id": "e6d1f56a.1147f8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5250,\r
-        "y": 306,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5312.883331298828,\r
+        "y": 284,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "20f95b42.b2257c",\r
-                "f9899c24.7b705"\r
+                "4599703a.c42f3",\r
+                "99fa8e6f.e803d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20f95b42.b2257c",\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": 5486,\r
-        "y": 267,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5548.883331298828,\r
+        "y": 245,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d378bd87.63a5c8",\r
+        "id": "a38e0436.5aedc",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5666,\r
-        "y": 310,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5728.883331298828,\r
+        "y": 288,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1cbdaba0.674dd4"\r
+                "8c88cbf0.e09b1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5261c81e.fbb5b8",\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": 5658,\r
-        "y": 365,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5720.883331298828,\r
+        "y": 343,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "66b4dbad.a4949c"\r
+                "e2be9acb.77d62"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "634ff531.a525f4",\r
+        "id": "c370b7ba.84a26",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5663,\r
-        "y": 422,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5725.883331298828,\r
+        "y": 400,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "21f2fdd8.0e601a"\r
+                "856ee89c.2898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21f2fdd8.0e601a",\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": 5815,\r
-        "y": 423,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5877.883331298828,\r
+        "y": 401,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "66b4dbad.a4949c",\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": 5826,\r
-        "y": 368,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5888.883331298828,\r
+        "y": 346,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1cbdaba0.674dd4",\r
+        "id": "8c88cbf0.e09b1",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5810.38232421875,\r
-        "y": 307.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5873.265655517578,\r
+        "y": 285.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ebf10644.3cf328"\r
+                "a4a57efc.888ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebf10644.3cf328",\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": 6025,\r
-        "y": 304,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 6087.883331298828,\r
+        "y": 282,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "204badf8.a5ba12",\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": 3592,\r
-        "y": 1644,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3654.883331298828,\r
+        "y": 1622,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4d3bca29.9af50c",\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": 3655,\r
-        "y": 1973,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3717.883331298828,\r
+        "y": 1951,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "30186c33.4929f4",\r
-                "868e39af.adebc8"\r
+                "3640aede.8913a2",\r
+                "f1b1c8d.9945bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30186c33.4929f4",\r
+        "id": "3640aede.8913a2",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3950.5,\r
-        "y": 1940,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4013.383331298828,\r
+        "y": 1918,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2aae4501.2c69e2"\r
+                "4b0d0deb.6577e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "868e39af.adebc8",\r
+        "id": "f1b1c8d.9945bb8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3955.5,\r
-        "y": 2005,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4018.383331298828,\r
+        "y": 1983,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7501d4e8.c8d944"\r
+                "5da14040.cb50b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2aae4501.2c69e2",\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": 4118.5,\r
-        "y": 1940,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4181.383331298828,\r
+        "y": 1918,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7501d4e8.c8d944",\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": 4129,\r
-        "y": 2005,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4191.883331298828,\r
+        "y": 1983,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cc294dbc.f351c",\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": 3531,\r
-        "y": 1701,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3593.883331298828,\r
+        "y": 1679,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c8227bea.321b5",\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": 3551,\r
-        "y": 1798,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3613.883331298828,\r
+        "y": 1776,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9f19ba3f.539ea8",\r
-                "e4125ed0.f068f8",\r
-                "de95537a.826588"\r
+                "56d2f84a.b524e8",\r
+                "43f5b436.ace8b4",\r
+                "a9c884c3.3b2c18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9f19ba3f.539ea8",\r
+        "id": "56d2f84a.b524e8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3753.5001220703125,\r
-        "y": 1751,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3816.3834533691406,\r
+        "y": 1729,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e35cf2ca.728ed8"\r
+                "10cf7345.17615d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e4125ed0.f068f8",\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": 3745.5001220703125,\r
-        "y": 1806,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3808.3834533691406,\r
+        "y": 1784,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c80b6676.b0f198"\r
+                "40e41e98.b2ab3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e35cf2ca.728ed8",\r
+        "id": "10cf7345.17615d",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3897.8824462890625,\r
-        "y": 1748.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3960.7657775878906,\r
+        "y": 1726.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "57d9c9b8.81d7a8"\r
+                "69889215.886b4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57d9c9b8.81d7a8",\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": 4082,\r
-        "y": 1763,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4144.883331298828,\r
+        "y": 1741,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2837eada.0816e6"\r
+                "3c1ff953.79a23e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de95537a.826588",\r
+        "id": "a9c884c3.3b2c18",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3750.5001220703125,\r
-        "y": 1863,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3813.3834533691406,\r
+        "y": 1841,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6ac21b2f.35237c"\r
+                "8ab7ecfb.f03ee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ac21b2f.35237c",\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": 3902.5001220703125,\r
-        "y": 1864,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3965.3834533691406,\r
+        "y": 1842,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c80b6676.b0f198",\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": 3913.5001220703125,\r
-        "y": 1809,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3976.3834533691406,\r
+        "y": 1787,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b2f2b82b.20ac9",\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": 4480,\r
-        "y": 1767,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4542.883331298828,\r
+        "y": 1745,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e8c4648e.2f16b8"\r
+                "901dac81.52118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2837eada.0816e6",\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": 4277,\r
-        "y": 1763,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4339.883331298828,\r
+        "y": 1741,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b2f2b82b.20ac9"\r
+                "37ef2104.1e9d5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7fa6120f.8bbc34",\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": 4865,\r
-        "y": 1766,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4927.883331298828,\r
+        "y": 1744,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2004b12.ed9d54e",\r
-                "ffd8f42d.6ff66",\r
-                "7412d147.be04a8"\r
+                "b5f45931.a1805",\r
+                "34bcb3b6.e69b1c",\r
+                "d4cc1381.862c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e8c4648e.2f16b8",\r
+        "id": "901dac81.52118",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4657,\r
-        "y": 1759,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4719.883331298828,\r
+        "y": 1737,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "619505d8.279204",\r
-                "7fa6120f.8bbc34"\r
+                "81cd4229.29ba8",\r
+                "86b8c4cb.c3747"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "619505d8.279204",\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": 4895,\r
-        "y": 1714,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4957.883331298828,\r
+        "y": 1692,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "407265d3.d9387c",\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": 5224,\r
-        "y": 1870,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5286.883331298828,\r
+        "y": 1848,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "70bb8ce1.2b5a7c",\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": 5235,\r
-        "y": 1815,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5297.883331298828,\r
+        "y": 1793,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "474b0f12.6a5378",\r
+        "id": "a84f2510.1ebf08",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5219.38232421875,\r
-        "y": 1754.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5282.265655517578,\r
+        "y": 1732.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4664ee87.d9fd18"\r
+                "f83738f1.e5e14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4664ee87.d9fd18",\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": 5434,\r
-        "y": 1751,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5496.883331298828,\r
+        "y": 1729,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2004b12.ed9d54e",\r
+        "id": "b5f45931.a1805",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5075,\r
-        "y": 1757,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5137.883331298828,\r
+        "y": 1735,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "474b0f12.6a5378"\r
+                "a84f2510.1ebf08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffd8f42d.6ff66",\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": 5067,\r
-        "y": 1812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5129.883331298828,\r
+        "y": 1790,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "70bb8ce1.2b5a7c"\r
+                "3b503e2a.8c5dd2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7412d147.be04a8",\r
+        "id": "d4cc1381.862c48",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5072,\r
-        "y": 1869,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5134.883331298828,\r
+        "y": 1847,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "407265d3.d9387c"\r
+                "a6f965e8.0bb248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79f7771a.baa2f",\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": 3106,\r
-        "y": 715,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3168.883331298828,\r
+        "y": 693,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6b315a67.2be854",\r
-                "7ca64a28.96fff4"\r
+                "60b8b463.e4925c",\r
+                "5e23be29.1eb6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b315a67.2be854",\r
+        "id": "60b8b463.e4925c",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3320,\r
-        "y": 752,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3382.883331298828,\r
+        "y": 730,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e26333e1.9f2a38"\r
+                "4d4203c4.4fd81c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7ca64a28.96fff4",\r
+        "id": "5e23be29.1eb6a",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3322,\r
-        "y": 690,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3384.883331298828,\r
+        "y": 668,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "89cb81b5.af1468"\r
+                "402d5674.bb5698"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e26333e1.9f2a38",\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": 2900,\r
-        "y": 1995,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2962.883331298828,\r
+        "y": 1973,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "5c3b586f.467af",\r
-                "6b4dbd17.81909c"\r
+                "4155de88.54a1f",\r
+                "11e38b5d.85c715"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c3b586f.467af",\r
+        "id": "4155de88.54a1f",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3153,\r
-        "y": 2029,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3215.883331298828,\r
+        "y": 2007,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a3ab9951.4bdf08"\r
+                "97b4f973.8f85a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b4dbd17.81909c",\r
+        "id": "11e38b5d.85c715",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3153,\r
-        "y": 1973,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3215.883331298828,\r
+        "y": 1951,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "29d8f363.c99594"\r
+                "4bdf7725.9cef3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3ab9951.4bdf08",\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": 3304,\r
-        "y": 2029,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3366.883331298828,\r
+        "y": 2007,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7f2aefb.cead08",\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": 4180,\r
-        "y": 127,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4242.883331298828,\r
+        "y": 105,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8d65460e.504db8",\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": 3588,\r
-        "y": 1586,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3650.883331298828,\r
+        "y": 1564,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e2a76dd.233f7a",\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": 3871,\r
-        "y": 384,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3933.883331298828,\r
+        "y": 362,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c7f2aefb.cead08",\r
-                "acb2a33f.d7ec9",\r
-                "adcc0fc7.59b628",\r
-                "36f9f62e.004372",\r
-                "1a2b69e5.bdb2ae",\r
-                "7d01ae3.e59e8d",\r
-                "91a8f363.33b6d",\r
-                "8c296a00.ae82e8"\r
+                "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": "29d8f363.c99594",\r
+        "id": "4bdf7725.9cef3",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3304,\r
-        "y": 1972,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3366.883331298828,\r
+        "y": 1950,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8d65460e.504db8",\r
-                "204badf8.a5ba12",\r
-                "cc294dbc.f351c",\r
-                "c8227bea.321b5",\r
-                "4d3bca29.9af50c",\r
-                "605c7758.9853c8",\r
-                "d3fdc974.92df9",\r
-                "52902dc6.5c041c"\r
+                "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": "59dac694.235a08",\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": 3542,\r
-        "y": 2271,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3604.883331298828,\r
+        "y": 2249,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "704c6.41b9333ac",\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": 3696,\r
-        "y": 2319,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3758.883331298828,\r
+        "y": 2297,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "5cc2fc76.782a54",\r
-                "be48f3e2.0fbf"\r
+                "b36c5e4.a4b982",\r
+                "75e03418.7b0a3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5cc2fc76.782a54",\r
+        "id": "b36c5e4.a4b982",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4041.5,\r
-        "y": 2300,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4104.383331298828,\r
+        "y": 2278,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a76d95f1.d45e1"\r
+                "996a2de3.86ff68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "be48f3e2.0fbf",\r
+        "id": "75e03418.7b0a3c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4045.5,\r
-        "y": 2340,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4108.383331298828,\r
+        "y": 2318,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1991eff2.b8a15"\r
+                "1787d971.8d0d67"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a76d95f1.d45e1",\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": 4199.5,\r
-        "y": 2300,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4262.383331298828,\r
+        "y": 2278,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1991eff2.b8a15",\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": 4203,\r
-        "y": 2340,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4265.883331298828,\r
+        "y": 2318,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "69ca6e83.833b58",\r
-                "1ce7897f.5077ef"\r
+                "79bbcc28.d4fd3c",\r
+                "137b8fb9.4aaa78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "69ca6e83.833b58",\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": 4543,\r
-        "y": 2339,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4605.883331298828,\r
+        "y": 2317,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "47268bd4.d29394",\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": 4401,\r
-        "y": 2297,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4463.883331298828,\r
+        "y": 2275,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1ce7897f.5077ef",\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": 4472,\r
-        "y": 2388,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4534.883331298828,\r
+        "y": 2366,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "adf25f68.f6874",\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": 3097,\r
-        "y": 655,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3159.883331298828,\r
+        "y": 633,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5011571a.f2ffc8",\r
+        "id": "b98d7c04.aadb6",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3692,\r
-        "y": 341,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3754.883331298828,\r
+        "y": 319,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "69454f54.a632a",\r
+        "id": "f9466402.70d608",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3249,\r
-        "y": 1919,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3311.883331298828,\r
+        "y": 1897,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "89cb81b5.af1468",\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": 3428,\r
-        "y": 503,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3490.883331298828,\r
+        "y": 481,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "89a2367.f810e48",\r
-                "76abc6c6.50ef4"\r
+                "40174504.12275c",\r
+                "483f6800.997ef8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76abc6c6.50ef4",\r
+        "id": "483f6800.997ef8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3670,\r
-        "y": 1092,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3732.883331298828,\r
+        "y": 1070,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fdc63597.3712e"\r
+                "f91cd9b2.b4ebc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89a2367.f810e48",\r
+        "id": "40174504.12275c",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3664,\r
-        "y": 383,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3726.883331298828,\r
+        "y": 361,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3e2a76dd.233f7a"\r
+                "9157e39e.50973"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdc63597.3712e",\r
+        "id": "f91cd9b2.b4ebc8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3828,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3890.883331298828,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1793312b.927ef7",\r
-                "41401fda.2be158",\r
-                "9005ec38.4e5e88",\r
-                "dd0899e7.f82f08",\r
-                "ecd7f356.de7408",\r
-                "b3054d0f.9c60c"\r
+                "e0a89dfb.b97bd8",\r
+                "356efc92.1be0c4",\r
+                "b98c51bd.b1df7",\r
+                "c9386596.fb5188",\r
+                "99a335d9.47dc9",\r
+                "1d1e23b2.17cb04"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41401fda.2be158",\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": 4092,\r
-        "y": 974,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4154.883331298828,\r
+        "y": 952,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ecd7f356.de7408",\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": 4173,\r
-        "y": 1289,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4235.883331298828,\r
+        "y": 1267,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e0518882.6fa588",\r
-                "87218147.0fa418"\r
+                "2ae3d84f.15cb3",\r
+                "a0cd8374.ae65d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0518882.6fa588",\r
+        "id": "2ae3d84f.15cb3",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4482.5,\r
-        "y": 1258,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4545.383331298828,\r
+        "y": 1236,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "57c63933.072c5"\r
+                "d03fdf1c.3b45d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87218147.0fa418",\r
+        "id": "a0cd8374.ae65d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4487.5,\r
-        "y": 1323,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4550.383331298828,\r
+        "y": 1301,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7dd1782c.b2154"\r
+                "f8c3fa12.5c834"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57c63933.072c5",\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": 4658.5,\r
-        "y": 1258,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4721.383331298828,\r
+        "y": 1236,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7dd1782c.b2154",\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": 4654,\r
-        "y": 1323,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4716.883331298828,\r
+        "y": 1301,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9005ec38.4e5e88",\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": 4030,\r
-        "y": 1022,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4092.883331298828,\r
+        "y": 1000,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dd0899e7.f82f08",\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": 4056,\r
-        "y": 1139,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4118.883331298828,\r
+        "y": 1117,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7a284ffa.3cc17",\r
-                "aa72c818.28213",\r
-                "f0ca75e3.4407d"\r
+                "312e9154.f9dbd6",\r
+                "38e6d39b.3fc964",\r
+                "d52b1c1f.8a6ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a284ffa.3cc17",\r
+        "id": "312e9154.f9dbd6",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4251.5001220703125,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4314.383453369141,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "25701aeb.93625e"\r
+                "6d3eafaf.02fb48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa72c818.28213",\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": 4243.5001220703125,\r
-        "y": 1146,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4306.383453369141,\r
+        "y": 1124,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f502d128.6eafe8"\r
+                "3519bfd5.fa4b3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25701aeb.93625e",\r
+        "id": "6d3eafaf.02fb48",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4395.8824462890625,\r
-        "y": 1090.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4458.765777587891,\r
+        "y": 1068.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "86d32773.3465f8"\r
+                "6a66b1f9.955598"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "86d32773.3465f8",\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": 4580,\r
-        "y": 1089,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4642.883331298828,\r
+        "y": 1067,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e526c1c.efff3c"\r
+                "43b05855.517cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e526c1c.efff3c",\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": 4775,\r
-        "y": 1089,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4837.883331298828,\r
+        "y": 1067,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b3ad7614.48799"\r
+                "c21a24cd.dd2528"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0ca75e3.4407d",\r
+        "id": "d52b1c1f.8a6ca8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4248.5001220703125,\r
-        "y": 1203,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4311.383453369141,\r
+        "y": 1181,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f3b0b426.0ebd8"\r
+                "db81dd24.8006b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f3b0b426.0ebd8",\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": 4400.5001220703125,\r
-        "y": 1204,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4463.383453369141,\r
+        "y": 1182,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f502d128.6eafe8",\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": 4411.5001220703125,\r
-        "y": 1147,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4474.383453369141,\r
+        "y": 1125,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1793312b.927ef7",\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": 4087,\r
-        "y": 914,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4149.883331298828,\r
+        "y": 892,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3ad7614.48799",\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": 4978,\r
-        "y": 1093,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5040.883331298828,\r
+        "y": 1071,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "96db10e5.ea83"\r
+                "f7c609f5.0c2d28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "306d874d.b412d8",\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": 5363,\r
-        "y": 1106,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5425.883331298828,\r
+        "y": 1084,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c6eb6256.83f998",\r
-                "45038891.4f4538",\r
-                "daa4d789.597db8"\r
+                "2769bc77.6b9fa4",\r
+                "7925966f.3df658",\r
+                "161a4207.178c96"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96db10e5.ea83",\r
+        "id": "f7c609f5.0c2d28",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5157,\r
-        "y": 1093,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5219.883331298828,\r
+        "y": 1071,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d230885e.9519f8",\r
-                "306d874d.b412d8"\r
+                "3634d6f2.f94292",\r
+                "dff3e5ec.9273"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d230885e.9519f8",\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": 5393,\r
-        "y": 1054,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5455.883331298828,\r
+        "y": 1032,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c6eb6256.83f998",\r
+        "id": "2769bc77.6b9fa4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5573,\r
-        "y": 1097,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5635.883331298828,\r
+        "y": 1075,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a3266db3.e5e668"\r
+                "8b0e2b2b.7a21d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "45038891.4f4538",\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": 5565,\r
-        "y": 1152,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5627.883331298828,\r
+        "y": 1130,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c1656fec.754d9"\r
+                "b9107d6e.7c0358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "daa4d789.597db8",\r
+        "id": "161a4207.178c96",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5570,\r
-        "y": 1209,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5632.883331298828,\r
+        "y": 1187,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e2730778.5b349"\r
+                "d5598bab.3dfb58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e2730778.5b349",\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": 5722,\r
-        "y": 1210,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5784.883331298828,\r
+        "y": 1188,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c1656fec.754d9",\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": 5733,\r
-        "y": 1155,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5795.883331298828,\r
+        "y": 1133,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3266db3.e5e668",\r
+        "id": "8b0e2b2b.7a21d",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5717.38232421875,\r
-        "y": 1094.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5780.265655517578,\r
+        "y": 1072.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "eeffd7c6.a525f"\r
+                "f80d31a9.31f3d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eeffd7c6.a525f",\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": 5932,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5994.883331298828,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24ea3ba5.00c9cc",\r
+        "id": "d718b282.287ca",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3706,\r
-        "y": 1032,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3768.883331298828,\r
+        "y": 1010,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "171d3657.f2327a",\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": 2268,\r
-        "y": 759,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2330.883331298828,\r
+        "y": 737,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "76b248ab.29f1f8",\r
-                "a2a1c5ad.da7c28"\r
+                "7d753f63.af1d7",\r
+                "7719dbd9.957fc4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a2a1c5ad.da7c28",\r
+        "id": "7719dbd9.957fc4",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2675,\r
-        "y": 777,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2737.883331298828,\r
+        "y": 755,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4b53f5cd.6e4a64"\r
+                "2b5dce30.392f92"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76b248ab.29f1f8",\r
+        "id": "7d753f63.af1d7",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2675,\r
-        "y": 722,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2737.883331298828,\r
+        "y": 700,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ed700187.4c0438"\r
+                "155f7f13.57fce1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed700187.4c0438",\r
+        "id": "155f7f13.57fce1",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2831,\r
-        "y": 720,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2893.883331298828,\r
+        "y": 698,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "adf25f68.f6874",\r
-                "79f7771a.baa2f"\r
+                "e7a16254.b52678",\r
+                "4a95df1.67c3fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b53f5cd.6e4a64",\r
+        "id": "2b5dce30.392f92",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2808,\r
-        "y": 778,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2870.883331298828,\r
+        "y": 756,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1d423866.3abba8",\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": 985,\r
-        "y": 194,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1047.8833312988281,\r
+        "y": 172,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7ea63f5.b58c8",\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": 4102,\r
-        "y": 612,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4164.883331298828,\r
+        "y": 590,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7d01ae3.e59e8d",\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": 4162,\r
-        "y": 651,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4224.883331298828,\r
+        "y": 629,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "63268214.354d14",\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": 978,\r
-        "y": 102,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1040.8833312988281,\r
+        "y": 80,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ad2fff57.f164d",\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": 3514,\r
-        "y": 2128,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3576.883331298828,\r
+        "y": 2106,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "605c7758.9853c8",\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": 3570,\r
-        "y": 2177,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3632.883331298828,\r
+        "y": 2155,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "45ce7d67.6029dc",\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": 978,\r
-        "y": 141,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1040.8833312988281,\r
+        "y": 119,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2b86835c.8d9024",\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": 1009,\r
-        "y": 242,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1071.8833312988281,\r
+        "y": 220,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5a6a7d0e.a2f89c",\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": 219,\r
-        "y": 717,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 281.8833312988281,\r
+        "y": 695,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "bd2f8dbe.e61408",\r
-                "cacc237e.394a4",\r
-                "f05100c1.a77fd8"\r
+                "e70c3582.89ad08",\r
+                "3aeaa08a.574a",\r
+                "1322af3c.bc6319"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd2f8dbe.e61408",\r
+        "id": "e70c3582.89ad08",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 438,\r
-        "y": 655,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 500.8833312988281,\r
+        "y": 633,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "64d16331.36ee54"\r
+                "9c476365.2b909"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cacc237e.394a4",\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": 447.490966796875,\r
-        "y": 697.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 510.3742980957031,\r
+        "y": 675.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
-            [\r
-                "537fe800.387e68"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "f05100c1.a77fd8",\r
+        "id": "1322af3c.bc6319",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 436,\r
-        "y": 744,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 498.8833312988281,\r
+        "y": 722,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4626cafb.2ab55c"\r
+                "23db95da.1941e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "64d16331.36ee54",\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": 635,\r
-        "y": 651,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 697.8833312988281,\r
+        "y": 629,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f0f139f4.8e2a48"\r
+                "1a5a20de.60b4cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "537fe800.387e68",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
-        "comments": "",\r
-        "x": 601.0623779296875,\r
-        "y": 700.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "4626cafb.2ab55c",\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": 605,\r
-        "y": 745,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 667.8833312988281,\r
+        "y": 723,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f0f139f4.8e2a48",\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": 858.33349609375,\r
-        "y": 650.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 921.2168273925781,\r
+        "y": 628.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2762e6c2.94358a"\r
+                "59a859e2.c48ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2762e6c2.94358a",\r
+        "id": "59a859e2.c48ca8",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1059.0001335144043,\r
-        "y": 652.000020980835,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1121.8834648132324,\r
+        "y": 630.000020980835,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "37a60584.767442"\r
+                "ae28be96.a81b18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37a60584.767442",\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": 189,\r
-        "y": 914,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 251.88333129882812,\r
+        "y": 892,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "99239678.d76be8",\r
-                "87a24056.0cfc9",\r
-                "b29ec635.8a7db"\r
+                "4595d435.587aa4",\r
+                "60a8c3ff.237aec",\r
+                "18e77ed.3460901"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "99239678.d76be8",\r
+        "id": "4595d435.587aa4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 397,\r
-        "y": 878,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 459.8833312988281,\r
+        "y": 856,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "bb3094ff.e3cd78"\r
+                "9c5806bb.83c05"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87a24056.0cfc9",\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": 397.490966796875,\r
-        "y": 923.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 460.3742980957031,\r
+        "y": 901.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
-            [\r
-                "816ef02e.772828"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "b29ec635.8a7db",\r
+        "id": "18e77ed.3460901",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 395,\r
-        "y": 967,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 457.8833312988281,\r
+        "y": 945,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b9990c7b.83fc7"\r
+                "a170b783.101ed"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "816ef02e.772828",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
-        "comments": "",\r
-        "x": 560.0623779296875,\r
-        "y": 923.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "b9990c7b.83fc7",\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": 564,\r
-        "y": 968,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 626.8833312988281,\r
+        "y": 946,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "30524cd6.9ca834",\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": 534,\r
-        "y": 1474,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 598.8833312988281,\r
+        "y": 1440,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b7324e21.fe4538"\r
+                "48f75925.f13078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b7324e21.fe4538",\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": 739,\r
-        "y": 1474,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 801.8833312988281,\r
+        "y": 1452,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fd6dca36.4f2ef"\r
+                "dc596581.8a224"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd6dca36.4f2ef",\r
+        "id": "dc596581.8a224",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 905,\r
-        "y": 1471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 967.8833312988281,\r
+        "y": 1449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "14e5640a.2c60e4"\r
+                "63611a55.44e3fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14e5640a.2c60e4",\r
+        "id": "63611a55.44e3fc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1066,\r
-        "y": 1468,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1128.8833312988281,\r
+        "y": 1446,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a961c0c2.954588",\r
-                "bfc93479.bb02c8",\r
-                "ea108501.b7cec8",\r
-                "9c9a6caf.c302e",\r
-                "520b6d65.f95b0c"\r
+                "155181d9.def56e",\r
+                "450c0202.9562fc",\r
+                "e522d7e8.f0b6d",\r
+                "b85bac18.623698",\r
+                "d97c4e37.51bad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfc93479.bb02c8",\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": 1270,\r
-        "y": 1426,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1332.8833312988281,\r
+        "y": 1404,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a961c0c2.954588",\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": 1267,\r
-        "y": 1471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1329.8833312988281,\r
+        "y": 1449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ae34427.3665d4",\r
-                "2e0f53f9.af66fc",\r
-                "e67056c5.33255"\r
+                "c73d859f.d40f2",\r
+                "cdecbb41.644898",\r
+                "ca040aae.e9fa08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e0f53f9.af66fc",\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": 1462.490966796875,\r
-        "y": 1444.573974609375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1525.3742980957031,\r
+        "y": 1422.573974609375,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c471a2c5.a52548"\r
+                "dcd0fdd9.1c84f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e67056c5.33255",\r
+        "id": "ca040aae.e9fa08",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1458,\r
-        "y": 1488.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1520.8833312988281,\r
+        "y": 1466.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ff2d9a38.ef94a"\r
+                "7c23dd25.00653c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c471a2c5.a52548",\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": 1625.0625,\r
-        "y": 1443.8596801757812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1687.9458312988281,\r
+        "y": 1421.8596801757812,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff2d9a38.ef94a",\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": 1626,\r
-        "y": 1488.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1688.8833312988281,\r
+        "y": 1466.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "de28fbd6.aeb6d8",\r
+        "id": "c84187cf.6e6008",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1628,\r
-        "y": 1535.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1690.8833312988281,\r
+        "y": 1513.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ae34427.3665d4",\r
+        "id": "c73d859f.d40f2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1459,\r
-        "y": 1535.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1521.8833312988281,\r
+        "y": 1513.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "de28fbd6.aeb6d8"\r
+                "c84187cf.6e6008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30e36623.144df2",\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": 148.5,\r
-        "y": 1133,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 211.38333129882812,\r
+        "y": 1111,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f6f4ecca.51b1b8",\r
-                "c489f9fc.e5ffb8",\r
-                "a9b0c19e.2c84b8"\r
+                "b58d5b5e.9a197",\r
+                "5c723a86.22c16c",\r
+                "fb40210e.8c5be8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3438a7d7.53b84",\r
+        "id": "ce504b34.d68ac8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 278.5,\r
-        "y": 1491,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 322.3833312988281,\r
+        "y": 1467,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f6f4ecca.51b1b8",\r
+        "id": "b58d5b5e.9a197",\r
          "type": "outcome",\r
          "name": "leaf",\r
          "xml": "<outcome value='leaf'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 134.5,\r
-        "y": 1379,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 197.38333129882812,\r
+        "y": 1357,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "96322198.44279"\r
+                "67ff853e.386644"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c489f9fc.e5ffb8",\r
+        "id": "5c723a86.22c16c",\r
          "type": "outcome",\r
          "name": "root",\r
          "xml": "<outcome value='root'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 135.5,\r
-        "y": 1437,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 198.38333129882812,\r
+        "y": 1415,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "398da5.544e025c"\r
+                "402699af.4c591"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9b0c19e.2c84b8",\r
+        "id": "fb40210e.8c5be8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 137.5,\r
-        "y": 1491,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 200.38333129882812,\r
+        "y": 1469,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3438a7d7.53b84"\r
+                "ce504b34.d68ac8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5287808.34bdc8",\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": 1243,\r
-        "y": 1699,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1305.8833312988281,\r
+        "y": 1677,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ea108501.b7cec8",\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].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.connectivity.cir`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.connectivity.eir`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1334,\r
-        "y": 1753,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1396.8833312988281,\r
+        "y": 1731,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "398da5.544e025c",\r
+        "id": "402699af.4c591",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 277.5,\r
-        "y": 1437,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 314.3833312988281,\r
+        "y": 1411,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f5ac679b.0c3448",\r
-                "30524cd6.9ca834",\r
-                "4bb59d5e.d5f6bc",\r
-                "c1ca24e2.0ded08",\r
-                "f1761a56.ef5438",\r
-                "6a3c09b5.9a3f5",\r
-                "62e9a9e6.6ea9a8",\r
-                "94499eb7.5f7bf8",\r
-                "24306e49.ece4e2",\r
-                "527621da.e42f6",\r
-                "f1193850.b7d1f"\r
+                "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": "96322198.44279",\r
+        "id": "67ff853e.386644",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 276.5,\r
-        "y": 1379,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 326.3833312988281,\r
+        "y": 1348,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "30524cd6.9ca834",\r
-                "4806b9e7.4221c",\r
-                "4f3ecf27.4c11b",\r
-                "c1ca24e2.0ded08",\r
-                "f1761a56.ef5438",\r
-                "6a3c09b5.9a3f5",\r
-                "62e9a9e6.6ea9a8",\r
-                "94499eb7.5f7bf8",\r
-                "24306e49.ece4e2",\r
-                "527621da.e42f6",\r
-                "f1193850.b7d1f"\r
+                "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": "4806b9e7.4221c",\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": 555.5,\r
-        "y": 1255,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 618.3833312988281,\r
+        "y": 1233,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f5ac679b.0c3448",\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": 572.5,\r
-        "y": 1349,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 635.3833312988281,\r
+        "y": 1327,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c1ca24e2.0ded08",\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": 479,\r
-        "y": 1714,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 561.8833312988281,\r
+        "y": 1696,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "835a7483.88e81"\r
+                "2dc7d020.0f01c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "835a7483.88e81",\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": 731,\r
-        "y": 1717,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 793.8833312988281,\r
+        "y": 1695,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "51c29716.e56f9"\r
+                "9a9b2fc1.cfc378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51c29716.e56f9",\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": 943,\r
-        "y": 1718,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1005.8833312988281,\r
+        "y": 1696,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ed212632.132b88"\r
+                "3ee84e3e.71c9c2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed212632.132b88",\r
+        "id": "3ee84e3e.71c9c2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 199,\r
-        "y": 1874,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 261.8833312988281,\r
+        "y": 1852,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "56f85a0e.adc1bc",\r
-                "4a52a34d.b3a154"\r
+                "a6f3ac42.8fbf28",\r
+                "c5253df7.0ed11"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a52a34d.b3a154",\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": 434,\r
-        "y": 1861,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 496.8833312988281,\r
+        "y": 1839,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "56f85a0e.adc1bc",\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": 424,\r
-        "y": 1922,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 486.8833312988281,\r
+        "y": 1900,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "29bd05cb.6887aa",\r
-                "769c56b6.046928",\r
-                "2ae22544.9de39a"\r
+                "b27c66fe.f461f8",\r
+                "d86a808d.b5d38",\r
+                "51be47ba.06369"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "769c56b6.046928",\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": 637.490966796875,\r
-        "y": 1906.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 700.3742980957031,\r
+        "y": 1884.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9a05194a.a2cf9"\r
+                "40ccd27e.7bf8ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ae22544.9de39a",\r
+        "id": "51be47ba.06369",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 633,\r
-        "y": 1951,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 695.8833312988281,\r
+        "y": 1929,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "55ecc37f.47d76c"\r
+                "10ad75eb.cd3092"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29bd05cb.6887aa",\r
+        "id": "b27c66fe.f461f8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 635,\r
-        "y": 2011,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 697.8833312988281,\r
+        "y": 1989,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d6336d05.5f3c98"\r
+                "f72f31f7.42e17"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a05194a.a2cf9",\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": 800.0625,\r
-        "y": 1905.8597412109375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 862.9458312988281,\r
+        "y": 1883.8597412109375,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "55ecc37f.47d76c",\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": 801,\r
-        "y": 1951,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 863.8833312988281,\r
+        "y": 1929,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6336d05.5f3c98",\r
+        "id": "f72f31f7.42e17",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 804,\r
-        "y": 2010,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 866.8833312988281,\r
+        "y": 1988,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "84a52064.39d0f",\r
-                "fd245192.c0f68"\r
+                "c01095c8.c5a848",\r
+                "1e0b480.37d7ab8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "62e9a9e6.6ea9a8",\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": 213,\r
-        "y": 2153,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 265.8833312988281,\r
+        "y": 2487,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "94499eb7.5f7bf8",\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.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 369,\r
-        "y": 2201,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 408.8833312988281,\r
+        "y": 2547,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a73a5a95.120de",\r
-                "bca2a5aa.f6cc3"\r
+                "7174c4fb.4236d4",\r
+                "3df090d7.e28cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a73a5a95.120de",\r
+        "id": "7174c4fb.4236d4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 681.5,\r
-        "y": 2178,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 721.3833312988281,\r
+        "y": 2524,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bca2a5aa.f6cc3",\r
+        "id": "3df090d7.e28cf",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 685.5,\r
-        "y": 2218,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 725.3833312988281,\r
+        "y": 2564,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "10f6c019.f86f7"\r
+                "bbef1ecc.7916"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60ee3bcb.03ac64",\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": 861.5,\r
-        "y": 2182,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 901.3833312988281,\r
+        "y": 2528,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10f6c019.f86f7",\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": 877,\r
-        "y": 2236,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 916.8833312988281,\r
+        "y": 2582,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "67f0aa7d.43690c"\r
+                "b94bbfec.158258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca5ee847.cad2",\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": 1172.5,\r
-        "y": 2205,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1212.3833312988281,\r
+        "y": 2551,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c6e95b64.3418d8",\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": 2616.5,\r
-        "y": 1924,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2679.383331298828,\r
+        "y": 1902,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "67f0aa7d.43690c",\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": 1134.5,\r
-        "y": 2247,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1174.3833312988281,\r
+        "y": 2593,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4f3ecf27.4c11b",\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": 521.5,\r
-        "y": 1293,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 584.3833312988281,\r
+        "y": 1271,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4bb59d5e.d5f6bc",\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": 534.5,\r
-        "y": 1389,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 597.3833312988281,\r
+        "y": 1367,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "91a8f363.33b6d",\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": 4271,\r
-        "y": 565,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4333.883331298828,\r
+        "y": 543,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b3054d0f.9c60c",\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": 4174,\r
-        "y": 1384,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4236.883331298828,\r
+        "y": 1362,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d3fdc974.92df9",\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": 3668,\r
-        "y": 2056,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3730.883331298828,\r
+        "y": 2034,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bb3094ff.e3cd78",\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": 769,\r
-        "y": 864,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 831.8833312988281,\r
+        "y": 842,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "282392e2.d6f746",\r
-                "f0518341.6afb1"\r
+                "24382f34.66808",\r
+                "ea56d949.8ce4b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "282392e2.d6f746",\r
+        "id": "24382f34.66808",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1132,\r
-        "y": 887,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1194.8833312988281,\r
+        "y": 865,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "77c0bd36.331cac"\r
+                "d7ed30c6.74c9b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0518341.6afb1",\r
+        "id": "ea56d949.8ce4b",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1132,\r
-        "y": 836,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1194.8833312988281,\r
+        "y": 814,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e54c87c8.43eeb8"\r
+                "3707e8cf.65827"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77c0bd36.331cac",\r
+        "id": "d7ed30c6.74c9b",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1288,\r
-        "y": 885,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1350.8833312988281,\r
+        "y": 863,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "30e36623.144df2"\r
+                "a7f36b9f.f75b88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e54c87c8.43eeb8",\r
+        "id": "3707e8cf.65827",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1265,\r
-        "y": 837,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1327.8833312988281,\r
+        "y": 815,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e9e324cf.d34fa8",\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": 2025,\r
-        "y": 235,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2087.883331298828,\r
+        "y": 213,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "52902dc6.5c041c",\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": 3567,\r
-        "y": 2216,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3629.883331298828,\r
+        "y": 2194,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8c296a00.ae82e8",\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": 4157,\r
-        "y": 689,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4219.883331298828,\r
+        "y": 667,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9c9a6caf.c302e",\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": 1331,\r
-        "y": 1795,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1393.8833312988281,\r
+        "y": 1773,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1761a56.ef5438",\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": 510,\r
-        "y": 1529,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 572.8833312988281,\r
+        "y": 1507,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6a3c09b5.9a3f5",\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": 541,\r
-        "y": 1569,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 603.8833312988281,\r
+        "y": 1547,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "84a52064.39d0f",\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": 1089,\r
-        "y": 1977,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1151.8833312988281,\r
+        "y": 1955,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fd245192.c0f68",\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": 1092,\r
-        "y": 2019,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1154.8833312988281,\r
+        "y": 1997,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24306e49.ece4e2",\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": 516,\r
-        "y": 1663,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 597.8833312988281,\r
+        "y": 1637,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "527621da.e42f6",\r
+        "id": "1b4871a6.1cd8a6",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
          "comments": "",\r
-        "x": 290,\r
-        "y": 2038,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 352.8833312988281,\r
+        "y": 2016,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1193850.b7d1f",\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": 298,\r
-        "y": 2095,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 360.8833312988281,\r
+        "y": 2073,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "520b6d65.f95b0c",\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": 1309,\r
-        "y": 1644,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1371.8833312988281,\r
+        "y": 1622,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "19e13e29.006812",\r
-                "9d0e6726.e149c8"\r
+                "3df77641.8d727a",\r
+                "f024d61d.5a31c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d0e6726.e149c8",\r
+        "id": "f024d61d.5a31c",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1532,\r
-        "y": 1599,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1594.8833312988281,\r
+        "y": 1577,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2d20dd4b.751b72"\r
+                "3c67000e.e921c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "19e13e29.006812",\r
+        "id": "3df77641.8d727a",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1534,\r
-        "y": 1663,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1596.8833312988281,\r
+        "y": 1641,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1dc48abe.a6b4ad"\r
+                "de64177a.8916f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2d20dd4b.751b72",\r
+        "id": "3c67000e.e921c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1697,\r
-        "y": 1596,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1759.8833312988281,\r
+        "y": 1574,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c6b49f04.8bee18"\r
+                "9bea7c66.5f62c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1dc48abe.a6b4ad",\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": 1696,\r
-        "y": 1659,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1758.8833312988281,\r
+        "y": 1637,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c6b49f04.8bee18",\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": 1979.8833312988281,\r
+        "y": 1588,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\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": 1524.8833312988281,\r
+        "y": 2313,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "c388a6bf.f87f3"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 1909.8833312988281,\r
+        "y": 2326,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "7866488b.2039a8",\r
+                "bdc692ef.1c0858",\r
+                "823a852f.40d29"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c388a6bf.f87f3",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1703.8833312988281,\r
+        "y": 2313,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "5c79d6d8.a6a8e",\r
+                "a2f5b878.ad169"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 1939.8833312988281,\r
+        "y": 2274,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7866488b.2039a8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2119.883331298828,\r
+        "y": 2317,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "4da79570.cd80cc"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 2111.883331298828,\r
+        "y": 2372,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "5ef7fec5.5efb98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "823a852f.40d29",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2116.883331298828,\r
+        "y": 2429,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "57488074.1d65e"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 2268.883331298828,\r
+        "y": 2430,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\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": 2279.883331298828,\r
+        "y": 2375,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4da79570.cd80cc",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2264.265655517578,\r
+        "y": 2314.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "69f8caaf.bba51c"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 2478.883331298828,\r
+        "y": 2311,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\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": 602.8833312988281,\r
+        "y": 2359,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "bb343bdc.881868",\r
+                "8bc84f5e.0473d8",\r
+                "78444b47.33ec34"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bb343bdc.881868",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 798.3834533691406,\r
+        "y": 2311,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "bf3ecbb9.4dd008"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 790.3834533691406,\r
+        "y": 2366,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "ef40b092.bc09e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bf3ecbb9.4dd008",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 942.7657775878906,\r
+        "y": 2310.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "1285266.d4ce8da"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 1126.8833312988281,\r
+        "y": 2309,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "640d04c1.8428dc"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 1321.8833312988281,\r
+        "y": 2309,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "7a38583b.020a88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "78444b47.33ec34",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 795.3834533691406,\r
+        "y": 2423,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "b417de17.8b3a6"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 947.3834533691406,\r
+        "y": 2424,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\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": 958.3834533691406,\r
+        "y": 2367,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\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": 592.8833312988281,\r
+        "y": 2271,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": []\r
+    },\r
+    {\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": 337.8833312988281,\r
+        "y": 2402,\r
+        "z": "db287b1f.2984a8",\r
+        "wires": [\r
+            [\r
+                "fc4eafc.4810e5",\r
+                "53cc84ce.e1faf4"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 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": 1917,\r
-        "y": 1610,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 754.8833312988281,\r
+        "y": 442,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      }\r
  ]
 \ No newline at end of file