A few bug fixes for CLL closed-loop operation.

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

index 1828f87..9697f14 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
  [\r
      {\r
-        "id": "4a53e986.e1345",\r
+        "id": "a7aee3f0.b04268",\r
          "type": "save",\r
          "name": "get all-vpn-bindings from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 401.8833312988281,\r
-        "y": 341,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 400.566650390625,\r
+        "y": 374,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bee28b81.87faf8",\r
-                "2e0d3206.b3958e",\r
-                "2caa6605.779652"\r
+                "96c8722a.b993c",\r
+                "e5061783.573db8",\r
+                "6a27552b.ad1ba4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bee28b81.87faf8",\r
+        "id": "96c8722a.b993c",\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": 588.566650390625,\r
+        "y": 387,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "db2a2eb9.c4729"\r
+                "41e4d89f.ed1468"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e0d3206.b3958e",\r
+        "id": "e5061783.573db8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 597.374267578125,\r
-        "y": 396.57403564453125,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 596.0575866699219,\r
+        "y": 429.57403564453125,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2caa6605.779652",\r
+        "id": "6a27552b.ad1ba4",\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": 586.566650390625,\r
+        "y": 476,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9a0e1ef7.428b9"\r
+                "a92b97b8.4129e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db2a2eb9.c4729",\r
+        "id": "41e4d89f.ed1468",\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": 761.566650390625,\r
+        "y": 385,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b1233538.ceab4"\r
+                "cbc7d636.2def18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1233538.ceab4",\r
+        "id": "cbc7d636.2def18",\r
          "type": "for",\r
          "name": "for vpnidx in all-vpn-bindings",\r
          "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 991.8833312988281,\r
-        "y": 353,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 990.566650390625,\r
+        "y": 386,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f68da0c8.dc2638"\r
+                "39ab6bfa.74801c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f68da0c8.dc2638",\r
+        "id": "39ab6bfa.74801c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1206.8833312988281,\r
-        "y": 354,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1205.566650390625,\r
+        "y": 387,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "947d4965.a799f8"\r
+                "e124b2ef.0bfdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab775a4c.a509d",\r
+        "id": "f6144c8.446efb",\r
          "type": "switchNode",\r
          "name": "switch vpnuuid is for this slice",\r
          "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1460.8833312988281,\r
-        "y": 276,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1459.566650390625,\r
+        "y": 309,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1ae0d7f3.280b18",\r
-                "b7c135fb.7fc808"\r
+                "dc53b823.c6e998",\r
+                "b2e345a3.6b81"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1ae0d7f3.280b18",\r
+        "id": "dc53b823.c6e998",\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": 1676.566650390625,\r
+        "y": 288,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "947d4965.a799f8"\r
+                "e124b2ef.0bfdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b7c135fb.7fc808",\r
+        "id": "b2e345a3.6b81",\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": 1676.566650390625,\r
+        "y": 337,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "947d4965.a799f8",\r
+        "id": "e124b2ef.0bfdc8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1861.8833312988281,\r
-        "y": 341,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1860.566650390625,\r
+        "y": 374,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7307d136.f98668",\r
-                "d6d93ab.df041c8",\r
-                "ed4d0298.cdb578"\r
+                "2ac81333.5163cc",\r
+                "ce04a89c.bde61",\r
+                "b01d3963.8ea8b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d12da893.5808e",\r
+        "id": "daba1b59.df55a",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 220.88333129882812,\r
-        "y": 82,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 219.566650390625,\r
+        "y": 115,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ba22940.68974f"\r
+                "53bce33c.ae731c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ba22940.68974f",\r
+        "id": "53bce33c.ae731c",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -201,3545 +201,3712 @@
          "comments": "",\r
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 505.1690216064453,\r
-        "y": 143.23810863494873,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 503.8523406982422,\r
+        "y": 176.23810863494873,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f0aeb23e.8f1f7"\r
+                "13dd53c4.ce4fbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0aeb23e.8f1f7",\r
+        "id": "13dd53c4.ce4fbc",\r
          "type": "method",\r
          "name": "method cll-vnf-topology-operation-cll-F1-Activate",\r
          "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 511.3119354248047,\r
-        "y": 228.00003051757812,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 509.99525451660156,\r
+        "y": 261.0000305175781,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "849eab75.e48858"\r
+                "60b5835f.a436c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "849eab75.e48858",\r
+        "id": "60b5835f.a436c4",\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": 819.8046875,\r
+        "y": 252.66668701171875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4a53e986.e1345",\r
-                "9dad0003.283738",\r
-                "47e937a3.3ee608",\r
-                "fa83bc41.1d8b08",\r
-                "39b1b2.d055464e"\r
+                "a7aee3f0.b04268",\r
+                "6d17c7fb.4906d8",\r
+                "7de7f253.4369ac",\r
+                "731e9165.7bfe5",\r
+                "c3d34fd5.00b8e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7307d136.f98668",\r
+        "id": "2ac81333.5163cc",\r
          "type": "set",\r
          "name": "set tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
          "comments": "",\r
-        "x": 2078.883331298828,\r
-        "y": 279,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2077.566650390625,\r
+        "y": 312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5be24b21.11ebc4",\r
+        "id": "581b9833.ca5308",\r
          "type": "set",\r
          "name": "set attachment_param for OTN A",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 4247.883331298828,\r
-        "y": 165,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4246.566650390625,\r
+        "y": 198,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "66c2f1fa.df4e",\r
+        "id": "c57ed1b4.089b78",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4328.883331298828,\r
-        "y": 480,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4327.566650390625,\r
+        "y": 513,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "78ae8a16.bcde6c",\r
-                "163e60b5.f624ef"\r
+                "6866347a.b34054",\r
+                "d9ef66bb.b2e3a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "78ae8a16.bcde6c",\r
+        "id": "6866347a.b34054",\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": 4637.066650390625,\r
+        "y": 482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a86780cc.869ba"\r
+                "351f2ca1.efff8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "163e60b5.f624ef",\r
+        "id": "d9ef66bb.b2e3a",\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": 4642.066650390625,\r
+        "y": 547,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "496a02d9.361154"\r
+                "7ec1daf0.49ebbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a86780cc.869ba",\r
+        "id": "351f2ca1.efff8c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4814.383331298828,\r
-        "y": 449,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4813.066650390625,\r
+        "y": 482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "496a02d9.361154",\r
+        "id": "7ec1daf0.49ebbc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4809.883331298828,\r
-        "y": 514,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4808.566650390625,\r
+        "y": 547,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4c8b1659.abc1b",\r
+        "id": "fe354f09.d7eaa",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
          "comments": "",\r
-        "x": 4193.383331298828,\r
-        "y": 734,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4192.066650390625,\r
+        "y": 767,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "902cb9fb.0d496",\r
+        "id": "f82c7890.c5a3a",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4347.383331298828,\r
-        "y": 782,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4346.066650390625,\r
+        "y": 815,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f961065e.0e576",\r
-                "6ca1f611.56dee"\r
+                "66ca2f72.5d0ea",\r
+                "384ae824.cd397"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f961065e.0e576",\r
+        "id": "66ca2f72.5d0ea",\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": 4691.566650390625,\r
+        "y": 796,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6296fab8.967dac"\r
+                "8897aa30.2d04c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ca1f611.56dee",\r
+        "id": "384ae824.cd397",\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": 4695.566650390625,\r
+        "y": 836,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ef7067c4.7ea328"\r
+                "e98f7531.5d07d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6296fab8.967dac",\r
+        "id": "8897aa30.2d04c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4850.883331298828,\r
-        "y": 763,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4849.566650390625,\r
+        "y": 796,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef7067c4.7ea328",\r
+        "id": "e98f7531.5d07d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4854.383331298828,\r
-        "y": 803,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4853.066650390625,\r
+        "y": 836,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ee477ca2.a65568",\r
-                "5e527e99.1f4728"\r
+                "3b168b09.265424",\r
+                "f9e9fb1f.d5d228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee477ca2.a65568",\r
+        "id": "3b168b09.265424",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5184.883331298828,\r
-        "y": 768,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5183.566650390625,\r
+        "y": 801,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f9d5afb7.0291b",\r
+        "id": "293d08cf.5ba9b",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 5048.883331298828,\r
-        "y": 727,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5047.566650390625,\r
+        "y": 760,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5e527e99.1f4728",\r
+        "id": "f9e9fb1f.d5d228",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5111.883331298828,\r
-        "y": 814,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5110.566650390625,\r
+        "y": 847,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "48c30a65.f0f584",\r
+        "id": "5b448e3f.d6f97",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4185.883331298828,\r
-        "y": 213,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4184.566650390625,\r
+        "y": 246,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bc523ecb.f956a8",\r
+        "id": "11357d7a.7ec893",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4211.883331298828,\r
-        "y": 330,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4210.566650390625,\r
+        "y": 363,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a72840b5.dc70e",\r
-                "54e4a8de.9445f8",\r
-                "4012660e.b55b2"\r
+                "9cee4545.4afd2",\r
+                "c87207dc.1fc4c8",\r
+                "a541f904.08a73"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a72840b5.dc70e",\r
+        "id": "9cee4545.4afd2",\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": 4406.0667724609375,\r
+        "y": 315,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9d071aa.9c29c68"\r
+                "174041c6.ef00ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "54e4a8de.9445f8",\r
+        "id": "c87207dc.1fc4c8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4399.383453369141,\r
-        "y": 337,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4398.0667724609375,\r
+        "y": 370,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3662c50c.d754d2"\r
+                "2578a714.32fd88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d071aa.9c29c68",\r
+        "id": "174041c6.ef00ae",\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": 4550.4490966796875,\r
+        "y": 314.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c1155c42.4dc2e8"\r
+                "44c47bf6.544e84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3b68f87.0c3248",\r
+        "id": "416e074e.1652a8",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5133.883331298828,\r
-        "y": 284,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5132.566650390625,\r
+        "y": 317,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e6d1f56a.1147f8"\r
+                "77699d71.cb9cbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1155c42.4dc2e8",\r
+        "id": "44c47bf6.544e84",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4735.883331298828,\r
-        "y": 280,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4734.566650390625,\r
+        "y": 313,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e3565ab9.0a825"\r
+                "ec3ad4d7.e6b51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3565ab9.0a825",\r
+        "id": "ec3ad4d7.e6b51",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4930.883331298828,\r
-        "y": 280,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4929.566650390625,\r
+        "y": 313,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a3b68f87.0c3248"\r
+                "416e074e.1652a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4012660e.b55b2",\r
+        "id": "a541f904.08a73",\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": 4403.0667724609375,\r
+        "y": 427,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7e9c03d8.c41c7c"\r
+                "44c8faa6.17201c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e9c03d8.c41c7c",\r
+        "id": "44c8faa6.17201c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4556.383453369141,\r
-        "y": 395,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4555.0667724609375,\r
+        "y": 428,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3662c50c.d754d2",\r
+        "id": "2578a714.32fd88",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4567.383453369141,\r
-        "y": 338,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4566.0667724609375,\r
+        "y": 371,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99fa8e6f.e803d8",\r
+        "id": "157b4f1e.ec4409",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5518.883331298828,\r
-        "y": 297,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5517.566650390625,\r
+        "y": 330,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a38e0436.5aedc",\r
-                "80f6747e.265c78",\r
-                "c370b7ba.84a26"\r
+                "5eb578c.a510488",\r
+                "646e1345.d32534",\r
+                "d2cac0b5.69fe18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6d1f56a.1147f8",\r
+        "id": "77699d71.cb9cbc",\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": 5311.566650390625,\r
+        "y": 317,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4599703a.c42f3",\r
-                "99fa8e6f.e803d8"\r
+                "e5b6fb7a.6fa868",\r
+                "157b4f1e.ec4409"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4599703a.c42f3",\r
+        "id": "e5b6fb7a.6fa868",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5548.883331298828,\r
-        "y": 245,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5547.566650390625,\r
+        "y": 278,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a38e0436.5aedc",\r
+        "id": "5eb578c.a510488",\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": 5727.566650390625,\r
+        "y": 321,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8c88cbf0.e09b1"\r
+                "e92c3ae0.67c78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80f6747e.265c78",\r
+        "id": "646e1345.d32534",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5720.883331298828,\r
-        "y": 343,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5719.566650390625,\r
+        "y": 376,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e2be9acb.77d62"\r
+                "bbc83f99.73f6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c370b7ba.84a26",\r
+        "id": "d2cac0b5.69fe18",\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": 5724.566650390625,\r
+        "y": 433,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "856ee89c.2898"\r
+                "2b4662b0.39c236"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "856ee89c.2898",\r
+        "id": "2b4662b0.39c236",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5877.883331298828,\r
-        "y": 401,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5876.566650390625,\r
+        "y": 434,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e2be9acb.77d62",\r
+        "id": "bbc83f99.73f6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5888.883331298828,\r
-        "y": 346,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5887.566650390625,\r
+        "y": 379,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8c88cbf0.e09b1",\r
+        "id": "e92c3ae0.67c78",\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": 5871.948974609375,\r
+        "y": 318.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a4a57efc.888ff8"\r
+                "79f8358f.b45374"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a4a57efc.888ff8",\r
+        "id": "79f8358f.b45374",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 6087.883331298828,\r
-        "y": 282,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 6086.566650390625,\r
+        "y": 315,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "172d91c5.a78676",\r
+        "id": "ffd19574.4197a8",\r
          "type": "set",\r
          "name": "set attachment_param for OTN B",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 3654.883331298828,\r
-        "y": 1622,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3653.566650390625,\r
+        "y": 1655,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f13d198f.d5c79",\r
+        "id": "bd3c5166.6aead",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3717.883331298828,\r
-        "y": 1951,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3716.566650390625,\r
+        "y": 1984,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3640aede.8913a2",\r
-                "f1b1c8d.9945bb8"\r
+                "85a267fb.c74d5",\r
+                "1abf40e9.7b1f1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3640aede.8913a2",\r
+        "id": "85a267fb.c74d5",\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": 4012.066650390625,\r
+        "y": 1951,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4b0d0deb.6577e4"\r
+                "8944bada.8beb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1b1c8d.9945bb8",\r
+        "id": "1abf40e9.7b1f1f",\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": 4017.066650390625,\r
+        "y": 2016,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5da14040.cb50b8"\r
+                "fa8bf7ac.5ecf28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b0d0deb.6577e4",\r
+        "id": "8944bada.8beb4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4181.383331298828,\r
-        "y": 1918,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4180.066650390625,\r
+        "y": 1951,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5da14040.cb50b8",\r
+        "id": "fa8bf7ac.5ecf28",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4191.883331298828,\r
-        "y": 1983,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4190.566650390625,\r
+        "y": 2016,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1e50105a.a8b96",\r
+        "id": "e3d71f0.616b0e",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3593.883331298828,\r
-        "y": 1679,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3592.566650390625,\r
+        "y": 1712,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfe45c65.d48f6",\r
+        "id": "5f81a64c.5bf2a",\r
          "type": "get-resource",\r
          "name": "get-resource dst pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3613.883331298828,\r
-        "y": 1776,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3612.566650390625,\r
+        "y": 1809,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "56d2f84a.b524e8",\r
-                "43f5b436.ace8b4",\r
-                "a9c884c3.3b2c18"\r
+                "1781a1bd.0348ce",\r
+                "e03bcd54.697738",\r
+                "94b9ef51.5409d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "56d2f84a.b524e8",\r
+        "id": "1781a1bd.0348ce",\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": 3815.0667724609375,\r
+        "y": 1762,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "10cf7345.17615d"\r
+                "a95165c1.f614f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43f5b436.ace8b4",\r
+        "id": "e03bcd54.697738",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3808.3834533691406,\r
-        "y": 1784,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3807.0667724609375,\r
+        "y": 1817,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "40e41e98.b2ab3"\r
+                "b5b6c797.75de6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10cf7345.17615d",\r
+        "id": "a95165c1.f614f8",\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": 3959.4490966796875,\r
+        "y": 1759.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "69889215.886b4c"\r
+                "5bb225c8.c4c70c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "69889215.886b4c",\r
+        "id": "5bb225c8.c4c70c",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4144.883331298828,\r
-        "y": 1741,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4143.566650390625,\r
+        "y": 1774,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3c1ff953.79a23e"\r
+                "7747e85a.705d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9c884c3.3b2c18",\r
+        "id": "94b9ef51.5409d",\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": 3812.0667724609375,\r
+        "y": 1874,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8ab7ecfb.f03ee"\r
+                "9d4f33d7.c972d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ab7ecfb.f03ee",\r
+        "id": "9d4f33d7.c972d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3965.3834533691406,\r
-        "y": 1842,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3964.0667724609375,\r
+        "y": 1875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40e41e98.b2ab3",\r
+        "id": "b5b6c797.75de6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3976.3834533691406,\r
-        "y": 1787,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3975.0667724609375,\r
+        "y": 1820,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "37ef2104.1e9d5e",\r
+        "id": "7641eade.641374",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4542.883331298828,\r
-        "y": 1745,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4541.566650390625,\r
+        "y": 1778,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "901dac81.52118"\r
+                "745d7190.9cf208"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c1ff953.79a23e",\r
+        "id": "7747e85a.705d5",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4339.883331298828,\r
-        "y": 1741,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4338.566650390625,\r
+        "y": 1774,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "37ef2104.1e9d5e"\r
+                "7641eade.641374"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "86b8c4cb.c3747",\r
+        "id": "95464c66.d9ff8",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4927.883331298828,\r
-        "y": 1744,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4926.566650390625,\r
+        "y": 1777,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b5f45931.a1805",\r
-                "34bcb3b6.e69b1c",\r
-                "d4cc1381.862c48"\r
+                "bb6dbaba.ff1548",\r
+                "a59e3175.15a9b",\r
+                "4bc34556.41323c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "901dac81.52118",\r
+        "id": "745d7190.9cf208",\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": 4718.566650390625,\r
+        "y": 1770,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "81cd4229.29ba8",\r
-                "86b8c4cb.c3747"\r
+                "80afd84e.d6bdd8",\r
+                "95464c66.d9ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81cd4229.29ba8",\r
+        "id": "80afd84e.d6bdd8",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4957.883331298828,\r
-        "y": 1692,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4956.566650390625,\r
+        "y": 1725,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a6f965e8.0bb248",\r
+        "id": "42edd12e.5451d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5286.883331298828,\r
-        "y": 1848,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5285.566650390625,\r
+        "y": 1881,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3b503e2a.8c5dd2",\r
+        "id": "ea697aed.d1f358",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5297.883331298828,\r
-        "y": 1793,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5296.566650390625,\r
+        "y": 1826,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a84f2510.1ebf08",\r
+        "id": "edcb3571.8c6728",\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": 5280.948974609375,\r
+        "y": 1765.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f83738f1.e5e14"\r
+                "6d55462a.8f8fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f83738f1.e5e14",\r
+        "id": "6d55462a.8f8fa8",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5496.883331298828,\r
-        "y": 1729,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5495.566650390625,\r
+        "y": 1762,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b5f45931.a1805",\r
+        "id": "bb6dbaba.ff1548",\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": 5136.566650390625,\r
+        "y": 1768,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a84f2510.1ebf08"\r
+                "edcb3571.8c6728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "34bcb3b6.e69b1c",\r
+        "id": "a59e3175.15a9b",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5129.883331298828,\r
-        "y": 1790,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5128.566650390625,\r
+        "y": 1823,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3b503e2a.8c5dd2"\r
+                "ea697aed.d1f358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d4cc1381.862c48",\r
+        "id": "4bc34556.41323c",\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": 5133.566650390625,\r
+        "y": 1880,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a6f965e8.0bb248"\r
+                "42edd12e.5451d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a95df1.67c3fa",\r
+        "id": "64ebcb8e.6a273c",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has dst-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3168.883331298828,\r
-        "y": 693,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3167.566650390625,\r
+        "y": 726,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "60b8b463.e4925c",\r
-                "5e23be29.1eb6a"\r
+                "635bfedd.0eff1",\r
+                "4466b072.e153e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60b8b463.e4925c",\r
+        "id": "635bfedd.0eff1",\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": 3381.566650390625,\r
+        "y": 763,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4d4203c4.4fd81c"\r
+                "f20f4b09.4270d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e23be29.1eb6a",\r
+        "id": "4466b072.e153e8",\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": 3383.566650390625,\r
+        "y": 701,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "402d5674.bb5698"\r
+                "388a019b.9b73c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d4203c4.4fd81c",\r
+        "id": "f20f4b09.4270d8",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2962.883331298828,\r
-        "y": 1973,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2961.566650390625,\r
+        "y": 2006,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4155de88.54a1f",\r
-                "11e38b5d.85c715"\r
+                "69af1ba1.41260c",\r
+                "13b2b9f.1f67dc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4155de88.54a1f",\r
+        "id": "69af1ba1.41260c",\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": 3214.566650390625,\r
+        "y": 2040,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "97b4f973.8f85a8"\r
+                "c8858f37.c3f05"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "11e38b5d.85c715",\r
+        "id": "13b2b9f.1f67dc6",\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": 3214.566650390625,\r
+        "y": 1984,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4bdf7725.9cef3"\r
+                "be4790f9.3bf898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97b4f973.8f85a8",\r
+        "id": "c8858f37.c3f05",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3366.883331298828,\r
-        "y": 2007,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3365.566650390625,\r
+        "y": 2040,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15e2350c.3f989b",\r
+        "id": "7a5e210e.9e5d48",\r
          "type": "set",\r
          "name": "set vpn-bindingA and connectivityA",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 4242.883331298828,\r
-        "y": 105,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4241.566650390625,\r
+        "y": 138,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "22f55219.d9af6e",\r
+        "id": "163461bd.87a87e",\r
          "type": "set",\r
          "name": "set vpn-bindingB and connectivityB",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
          "comments": "",\r
-        "x": 3650.883331298828,\r
-        "y": 1564,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3649.566650390625,\r
+        "y": 1597,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9157e39e.50973",\r
+        "id": "354c57ea.e71ee8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3933.883331298828,\r
-        "y": 362,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3932.566650390625,\r
+        "y": 395,\r
+        "z": "b25656d7.85a8a8",\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
+                "7a5e210e.9e5d48",\r
+                "581b9833.ca5308",\r
+                "5b448e3f.d6f97",\r
+                "11357d7a.7ec893",\r
+                "c57ed1b4.089b78",\r
+                "5d6e99f5.a1e2d",\r
+                "1771c9d3.36c546",\r
+                "d9cf64bd.4ed12"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4bdf7725.9cef3",\r
+        "id": "be4790f9.3bf898",\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": 3365.566650390625,\r
+        "y": 1983,\r
+        "z": "b25656d7.85a8a8",\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
+                "163461bd.87a87e",\r
+                "ffd19574.4197a8",\r
+                "e3d71f0.616b0e",\r
+                "5f81a64c.5bf2a",\r
+                "bd3c5166.6aead",\r
+                "b596d9f.c7daaa8",\r
+                "2308c235.08d20e",\r
+                "5a0cb184.9cdf98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7e7eca7.931088",\r
+        "id": "12d5b667.53ec1a",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
          "comments": "",\r
-        "x": 3604.883331298828,\r
-        "y": 2249,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3603.566650390625,\r
+        "y": 2282,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5544b67f.df3238",\r
+        "id": "b0af817e.3df5c",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3758.883331298828,\r
-        "y": 2297,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3757.566650390625,\r
+        "y": 2330,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b36c5e4.a4b982",\r
-                "75e03418.7b0a3c"\r
+                "8bd672ae.f97518",\r
+                "171382a6.de96c5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b36c5e4.a4b982",\r
+        "id": "8bd672ae.f97518",\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": 4103.066650390625,\r
+        "y": 2311,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "996a2de3.86ff68"\r
+                "26f501a4.aaf356"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75e03418.7b0a3c",\r
+        "id": "171382a6.de96c5",\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": 4107.066650390625,\r
+        "y": 2351,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1787d971.8d0d67"\r
+                "81506f95.53e78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "996a2de3.86ff68",\r
+        "id": "26f501a4.aaf356",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4262.383331298828,\r
-        "y": 2278,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4261.066650390625,\r
+        "y": 2311,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1787d971.8d0d67",\r
+        "id": "81506f95.53e78",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4265.883331298828,\r
-        "y": 2318,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4264.566650390625,\r
+        "y": 2351,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "79bbcc28.d4fd3c",\r
-                "137b8fb9.4aaa78"\r
+                "8a72bd7f.2b673",\r
+                "2efc6876.725c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79bbcc28.d4fd3c",\r
+        "id": "8a72bd7f.2b673",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4605.883331298828,\r
-        "y": 2317,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4604.566650390625,\r
+        "y": 2350,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9aab71de.3f671",\r
+        "id": "52aaed09.836384",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4463.883331298828,\r
-        "y": 2275,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4462.566650390625,\r
+        "y": 2308,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "137b8fb9.4aaa78",\r
+        "id": "2efc6876.725c8",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4534.883331298828,\r
-        "y": 2366,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4533.566650390625,\r
+        "y": 2399,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e7a16254.b52678",\r
+        "id": "601ee7c2.7cf4c8",\r
          "type": "set",\r
          "name": "set attachment_param (gfp-n) for OTN",\r
          "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
          "comments": "",\r
-        "x": 3159.883331298828,\r
-        "y": 633,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3158.566650390625,\r
+        "y": 666,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b98d7c04.aadb6",\r
+        "id": "f8b99cf2.a93e78",\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": 3753.566650390625,\r
+        "y": 352,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f9466402.70d608",\r
+        "id": "ba2b5c4f.29126",\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": 3310.566650390625,\r
+        "y": 1930,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "402d5674.bb5698",\r
+        "id": "388a019b.9b73c6",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3490.883331298828,\r
-        "y": 481,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3489.566650390625,\r
+        "y": 514,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "40174504.12275c",\r
-                "483f6800.997ef8"\r
+                "60287d21.a15fac",\r
+                "e673bc57.d2c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "483f6800.997ef8",\r
+        "id": "e673bc57.d2c08",\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": 3731.566650390625,\r
+        "y": 1103,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f91cd9b2.b4ebc8"\r
+                "8e141356.94256"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40174504.12275c",\r
+        "id": "60287d21.a15fac",\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": 3725.566650390625,\r
+        "y": 394,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9157e39e.50973"\r
+                "354c57ea.e71ee8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f91cd9b2.b4ebc8",\r
+        "id": "8e141356.94256",\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": 3889.566650390625,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e0a89dfb.b97bd8",\r
-                "356efc92.1be0c4",\r
-                "b98c51bd.b1df7",\r
-                "c9386596.fb5188",\r
-                "99a335d9.47dc9",\r
-                "1d1e23b2.17cb04"\r
+                "660dd4a0.d8f1f4",\r
+                "bd6ec24f.7d2838",\r
+                "2d50a497.118c24",\r
+                "60d7ef05.f89ff8",\r
+                "feec0e79.04d7e8",\r
+                "6270f9ff.6a6b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "356efc92.1be0c4",\r
+        "id": "bd6ec24f.7d2838",\r
          "type": "set",\r
          "name": "set attachment_param for OTN G",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 4154.883331298828,\r
-        "y": 952,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4153.566650390625,\r
+        "y": 985,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99a335d9.47dc9",\r
+        "id": "feec0e79.04d7e8",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4235.883331298828,\r
-        "y": 1267,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4234.566650390625,\r
+        "y": 1300,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2ae3d84f.15cb3",\r
-                "a0cd8374.ae65d8"\r
+                "1829c13e.6c182f",\r
+                "cdc3e429.be6fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ae3d84f.15cb3",\r
+        "id": "1829c13e.6c182f",\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": 4544.066650390625,\r
+        "y": 1269,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d03fdf1c.3b45d"\r
+                "5b91a7ec.2e4658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a0cd8374.ae65d8",\r
+        "id": "cdc3e429.be6fa",\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": 4549.066650390625,\r
+        "y": 1334,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f8c3fa12.5c834"\r
+                "8046aee4.83e438"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d03fdf1c.3b45d",\r
+        "id": "5b91a7ec.2e4658",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4721.383331298828,\r
-        "y": 1236,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4720.066650390625,\r
+        "y": 1269,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f8c3fa12.5c834",\r
+        "id": "8046aee4.83e438",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4716.883331298828,\r
-        "y": 1301,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4715.566650390625,\r
+        "y": 1334,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b98c51bd.b1df7",\r
+        "id": "2d50a497.118c24",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4092.883331298828,\r
-        "y": 1000,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4091.566650390625,\r
+        "y": 1033,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9386596.fb5188",\r
+        "id": "60d7ef05.f89ff8",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4118.883331298828,\r
-        "y": 1117,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4117.566650390625,\r
+        "y": 1150,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "312e9154.f9dbd6",\r
-                "38e6d39b.3fc964",\r
-                "d52b1c1f.8a6ca8"\r
+                "684da58c.28fc44",\r
+                "7420bdce.6aab1c",\r
+                "21d55314.ed559c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "312e9154.f9dbd6",\r
+        "id": "684da58c.28fc44",\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": 4313.0667724609375,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6d3eafaf.02fb48"\r
+                "64489fc6.c8241"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38e6d39b.3fc964",\r
+        "id": "7420bdce.6aab1c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4306.383453369141,\r
-        "y": 1124,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4305.0667724609375,\r
+        "y": 1157,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3519bfd5.fa4b3"\r
+                "92f1b89c.1ab69"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6d3eafaf.02fb48",\r
+        "id": "64489fc6.c8241",\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": 4457.4490966796875,\r
+        "y": 1101.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6a66b1f9.955598"\r
+                "48d2ac4e.25f6b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a66b1f9.955598",\r
+        "id": "48d2ac4e.25f6b4",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4642.883331298828,\r
-        "y": 1067,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4641.566650390625,\r
+        "y": 1100,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "43b05855.517cf"\r
+                "714ce556.4f2fcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43b05855.517cf",\r
+        "id": "714ce556.4f2fcc",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4837.883331298828,\r
-        "y": 1067,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4836.566650390625,\r
+        "y": 1100,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c21a24cd.dd2528"\r
+                "2076535.8c263ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d52b1c1f.8a6ca8",\r
+        "id": "21d55314.ed559c",\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": 4310.0667724609375,\r
+        "y": 1214,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "db81dd24.8006b"\r
+                "45f37411.31ce94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db81dd24.8006b",\r
+        "id": "45f37411.31ce94",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4463.383453369141,\r
-        "y": 1182,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4462.0667724609375,\r
+        "y": 1215,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3519bfd5.fa4b3",\r
+        "id": "92f1b89c.1ab69",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4474.383453369141,\r
-        "y": 1125,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4473.0667724609375,\r
+        "y": 1158,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e0a89dfb.b97bd8",\r
+        "id": "660dd4a0.d8f1f4",\r
          "type": "set",\r
          "name": "set vpn-bindingG and connectivityG",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 4149.883331298828,\r
-        "y": 892,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4148.566650390625,\r
+        "y": 925,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c21a24cd.dd2528",\r
+        "id": "2076535.8c263ac",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5040.883331298828,\r
-        "y": 1071,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5039.566650390625,\r
+        "y": 1104,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f7c609f5.0c2d28"\r
+                "f782ae02.7309d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dff3e5ec.9273",\r
+        "id": "4c7d2512.5b4fb4",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5425.883331298828,\r
-        "y": 1084,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5424.566650390625,\r
+        "y": 1117,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2769bc77.6b9fa4",\r
-                "7925966f.3df658",\r
-                "161a4207.178c96"\r
+                "f27cc561.589478",\r
+                "533a9a4e.562074",\r
+                "f04fcd62.bdef1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7c609f5.0c2d28",\r
+        "id": "f782ae02.7309d8",\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": 5218.566650390625,\r
+        "y": 1104,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3634d6f2.f94292",\r
-                "dff3e5ec.9273"\r
+                "eec3155e.2bcec8",\r
+                "4c7d2512.5b4fb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3634d6f2.f94292",\r
+        "id": "eec3155e.2bcec8",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainG id",\r
          "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5455.883331298828,\r
-        "y": 1032,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5454.566650390625,\r
+        "y": 1065,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2769bc77.6b9fa4",\r
+        "id": "f27cc561.589478",\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": 5634.566650390625,\r
+        "y": 1108,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8b0e2b2b.7a21d"\r
+                "20cc7528.d35caa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7925966f.3df658",\r
+        "id": "533a9a4e.562074",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5627.883331298828,\r
-        "y": 1130,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5626.566650390625,\r
+        "y": 1163,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b9107d6e.7c0358"\r
+                "a99b13d6.7a5b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "161a4207.178c96",\r
+        "id": "f04fcd62.bdef1",\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": 5631.566650390625,\r
+        "y": 1220,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d5598bab.3dfb58"\r
+                "76e3f44a.1be574"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5598bab.3dfb58",\r
+        "id": "76e3f44a.1be574",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5784.883331298828,\r
-        "y": 1188,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5783.566650390625,\r
+        "y": 1221,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9107d6e.7c0358",\r
+        "id": "a99b13d6.7a5b4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5795.883331298828,\r
-        "y": 1133,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5794.566650390625,\r
+        "y": 1166,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8b0e2b2b.7a21d",\r
+        "id": "20cc7528.d35caa",\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": 5778.948974609375,\r
+        "y": 1105.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f80d31a9.31f3d"\r
+                "52e6acc9.c6278c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f80d31a9.31f3d",\r
+        "id": "52e6acc9.c6278c",\r
          "type": "set",\r
          "name": "set controller domainG data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5994.883331298828,\r
-        "y": 1069,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 5993.566650390625,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d718b282.287ca",\r
+        "id": "7dd287b6.719d08",\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": 3767.566650390625,\r
+        "y": 1043,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6d93ab.df041c8",\r
+        "id": "ce04a89c.bde61",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
          "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2330.883331298828,\r
-        "y": 737,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2329.566650390625,\r
+        "y": 770,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7d753f63.af1d7",\r
-                "7719dbd9.957fc4"\r
+                "f4c77699.53d898",\r
+                "9865c4e0.3bcc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7719dbd9.957fc4",\r
+        "id": "9865c4e0.3bcc6",\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": 2736.566650390625,\r
+        "y": 788,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2b5dce30.392f92"\r
+                "ad8883f5.8e3298"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d753f63.af1d7",\r
+        "id": "f4c77699.53d898",\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": 2736.566650390625,\r
+        "y": 733,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "155f7f13.57fce1"\r
+                "e8f3ed6f.2eafd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "155f7f13.57fce1",\r
+        "id": "e8f3ed6f.2eafd",\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": 2892.566650390625,\r
+        "y": 731,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e7a16254.b52678",\r
-                "4a95df1.67c3fa"\r
+                "601ee7c2.7cf4c8",\r
+                "64ebcb8e.6a273c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b5dce30.392f92",\r
+        "id": "ad8883f5.8e3298",\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": 2869.566650390625,\r
+        "y": 789,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9dad0003.283738",\r
+        "id": "6d17c7fb.4906d8",\r
          "type": "set",\r
          "name": "unset tmp.aai.all-vpn-bindings",\r
          "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",\r
          "comments": "",\r
-        "x": 1047.8833312988281,\r
-        "y": 172,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1046.566650390625,\r
+        "y": 205,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a6d3cb9.27687b8",\r
+        "id": "c6c6f64f.fccbe8",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 4164.883331298828,\r
-        "y": 590,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4163.566650390625,\r
+        "y": 623,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "738a4fa7.5a68d",\r
+        "id": "5d6e99f5.a1e2d",\r
          "type": "set",\r
          "name": "set leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 4224.883331298828,\r
-        "y": 629,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4223.566650390625,\r
+        "y": 662,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "47e937a3.3ee608",\r
+        "id": "7de7f253.4369ac",\r
          "type": "set",\r
          "name": "unset leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 1040.8833312988281,\r
-        "y": 80,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1039.566650390625,\r
+        "y": 113,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6f67cdff.5c5554",\r
+        "id": "9d19ef7b.02af28",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 3576.883331298828,\r
-        "y": 2106,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3575.566650390625,\r
+        "y": 2139,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "78f084cb.41e754",\r
+        "id": "b596d9f.c7daaa8",\r
          "type": "set",\r
          "name": "set root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 3632.883331298828,\r
-        "y": 2155,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3631.566650390625,\r
+        "y": 2188,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "912dde6.9b60fa",\r
+        "id": "aeebae01.261168",\r
          "type": "set",\r
          "name": "unset root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 1040.8833312988281,\r
-        "y": 119,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1039.566650390625,\r
+        "y": 152,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fa83bc41.1d8b08",\r
+        "id": "731e9165.7bfe5",\r
          "type": "execute",\r
          "name": "execute properties",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1071.8833312988281,\r
-        "y": 220,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1070.566650390625,\r
+        "y": 253,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "39b1b2.d055464e",\r
+        "id": "c3d34fd5.00b8e8",\r
          "type": "save",\r
          "name": "get service-instance from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 281.8833312988281,\r
-        "y": 695,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 280.566650390625,\r
+        "y": 728,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e70c3582.89ad08",\r
-                "3aeaa08a.574a",\r
-                "1322af3c.bc6319"\r
+                "39350f2.499cf7",\r
+                "6ce2e49e.7b3484",\r
+                "5333638f.7ecf8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e70c3582.89ad08",\r
+        "id": "39350f2.499cf7",\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": 499.566650390625,\r
+        "y": 666,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9c476365.2b909"\r
+                "36841c29.6decdc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3aeaa08a.574a",\r
+        "id": "6ce2e49e.7b3484",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 510.3742980957031,\r
-        "y": 675.5740356445312,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 509.0576171875,\r
+        "y": 708.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1322af3c.bc6319",\r
+        "id": "5333638f.7ecf8c",\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": 497.566650390625,\r
+        "y": 755,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "23db95da.1941e2"\r
+                "3e93247c.aebb34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c476365.2b909",\r
+        "id": "36841c29.6decdc",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 697.8833312988281,\r
-        "y": 629,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 696.566650390625,\r
+        "y": 662,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1a5a20de.60b4cf"\r
+                "1f2c86c7.cadda9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23db95da.1941e2",\r
+        "id": "3e93247c.aebb34",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 667.8833312988281,\r
-        "y": 723,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 666.566650390625,\r
+        "y": 756,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1a5a20de.60b4cf",\r
+        "id": "1f2c86c7.cadda9",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 921.2168273925781,\r
-        "y": 628.9999389648438,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 919.900146484375,\r
+        "y": 661.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "59a859e2.c48ca8"\r
+                "a1cbb7bd.24594"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59a859e2.c48ca8",\r
+        "id": "a1cbb7bd.24594",\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": 1120.5667839050293,\r
+        "y": 663.000020980835,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ae28be96.a81b18"\r
+                "1f60fbe4.6df234"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ae28be96.a81b18",\r
+        "id": "1f60fbe4.6df234",\r
          "type": "save",\r
          "name": "get connectivity from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 251.88333129882812,\r
-        "y": 892,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 250.566650390625,\r
+        "y": 925,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4595d435.587aa4",\r
-                "60a8c3ff.237aec",\r
-                "18e77ed.3460901"\r
+                "63c00e4f.b84e58",\r
+                "13815c78.95eb5c",\r
+                "e5780368.e11db"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4595d435.587aa4",\r
+        "id": "63c00e4f.b84e58",\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": 458.566650390625,\r
+        "y": 889,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9c5806bb.83c05"\r
+                "c1076b8e.81d988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60a8c3ff.237aec",\r
+        "id": "13815c78.95eb5c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 460.3742980957031,\r
-        "y": 901.5740356445312,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 459.0576171875,\r
+        "y": 934.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "18e77ed.3460901",\r
+        "id": "e5780368.e11db",\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": 456.566650390625,\r
+        "y": 978,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a170b783.101ed"\r
+                "96cea788.4bc5b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a170b783.101ed",\r
+        "id": "96cea788.4bc5b",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 626.8833312988281,\r
-        "y": 946,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 625.566650390625,\r
+        "y": 979,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aaf101ae.84a298",\r
+        "id": "ec5bb05c.091188",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 598.8833312988281,\r
-        "y": 1440,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 597.566650390625,\r
+        "y": 1473,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "48f75925.f13078"\r
+                "19a0d254.b680d6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48f75925.f13078",\r
+        "id": "19a0d254.b680d6",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 801.8833312988281,\r
-        "y": 1452,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 800.566650390625,\r
+        "y": 1485,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "dc596581.8a224"\r
+                "5cf33a37.92a98c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dc596581.8a224",\r
+        "id": "5cf33a37.92a98c",\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": 966.566650390625,\r
+        "y": 1482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "63611a55.44e3fc"\r
+                "60d055a9.95f0c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63611a55.44e3fc",\r
+        "id": "60d055a9.95f0c4",\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": 1127.566650390625,\r
+        "y": 1479,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "155181d9.def56e",\r
-                "450c0202.9562fc",\r
-                "e522d7e8.f0b6d",\r
-                "b85bac18.623698",\r
-                "d97c4e37.51bad8"\r
+                "325c2337.f5bbac",\r
+                "282c70ac.7ebb8",\r
+                "790547b3.03e69",\r
+                "be332a4a.d8db58",\r
+                "88b6396e.dee88",\r
+                "3f4654a9.b7d9fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "450c0202.9562fc",\r
+        "id": "282c70ac.7ebb8",\r
          "type": "set",\r
          "name": "unset tmp.aai.uni",\r
          "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
          "comments": "",\r
-        "x": 1332.8833312988281,\r
-        "y": 1404,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1333.566650390625,\r
+        "y": 1078.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "155181d9.def56e",\r
+        "id": "325c2337.f5bbac",\r
          "type": "save",\r
          "name": "get uni from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1329.8833312988281,\r
-        "y": 1449,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1330.566650390625,\r
+        "y": 1123.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c73d859f.d40f2",\r
-                "cdecbb41.644898",\r
-                "ca040aae.e9fa08"\r
+                "5ebf3dd3.403df4",\r
+                "df8620f2.fcde78",\r
+                "4f82abb0.8dd704"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cdecbb41.644898",\r
+        "id": "df8620f2.fcde78",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1525.3742980957031,\r
-        "y": 1422.573974609375,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1526.0576171875,\r
+        "y": 1097.5739135742188,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "dcd0fdd9.1c84f"\r
+                "f317bbdf.6454e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca040aae.e9fa08",\r
+        "id": "4f82abb0.8dd704",\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": 1521.566650390625,\r
+        "y": 1141.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7c23dd25.00653c"\r
+                "ba985891.b5d178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dcd0fdd9.1c84f",\r
+        "id": "f317bbdf.6454e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1687.9458312988281,\r
-        "y": 1421.8596801757812,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1688.629150390625,\r
+        "y": 1096.859619140625,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7c23dd25.00653c",\r
+        "id": "ba985891.b5d178",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 1688.8833312988281,\r
-        "y": 1466.9999389648438,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1689.566650390625,\r
+        "y": 1141.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c84187cf.6e6008",\r
+        "id": "d594aca6.9a4aa",\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": 1691.566650390625,\r
+        "y": 1188.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c73d859f.d40f2",\r
+        "id": "5ebf3dd3.403df4",\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
+        "x": 1522.566650390625,\r
+        "y": 1188.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c84187cf.6e6008"\r
+                "d594aca6.9a4aa"\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
-        "wires": [\r
-            [\r
-                "ce504b34.d68ac8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "5d006f15.710a08",\r
+        "id": "f22d69be.3697f8",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 1305.8833312988281,\r
-        "y": 1677,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1304.566650390625,\r
+        "y": 1710,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e522d7e8.f0b6d",\r
+        "id": "790547b3.03e69",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
          "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1396.8833312988281,\r
-        "y": 1731,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1395.566650390625,\r
+        "y": 1764,\r
+        "z": "b25656d7.85a8a8",\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": "a6f0acc2.4c1e8",\r
          "type": "set",\r
          "name": "unset ethernet-srv-end-points-list",\r
          "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
          "comments": "",\r
-        "x": 618.3833312988281,\r
-        "y": 1233,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2072.066650390625,\r
+        "y": 1177,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "784b1e5c.92c77",\r
+        "id": "ff492e23.69ead8",\r
          "type": "set",\r
          "name": "unset ethernet-srv-end-points-list",\r
          "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
          "comments": "",\r
-        "x": 635.3833312988281,\r
-        "y": 1327,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2077.066650390625,\r
+        "y": 1279,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3502903c.982ab",\r
+        "id": "f2cd3854.ada88",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 561.8833312988281,\r
-        "y": 1696,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 560.566650390625,\r
+        "y": 1729,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2dc7d020.0f01c8"\r
+                "6040df7.067df2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2dc7d020.0f01c8",\r
+        "id": "6040df7.067df2",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 793.8833312988281,\r
-        "y": 1695,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 792.566650390625,\r
+        "y": 1728,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9a9b2fc1.cfc378"\r
+                "f4813036.0e422"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a9b2fc1.cfc378",\r
+        "id": "f4813036.0e422",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1005.8833312988281,\r
-        "y": 1696,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1004.566650390625,\r
+        "y": 1729,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3ee84e3e.71c9c2"\r
+                "21d7816d.cb9a2e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee84e3e.71c9c2",\r
+        "id": "21d7816d.cb9a2e",\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": 260.566650390625,\r
+        "y": 1885,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a6f3ac42.8fbf28",\r
-                "c5253df7.0ed11"\r
+                "99bd9d6a.34096",\r
+                "25dea7fd.0f37b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c5253df7.0ed11",\r
+        "id": "25dea7fd.0f37b",\r
          "type": "set",\r
          "name": "unset tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
          "comments": "",\r
-        "x": 496.8833312988281,\r
-        "y": 1839,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 495.566650390625,\r
+        "y": 1872,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a6f3ac42.8fbf28",\r
+        "id": "99bd9d6a.34096",\r
          "type": "save",\r
          "name": "get vpn-binding from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 486.8833312988281,\r
-        "y": 1900,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 485.566650390625,\r
+        "y": 1933,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b27c66fe.f461f8",\r
-                "d86a808d.b5d38",\r
-                "51be47ba.06369"\r
+                "74a706a.d47d878",\r
+                "7274c8e3.f8fec8",\r
+                "b6208f6.4c1eb7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d86a808d.b5d38",\r
+        "id": "7274c8e3.f8fec8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 700.3742980957031,\r
-        "y": 1884.5740356445312,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 699.0576171875,\r
+        "y": 1917.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "40ccd27e.7bf8ec"\r
+                "7f886391.998a1c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51be47ba.06369",\r
+        "id": "b6208f6.4c1eb7",\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": 694.566650390625,\r
+        "y": 1962,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "10ad75eb.cd3092"\r
+                "3f233556.698682"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b27c66fe.f461f8",\r
+        "id": "74a706a.d47d878",\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": 696.566650390625,\r
+        "y": 2022,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f72f31f7.42e17"\r
+                "721ed34e.4f1714"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40ccd27e.7bf8ec",\r
+        "id": "7f886391.998a1c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 862.9458312988281,\r
-        "y": 1883.8597412109375,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 861.629150390625,\r
+        "y": 1916.8597412109375,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10ad75eb.cd3092",\r
+        "id": "3f233556.698682",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 863.8833312988281,\r
-        "y": 1929,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 862.566650390625,\r
+        "y": 1962,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f72f31f7.42e17",\r
+        "id": "721ed34e.4f1714",\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": 865.566650390625,\r
+        "y": 2021,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c01095c8.c5a848",\r
-                "1e0b480.37d7ab8"\r
+                "fb6c612a.831f28",\r
+                "af0310e2.931fe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8f2651c.3a035",\r
+        "id": "a05b5003.46c7e8",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
          "comments": "",\r
-        "x": 265.8833312988281,\r
-        "y": 2487,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 285.566650390625,\r
+        "y": 2523,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f84d6f72.692148",\r
+        "id": "c5885881.921d18",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 408.8833312988281,\r
-        "y": 2547,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 407.566650390625,\r
+        "y": 2580,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7174c4fb.4236d4",\r
-                "3df090d7.e28cf"\r
+                "1736d2be.a7f385",\r
+                "11bf3fb5.747c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7174c4fb.4236d4",\r
+        "id": "1736d2be.a7f385",\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": 720.066650390625,\r
+        "y": 2557,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3df090d7.e28cf",\r
+        "id": "11bf3fb5.747c4",\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": 724.066650390625,\r
+        "y": 2597,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bbef1ecc.7916"\r
+                "9fa6731e.bfdda"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d6cfe8e.59e2a",\r
+        "id": "d975bee8.cbb1b8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 901.3833312988281,\r
-        "y": 2528,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 900.066650390625,\r
+        "y": 2561,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bbef1ecc.7916",\r
+        "id": "9fa6731e.bfdda",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 916.8833312988281,\r
-        "y": 2582,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 915.566650390625,\r
+        "y": 2615,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b94bbfec.158258"\r
+                "26102eb4.5bf9d2",\r
+                "a5cf86e7.fd2ae8",\r
+                "94107493.94d3e8",\r
+                "c85f3994.bd81f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2dda6de.cb3b28",\r
+        "id": "3a7c38a3.d1311",\r
          "type": "save",\r
          "name": "update vpn-binding resource (aka. OTN ) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1212.3833312988281,\r
-        "y": 2551,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1211.066650390625,\r
+        "y": 2584,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1cb10652.ba5e0a",\r
+        "id": "d5ebfe0.284f7",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 2679.383331298828,\r
-        "y": 1902,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2678.066650390625,\r
+        "y": 1935,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b94bbfec.158258",\r
+        "id": "26102eb4.5bf9d2",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1174.3833312988281,\r
-        "y": 2593,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1173.066650390625,\r
+        "y": 2626,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70ed09af.22122",\r
+        "id": "eaf51112.30b59",\r
          "type": "set",\r
          "name": "set leafOrRootAccess",\r
          "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
          "comments": "",\r
-        "x": 584.3833312988281,\r
-        "y": 1271,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2038.066650390625,\r
+        "y": 1215,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfffb0d0.b2d2d",\r
+        "id": "77e27285.394bfc",\r
          "type": "set",\r
          "name": "set leafOrRootAccess",\r
          "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
          "comments": "",\r
-        "x": 597.3833312988281,\r
-        "y": 1367,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2039.066650390625,\r
+        "y": 1319,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9521e4ca.a61af",\r
+        "id": "1771c9d3.36c546",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4333.883331298828,\r
-        "y": 543,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4332.566650390625,\r
+        "y": 576,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1d1e23b2.17cb04",\r
+        "id": "6270f9ff.6a6b4",\r
          "type": "save",\r
          "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4236.883331298828,\r
-        "y": 1362,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4235.566650390625,\r
+        "y": 1395,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e35a6c95.6b3d6",\r
+        "id": "2308c235.08d20e",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3730.883331298828,\r
-        "y": 2034,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3729.566650390625,\r
+        "y": 2067,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9c5806bb.83c05",\r
+        "id": "c1076b8e.81d988",\r
          "type": "switchNode",\r
          "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
          "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 831.8833312988281,\r
-        "y": 842,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 830.566650390625,\r
+        "y": 875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "24382f34.66808",\r
-                "ea56d949.8ce4b"\r
+                "451a757.6fc508c",\r
+                "8b0542af.2f9d78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24382f34.66808",\r
+        "id": "451a757.6fc508c",\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": 1193.566650390625,\r
+        "y": 898,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d7ed30c6.74c9b"\r
+                "f1ea0737.b79178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea56d949.8ce4b",\r
+        "id": "8b0542af.2f9d78",\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": 1193.566650390625,\r
+        "y": 847,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3707e8cf.65827"\r
+                "3e6bbe33.acc602"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7ed30c6.74c9b",\r
+        "id": "f1ea0737.b79178",\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": 1349.566650390625,\r
+        "y": 896,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a7f36b9f.f75b88"\r
+                "cb3a4052.881008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3707e8cf.65827",\r
+        "id": "3e6bbe33.acc602",\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": 1326.566650390625,\r
+        "y": 848,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ed4d0298.cdb578",\r
+        "id": "b01d3963.8ea8b8",\r
          "type": "set",\r
          "name": "unset tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",\r
          "comments": "",\r
-        "x": 2087.883331298828,\r
-        "y": 213,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2086.566650390625,\r
+        "y": 246,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1ced8517.ce35e3",\r
+        "id": "5a0cb184.9cdf98",\r
          "type": "set",\r
          "name": "set root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 3629.883331298828,\r
-        "y": 2194,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 3628.566650390625,\r
+        "y": 2227,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "224f4283.917d26",\r
+        "id": "d9cf64bd.4ed12",\r
          "type": "set",\r
          "name": "set leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 4219.883331298828,\r
-        "y": 667,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 4218.566650390625,\r
+        "y": 700,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b85bac18.623698",\r
+        "id": "be332a4a.d8db58",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
          "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1393.8833312988281,\r
-        "y": 1773,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1392.566650390625,\r
+        "y": 1806,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5524ecac.5cf47c",\r
+        "id": "3501da3.a014526",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
          "comments": "",\r
-        "x": 572.8833312988281,\r
-        "y": 1507,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 571.566650390625,\r
+        "y": 1540,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a12bd239.f8368",\r
+        "id": "2c2649c2.53ac7e",\r
          "type": "execute",\r
          "name": "execute printContext",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 603.8833312988281,\r
-        "y": 1547,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 602.566650390625,\r
+        "y": 1580,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c01095c8.c5a848",\r
+        "id": "fb6c612a.831f28",\r
          "type": "set",\r
          "name": "set otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1151.8833312988281,\r
-        "y": 1955,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1150.566650390625,\r
+        "y": 1988,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1e0b480.37d7ab8",\r
+        "id": "af0310e2.931fe8",\r
          "type": "set",\r
          "name": "set otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1154.8833312988281,\r
-        "y": 1997,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1153.566650390625,\r
+        "y": 2030,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d1396ed.19b6f8",\r
+        "id": "694d6c2f.8edccc",\r
          "type": "set",\r
          "name": "unset otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 597.8833312988281,\r
-        "y": 1637,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 596.566650390625,\r
+        "y": 1670,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1b4871a6.1cd8a6",\r
+        "id": "4b32fbef.652bc4",\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": 351.566650390625,\r
+        "y": 2049,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "48083140.e99758",\r
+        "id": "caa8a64f.1936",\r
          "type": "execute",\r
          "name": "execute printContext",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 360.8833312988281,\r
-        "y": 2073,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 359.566650390625,\r
+        "y": 2106,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d97c4e37.51bad8",\r
+        "id": "88b6396e.dee88",\r
          "type": "execute",\r
          "name": "execute split tp-id to get pnf-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1371.8833312988281,\r
-        "y": 1622,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1370.566650390625,\r
+        "y": 1655,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3df77641.8d727a",\r
-                "f024d61d.5a31c"\r
+                "45e3fdbe.201574",\r
+                "86940004.bfdd7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f024d61d.5a31c",\r
+        "id": "86940004.bfdd7",\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": 1593.566650390625,\r
+        "y": 1610,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3c67000e.e921c"\r
+                "c31b8cce.808f08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3df77641.8d727a",\r
+        "id": "45e3fdbe.201574",\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": 1595.566650390625,\r
+        "y": 1674,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "de64177a.8916f"\r
+                "1cc861e4.834c36"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c67000e.e921c",\r
+        "id": "c31b8cce.808f08",\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": 1758.566650390625,\r
+        "y": 1607,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9bea7c66.5f62c8"\r
+                "b2423aca.7a4fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de64177a.8916f",\r
+        "id": "1cc861e4.834c36",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 1758.8833312988281,\r
-        "y": 1637,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1757.566650390625,\r
+        "y": 1670,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9bea7c66.5f62c8",\r
+        "id": "b2423aca.7a4fa8",\r
          "type": "set",\r
          "name": "set tmp.uni-node-id-short",\r
          "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
          "comments": "",\r
-        "x": 1979.8833312988281,\r
-        "y": 1588,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1978.566650390625,\r
+        "y": 1621,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a38583b.020a88",\r
+        "id": "45f30159.842648",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1524.8833312988281,\r
-        "y": 2313,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1523.566650390625,\r
+        "y": 2346,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c388a6bf.f87f3"\r
+                "195465ca.996e92"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a2f5b878.ad169",\r
+        "id": "ac9df433.f2c8",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1909.8833312988281,\r
-        "y": 2326,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1908.566650390625,\r
+        "y": 2359,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7866488b.2039a8",\r
-                "bdc692ef.1c0858",\r
-                "823a852f.40d29"\r
+                "565cac1f.04fa64",\r
+                "e43b7ac1.fcb9e",\r
+                "7ad49b0d.e0614c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c388a6bf.f87f3",\r
+        "id": "195465ca.996e92",\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": 1702.566650390625,\r
+        "y": 2346,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5c79d6d8.a6a8e",\r
-                "a2f5b878.ad169"\r
+                "94dbb559.adb488",\r
+                "ac9df433.f2c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c79d6d8.a6a8e",\r
+        "id": "94dbb559.adb488",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainConn id",\r
          "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 1939.8833312988281,\r
-        "y": 2274,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1938.566650390625,\r
+        "y": 2307,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7866488b.2039a8",\r
+        "id": "565cac1f.04fa64",\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": 2118.566650390625,\r
+        "y": 2350,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4da79570.cd80cc"\r
+                "b1dc084c.7cde9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bdc692ef.1c0858",\r
+        "id": "e43b7ac1.fcb9e",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2111.883331298828,\r
-        "y": 2372,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2110.566650390625,\r
+        "y": 2405,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5ef7fec5.5efb98"\r
+                "385c483c.3ef568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "823a852f.40d29",\r
+        "id": "7ad49b0d.e0614c",\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": 2115.566650390625,\r
+        "y": 2462,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "57488074.1d65e"\r
+                "35f4b5a3.f8aa4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57488074.1d65e",\r
+        "id": "35f4b5a3.f8aa4a",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2268.883331298828,\r
-        "y": 2430,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2267.566650390625,\r
+        "y": 2463,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5ef7fec5.5efb98",\r
+        "id": "385c483c.3ef568",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2279.883331298828,\r
-        "y": 2375,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2278.566650390625,\r
+        "y": 2408,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4da79570.cd80cc",\r
+        "id": "b1dc084c.7cde9",\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": 2262.948974609375,\r
+        "y": 2347.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "69f8caaf.bba51c"\r
+                "5d32a434.f7be54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "69f8caaf.bba51c",\r
+        "id": "5d32a434.f7be54",\r
          "type": "set",\r
          "name": "set controller domainConn data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 2478.883331298828,\r
-        "y": 2311,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 2477.566650390625,\r
+        "y": 2344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "53cc84ce.e1faf4",\r
+        "id": "51bc490a.0719c",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 602.8833312988281,\r
-        "y": 2359,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 601.566650390625,\r
+        "y": 2392,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bb343bdc.881868",\r
-                "8bc84f5e.0473d8",\r
-                "78444b47.33ec34"\r
+                "9a98fb41.58116",\r
+                "d11dcfed.810438",\r
+                "f803d5ab.85238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bb343bdc.881868",\r
+        "id": "9a98fb41.58116",\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": 797.0667724609375,\r
+        "y": 2344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bf3ecbb9.4dd008"\r
+                "98bce7a3.da5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8bc84f5e.0473d8",\r
+        "id": "d11dcfed.810438",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 790.3834533691406,\r
-        "y": 2366,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 789.0667724609375,\r
+        "y": 2399,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ef40b092.bc09e"\r
+                "71f2762f.659628"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bf3ecbb9.4dd008",\r
+        "id": "98bce7a3.da5e",\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": 941.4490966796875,\r
+        "y": 2343.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1285266.d4ce8da"\r
+                "c67046c0.c64788"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1285266.d4ce8da",\r
+        "id": "c67046c0.c64788",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1126.8833312988281,\r
-        "y": 2309,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1125.566650390625,\r
+        "y": 2342,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "640d04c1.8428dc"\r
+                "5f0a1eb2.b2273"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "640d04c1.8428dc",\r
+        "id": "5f0a1eb2.b2273",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1321.8833312988281,\r
-        "y": 2309,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1320.566650390625,\r
+        "y": 2342,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7a38583b.020a88"\r
+                "45f30159.842648"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "78444b47.33ec34",\r
+        "id": "f803d5ab.85238",\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": 794.0667724609375,\r
+        "y": 2456,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b417de17.8b3a6"\r
+                "33262ba5.8d682c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b417de17.8b3a6",\r
+        "id": "33262ba5.8d682c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 947.3834533691406,\r
-        "y": 2424,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 946.0667724609375,\r
+        "y": 2457,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef40b092.bc09e",\r
+        "id": "71f2762f.659628",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 958.3834533691406,\r
-        "y": 2367,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 957.0667724609375,\r
+        "y": 2400,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fc4eafc.4810e5",\r
+        "id": "808535b.d0bfd48",\r
          "type": "set",\r
          "name": "set tmp.pnf-name-forUrl",\r
          "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 592.8833312988281,\r
-        "y": 2271,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 591.566650390625,\r
+        "y": 2304,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d94511cd.5d63f",\r
+        "id": "6e3ab27b.a7f37c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 337.8833312988281,\r
-        "y": 2402,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 336.566650390625,\r
+        "y": 2435,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fc4eafc.4810e5",\r
-                "53cc84ce.e1faf4"\r
+                "808535b.d0bfd48",\r
+                "51bc490a.0719c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1a955b8d.047dd4",\r
+        "id": "dc357fe5.d2f6d8",\r
          "type": "comment",\r
          "name": "Temporary skipping this check - to support multiple instances in one slice",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1552.8500061035156,\r
-        "y": 219.88333129882812,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 1551.5333251953125,\r
+        "y": 252.88333129882812,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9a0e1ef7.428b9",\r
+        "id": "a92b97b8.4129e8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 754.8833312988281,\r
-        "y": 442,\r
-        "z": "db287b1f.2984a8",\r
+        "x": 753.566650390625,\r
+        "y": 475,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "baa368e2.d0057",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 313.066650390625,\r
+        "y": 1444,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "ec5bb05c.091188",\r
+                "f2cd3854.ada88",\r
+                "3501da3.a014526",\r
+                "2c2649c2.53ac7e",\r
+                "a05b5003.46c7e8",\r
+                "c5885881.921d18",\r
+                "694d6c2f.8edccc",\r
+                "4b32fbef.652bc4",\r
+                "caa8a64f.1936",\r
+                "6e3ab27b.a7f37c",\r
+                "5a72a2f9.fe54bc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3f4654a9.b7d9fc",\r
+        "type": "switchNode",\r
+        "name": "switch uni type",\r
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1343.566650390625,\r
+        "y": 1282,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "118223c9.ee1e8c",\r
+                "5e72886e.16b82",\r
+                "9ad14e96.a683a8",\r
+                "b20e668c.49e0a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "118223c9.ee1e8c",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1508.566650390625,\r
+        "y": 1264,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "4829f132.924c9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e72886e.16b82",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1511.566650390625,\r
+        "y": 1303,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "1b6bbf84.2b9b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b20e668c.49e0a",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1505.566650390625,\r
+        "y": 1381,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "23f70279.3c530e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9ad14e96.a683a8",\r
+        "type": "outcome",\r
+        "name": "root-secondary",\r
+        "xml": "<outcome value='root-secondary'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1528.566650390625,\r
+        "y": 1344,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "690a7c3c.e28bc4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "34596fcc.944e58",\r
+        "type": "set",\r
+        "name": "unset ethernet-srv-end-points-list",\r
+        "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
+        "comments": "",\r
+        "x": 2074.566650390625,\r
+        "y": 1377,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "36c4b896.3cd558",\r
+        "type": "set",\r
+        "name": "set leafOrRootAccess",\r
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",\r
+        "comments": "",\r
+        "x": 2036.566650390625,\r
+        "y": 1417,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "23f70279.3c530e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1657.566650390625,\r
+        "y": 1402,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a5cf86e7.fd2ae8",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1247.1500244140625,\r
+        "y": 2701.3336181640625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4829f132.924c9",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1643.4832763671875,\r
+        "y": 1260.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "eaf51112.30b59"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1b6bbf84.2b9b8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1645.4832763671875,\r
+        "y": 1298.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "77e27285.394bfc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "690a7c3c.e28bc4",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1688.4832763671875,\r
+        "y": 1345.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "36c4b896.3cd558"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "94107493.94d3e8",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishSubscription",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1215.1500244140625,\r
+        "y": 2773.33349609375,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c85f3994.bd81f",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1245.1500244140625,\r
+        "y": 2835.33349609375,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "5a72a2f9.fe54bc",\r
+        "type": "set",\r
+        "name": "unset ethernet-srv-end-points-list",\r
+        "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
+        "comments": "",\r
+        "x": 638.566650390625,\r
+        "y": 1382.166748046875,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cb3a4052.881008",\r
+        "type": "switchNode",\r
+        "name": "switch conn type",\r
+        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 179.56666564941406,\r
+        "y": 1093.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "f5718cb9.775688",\r
+                "eaa991b9.45489"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eaa991b9.45489",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 364.566650390625,\r
+        "y": 1267.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "baa368e2.d0057"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f5718cb9.775688",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 367.566650390625,\r
+        "y": 1222.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "baa368e2.d0057"\r
+            ]\r
+        ]\r
      }\r
  ]
 \ No newline at end of file