Support for 1+1 protection path for a cloud leased-line (CLL) service.

[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 1828f87..d58ad7b 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
  [\r
      {\r
-        "id": "4a53e986.e1345",\r
+        "id": "d35e2da9.70a7e",\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": 401.8833312988281,\r
-        "y": 341,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 372,\r
+        "y": 306,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "bee28b81.87faf8",\r
-                "2e0d3206.b3958e",\r
-                "2caa6605.779652"\r
+                "88d19ab1.10b18",\r
+                "8fd12759.af6e18",\r
+                "50405d21.7eae84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bee28b81.87faf8",\r
+        "id": "88d19ab1.10b18",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 589.8833312988281,\r
-        "y": 354,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 560,\r
+        "y": 319,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "db2a2eb9.c4729"\r
+                "d472199a.beff9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e0d3206.b3958e",\r
+        "id": "8fd12759.af6e18",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 597.374267578125,\r
-        "y": 396.57403564453125,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 567.4909362792969,\r
+        "y": 361.57403564453125,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2caa6605.779652",\r
+        "id": "50405d21.7eae84",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 587.8833312988281,\r
-        "y": 443,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 558,\r
+        "y": 408,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9a0e1ef7.428b9"\r
+                "6b1a691d.f6617"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db2a2eb9.c4729",\r
+        "id": "d472199a.beff9",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 762.8833312988281,\r
-        "y": 352,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 733,\r
+        "y": 317,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b1233538.ceab4"\r
+                "f306805a.38d6f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1233538.ceab4",\r
+        "id": "f306805a.38d6f8",\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": 991.8833312988281,\r
-        "y": 353,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 962,\r
+        "y": 318,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f68da0c8.dc2638"\r
+                "4a920666.d84d68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f68da0c8.dc2638",\r
+        "id": "4a920666.d84d68",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1206.8833312988281,\r
-        "y": 354,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1177,\r
+        "y": 319,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "947d4965.a799f8"\r
+                "fc848cba.fc33d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab775a4c.a509d",\r
+        "id": "841ae1dd.49d178",\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": 1460.8833312988281,\r
-        "y": 276,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1431,\r
+        "y": 241,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1ae0d7f3.280b18",\r
-                "b7c135fb.7fc808"\r
+                "98ef6cc.4725e9",\r
+                "ab42fe03.c49e3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1ae0d7f3.280b18",\r
+        "id": "98ef6cc.4725e9",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1677.8833312988281,\r
-        "y": 255,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1648,\r
+        "y": 220,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "947d4965.a799f8"\r
+                "fc848cba.fc33d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b7c135fb.7fc808",\r
+        "id": "ab42fe03.c49e3",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1677.8833312988281,\r
-        "y": 304,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1648,\r
+        "y": 269,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "947d4965.a799f8",\r
+        "id": "fc848cba.fc33d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1861.8833312988281,\r
-        "y": 341,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1832,\r
+        "y": 306,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7307d136.f98668",\r
-                "d6d93ab.df041c8",\r
-                "ed4d0298.cdb578"\r
+                "53692e4a.48cde",\r
+                "957d0d12.f7d338",\r
+                "1f9b767f.d670b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d12da893.5808e",\r
+        "id": "524dbe59.8ef8f",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 220.88333129882812,\r
-        "y": 82,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 191,\r
+        "y": 47,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ba22940.68974f"\r
+                "320667fa.12a2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ba22940.68974f",\r
+        "id": "320667fa.12a2c",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -201,3545 +201,3558 @@
          "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": 505.1690216064453,\r
-        "y": 143.23810863494873,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 475.2856903076172,\r
+        "y": 108.23810863494873,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f0aeb23e.8f1f7"\r
+                "aa006c98.f12b58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0aeb23e.8f1f7",\r
+        "id": "aa006c98.f12b58",\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": 511.3119354248047,\r
-        "y": 228.00003051757812,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 481.42860412597656,\r
+        "y": 193.00003051757812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "849eab75.e48858"\r
+                "72fe4a66.39584c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "849eab75.e48858",\r
+        "id": "72fe4a66.39584c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 821.1213684082031,\r
-        "y": 219.66668701171875,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 791.238037109375,\r
+        "y": 184.66668701171875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4a53e986.e1345",\r
-                "9dad0003.283738",\r
-                "47e937a3.3ee608",\r
-                "fa83bc41.1d8b08",\r
-                "39b1b2.d055464e"\r
+                "d35e2da9.70a7e",\r
+                "cce8745e.b515b8",\r
+                "706cb78c.da92b",\r
+                "88772a4.9b58658",\r
+                "4ace150.4554dec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7307d136.f98668",\r
+        "id": "53692e4a.48cde",\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": 2078.883331298828,\r
-        "y": 279,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2049,\r
+        "y": 244,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5be24b21.11ebc4",\r
+        "id": "123fcc82.b79ae3",\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": 4247.883331298828,\r
-        "y": 165,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4218,\r
+        "y": 130,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "66c2f1fa.df4e",\r
+        "id": "e308a3a2.af826",\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": 4328.883331298828,\r
-        "y": 480,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4299,\r
+        "y": 445,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "78ae8a16.bcde6c",\r
-                "163e60b5.f624ef"\r
+                "fedd6b9.d7f3318",\r
+                "39581c20.edb614"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "78ae8a16.bcde6c",\r
+        "id": "fedd6b9.d7f3318",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4638.383331298828,\r
-        "y": 449,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4608.5,\r
+        "y": 414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a86780cc.869ba"\r
+                "c49081cf.377c78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "163e60b5.f624ef",\r
+        "id": "39581c20.edb614",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4643.383331298828,\r
-        "y": 514,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4613.5,\r
+        "y": 479,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "496a02d9.361154"\r
+                "9c0572a4.3a997"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a86780cc.869ba",\r
+        "id": "c49081cf.377c78",\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": 4814.383331298828,\r
-        "y": 449,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4784.5,\r
+        "y": 414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "496a02d9.361154",\r
+        "id": "9c0572a4.3a997",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4809.883331298828,\r
-        "y": 514,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4780,\r
+        "y": 479,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4c8b1659.abc1b",\r
+        "id": "2d297001.689a7",\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": 4193.383331298828,\r
-        "y": 734,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4163.5,\r
+        "y": 699,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "902cb9fb.0d496",\r
+        "id": "54d9bbcc.0d0bac",\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": 4347.383331298828,\r
-        "y": 782,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4317.5,\r
+        "y": 747,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f961065e.0e576",\r
-                "6ca1f611.56dee"\r
+                "2ade786d.c09b28",\r
+                "f17ad5b3.0ef818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f961065e.0e576",\r
+        "id": "2ade786d.c09b28",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4692.883331298828,\r
-        "y": 763,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4663,\r
+        "y": 728,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6296fab8.967dac"\r
+                "72718fb4.e15e78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ca1f611.56dee",\r
+        "id": "f17ad5b3.0ef818",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4696.883331298828,\r
-        "y": 803,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4667,\r
+        "y": 768,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ef7067c4.7ea328"\r
+                "98b1fdb0.a42648"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6296fab8.967dac",\r
+        "id": "72718fb4.e15e78",\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": 4850.883331298828,\r
-        "y": 763,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4821,\r
+        "y": 728,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef7067c4.7ea328",\r
+        "id": "98b1fdb0.a42648",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4854.383331298828,\r
-        "y": 803,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4824.5,\r
+        "y": 768,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ee477ca2.a65568",\r
-                "5e527e99.1f4728"\r
+                "fe12ce9.6a53ab",\r
+                "4eba4c2.fda54b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee477ca2.a65568",\r
+        "id": "fe12ce9.6a53ab",\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": 5184.883331298828,\r
-        "y": 768,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5155,\r
+        "y": 733,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f9d5afb7.0291b",\r
+        "id": "9e233ee4.5c90e",\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": 5048.883331298828,\r
-        "y": 727,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5019,\r
+        "y": 692,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5e527e99.1f4728",\r
+        "id": "4eba4c2.fda54b4",\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": 5111.883331298828,\r
-        "y": 814,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5082,\r
+        "y": 779,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "48c30a65.f0f584",\r
+        "id": "fbd17573.b91cd8",\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": 4185.883331298828,\r
-        "y": 213,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4156,\r
+        "y": 178,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bc523ecb.f956a8",\r
+        "id": "985dbb20.1c3b78",\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": 4211.883331298828,\r
-        "y": 330,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4182,\r
+        "y": 295,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a72840b5.dc70e",\r
-                "54e4a8de.9445f8",\r
-                "4012660e.b55b2"\r
+                "544c4f89.eba52",\r
+                "eb873b5e.d10b8",\r
+                "d8377d86.76164"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a72840b5.dc70e",\r
+        "id": "544c4f89.eba52",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4407.383453369141,\r
-        "y": 282,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4377.5001220703125,\r
+        "y": 247,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9d071aa.9c29c68"\r
+                "cd232c91.ed7d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "54e4a8de.9445f8",\r
+        "id": "eb873b5e.d10b8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4399.383453369141,\r
-        "y": 337,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4369.5001220703125,\r
+        "y": 302,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3662c50c.d754d2"\r
+                "7e7e18a4.ea2a98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d071aa.9c29c68",\r
+        "id": "cd232c91.ed7d5",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4551.765777587891,\r
-        "y": 281.6556701660156,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4521.8824462890625,\r
+        "y": 246.65567016601562,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c1155c42.4dc2e8"\r
+                "d5d46c3b.524dc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3b68f87.0c3248",\r
+        "id": "4c85ec99.26bac4",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5133.883331298828,\r
-        "y": 284,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5104,\r
+        "y": 249,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e6d1f56a.1147f8"\r
+                "490c8cc0.c71134"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1155c42.4dc2e8",\r
+        "id": "d5d46c3b.524dc8",\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": 4735.883331298828,\r
-        "y": 280,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4706,\r
+        "y": 245,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e3565ab9.0a825"\r
+                "cc43f2ea.19847"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3565ab9.0a825",\r
+        "id": "cc43f2ea.19847",\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": 4930.883331298828,\r
-        "y": 280,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4901,\r
+        "y": 245,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a3b68f87.0c3248"\r
+                "4c85ec99.26bac4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4012660e.b55b2",\r
+        "id": "d8377d86.76164",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4404.383453369141,\r
-        "y": 394,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4374.5001220703125,\r
+        "y": 359,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7e9c03d8.c41c7c"\r
+                "9cf617d3.aee3a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e9c03d8.c41c7c",\r
+        "id": "9cf617d3.aee3a8",\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": 4556.383453369141,\r
-        "y": 395,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4526.5001220703125,\r
+        "y": 360,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3662c50c.d754d2",\r
+        "id": "7e7e18a4.ea2a98",\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": 4567.383453369141,\r
-        "y": 338,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4537.5001220703125,\r
+        "y": 303,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99fa8e6f.e803d8",\r
+        "id": "f42e9c90.ae58f",\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": 5518.883331298828,\r
-        "y": 297,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5489,\r
+        "y": 262,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a38e0436.5aedc",\r
-                "80f6747e.265c78",\r
-                "c370b7ba.84a26"\r
+                "f404a9ca.fbce2",\r
+                "3fd1ebaf.c62a54",\r
+                "66a3972e.71bfa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6d1f56a.1147f8",\r
+        "id": "490c8cc0.c71134",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5312.883331298828,\r
-        "y": 284,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5283,\r
+        "y": 249,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4599703a.c42f3",\r
-                "99fa8e6f.e803d8"\r
+                "9ce5b4b0.4bb188",\r
+                "f42e9c90.ae58f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4599703a.c42f3",\r
+        "id": "9ce5b4b0.4bb188",\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": 5548.883331298828,\r
-        "y": 245,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5519,\r
+        "y": 210,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a38e0436.5aedc",\r
+        "id": "f404a9ca.fbce2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5728.883331298828,\r
-        "y": 288,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5699,\r
+        "y": 253,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8c88cbf0.e09b1"\r
+                "3597c274.50637e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80f6747e.265c78",\r
+        "id": "3fd1ebaf.c62a54",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5720.883331298828,\r
-        "y": 343,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5691,\r
+        "y": 308,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e2be9acb.77d62"\r
+                "ff90e84e.43d4b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c370b7ba.84a26",\r
+        "id": "66a3972e.71bfa8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5725.883331298828,\r
-        "y": 400,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5696,\r
+        "y": 365,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "856ee89c.2898"\r
+                "ff823793.36814"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "856ee89c.2898",\r
+        "id": "ff823793.36814",\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": 5877.883331298828,\r
-        "y": 401,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5848,\r
+        "y": 366,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e2be9acb.77d62",\r
+        "id": "ff90e84e.43d4b8",\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": 5888.883331298828,\r
-        "y": 346,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5859,\r
+        "y": 311,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8c88cbf0.e09b1",\r
+        "id": "3597c274.50637e",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5873.265655517578,\r
-        "y": 285.6556701660156,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5843.38232421875,\r
+        "y": 250.65567016601562,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a4a57efc.888ff8"\r
+                "d39e28b5.1aec5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a4a57efc.888ff8",\r
+        "id": "d39e28b5.1aec5",\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": 6087.883331298828,\r
-        "y": 282,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 6058,\r
+        "y": 247,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "172d91c5.a78676",\r
+        "id": "139f2f1e.8fa159",\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": 3654.883331298828,\r
-        "y": 1622,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3625,\r
+        "y": 1587,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f13d198f.d5c79",\r
+        "id": "18d2c2bc.05fd85",\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": 3717.883331298828,\r
-        "y": 1951,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3688,\r
+        "y": 1916,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3640aede.8913a2",\r
-                "f1b1c8d.9945bb8"\r
+                "8895fa29.bf8e3",\r
+                "23c7c635.fd4722"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3640aede.8913a2",\r
+        "id": "8895fa29.bf8e3",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4013.383331298828,\r
-        "y": 1918,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3983.5,\r
+        "y": 1883,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4b0d0deb.6577e4"\r
+                "500b5538.e88684"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1b1c8d.9945bb8",\r
+        "id": "23c7c635.fd4722",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4018.383331298828,\r
-        "y": 1983,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3988.5,\r
+        "y": 1948,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5da14040.cb50b8"\r
+                "909dfd67.2300d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b0d0deb.6577e4",\r
+        "id": "500b5538.e88684",\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": 4181.383331298828,\r
-        "y": 1918,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4151.5,\r
+        "y": 1883,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5da14040.cb50b8",\r
+        "id": "909dfd67.2300d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4191.883331298828,\r
-        "y": 1983,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4162,\r
+        "y": 1948,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1e50105a.a8b96",\r
+        "id": "a49aeabe.b5ff8",\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": 3593.883331298828,\r
-        "y": 1679,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3564,\r
+        "y": 1644,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfe45c65.d48f6",\r
+        "id": "642d00da.b53c68",\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": 3613.883331298828,\r
-        "y": 1776,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3584,\r
+        "y": 1741,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "56d2f84a.b524e8",\r
-                "43f5b436.ace8b4",\r
-                "a9c884c3.3b2c18"\r
+                "1e5d6803.78b7d8",\r
+                "84307ec5.09a8d",\r
+                "b468d4fc.bc9c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "56d2f84a.b524e8",\r
+        "id": "1e5d6803.78b7d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3816.3834533691406,\r
-        "y": 1729,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3786.5001220703125,\r
+        "y": 1694,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "10cf7345.17615d"\r
+                "683b34d0.c1df64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43f5b436.ace8b4",\r
+        "id": "84307ec5.09a8d",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3808.3834533691406,\r
-        "y": 1784,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3778.5001220703125,\r
+        "y": 1749,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "40e41e98.b2ab3"\r
+                "72cad52e.cb1d74"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10cf7345.17615d",\r
+        "id": "683b34d0.c1df64",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3960.7657775878906,\r
-        "y": 1726.6556701660156,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3930.8824462890625,\r
+        "y": 1691.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "69889215.886b4c"\r
+                "8511cae6.cbf588"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "69889215.886b4c",\r
+        "id": "8511cae6.cbf588",\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": 4144.883331298828,\r
-        "y": 1741,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4115,\r
+        "y": 1706,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3c1ff953.79a23e"\r
+                "82496ff9.234ee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9c884c3.3b2c18",\r
+        "id": "b468d4fc.bc9c8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3813.3834533691406,\r
-        "y": 1841,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3783.5001220703125,\r
+        "y": 1806,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8ab7ecfb.f03ee"\r
+                "a6137ce1.b3b5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ab7ecfb.f03ee",\r
+        "id": "a6137ce1.b3b5c",\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": 3965.3834533691406,\r
-        "y": 1842,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3935.5001220703125,\r
+        "y": 1807,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40e41e98.b2ab3",\r
+        "id": "72cad52e.cb1d74",\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": 3976.3834533691406,\r
-        "y": 1787,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3946.5001220703125,\r
+        "y": 1752,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "37ef2104.1e9d5e",\r
+        "id": "7b4a137a.364fcc",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4542.883331298828,\r
-        "y": 1745,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4513,\r
+        "y": 1710,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "901dac81.52118"\r
+                "37fe69a9.07064e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c1ff953.79a23e",\r
+        "id": "82496ff9.234ee",\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": 4339.883331298828,\r
-        "y": 1741,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4310,\r
+        "y": 1706,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "37ef2104.1e9d5e"\r
+                "7b4a137a.364fcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "86b8c4cb.c3747",\r
+        "id": "4bdd9e57.a5e13",\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": 4927.883331298828,\r
-        "y": 1744,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4898,\r
+        "y": 1709,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b5f45931.a1805",\r
-                "34bcb3b6.e69b1c",\r
-                "d4cc1381.862c48"\r
+                "8afff046.26af98",\r
+                "5118b1e.53f805",\r
+                "5a800db8.063d6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "901dac81.52118",\r
+        "id": "37fe69a9.07064e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4719.883331298828,\r
-        "y": 1737,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4690,\r
+        "y": 1702,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "81cd4229.29ba8",\r
-                "86b8c4cb.c3747"\r
+                "d299743b.8f6b68",\r
+                "4bdd9e57.a5e13"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81cd4229.29ba8",\r
+        "id": "d299743b.8f6b68",\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": 4957.883331298828,\r
-        "y": 1692,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4928,\r
+        "y": 1657,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a6f965e8.0bb248",\r
+        "id": "2523ddf0.8e1c8a",\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": 5286.883331298828,\r
-        "y": 1848,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5257,\r
+        "y": 1813,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3b503e2a.8c5dd2",\r
+        "id": "6f850c0f.e212ac",\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": 5297.883331298828,\r
-        "y": 1793,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5268,\r
+        "y": 1758,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a84f2510.1ebf08",\r
+        "id": "546ca846.269108",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5282.265655517578,\r
-        "y": 1732.6556701660156,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5252.38232421875,\r
+        "y": 1697.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f83738f1.e5e14"\r
+                "fac7ab27.77dda8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f83738f1.e5e14",\r
+        "id": "fac7ab27.77dda8",\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": 5496.883331298828,\r
-        "y": 1729,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5467,\r
+        "y": 1694,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b5f45931.a1805",\r
+        "id": "8afff046.26af98",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5137.883331298828,\r
-        "y": 1735,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5108,\r
+        "y": 1700,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a84f2510.1ebf08"\r
+                "546ca846.269108"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "34bcb3b6.e69b1c",\r
+        "id": "5118b1e.53f805",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5129.883331298828,\r
-        "y": 1790,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5100,\r
+        "y": 1755,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3b503e2a.8c5dd2"\r
+                "6f850c0f.e212ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d4cc1381.862c48",\r
+        "id": "5a800db8.063d6c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5134.883331298828,\r
-        "y": 1847,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5105,\r
+        "y": 1812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a6f965e8.0bb248"\r
+                "2523ddf0.8e1c8a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a95df1.67c3fa",\r
+        "id": "a1edca3.1a62bb8",\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": 3168.883331298828,\r
-        "y": 693,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3139,\r
+        "y": 658,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "60b8b463.e4925c",\r
-                "5e23be29.1eb6a"\r
+                "d4bdeded.3ef248",\r
+                "eead64c.0115918"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60b8b463.e4925c",\r
+        "id": "d4bdeded.3ef248",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3382.883331298828,\r
-        "y": 730,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3353,\r
+        "y": 695,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4d4203c4.4fd81c"\r
+                "614a0644.b0e3e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e23be29.1eb6a",\r
+        "id": "eead64c.0115918",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3384.883331298828,\r
-        "y": 668,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3355,\r
+        "y": 633,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "402d5674.bb5698"\r
+                "295e16ce.878c6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d4203c4.4fd81c",\r
+        "id": "614a0644.b0e3e",\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": 2962.883331298828,\r
-        "y": 1973,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2933,\r
+        "y": 1938,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4155de88.54a1f",\r
-                "11e38b5d.85c715"\r
+                "75bfd38b.356f64",\r
+                "f4c4b096.a3ce2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4155de88.54a1f",\r
+        "id": "75bfd38b.356f64",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3215.883331298828,\r
-        "y": 2007,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3186,\r
+        "y": 1972,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "97b4f973.8f85a8"\r
+                "b0597a28.514d3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "11e38b5d.85c715",\r
+        "id": "f4c4b096.a3ce2",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3215.883331298828,\r
-        "y": 1951,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3186,\r
+        "y": 1916,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4bdf7725.9cef3"\r
+                "64045150.224658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97b4f973.8f85a8",\r
+        "id": "b0597a28.514d3",\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": 3366.883331298828,\r
-        "y": 2007,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3337,\r
+        "y": 1972,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15e2350c.3f989b",\r
+        "id": "cf5b963d.2b5a08",\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": 4242.883331298828,\r
-        "y": 105,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4213,\r
+        "y": 70,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "22f55219.d9af6e",\r
+        "id": "4badfb31.b82c1c",\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": 3650.883331298828,\r
-        "y": 1564,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3621,\r
+        "y": 1529,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9157e39e.50973",\r
+        "id": "552020c2.f01db",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3933.883331298828,\r
-        "y": 362,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3904,\r
+        "y": 327,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\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
+                "cf5b963d.2b5a08",\r
+                "123fcc82.b79ae3",\r
+                "fbd17573.b91cd8",\r
+                "985dbb20.1c3b78",\r
+                "e308a3a2.af826",\r
+                "ec3b4a19.7f5ee",\r
+                "881b2d7a.c4e888",\r
+                "1a392cd7.238923"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4bdf7725.9cef3",\r
+        "id": "64045150.224658",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3366.883331298828,\r
-        "y": 1950,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3337,\r
+        "y": 1915,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\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
+                "4badfb31.b82c1c",\r
+                "139f2f1e.8fa159",\r
+                "a49aeabe.b5ff8",\r
+                "642d00da.b53c68",\r
+                "18d2c2bc.05fd85",\r
+                "724930a5.f44628",\r
+                "98331ea2.d141f",\r
+                "f84de17e.e8ea08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7e7eca7.931088",\r
+        "id": "ed40d4d6.135678",\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": 3604.883331298828,\r
-        "y": 2249,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3575,\r
+        "y": 2214,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5544b67f.df3238",\r
+        "id": "b71c97.3dad8368",\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": 3758.883331298828,\r
-        "y": 2297,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3729,\r
+        "y": 2262,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b36c5e4.a4b982",\r
-                "75e03418.7b0a3c"\r
+                "aa1d9a65.d56ee",\r
+                "ce785491.f82258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b36c5e4.a4b982",\r
+        "id": "aa1d9a65.d56ee",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4104.383331298828,\r
-        "y": 2278,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4074.5,\r
+        "y": 2243,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "996a2de3.86ff68"\r
+                "d8df230a.b47018"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75e03418.7b0a3c",\r
+        "id": "ce785491.f82258",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4108.383331298828,\r
-        "y": 2318,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4078.5,\r
+        "y": 2283,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1787d971.8d0d67"\r
+                "d2d57048.de12f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "996a2de3.86ff68",\r
+        "id": "d8df230a.b47018",\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": 4262.383331298828,\r
-        "y": 2278,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4232.5,\r
+        "y": 2243,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1787d971.8d0d67",\r
+        "id": "d2d57048.de12f",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4265.883331298828,\r
-        "y": 2318,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4236,\r
+        "y": 2283,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "79bbcc28.d4fd3c",\r
-                "137b8fb9.4aaa78"\r
+                "703675c3.1d187c",\r
+                "6a8e2764.0748e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79bbcc28.d4fd3c",\r
+        "id": "703675c3.1d187c",\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": 4605.883331298828,\r
-        "y": 2317,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4576,\r
+        "y": 2282,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9aab71de.3f671",\r
+        "id": "b9adfc7b.f1d908",\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": 4463.883331298828,\r
-        "y": 2275,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4434,\r
+        "y": 2240,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "137b8fb9.4aaa78",\r
+        "id": "6a8e2764.0748e8",\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": 4534.883331298828,\r
-        "y": 2366,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4505,\r
+        "y": 2331,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e7a16254.b52678",\r
+        "id": "641093d5.a73774",\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": 3159.883331298828,\r
-        "y": 633,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3130,\r
+        "y": 598,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b98d7c04.aadb6",\r
+        "id": "29b91b19.d2edf4",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3754.883331298828,\r
-        "y": 319,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3725,\r
+        "y": 284,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f9466402.70d608",\r
+        "id": "df88a98e.3b797",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3311.883331298828,\r
-        "y": 1897,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3282,\r
+        "y": 1862,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "402d5674.bb5698",\r
+        "id": "295e16ce.878c6a",\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": 3490.883331298828,\r
-        "y": 481,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3461,\r
+        "y": 446,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "40174504.12275c",\r
-                "483f6800.997ef8"\r
+                "fdfbdf68.ace01",\r
+                "8f7ef737.3d4208"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "483f6800.997ef8",\r
+        "id": "8f7ef737.3d4208",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3732.883331298828,\r
-        "y": 1070,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3703,\r
+        "y": 1035,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f91cd9b2.b4ebc8"\r
+                "d545d977.39f008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40174504.12275c",\r
+        "id": "fdfbdf68.ace01",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3726.883331298828,\r
-        "y": 361,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3697,\r
+        "y": 326,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9157e39e.50973"\r
+                "552020c2.f01db"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f91cd9b2.b4ebc8",\r
+        "id": "d545d977.39f008",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3890.883331298828,\r
-        "y": 1069,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3861,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e0a89dfb.b97bd8",\r
-                "356efc92.1be0c4",\r
-                "b98c51bd.b1df7",\r
-                "c9386596.fb5188",\r
-                "99a335d9.47dc9",\r
-                "1d1e23b2.17cb04"\r
+                "127c7c35.f5600c",\r
+                "aa22b9fb.8c00d",\r
+                "7a8bb8ff.a3807",\r
+                "b6e4b7cd.3aab58",\r
+                "9befe6d.bfbfb18",\r
+                "61ff745d.2cf8b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "356efc92.1be0c4",\r
+        "id": "aa22b9fb.8c00d",\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": 4154.883331298828,\r
-        "y": 952,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4125,\r
+        "y": 917,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99a335d9.47dc9",\r
+        "id": "9befe6d.bfbfb18",\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": 4235.883331298828,\r
-        "y": 1267,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4206,\r
+        "y": 1232,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2ae3d84f.15cb3",\r
-                "a0cd8374.ae65d8"\r
+                "602f32f4.cac7b4",\r
+                "1d093526.32224b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ae3d84f.15cb3",\r
+        "id": "602f32f4.cac7b4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4545.383331298828,\r
-        "y": 1236,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4515.5,\r
+        "y": 1201,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d03fdf1c.3b45d"\r
+                "4513cd6b.369634"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a0cd8374.ae65d8",\r
+        "id": "1d093526.32224b",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4550.383331298828,\r
-        "y": 1301,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4520.5,\r
+        "y": 1266,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f8c3fa12.5c834"\r
+                "7640c8ac.188fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d03fdf1c.3b45d",\r
+        "id": "4513cd6b.369634",\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": 4721.383331298828,\r
-        "y": 1236,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4691.5,\r
+        "y": 1201,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f8c3fa12.5c834",\r
+        "id": "7640c8ac.188fc8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4716.883331298828,\r
-        "y": 1301,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4687,\r
+        "y": 1266,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b98c51bd.b1df7",\r
+        "id": "7a8bb8ff.a3807",\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": 4092.883331298828,\r
-        "y": 1000,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4063,\r
+        "y": 965,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9386596.fb5188",\r
+        "id": "b6e4b7cd.3aab58",\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": 4118.883331298828,\r
-        "y": 1117,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4089,\r
+        "y": 1082,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "312e9154.f9dbd6",\r
-                "38e6d39b.3fc964",\r
-                "d52b1c1f.8a6ca8"\r
+                "bc604696.f19bf",\r
+                "6b2ab2eb.e94cac",\r
+                "158e3d74.81687b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "312e9154.f9dbd6",\r
+        "id": "bc604696.f19bf",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4314.383453369141,\r
-        "y": 1069,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4284.5001220703125,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6d3eafaf.02fb48"\r
+                "fbbae41a.6bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38e6d39b.3fc964",\r
+        "id": "6b2ab2eb.e94cac",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4306.383453369141,\r
-        "y": 1124,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4276.5001220703125,\r
+        "y": 1089,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3519bfd5.fa4b3"\r
+                "5e10560f.7f2a6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6d3eafaf.02fb48",\r
+        "id": "fbbae41a.6bb8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4458.765777587891,\r
-        "y": 1068.6556701660156,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4428.8824462890625,\r
+        "y": 1033.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6a66b1f9.955598"\r
+                "4ab90ec7.0f8a1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a66b1f9.955598",\r
+        "id": "4ab90ec7.0f8a1",\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": 4642.883331298828,\r
-        "y": 1067,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4613,\r
+        "y": 1032,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "43b05855.517cf"\r
+                "3bb025b6.92298a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43b05855.517cf",\r
+        "id": "3bb025b6.92298a",\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": 4837.883331298828,\r
-        "y": 1067,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4808,\r
+        "y": 1032,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c21a24cd.dd2528"\r
+                "ce204654.d589e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d52b1c1f.8a6ca8",\r
+        "id": "158e3d74.81687b",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4311.383453369141,\r
-        "y": 1181,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4281.5001220703125,\r
+        "y": 1146,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "db81dd24.8006b"\r
+                "cfe04507.17faa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db81dd24.8006b",\r
+        "id": "cfe04507.17faa",\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": 4463.383453369141,\r
-        "y": 1182,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4433.5001220703125,\r
+        "y": 1147,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3519bfd5.fa4b3",\r
+        "id": "5e10560f.7f2a6",\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": 4474.383453369141,\r
-        "y": 1125,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4444.5001220703125,\r
+        "y": 1090,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e0a89dfb.b97bd8",\r
+        "id": "127c7c35.f5600c",\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": 4149.883331298828,\r
-        "y": 892,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4120,\r
+        "y": 857,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c21a24cd.dd2528",\r
+        "id": "ce204654.d589e8",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5040.883331298828,\r
-        "y": 1071,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5011,\r
+        "y": 1036,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f7c609f5.0c2d28"\r
+                "fea8f5c8.b664d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dff3e5ec.9273",\r
+        "id": "17936311.45c0f5",\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": 5425.883331298828,\r
-        "y": 1084,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5396,\r
+        "y": 1049,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2769bc77.6b9fa4",\r
-                "7925966f.3df658",\r
-                "161a4207.178c96"\r
+                "bda3b861.07af08",\r
+                "8ce8739f.28fc08",\r
+                "8098fa71.4cbf3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7c609f5.0c2d28",\r
+        "id": "fea8f5c8.b664d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5219.883331298828,\r
-        "y": 1071,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5190,\r
+        "y": 1036,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3634d6f2.f94292",\r
-                "dff3e5ec.9273"\r
+                "619520a0.18d9e",\r
+                "17936311.45c0f5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3634d6f2.f94292",\r
+        "id": "619520a0.18d9e",\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": 5455.883331298828,\r
-        "y": 1032,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5426,\r
+        "y": 997,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2769bc77.6b9fa4",\r
+        "id": "bda3b861.07af08",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5635.883331298828,\r
-        "y": 1075,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5606,\r
+        "y": 1040,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8b0e2b2b.7a21d"\r
+                "3c9ad3f5.e5e4a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7925966f.3df658",\r
+        "id": "8ce8739f.28fc08",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5627.883331298828,\r
-        "y": 1130,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5598,\r
+        "y": 1095,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b9107d6e.7c0358"\r
+                "ec86cd9f.a15968"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "161a4207.178c96",\r
+        "id": "8098fa71.4cbf3",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5632.883331298828,\r
-        "y": 1187,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5603,\r
+        "y": 1152,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d5598bab.3dfb58"\r
+                "244270ad.8dfe1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5598bab.3dfb58",\r
+        "id": "244270ad.8dfe1",\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": 5784.883331298828,\r
-        "y": 1188,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5755,\r
+        "y": 1153,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9107d6e.7c0358",\r
+        "id": "ec86cd9f.a15968",\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": 5795.883331298828,\r
-        "y": 1133,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5766,\r
+        "y": 1098,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8b0e2b2b.7a21d",\r
+        "id": "3c9ad3f5.e5e4a4",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5780.265655517578,\r
-        "y": 1072.6556701660156,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5750.38232421875,\r
+        "y": 1037.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f80d31a9.31f3d"\r
+                "2068f2a1.5ec866"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f80d31a9.31f3d",\r
+        "id": "2068f2a1.5ec866",\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": 5994.883331298828,\r
-        "y": 1069,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5965,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d718b282.287ca",\r
+        "id": "e69cbe2a.82be58",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3768.883331298828,\r
-        "y": 1010,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3739,\r
+        "y": 975,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6d93ab.df041c8",\r
+        "id": "957d0d12.f7d338",\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": 2330.883331298828,\r
-        "y": 737,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2301,\r
+        "y": 702,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7d753f63.af1d7",\r
-                "7719dbd9.957fc4"\r
+                "7969493f.6a54d",\r
+                "9a6050c4.300548"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7719dbd9.957fc4",\r
+        "id": "9a6050c4.300548",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2737.883331298828,\r
-        "y": 755,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2708,\r
+        "y": 720,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2b5dce30.392f92"\r
+                "66cd0943.de62f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d753f63.af1d7",\r
+        "id": "7969493f.6a54d",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2737.883331298828,\r
-        "y": 700,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2708,\r
+        "y": 665,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "155f7f13.57fce1"\r
+                "7c5fc999.6b62c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "155f7f13.57fce1",\r
+        "id": "7c5fc999.6b62c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2893.883331298828,\r
-        "y": 698,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2864,\r
+        "y": 663,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e7a16254.b52678",\r
-                "4a95df1.67c3fa"\r
+                "641093d5.a73774",\r
+                "a1edca3.1a62bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b5dce30.392f92",\r
+        "id": "66cd0943.de62f",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2870.883331298828,\r
-        "y": 756,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2841,\r
+        "y": 721,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9dad0003.283738",\r
+        "id": "cce8745e.b515b8",\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": 1047.8833312988281,\r
-        "y": 172,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1018,\r
+        "y": 137,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a6d3cb9.27687b8",\r
+        "id": "48ad099a.c16688",\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": 4164.883331298828,\r
-        "y": 590,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4135,\r
+        "y": 555,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "738a4fa7.5a68d",\r
+        "id": "ec3b4a19.7f5ee",\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": 4224.883331298828,\r
-        "y": 629,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4195,\r
+        "y": 594,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "47e937a3.3ee608",\r
+        "id": "706cb78c.da92b",\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": 1040.8833312988281,\r
-        "y": 80,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1011,\r
+        "y": 45,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6f67cdff.5c5554",\r
+        "id": "9a38eb9e.71f4d8",\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": 3576.883331298828,\r
-        "y": 2106,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3547,\r
+        "y": 2071,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "78f084cb.41e754",\r
+        "id": "724930a5.f44628",\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": 3632.883331298828,\r
-        "y": 2155,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3603,\r
+        "y": 2120,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "912dde6.9b60fa",\r
+        "id": "2a414bdc.2311dc",\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": 1040.8833312988281,\r
-        "y": 119,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1011,\r
+        "y": 84,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fa83bc41.1d8b08",\r
+        "id": "88772a4.9b58658",\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": 1071.8833312988281,\r
-        "y": 220,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1042,\r
+        "y": 185,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "39b1b2.d055464e",\r
+        "id": "4ace150.4554dec",\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": 281.8833312988281,\r
-        "y": 695,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 252,\r
+        "y": 660,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e70c3582.89ad08",\r
-                "3aeaa08a.574a",\r
-                "1322af3c.bc6319"\r
+                "ce4ab0d3.b836a",\r
+                "9dbee6c6.1a60a",\r
+                "290803ec.65c94c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e70c3582.89ad08",\r
+        "id": "ce4ab0d3.b836a",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 500.8833312988281,\r
-        "y": 633,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 471,\r
+        "y": 598,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9c476365.2b909"\r
+                "280015e3.c315e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3aeaa08a.574a",\r
+        "id": "9dbee6c6.1a60a",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 510.3742980957031,\r
-        "y": 675.5740356445312,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 480.490966796875,\r
+        "y": 640.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1322af3c.bc6319",\r
+        "id": "290803ec.65c94c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 498.8833312988281,\r
-        "y": 722,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 469,\r
+        "y": 687,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "23db95da.1941e2"\r
+                "f842cdf9.29a79"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c476365.2b909",\r
+        "id": "280015e3.c315e2",\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": 697.8833312988281,\r
-        "y": 629,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 668,\r
+        "y": 594,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1a5a20de.60b4cf"\r
+                "cd508bdd.302a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23db95da.1941e2",\r
+        "id": "f842cdf9.29a79",\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": 667.8833312988281,\r
-        "y": 723,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 638,\r
+        "y": 688,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1a5a20de.60b4cf",\r
+        "id": "cd508bdd.302a88",\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": 921.2168273925781,\r
-        "y": 628.9999389648438,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 891.33349609375,\r
+        "y": 593.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "59a859e2.c48ca8"\r
+                "d4df8e14.56fc08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59a859e2.c48ca8",\r
+        "id": "d4df8e14.56fc08",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1121.8834648132324,\r
-        "y": 630.000020980835,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1092.0001335144043,\r
+        "y": 595.000020980835,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ae28be96.a81b18"\r
+                "b67eb6e5.58b31"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ae28be96.a81b18",\r
+        "id": "b67eb6e5.58b31",\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": 251.88333129882812,\r
-        "y": 892,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 222,\r
+        "y": 857,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4595d435.587aa4",\r
-                "60a8c3ff.237aec",\r
-                "18e77ed.3460901"\r
+                "eb910f68.8a5408",\r
+                "a6536ba8.c4e148",\r
+                "6d1288a7.3722b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4595d435.587aa4",\r
+        "id": "eb910f68.8a5408",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 459.8833312988281,\r
-        "y": 856,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 430,\r
+        "y": 821,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9c5806bb.83c05"\r
+                "6687da8.fb06ca4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60a8c3ff.237aec",\r
+        "id": "a6536ba8.c4e148",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 460.3742980957031,\r
-        "y": 901.5740356445312,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 430.490966796875,\r
+        "y": 866.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "18e77ed.3460901",\r
+        "id": "6d1288a7.3722b8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 457.8833312988281,\r
-        "y": 945,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 428,\r
+        "y": 910,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a170b783.101ed"\r
+                "a3e6b31.4b2495"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a170b783.101ed",\r
+        "id": "a3e6b31.4b2495",\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": 626.8833312988281,\r
-        "y": 946,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 597,\r
+        "y": 911,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aaf101ae.84a298",\r
+        "id": "64de189c.ea0ca",\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": 598.8833312988281,\r
-        "y": 1440,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 569,\r
+        "y": 1405,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "48f75925.f13078"\r
+                "f09d5f3a.90b09"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48f75925.f13078",\r
+        "id": "f09d5f3a.90b09",\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": 801.8833312988281,\r
-        "y": 1452,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 772,\r
+        "y": 1417,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "dc596581.8a224"\r
+                "be069a3d.2f258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dc596581.8a224",\r
+        "id": "be069a3d.2f258",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 967.8833312988281,\r
-        "y": 1449,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 938,\r
+        "y": 1414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "63611a55.44e3fc"\r
+                "b33327bf.cf44b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63611a55.44e3fc",\r
+        "id": "b33327bf.cf44b8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1128.8833312988281,\r
-        "y": 1446,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1099,\r
+        "y": 1411,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "155181d9.def56e",\r
-                "450c0202.9562fc",\r
-                "e522d7e8.f0b6d",\r
-                "b85bac18.623698",\r
-                "d97c4e37.51bad8"\r
+                "9b6250ff.75cf18",\r
+                "6e8e9c3e.00f634",\r
+                "db16830a.f6a5",\r
+                "611e4d54.277574",\r
+                "c0f4e533.035be8",\r
+                "ee82569c.a25768"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "450c0202.9562fc",\r
+        "id": "6e8e9c3e.00f634",\r
          "type": "set",\r
          "name": "unset tmp.aai.uni",\r
          "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
          "comments": "",\r
-        "x": 1332.8833312988281,\r
-        "y": 1404,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1305,\r
+        "y": 1010.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "155181d9.def56e",\r
+        "id": "9b6250ff.75cf18",\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": 1329.8833312988281,\r
-        "y": 1449,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1302,\r
+        "y": 1055.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c73d859f.d40f2",\r
-                "cdecbb41.644898",\r
-                "ca040aae.e9fa08"\r
+                "1b290eb5.e974c9",\r
+                "b84573d.a8be19",\r
+                "ef2334eb.3c1b68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cdecbb41.644898",\r
+        "id": "b84573d.a8be19",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1525.3742980957031,\r
-        "y": 1422.573974609375,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1497.490966796875,\r
+        "y": 1029.5739135742188,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "dcd0fdd9.1c84f"\r
+                "45bb14a8.1a7924"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca040aae.e9fa08",\r
+        "id": "ef2334eb.3c1b68",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1520.8833312988281,\r
-        "y": 1466.9999389648438,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1493,\r
+        "y": 1073.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7c23dd25.00653c"\r
+                "cd1f6950.fef1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dcd0fdd9.1c84f",\r
+        "id": "45bb14a8.1a7924",\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": 1687.9458312988281,\r
-        "y": 1421.8596801757812,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1660.0625,\r
+        "y": 1028.859619140625,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7c23dd25.00653c",\r
+        "id": "cd1f6950.fef1f",\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": 1688.8833312988281,\r
-        "y": 1466.9999389648438,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1661,\r
+        "y": 1073.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c84187cf.6e6008",\r
+        "id": "cd4af41f.be1a78",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1690.8833312988281,\r
-        "y": 1513.9999389648438,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1663,\r
+        "y": 1120.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c73d859f.d40f2",\r
+        "id": "1b290eb5.e974c9",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1521.8833312988281,\r
-        "y": 1513.9999389648438,\r
-        "z": "db287b1f.2984a8",\r
-        "wires": [\r
-            [\r
-                "c84187cf.6e6008"\r
-            ]\r
-        ]\r
-    },\r
-    {\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": 211.38333129882812,\r
-        "y": 1111,\r
-        "z": "db287b1f.2984a8",\r
-        "wires": [\r
-            [\r
-                "b58d5b5e.9a197",\r
-                "5c723a86.22c16c",\r
-                "fb40210e.8c5be8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "ce504b34.d68ac8",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 322.3833312988281,\r
-        "y": 1467,\r
-        "z": "db287b1f.2984a8",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "b58d5b5e.9a197",\r
-        "type": "outcome",\r
-        "name": "leaf",\r
-        "xml": "<outcome value='leaf'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 197.38333129882812,\r
-        "y": 1357,\r
-        "z": "db287b1f.2984a8",\r
-        "wires": [\r
-            [\r
-                "67ff853e.386644"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "5c723a86.22c16c",\r
-        "type": "outcome",\r
-        "name": "root",\r
-        "xml": "<outcome value='root'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 198.38333129882812,\r
-        "y": 1415,\r
-        "z": "db287b1f.2984a8",\r
-        "wires": [\r
-            [\r
-                "402699af.4c591"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fb40210e.8c5be8",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 200.38333129882812,\r
-        "y": 1469,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1494,\r
+        "y": 1120.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ce504b34.d68ac8"\r
+                "cd4af41f.be1a78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d006f15.710a08",\r
+        "id": "60f7024f.a382fc",\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": 1305.8833312988281,\r
-        "y": 1677,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1276,\r
+        "y": 1642,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e522d7e8.f0b6d",\r
+        "id": "db16830a.f6a5",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
          "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1396.8833312988281,\r
-        "y": 1731,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1367,\r
+        "y": 1696,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "402699af.4c591",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 314.3833312988281,\r
-        "y": 1411,\r
-        "z": "db287b1f.2984a8",\r
-        "wires": [\r
-            [\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": "67ff853e.386644",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 326.3833312988281,\r
-        "y": 1348,\r
-        "z": "db287b1f.2984a8",\r
-        "wires": [\r
-            [\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": "80e8f9a6.45b808",\r
+        "id": "1989ebd9.8b76bc",\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": 618.3833312988281,\r
-        "y": 1233,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2043.5,\r
+        "y": 1109,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "784b1e5c.92c77",\r
+        "id": "9da50ff.0241af",\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": 635.3833312988281,\r
-        "y": 1327,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2048.5,\r
+        "y": 1211,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3502903c.982ab",\r
+        "id": "eda2f0f7.d8fb38",\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": 561.8833312988281,\r
-        "y": 1696,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 532,\r
+        "y": 1661,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2dc7d020.0f01c8"\r
+                "62852429.1f30ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2dc7d020.0f01c8",\r
+        "id": "62852429.1f30ac",\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": 793.8833312988281,\r
-        "y": 1695,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 764,\r
+        "y": 1660,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9a9b2fc1.cfc378"\r
+                "ede4a749.9f1af8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a9b2fc1.cfc378",\r
+        "id": "ede4a749.9f1af8",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1005.8833312988281,\r
-        "y": 1696,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 976,\r
+        "y": 1661,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3ee84e3e.71c9c2"\r
+                "b699a292.eb6f88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee84e3e.71c9c2",\r
+        "id": "b699a292.eb6f88",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 261.8833312988281,\r
-        "y": 1852,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 232,\r
+        "y": 1817,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a6f3ac42.8fbf28",\r
-                "c5253df7.0ed11"\r
+                "13d7e483.3188fb",\r
+                "74bc3a8f.9628d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c5253df7.0ed11",\r
+        "id": "74bc3a8f.9628d4",\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": 496.8833312988281,\r
-        "y": 1839,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 467,\r
+        "y": 1804,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a6f3ac42.8fbf28",\r
+        "id": "13d7e483.3188fb",\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": 486.8833312988281,\r
-        "y": 1900,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 457,\r
+        "y": 1865,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b27c66fe.f461f8",\r
-                "d86a808d.b5d38",\r
-                "51be47ba.06369"\r
+                "bcef8cd9.e20998",\r
+                "764e27eb.b5496",\r
+                "21958602.3fa0ea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d86a808d.b5d38",\r
+        "id": "764e27eb.b5496",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 700.3742980957031,\r
-        "y": 1884.5740356445312,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 670.490966796875,\r
+        "y": 1849.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "40ccd27e.7bf8ec"\r
+                "9c812de2.87639"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51be47ba.06369",\r
+        "id": "21958602.3fa0ea",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 695.8833312988281,\r
-        "y": 1929,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 666,\r
+        "y": 1894,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "10ad75eb.cd3092"\r
+                "2915d3a6.63730c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b27c66fe.f461f8",\r
+        "id": "bcef8cd9.e20998",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 697.8833312988281,\r
-        "y": 1989,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 668,\r
+        "y": 1954,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f72f31f7.42e17"\r
+                "bb26f0d0.bc6288"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40ccd27e.7bf8ec",\r
+        "id": "9c812de2.87639",\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": 862.9458312988281,\r
-        "y": 1883.8597412109375,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 833.0625,\r
+        "y": 1848.8597412109375,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10ad75eb.cd3092",\r
+        "id": "2915d3a6.63730c",\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": 863.8833312988281,\r
-        "y": 1929,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 834,\r
+        "y": 1894,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f72f31f7.42e17",\r
+        "id": "bb26f0d0.bc6288",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 866.8833312988281,\r
-        "y": 1988,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 837,\r
+        "y": 1953,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c01095c8.c5a848",\r
-                "1e0b480.37d7ab8"\r
+                "e8fb0469.22a408",\r
+                "b503b0ba.b1ff6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8f2651c.3a035",\r
+        "id": "445d8bb1.6c470c",\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": 265.8833312988281,\r
-        "y": 2487,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 236,\r
+        "y": 2452,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f84d6f72.692148",\r
+        "id": "925823e9.1c4a4",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 408.8833312988281,\r
-        "y": 2547,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 379,\r
+        "y": 2512,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7174c4fb.4236d4",\r
-                "3df090d7.e28cf"\r
+                "345842a4.88ef2e",\r
+                "a4dc32a8.6620d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7174c4fb.4236d4",\r
+        "id": "345842a4.88ef2e",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 721.3833312988281,\r
-        "y": 2524,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 691.5,\r
+        "y": 2489,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3df090d7.e28cf",\r
+        "id": "a4dc32a8.6620d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 725.3833312988281,\r
-        "y": 2564,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 695.5,\r
+        "y": 2529,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "bbef1ecc.7916"\r
+                "d1fda3bb.92b0e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d6cfe8e.59e2a",\r
+        "id": "cde1b667.7c4d6",\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": 901.3833312988281,\r
-        "y": 2528,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 871.5,\r
+        "y": 2493,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bbef1ecc.7916",\r
+        "id": "d1fda3bb.92b0e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 916.8833312988281,\r
-        "y": 2582,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 887,\r
+        "y": 2547,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b94bbfec.158258"\r
+                "a9ee92c3.93f6e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2dda6de.cb3b28",\r
+        "id": "459839ba.ae33c",\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": 1212.3833312988281,\r
-        "y": 2551,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1182.5,\r
+        "y": 2516,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1cb10652.ba5e0a",\r
+        "id": "120147ed.79206",\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": 2679.383331298828,\r
-        "y": 1902,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2649.5,\r
+        "y": 1867,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b94bbfec.158258",\r
+        "id": "a9ee92c3.93f6e8",\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": 1174.3833312988281,\r
-        "y": 2593,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1144.5,\r
+        "y": 2558,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70ed09af.22122",\r
+        "id": "9d25e547.75567",\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": 584.3833312988281,\r
-        "y": 1271,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2009.5,\r
+        "y": 1147,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfffb0d0.b2d2d",\r
+        "id": "52a255e0.e77dec",\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": 597.3833312988281,\r
-        "y": 1367,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2010.5,\r
+        "y": 1251,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9521e4ca.a61af",\r
+        "id": "881b2d7a.c4e888",\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": 4333.883331298828,\r
-        "y": 543,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4304,\r
+        "y": 508,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1d1e23b2.17cb04",\r
+        "id": "61ff745d.2cf8b4",\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": 4236.883331298828,\r
-        "y": 1362,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4207,\r
+        "y": 1327,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e35a6c95.6b3d6",\r
+        "id": "98331ea2.d141f",\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": 3730.883331298828,\r
-        "y": 2034,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3701,\r
+        "y": 1999,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9c5806bb.83c05",\r
+        "id": "6687da8.fb06ca4",\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": 831.8833312988281,\r
-        "y": 842,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 802,\r
+        "y": 807,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "24382f34.66808",\r
-                "ea56d949.8ce4b"\r
+                "11a4a5f5.385f32",\r
+                "192499d2.667f1e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24382f34.66808",\r
+        "id": "11a4a5f5.385f32",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1194.8833312988281,\r
-        "y": 865,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1165,\r
+        "y": 830,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d7ed30c6.74c9b"\r
+                "1fc9c5be.8fac2a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea56d949.8ce4b",\r
+        "id": "192499d2.667f1e",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1194.8833312988281,\r
-        "y": 814,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1165,\r
+        "y": 779,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3707e8cf.65827"\r
+                "5fe8520c.50e664"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7ed30c6.74c9b",\r
+        "id": "1fc9c5be.8fac2a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1350.8833312988281,\r
-        "y": 863,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1321,\r
+        "y": 828,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a7f36b9f.f75b88"\r
+                "a46faf22.6dbda8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3707e8cf.65827",\r
+        "id": "5fe8520c.50e664",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1327.8833312988281,\r
-        "y": 815,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1298,\r
+        "y": 780,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ed4d0298.cdb578",\r
+        "id": "1f9b767f.d670b2",\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": 2087.883331298828,\r
-        "y": 213,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2058,\r
+        "y": 178,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1ced8517.ce35e3",\r
+        "id": "f84de17e.e8ea08",\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": 3629.883331298828,\r
-        "y": 2194,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3600,\r
+        "y": 2159,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "224f4283.917d26",\r
+        "id": "1a392cd7.238923",\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": 4219.883331298828,\r
-        "y": 667,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4190,\r
+        "y": 632,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b85bac18.623698",\r
+        "id": "611e4d54.277574",\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": 1393.8833312988281,\r
-        "y": 1773,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1364,\r
+        "y": 1738,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5524ecac.5cf47c",\r
+        "id": "dc7d7df9.afb81",\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": 572.8833312988281,\r
-        "y": 1507,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 543,\r
+        "y": 1472,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a12bd239.f8368",\r
+        "id": "c70f6326.e297a",\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": 603.8833312988281,\r
-        "y": 1547,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 574,\r
+        "y": 1512,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c01095c8.c5a848",\r
+        "id": "e8fb0469.22a408",\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": 1151.8833312988281,\r
-        "y": 1955,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1122,\r
+        "y": 1920,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1e0b480.37d7ab8",\r
+        "id": "b503b0ba.b1ff6",\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": 1154.8833312988281,\r
-        "y": 1997,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1125,\r
+        "y": 1962,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d1396ed.19b6f8",\r
+        "id": "f7d70d92.8a17d",\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": 597.8833312988281,\r
-        "y": 1637,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 568,\r
+        "y": 1602,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1b4871a6.1cd8a6",\r
+        "id": "93ecab9f.5bb27",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
          "comments": "",\r
-        "x": 352.8833312988281,\r
-        "y": 2016,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 323,\r
+        "y": 1981,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "48083140.e99758",\r
+        "id": "e1bf516d.80132",\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": 360.8833312988281,\r
-        "y": 2073,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 331,\r
+        "y": 2038,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d97c4e37.51bad8",\r
+        "id": "c0f4e533.035be8",\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": 1371.8833312988281,\r
-        "y": 1622,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1342,\r
+        "y": 1587,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3df77641.8d727a",\r
-                "f024d61d.5a31c"\r
+                "ff9a5641.69fda",\r
+                "a44c9ce4.5d2008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f024d61d.5a31c",\r
+        "id": "a44c9ce4.5d2008",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1594.8833312988281,\r
-        "y": 1577,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1565,\r
+        "y": 1542,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3c67000e.e921c"\r
+                "eaca171f.944a48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3df77641.8d727a",\r
+        "id": "ff9a5641.69fda",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1596.8833312988281,\r
-        "y": 1641,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1567,\r
+        "y": 1606,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "de64177a.8916f"\r
+                "93d69fa.52d496"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c67000e.e921c",\r
+        "id": "eaca171f.944a48",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1759.8833312988281,\r
-        "y": 1574,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1730,\r
+        "y": 1539,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9bea7c66.5f62c8"\r
+                "b0447236.92d3b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de64177a.8916f",\r
+        "id": "93d69fa.52d496",\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": 1758.8833312988281,\r
-        "y": 1637,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1729,\r
+        "y": 1602,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9bea7c66.5f62c8",\r
+        "id": "b0447236.92d3b",\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 -4]`' />\n",\r
          "comments": "",\r
-        "x": 1979.8833312988281,\r
-        "y": 1588,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1950,\r
+        "y": 1553,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a38583b.020a88",\r
+        "id": "ab15b7a9.bc6bc8",\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
+        "x": 1495,\r
+        "y": 2278,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c388a6bf.f87f3"\r
+                "be2440af.c20c98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a2f5b878.ad169",\r
+        "id": "1405448e.40f263",\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
+        "x": 1880,\r
+        "y": 2291,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7866488b.2039a8",\r
-                "bdc692ef.1c0858",\r
-                "823a852f.40d29"\r
+                "facba133.b01618",\r
+                "36457cd.f85a104",\r
+                "a0c24437.cf174"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c388a6bf.f87f3",\r
+        "id": "be2440af.c20c98",\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
+        "x": 1674,\r
+        "y": 2278,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5c79d6d8.a6a8e",\r
-                "a2f5b878.ad169"\r
+                "eec40e11.9fdab",\r
+                "1405448e.40f263"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c79d6d8.a6a8e",\r
+        "id": "eec40e11.9fdab",\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
+        "x": 1910,\r
+        "y": 2239,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7866488b.2039a8",\r
+        "id": "facba133.b01618",\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
+        "x": 2090,\r
+        "y": 2282,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4da79570.cd80cc"\r
+                "926a046d.eed228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bdc692ef.1c0858",\r
+        "id": "36457cd.f85a104",\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
+        "x": 2082,\r
+        "y": 2337,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5ef7fec5.5efb98"\r
+                "6ca22053.c9fba8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "823a852f.40d29",\r
+        "id": "a0c24437.cf174",\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
+        "x": 2087,\r
+        "y": 2394,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "57488074.1d65e"\r
+                "f91dd017.676d7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57488074.1d65e",\r
+        "id": "f91dd017.676d7",\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
+        "x": 2239,\r
+        "y": 2395,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5ef7fec5.5efb98",\r
+        "id": "6ca22053.c9fba8",\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
+        "x": 2250,\r
+        "y": 2340,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4da79570.cd80cc",\r
+        "id": "926a046d.eed228",\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
+        "x": 2234.38232421875,\r
+        "y": 2279.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "69f8caaf.bba51c"\r
+                "1e25e04f.ee7df"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "69f8caaf.bba51c",\r
+        "id": "1e25e04f.ee7df",\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
+        "x": 2449,\r
+        "y": 2276,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "53cc84ce.e1faf4",\r
+        "id": "46842cb8.91c5bc",\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
+        "x": 573,\r
+        "y": 2324,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "bb343bdc.881868",\r
-                "8bc84f5e.0473d8",\r
-                "78444b47.33ec34"\r
+                "80e94eed.70f82",\r
+                "e1101309.b00428",\r
+                "6cefa506.12a2dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bb343bdc.881868",\r
+        "id": "80e94eed.70f82",\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
+        "x": 768.5001220703125,\r
+        "y": 2276,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "bf3ecbb9.4dd008"\r
+                "a961cabf.5d77d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8bc84f5e.0473d8",\r
+        "id": "e1101309.b00428",\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
+        "x": 760.5001220703125,\r
+        "y": 2331,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ef40b092.bc09e"\r
+                "cfce6a08.8d1818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bf3ecbb9.4dd008",\r
+        "id": "a961cabf.5d77d8",\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
+        "x": 912.8824462890625,\r
+        "y": 2275.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1285266.d4ce8da"\r
+                "41f5578e.096c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1285266.d4ce8da",\r
+        "id": "41f5578e.096c08",\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
+        "x": 1097,\r
+        "y": 2274,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "640d04c1.8428dc"\r
+                "78702bad.3695f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "640d04c1.8428dc",\r
+        "id": "78702bad.3695f4",\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
+        "x": 1292,\r
+        "y": 2274,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7a38583b.020a88"\r
+                "ab15b7a9.bc6bc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "78444b47.33ec34",\r
+        "id": "6cefa506.12a2dc",\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
+        "x": 765.5001220703125,\r
+        "y": 2388,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b417de17.8b3a6"\r
+                "bbb236e9.1d475"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b417de17.8b3a6",\r
+        "id": "bbb236e9.1d475",\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
+        "x": 917.5001220703125,\r
+        "y": 2389,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef40b092.bc09e",\r
+        "id": "cfce6a08.8d1818",\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
+        "x": 928.5001220703125,\r
+        "y": 2332,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fc4eafc.4810e5",\r
+        "id": "fd11a034.71ffe8",\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
+        "x": 563,\r
+        "y": 2236,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d94511cd.5d63f",\r
+        "id": "2ab715a0.ab46a2",\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
+        "x": 308,\r
+        "y": 2367,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fc4eafc.4810e5",\r
-                "53cc84ce.e1faf4"\r
+                "fd11a034.71ffe8",\r
+                "46842cb8.91c5bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1a955b8d.047dd4",\r
+        "id": "c68339b5.636678",\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
+        "x": 1522.9666748046875,\r
+        "y": 184.88333129882812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9a0e1ef7.428b9",\r
+        "id": "6b1a691d.f6617",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 754.8833312988281,\r
-        "y": 442,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 725,\r
+        "y": 407,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "a46faf22.6dbda8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 284.5,\r
+        "y": 1376,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "64de189c.ea0ca",\r
+                "eda2f0f7.d8fb38",\r
+                "dc7d7df9.afb81",\r
+                "c70f6326.e297a",\r
+                "445d8bb1.6c470c",\r
+                "925823e9.1c4a4",\r
+                "f7d70d92.8a17d",\r
+                "93ecab9f.5bb27",\r
+                "e1bf516d.80132",\r
+                "2ab715a0.ab46a2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ee82569c.a25768",\r
+        "type": "switchNode",\r
+        "name": "switch uni type",\r
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1315,\r
+        "y": 1214,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "ef11d348.e67b18",\r
+                "db4eac49.9ee78",\r
+                "ccd7386e.438c4",\r
+                "8a1e26c1.925918"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ef11d348.e67b18",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1480,\r
+        "y": 1196,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "1989ebd9.8b76bc",\r
+                "9d25e547.75567"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "db4eac49.9ee78",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1483,\r
+        "y": 1235,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "9da50ff.0241af",\r
+                "52a255e0.e77dec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8a1e26c1.925918",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1477,\r
+        "y": 1313,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "af3eb285.34bda8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ccd7386e.438c4",\r
+        "type": "outcome",\r
+        "name": "root-secondary",\r
+        "xml": "<outcome value='root-secondary'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1500,\r
+        "y": 1276,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "8dd3ee03.704618",\r
+                "3acf3b0f.3b0184"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8dd3ee03.704618",\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": 2046,\r
+        "y": 1309,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3acf3b0f.3b0184",\r
+        "type": "set",\r
+        "name": "set leafOrRootAccess",\r
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",\r
+        "comments": "",\r
+        "x": 2008,\r
+        "y": 1349,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "af3eb285.34bda8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1629,\r
+        "y": 1334,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            []\r
+        ]\r
      }\r
  ]
 \ No newline at end of file