diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
index bee8da8..3a50865 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "4eb3c760.0f4e78",
+    "id": "93b0ef5b.3e408",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 91,
-    "y": 47,
-    "z": "5b3e3707.3aa6c8",
+    "x": 139,
+    "y": 54,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "6dada1.f2c9326"
+        "a7b13cb2.c08d5"
       ]
     ]
   },
   {
-    "id": "6dada1.f2c9326",
+    "id": "a7b13cb2.c08d5",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2246 +22,2246 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 282.0000057220459,
-    "y": 117.00001811981201,
-    "z": "5b3e3707.3aa6c8",
+    "x": 330.0000057220459,
+    "y": 124.00001811981201,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "280e7b0d.e2eef4"
+        "5d2c2651.f9a3d8"
       ]
     ]
   },
   {
-    "id": "280e7b0d.e2eef4",
+    "id": "5d2c2651.f9a3d8",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-activate",
     "xml": "<method rpc='sdwan-attachment-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 270.00012397766113,
-    "y": 205.00000095367432,
-    "z": "5b3e3707.3aa6c8",
+    "x": 318.00012397766113,
+    "y": 212.00000095367432,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "3b8ff9db.6736b6"
+        "c8d63fe2.b2b23"
       ]
     ]
   },
   {
-    "id": "3b8ff9db.6736b6",
+    "id": "c8d63fe2.b2b23",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 172.00013732910156,
-    "y": 891.0002890825272,
-    "z": "5b3e3707.3aa6c8",
+    "x": 220.00013732910156,
+    "y": 898.0002890825272,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "91ee02fa.b186a",
-        "ba42cb5a.846d08",
-        "b40f6fde.18743",
-        "8171db6d.f63858",
-        "e6936fb4.46122",
-        "a02dc728.884b28",
-        "210482d7.10d8ee",
-        "b09356ce.de3e78",
-        "b70e72ac.ac27d",
-        "720d11d0.f67bc",
-        "671de4e7.c5daec",
-        "22826455.9296ec",
-        "f959c075.1e7e6",
-        "69260ab2.333c94",
-        "1ebdd52f.25cc2b",
-        "5f71dd6c.97cd84",
-        "69e18ab9.627484",
-        "bcfeb911.f55008",
-        "19a39c5d.bf96f4",
-        "c4f38bc0.54d238",
-        "6a97289d.80a568",
-        "f3ac87c7.5588f8",
-        "c88d609e.257e3",
-        "86fafd91.f4f2f",
-        "df3f5d3a.29e2c",
-        "55f46b97.799ce4"
+        "d462bbd.082f148",
+        "ce900383.4855d",
+        "bc468479.f5a808",
+        "cc58fb4f.38c9d8",
+        "5687be1a.59a66",
+        "a1d43226.8d32d",
+        "a6ce139d.8cd82",
+        "fcbe570.434f0a8",
+        "e2fb4f17.bce7a",
+        "3aed3696.4cf77a",
+        "e78f2c1f.7461f",
+        "f801a0de.16907",
+        "d4bcebf0.e04a68",
+        "a351ad64.5b62",
+        "169bc249.b8cede",
+        "86489e85.9e429",
+        "6a1b7e4b.2ba26",
+        "7ad41615.6876c8",
+        "fb5be39e.fa586",
+        "2406d281.b1df1e",
+        "4e50db83.d2f224",
+        "862cb704.9f9128",
+        "4e5f3349.352d6c",
+        "28b00a13.902c76",
+        "9a0f8d9a.4d443",
+        "f9894d64.11723"
       ]
     ]
   },
   {
-    "id": "91ee02fa.b186a",
+    "id": "d462bbd.082f148",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id,etc",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 682.9935626983643,
-    "y": 158.99348783493042,
-    "z": "5b3e3707.3aa6c8",
+    "x": 730.9935626983643,
+    "y": 165.99348783493042,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "fc6cccab.f6373",
+    "id": "1a77342a.e82ccc",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 711.9538745880127,
-    "y": 123.02528381347656,
-    "z": "5b3e3707.3aa6c8",
+    "x": 759.9538745880127,
+    "y": 130.02528381347656,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "ba42cb5a.846d08",
+    "id": "ce900383.4855d",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 636.993501663208,
-    "y": 251.99349308013916,
-    "z": "5b3e3707.3aa6c8",
+    "x": 684.993501663208,
+    "y": 258.99349308013916,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "8171db6d.f63858",
+    "id": "cc58fb4f.38c9d8",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 643.255392074585,
-    "y": 339.66022205352783,
-    "z": "5b3e3707.3aa6c8",
+    "x": 691.255392074585,
+    "y": 346.66022205352783,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "b40f6fde.18743",
+    "id": "bc468479.f5a808",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 690.255449295044,
-    "y": 427.6602258682251,
-    "z": "5b3e3707.3aa6c8",
+    "x": 738.255449295044,
+    "y": 434.6602258682251,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8f7c2f3a.39068",
+    "id": "cd648838.9eb298",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 744.8084106445312,
-    "y": 496.53865146636963,
-    "z": "5b3e3707.3aa6c8",
+    "x": 792.8084106445312,
+    "y": 503.53865146636963,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "6a9edb15.0372c4",
+    "id": "9dbfb79f.f4be18",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 690.9935321807861,
-    "y": 218.99350261688232,
-    "z": "5b3e3707.3aa6c8",
+    "x": 738.9935321807861,
+    "y": 225.99350261688232,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "5d0ffaf8.eea164",
+    "id": "247d684d.e973f8",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 708.9934978485107,
-    "y": 304.8823833465576,
-    "z": "5b3e3707.3aa6c8",
+    "x": 756.9934978485107,
+    "y": 311.8823833465576,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "4c6a252e.949a4c",
+    "id": "6426cfba.672b8",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 734.9935169219971,
-    "y": 391.882342338562,
-    "z": "5b3e3707.3aa6c8",
+    "x": 782.9935169219971,
+    "y": 398.882342338562,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "1df58ece.22a6f1",
+    "id": "406068c.1da4a98",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1198.6668224334717,
-    "y": 509.99997901916504,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1246.6668224334717,
+    "y": 516.999979019165,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "beb58fcf.0e694"
+        "519eae9c.9b2f6"
       ]
     ]
   },
   {
-    "id": "beb58fcf.0e694",
+    "id": "519eae9c.9b2f6",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1342.6669006347656,
-    "y": 467.4998970031738,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1390.6669006347656,
+    "y": 474.4998970031738,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "b372be99.b158c"
+        "d1dd16e9.faf918"
       ]
     ]
   },
   {
-    "id": "b372be99.b158c",
+    "id": "d1dd16e9.faf918",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1511.5243244171143,
-    "y": 465.11906814575195,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1559.5243244171143,
+    "y": 472.11906814575195,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "553cf33f.abe66c",
-        "efe7a59a.897c58"
+        "6a124f25.b362a",
+        "caf37a34.d778a8"
       ]
     ]
   },
   {
-    "id": "553cf33f.abe66c",
+    "id": "6a124f25.b362a",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1666.8574600219727,
-    "y": 437.1189832687378,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1714.8574600219727,
+    "y": 444.1189832687378,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "bb79446e.fd2a98"
+        "d1a8c266.f1b55"
       ]
     ]
   },
   {
-    "id": "bb79446e.fd2a98",
+    "id": "d1a8c266.f1b55",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1825.3812637329102,
-    "y": 435.02383041381836,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1873.3812637329102,
+    "y": 442.02383041381836,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "c3367ce.c8b6f8",
-        "6e235bab.f44c74",
-        "fca0cf3f.e6c1c"
+        "bb518772.b81358",
+        "645ade11.426a1",
+        "44255d43.96da34"
       ]
     ]
   },
   {
-    "id": "cad70d2f.866d6",
+    "id": "2aedf56b.f1b1ba",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachment resource not exist\" />\n    \n",
     "comments": "",
-    "x": 1765.5191955566406,
-    "y": 542.0660648345947,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1813.5191955566406,
+    "y": 549.0660648345947,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "60f581d.8121d8",
+    "id": "e00fd6fc.ea7778",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1190.5186252593994,
-    "y": 545.0660638809204,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1238.5186252593994,
+    "y": 552.0660638809204,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "4541101a.4fcaa"
+        "d0418e39.56684"
       ]
     ]
   },
   {
-    "id": "4541101a.4fcaa",
+    "id": "d0418e39.56684",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1370.518575668335,
-    "y": 545.7326145172119,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1418.518575668335,
+    "y": 552.7326145172119,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "cad70d2f.866d6"
+        "2aedf56b.f1b1ba"
       ]
     ]
   },
   {
-    "id": "efe7a59a.897c58",
+    "id": "caf37a34.d778a8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1658.1854629516602,
-    "y": 496.39935779571533,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1706.1854629516602,
+    "y": 503.39935779571533,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "cad70d2f.866d6"
+        "2aedf56b.f1b1ba"
       ]
     ]
   },
   {
-    "id": "c3367ce.c8b6f8",
+    "id": "bb518772.b81358",
     "type": "set",
     "name": "set connection-attachment-ar from get",
     "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
     "comments": "",
-    "x": 2072.4447174072266,
-    "y": 408.00008249282837,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2120.4447174072266,
+    "y": 415.00008249282837,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "6e235bab.f44c74",
+    "id": "645ade11.426a1",
     "type": "set",
     "name": "set oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
     "comments": "",
-    "x": 2021.4449863433838,
-    "y": 510.4286185503006,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2069.444986343384,
+    "y": 517.4286185503006,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "fca0cf3f.e6c1c",
+    "id": "44255d43.96da34",
     "type": "switchNode",
     "name": "switch order-status",
     "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2023.444803237915,
-    "y": 450.0000435113907,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2071.444803237915,
+    "y": 457.0000435113907,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "3fdfd73c.bfa0f8",
-        "a02243dc.27d9"
+        "48830e3c.30889",
+        "2b84fa59.5b57c6"
       ]
     ]
   },
   {
-    "id": "a02243dc.27d9",
+    "id": "2b84fa59.5b57c6",
     "type": "outcome",
     "name": "outcome Created",
     "xml": "<outcome value='Created'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2251.0451526641846,
-    "y": 441.00010073184967,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2299.0451526641846,
+    "y": 448.00010073184967,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "efd48355.63c2"
+        "45156448.968e9c"
       ]
     ]
   },
   {
-    "id": "3fdfd73c.bfa0f8",
+    "id": "48830e3c.30889",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2245.759048461914,
-    "y": 480.42865800857544,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2293.759048461914,
+    "y": 487.42865800857544,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "e7841384.7d2f"
+        "a911339e.75cc3"
       ]
     ]
   },
   {
-    "id": "efd48355.63c2",
+    "id": "45156448.968e9c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2410.515281677246,
-    "y": 441.37570571899414,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2458.515281677246,
+    "y": 448.37570571899414,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e7841384.7d2f",
+    "id": "a911339e.75cc3",
     "type": "returnFailure",
     "name": "return failure",
     "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
     "comments": "",
-    "x": 2421.666862487793,
-    "y": 479.000057220459,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2469.666862487793,
+    "y": 486.000057220459,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "28e25554.5dcffa",
+    "id": "233d3f47.5a62d",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 915.3030433654785,
-    "y": 616.4936294555664,
-    "z": "5b3e3707.3aa6c8",
+    "x": 963.3030433654785,
+    "y": 623.4936294555664,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e6936fb4.46122",
+    "id": "5687be1a.59a66",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 609.3091430664062,
-    "y": 617.5,
-    "z": "5b3e3707.3aa6c8",
+    "x": 657.3091430664062,
+    "y": 624.5,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "28e25554.5dcffa"
+        "233d3f47.5a62d"
       ]
     ]
   },
   {
-    "id": "912e86c8.6df528",
+    "id": "9b9946c9.3f3d68",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 787.00048828125,
-    "y": 688.53173828125,
-    "z": "5b3e3707.3aa6c8",
+    "x": 835.00048828125,
+    "y": 695.53173828125,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "bb953da4.20a6",
+    "id": "2f29782e.56da68",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2134.4727783203125,
-    "y": 368.5039367675781,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2182.4727783203125,
+    "y": 375.5039367675781,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "a02dc728.884b28",
+    "id": "a1d43226.8d32d",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 672.9688110351562,
-    "y": 718.0001220703125,
-    "z": "5b3e3707.3aa6c8",
+    "x": 720.9688110351562,
+    "y": 725.0001220703125,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "237a4084.caa97",
+    "id": "9e759fa5.c7253",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1032.968978881836,
-    "y": 775.0000915527344,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1080.968978881836,
+    "y": 782.0000915527344,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "cb935d16.398af"
+        "b7458f6f.6b103"
       ]
     ]
   },
   {
-    "id": "b92e648c.4237d8",
+    "id": "5edd87c2.935d58",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1024.8207817077637,
-    "y": 810.0661764144897,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1072.8207817077637,
+    "y": 817.0661764144897,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "3472a1b6.dd0c3e"
+        "45257af8.9c6094"
       ]
     ]
   },
   {
-    "id": "3472a1b6.dd0c3e",
+    "id": "45257af8.9c6094",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n    \n",
     "comments": "",
-    "x": 1170.9695625305176,
-    "y": 809.3335876464844,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1218.9695625305176,
+    "y": 816.3335876464844,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "cb935d16.398af",
+    "id": "b7458f6f.6b103",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1163.9690742492676,
-    "y": 775.0001525878906,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1211.9690742492676,
+    "y": 782.0001525878906,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a9379012.e6c67",
+    "id": "41e65fa0.2c10b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 846.7313137054443,
-    "y": 2135.9540371894836,
-    "z": "5b3e3707.3aa6c8",
+    "x": 894.7313137054443,
+    "y": 2142.9540371894836,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "be6d4648.608728"
+        "b6c4d495.4bdad8"
       ]
     ]
   },
   {
-    "id": "be6d4648.608728",
+    "id": "b6c4d495.4bdad8",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 1013.2551345825195,
-    "y": 2162.5730443000793,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1061.2551345825195,
+    "y": 2169.5730443000793,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "c2820f2f.b28f6",
+    "id": "691b6216.46804c",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 848.8265419006348,
-    "y": 2183.715879917145,
-    "z": "5b3e3707.3aa6c8",
+    "x": 896.8265419006348,
+    "y": 2190.715879917145,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "be6d4648.608728"
+        "b6c4d495.4bdad8"
       ]
     ]
   },
   {
-    "id": "4982ee04.1cd2f",
+    "id": "39d44506.fc1dea",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 620.7789573669434,
-    "y": 2124.3032002449036,
-    "z": "5b3e3707.3aa6c8",
+    "x": 668.7789573669434,
+    "y": 2131.3032002449036,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "1ebdd52f.25cc2b",
+    "id": "169bc249.b8cede",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 635.5466537475586,
-    "y": 2045.8286814689636,
-    "z": "5b3e3707.3aa6c8",
+    "x": 683.5466537475586,
+    "y": 2052.8286814689636,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "5f71dd6c.97cd84",
+    "id": "86489e85.9e429",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 595.9598255157471,
-    "y": 2231.4444699287415,
-    "z": "5b3e3707.3aa6c8",
+    "x": 643.9598255157471,
+    "y": 2238.4444699287415,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "69260ab2.333c94",
+    "id": "a351ad64.5b62",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sdwan-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 688.278736114502,
-    "y": 1970.4695343971252,
-    "z": "5b3e3707.3aa6c8",
+    "x": 736.278736114502,
+    "y": 1977.4695343971252,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "61914fb2.5848f",
-        "913cab50.d379e8",
-        "247de1a.a91111e"
+        "7f052e3d.cfc45",
+        "9a139c80.89827",
+        "c0ebd24f.2c1be"
       ]
     ]
   },
   {
-    "id": "61914fb2.5848f",
+    "id": "7f052e3d.cfc45",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 942.9201583862305,
-    "y": 2014.8009285926819,
-    "z": "5b3e3707.3aa6c8",
+    "x": 990.9201583862305,
+    "y": 2021.8009285926819,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "63853616.80d768"
+        "d5b448a4.f99588"
       ]
     ]
   },
   {
-    "id": "913cab50.d379e8",
+    "id": "9a139c80.89827",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 944.9201812744141,
-    "y": 1973.3008927330375,
-    "z": "5b3e3707.3aa6c8",
+    "x": 992.9201812744141,
+    "y": 1980.3008927330375,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "63853616.80d768"
+        "d5b448a4.f99588"
       ]
     ]
   },
   {
-    "id": "247de1a.a91111e",
+    "id": "c0ebd24f.2c1be",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 948.6702651977539,
-    "y": 1924.6580452919006,
-    "z": "5b3e3707.3aa6c8",
+    "x": 996.6702651977539,
+    "y": 1931.6580452919006,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "e8b97cec.a52d7"
+        "da728790.b76f18"
       ]
     ]
   },
   {
-    "id": "63853616.80d768",
+    "id": "d5b448a4.f99588",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1103.6702842712402,
-    "y": 1993.05095911026,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1151.6702842712402,
+    "y": 2000.05095911026,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "e8b97cec.a52d7",
+    "id": "da728790.b76f18",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1076.3262100219727,
-    "y": 1926.8502135276794,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1124.3262100219727,
+    "y": 1933.8502135276794,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "720d11d0.f67bc",
+    "id": "3aed3696.4cf77a",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n",
     "comments": "",
-    "x": 590.4923515319824,
-    "y": 1804.8504354953766,
-    "z": "5b3e3707.3aa6c8",
+    "x": 638.4923515319824,
+    "y": 1811.8504354953766,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "22826455.9296ec",
+    "id": "f801a0de.16907",
     "type": "execute",
     "name": "execute getTime",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 607.7781944274902,
-    "y": 1877.4700331687927,
-    "z": "5b3e3707.3aa6c8",
+    "x": 655.7781944274902,
+    "y": 1884.4700331687927,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f959c075.1e7e6",
+    "id": "d4bcebf0.e04a68",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 657.7652740478516,
-    "y": 1914.4211134910583,
-    "z": "5b3e3707.3aa6c8",
+    "x": 705.7652740478516,
+    "y": 1921.4211134910583,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "671de4e7.c5daec",
+    "id": "e78f2c1f.7461f",
     "type": "set",
     "name": "set model-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
     "comments": "",
-    "x": 604.3338928222656,
-    "y": 1844.025085926056,
-    "z": "5b3e3707.3aa6c8",
+    "x": 652.3338928222656,
+    "y": 1851.025085926056,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "33b4dd9d.575162",
+    "id": "82a1071f.9cdd18",
     "type": "comment",
     "name": "Prepare data for allotted-resource addition to MDSAL",
     "info": "This will add to allotted-resource which is present inside service.",
     "comments": "",
-    "x": 715.6673889160156,
-    "y": 1766.0250434875488,
-    "z": "5b3e3707.3aa6c8",
+    "x": 763.6673889160156,
+    "y": 1773.0250434875488,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "ad8abb41.f27f98",
+    "id": "74588870.73e178",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 659.2471809387207,
-    "y": 1732.4383397102356,
-    "z": "5b3e3707.3aa6c8",
+    "x": 707.2471809387207,
+    "y": 1739.4383397102356,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "c88d609e.257e3",
+    "id": "4e5f3349.352d6c",
     "type": "update",
     "name": "update AAI allotted-resource",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 647.2232360839844,
-    "y": 2161.7553429603577,
-    "z": "5b3e3707.3aa6c8",
+    "x": 695.2232360839844,
+    "y": 2168.7553429603577,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "a9379012.e6c67",
-        "c2820f2f.b28f6"
+        "41e65fa0.2c10b",
+        "691b6216.46804c"
       ]
     ]
   },
   {
-    "id": "210482d7.10d8ee",
+    "id": "a6ce139d.8cd82",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 819.0039672851562,
-    "y": 528.00390625,
-    "z": "5b3e3707.3aa6c8",
+    "x": 867.0039672851562,
+    "y": 535.00390625,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "1df58ece.22a6f1",
-        "60f581d.8121d8"
+        "406068c.1da4a98",
+        "e00fd6fc.ea7778"
       ]
     ]
   },
   {
-    "id": "b09356ce.de3e78",
+    "id": "fcbe570.434f0a8",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 742.0040893554688,
-    "y": 791.0040893554688,
-    "z": "5b3e3707.3aa6c8",
+    "x": 790.0040893554688,
+    "y": 798.0040893554688,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "237a4084.caa97",
-        "b92e648c.4237d8"
+        "9e759fa5.c7253",
+        "5edd87c2.935d58"
       ]
     ]
   },
   {
-    "id": "b70e72ac.ac27d",
+    "id": "e2fb4f17.bce7a",
     "type": "execute",
     "name": "get parent-service-data url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 642.0039978027344,
-    "y": 754.0039224624634,
-    "z": "5b3e3707.3aa6c8",
+    "x": 690.0039978027344,
+    "y": 761.0039224624634,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "32321857.9b87a8",
+    "id": "1f1e2af2.8cbfa5",
     "type": "set",
     "name": "set prop.ar.provided-allotted-resource-id",
     "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />\n\n",
     "comments": "",
-    "x": 1499.9964752197266,
-    "y": 843.1218557357788,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1547.9964752197266,
+    "y": 850.1218557357788,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "b156e259.c2b83",
+    "id": "fc107783.f66638",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2005.9970703125,
-    "y": 937.4551391601562,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2053.9970703125,
+    "y": 944.4551391601562,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "7bcfda30.e9f8d4"
+        "23bfc366.b2fa3c"
       ]
     ]
   },
   {
-    "id": "9ffe3ec9.11aa8",
+    "id": "d6f3b7ed.897558",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2009.848445892334,
-    "y": 899.52121925354,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2057.848445892334,
+    "y": 906.52121925354,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "66958c0e.e9ae64"
+        "62911322.6e35fc"
       ]
     ]
   },
   {
-    "id": "edc31606.488c38",
+    "id": "69edf94d.eac048",
     "type": "for",
     "name": "for arvidx.. mdsal-sd.service-data.vnfs.vnf_length[]",
     "xml": "<for index='arvidx' start='0' end='`$mdsal-sd.service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1901.9976425170898,
-    "y": 1665.1222692728043,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1949.9976425170898,
+    "y": 1672.1222692728043,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "4a985c04.ef4f84"
+        "764ffe4a.681ad"
       ]
     ]
   },
   {
-    "id": "4a985c04.ef4f84",
+    "id": "764ffe4a.681ad",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1661.6641387939453,
-    "y": 1737.1224619150162,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1709.6641387939453,
+    "y": 1744.1224619150162,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "f49161ce.7951e"
+        "b8e7c061.bd378"
       ]
     ]
   },
   {
-    "id": "f49161ce.7951e",
+    "id": "b8e7c061.bd378",
     "type": "switchNode",
     "name": "switch ActivateSiteInstance",
     "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1874.5293731689453,
-    "y": 1738.3203302621841,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1922.5293731689453,
+    "y": 1745.3203302621841,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "ba99c3de.16d52"
+        "af3c96cc.a1d208"
       ]
     ]
   },
   {
-    "id": "ba99c3de.16d52",
+    "id": "af3c96cc.a1d208",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2079.52872467041,
-    "y": 1741.3203264474869,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2127.52872467041,
+    "y": 1748.3203264474869,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "81072e73.36a9b"
+        "a89b6820.3b89d8"
       ]
     ]
   },
   {
-    "id": "fe54ca75.073228",
+    "id": "8d253099.60ab9",
     "type": "set",
     "name": "set tmp.sitevidx ",
     "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 2423.528896331787,
-    "y": 1721.3206740617752,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2471.528896331787,
+    "y": 1728.3206740617752,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "fca98070.131e",
+    "id": "6d8cc41a.be1cfc",
     "type": "set",
     "name": "set prop.ar-parent-service-instance-id",
     "xml": "<set>\n<parameter name='prop.ar-parent-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />                                                                                                                                                                                        \n",
     "comments": "",
-    "x": 1650.9970703125,
-    "y": 1084.1221185922623,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1698.9970703125,
+    "y": 1091.1221185922623,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "3615b198.912bde",
+    "id": "f4b5259e.86dd38",
     "type": "for",
     "name": "for loop aridx - Get role from allotted resource",
     "xml": "<for index=\"aridx\" start=\"0\" end=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 1677.9965839385986,
-    "y": 1041.6217069625854,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1725.9965839385986,
+    "y": 1048.6217069625854,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "ff4ce46e.aa5008"
+        "4483e9ee.7ffd68"
       ]
     ]
   },
   {
-    "id": "17a801cc.ffa25e",
+    "id": "c5da2f8.eb203d",
     "type": "switchNode",
     "name": "switch Role",
     "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'role'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2108.9968280792236,
-    "y": 1007.621829032898,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2156.9968280792236,
+    "y": 1014.621829032898,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "4be35b76.6b2a54"
+        "4dcb3b71.c91564"
       ]
     ]
   },
   {
-    "id": "4be35b76.6b2a54",
+    "id": "4dcb3b71.c91564",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2248.9970722198486,
-    "y": 1005.6219511032104,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2296.9970722198486,
+    "y": 1012.6219511032104,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "7e234298.9ccc3c"
+        "abbbe638.28eb78"
       ]
     ]
   },
   {
-    "id": "7e234298.9ccc3c",
+    "id": "abbbe638.28eb78",
     "type": "set",
     "name": "set prop.role",
     "xml": "<set>\n<parameter name='prop.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n",
     "comments": "",
-    "x": 2392.9978046417236,
-    "y": 1005.2218046188354,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2440.9978046417236,
+    "y": 1012.2218046188354,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "c26e60ea.9b07b",
+    "id": "96905d4d.266e3",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1956.9968872070312,
-    "y": 1184.1219259500504,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2004.9968872070312,
+    "y": 1191.1219259500504,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "dcf01c19.ab4ec"
+        "20f71ccb.8bb9b4"
       ]
     ]
   },
   {
-    "id": "21194342.fd75ac",
+    "id": "6d849909.165408",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1954.8492164611816,
-    "y": 1145.18805372715,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2002.8492164611816,
+    "y": 1152.18805372715,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "26a61e2a.3b4ee2"
+        "f2dcd85c.bce9e8"
       ]
     ]
   },
   {
-    "id": "66958c0e.e9ae64",
+    "id": "62911322.6e35fc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2135.996570587158,
-    "y": 896.6216526031494,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2183.996570587158,
+    "y": 903.6216526031494,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "7bcfda30.e9f8d4",
+    "id": "23bfc366.b2fa3c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1301.496524810791,
-    "y": 1076.6217823028564,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1349.496524810791,
+    "y": 1083.6217823028564,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "3615b198.912bde",
-        "fca98070.131e",
-        "d8ea80f8.53dca",
-        "f11b05ac.5891b8"
+        "f4b5259e.86dd38",
+        "6d8cc41a.be1cfc",
+        "eed01b55.d04f18",
+        "48c9897c.fcd5b8"
       ]
     ]
   },
   {
-    "id": "26a61e2a.3b4ee2",
+    "id": "f2dcd85c.bce9e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2084.4974098205566,
-    "y": 1138.6220136880875,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2132.4974098205566,
+    "y": 1145.6220136880875,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "dcf01c19.ab4ec",
+    "id": "20f71ccb.8bb9b4",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1683.4971466064453,
-    "y": 1263.6221548318863,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1731.4971466064453,
+    "y": 1270.6221548318863,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "6973f8af.870f38"
+        "873845fc.6f6098"
       ]
     ]
   },
   {
-    "id": "452db2df.70966c",
+    "id": "615b5e26.43cbe",
     "type": "for",
     "name": "for loop siteidx - Get site ID from servicedata",
     "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2502.4985961914062,
-    "y": 1771.6224666833878,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2550.4985961914062,
+    "y": 1778.6224666833878,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "5784939.f29e76c"
+        "b6197b80.43b5b8"
       ]
     ]
   },
   {
-    "id": "200a6173.10b10e",
+    "id": "dbd732d1.3a3c8",
     "type": "switchNode",
     "name": "switch siteId",
     "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1973.501958847046,
-    "y": 1885.6239286661148,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2021.501958847046,
+    "y": 1892.6239286661148,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "91222197.1f508"
+        "a928d05f.807d7"
       ]
     ]
   },
   {
-    "id": "91222197.1f508",
+    "id": "a928d05f.807d7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2128.5023288726807,
-    "y": 1887.6242953538895,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2176.5023288726807,
+    "y": 1894.6242953538895,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "ea7d1279.422d1"
+        "7763b485.9a224c"
       ]
     ]
   },
   {
-    "id": "62f62c1c.d1f314",
+    "id": "ae878fc7.06ea3",
     "type": "set",
     "name": "Add sites to list and update length",
     "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
     "comments": "",
-    "x": 2106.0009231567383,
-    "y": 2020.1228910684586,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2154.0009231567383,
+    "y": 2027.1228910684586,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "f3ac87c7.5588f8",
+    "id": "862cb704.9f9128",
     "type": "execute",
     "name": "execute RestApiCallNode create vpn topology",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\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=\"put\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 698.9997272491455,
-    "y": 1553.6235390901566,
-    "z": "5b3e3707.3aa6c8",
+    "x": 746.9997272491455,
+    "y": 1560.6235390901566,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "b3354b35.0339d8",
-        "83e6dff5.c0823"
+        "9ca71cfd.a9b42",
+        "e39ed217.1ee0b"
       ]
     ]
   },
   {
-    "id": "83e6dff5.c0823",
+    "id": "e39ed217.1ee0b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 942.9996814727783,
-    "y": 1574.6233559846878,
-    "z": "5b3e3707.3aa6c8",
+    "x": 990.9996814727783,
+    "y": 1581.6233559846878,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "5884381c.754b78"
+        "bda5dec3.598f2"
       ]
     ]
   },
   {
-    "id": "5884381c.754b78",
+    "id": "bda5dec3.598f2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1112.999620437622,
-    "y": 1577.6233559846878,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1160.999620437622,
+    "y": 1584.6233559846878,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "3a834e9e.d6b4c2",
+    "id": "d878c3fa.89f44",
     "type": "returnFailure",
     "name": "return failure",
     "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 vpn topology failed\" />\n",
     "comments": "",
-    "x": 1112.9997425079346,
-    "y": 1533.6233559846878,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1160.9997425079346,
+    "y": 1540.6233559846878,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "b3354b35.0339d8",
+    "id": "9ca71cfd.a9b42",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 945.9996204376221,
-    "y": 1533.6233559846878,
-    "z": "5b3e3707.3aa6c8",
+    "x": 993.9996204376221,
+    "y": 1540.6233559846878,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "3a834e9e.d6b4c2"
+        "d878c3fa.89f44"
       ]
     ]
   },
   {
-    "id": "97a06baa.a4df68",
+    "id": "1627716.a22478f",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1061.5652923583984,
-    "y": 928.2990293502808,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1109.5652923583984,
+    "y": 935.2990293502808,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "c4f38bc0.54d238",
+    "id": "2406d281.b1df1e",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "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 = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 658.0650634765625,
-    "y": 954.2993497848511,
-    "z": "5b3e3707.3aa6c8",
+    "x": 706.0650634765625,
+    "y": 961.2993497848511,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "b1ed8af2.ff9cc8",
-        "64af3109.c43ba",
-        "b545c5fe.0aa818"
+        "cc3f42f.1aaf5c",
+        "2581bcc6.214074",
+        "bc3b824e.981ad"
       ]
     ]
   },
   {
-    "id": "b1ed8af2.ff9cc8",
+    "id": "cc3f42f.1aaf5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 896.0651664733887,
-    "y": 928.2989978790283,
-    "z": "5b3e3707.3aa6c8",
+    "x": 944.0651664733887,
+    "y": 935.2989978790283,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "97a06baa.a4df68"
+        "1627716.a22478f"
       ]
     ]
   },
   {
-    "id": "64af3109.c43ba",
+    "id": "2581bcc6.214074",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 892.5559043884277,
-    "y": 964.8731408119202,
-    "z": "5b3e3707.3aa6c8",
+    "x": 940.5559043884277,
+    "y": 971.8731408119202,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "84eeaaa5.5de4f8"
+        "5dde6a53.1070f4"
       ]
     ]
   },
   {
-    "id": "b545c5fe.0aa818",
+    "id": "bc3b824e.981ad",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 886.8889579772949,
-    "y": 1001.2064542770386,
-    "z": "5b3e3707.3aa6c8",
+    "x": 934.8889579772949,
+    "y": 1008.2064542770386,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "4396ff0e.50b9e"
+        "e1a59b7f.54e028"
       ]
     ]
   },
   {
-    "id": "84eeaaa5.5de4f8",
+    "id": "5dde6a53.1070f4",
     "type": "returnFailure",
     "name": "return failure",
     "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1049.1273345947266,
-    "y": 964.1588926315308,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1097.1273345947266,
+    "y": 971.1588926315308,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "4396ff0e.50b9e",
+    "id": "e1a59b7f.54e028",
     "type": "returnFailure",
     "name": "return failure",
     "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1048.6615295410156,
-    "y": 996.6456785202026,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1096.6615295410156,
+    "y": 1003.6456785202026,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "6973f8af.870f38",
+    "id": "873845fc.6f6098",
     "type": "for",
     "name": "for pnidx.. mdsal-psd.service-data.networks.network_length[]",
     "xml": "<for index='pnidx' start='0' end='`$mdsal-parentsd.service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1991.4972763061523,
-    "y": 1263.122277855873,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2039.4972763061523,
+    "y": 1270.122277855873,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "86298d2a.4e81d"
+        "d2c7de71.be999"
       ]
     ]
   },
   {
-    "id": "9e5424eb.2e5b98",
+    "id": "442e3eb2.30a6",
     "type": "switchNode",
     "name": "switch ActivateSDWANConnectivityInstance",
     "xml": "<switch test=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.request-information.request-action == ActivateSDWANConnectivityInstance`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1838.165672302246,
-    "y": 1352.1222940683365,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1886.165672302246,
+    "y": 1359.1222940683365,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "7568a55.272e35c"
+        "202c0d34.0eeba2"
       ]
     ]
   },
   {
-    "id": "7568a55.272e35c",
+    "id": "202c0d34.0eeba2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2094.1651248931885,
-    "y": 1350.1222330331802,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2142.1651248931885,
+    "y": 1357.1222330331802,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "e1df3461.3efed8"
+        "d6c2bdb0.f6742"
       ]
     ]
   },
   {
-    "id": "34f69c4e.e0acb4",
+    "id": "ecaeb85c.a23ad8",
     "type": "for",
     "name": "for loop paramidx - Get topology from servicedata",
     "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 1881.1637878417969,
-    "y": 1443.1214720010757,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1929.1637878417969,
+    "y": 1450.1214720010757,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "1b29b6f3.84c7e9"
+        "55fb20e6.ae2b8"
       ]
     ]
   },
   {
-    "id": "9dd144dd.7929d8",
+    "id": "275c933d.3e84dc",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2335.1641483306885,
-    "y": 1430.121761918068,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2383.1641483306885,
+    "y": 1437.121761918068,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "e3be96aa.c2c8a8"
+        "3594c1ef.8c09de"
       ]
     ]
   },
   {
-    "id": "e3be96aa.c2c8a8",
+    "id": "3594c1ef.8c09de",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2484.1639041900635,
-    "y": 1425.1218839883804,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2532.1639041900635,
+    "y": 1432.1218839883804,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "23ce8dd3.49fc12"
+        "d0fec186.f6378"
       ]
     ]
   },
   {
-    "id": "23ce8dd3.49fc12",
+    "id": "d0fec186.f6378",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 2624.1640911102295,
-    "y": 1422.721799492836,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2672.1640911102295,
+    "y": 1429.721799492836,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "ecf33c6a.0e252",
+    "id": "d8436e7b.788fa",
     "type": "switchNode",
     "name": "switch vpnId",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2322.8300952911377,
-    "y": 1468.454986691475,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2370.8300952911377,
+    "y": 1475.454986691475,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "3bf645ac.c4019a"
+        "ef5a8550.4c3fc8"
       ]
     ]
   },
   {
-    "id": "3bf645ac.c4019a",
+    "id": "ef5a8550.4c3fc8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2462.8300380706787,
-    "y": 1468.454803109169,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2510.8300380706787,
+    "y": 1475.454803109169,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "f947fdb0.d1a3c"
+        "ff006bb3.c58668"
       ]
     ]
   },
   {
-    "id": "f947fdb0.d1a3c",
+    "id": "ff006bb3.c58668",
     "type": "set",
     "name": "set prop.vpn1Id",
     "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 2610.830041885376,
-    "y": 1468.054870724678,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2658.830041885376,
+    "y": 1475.054870724678,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "6a97289d.80a568",
+    "id": "4e50db83.d2f224",
     "type": "execute",
     "name": "execute RestApiCallNode create vpn ",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\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=\"put\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 667.9981231689453,
-    "y": 1462.1229600906372,
-    "z": "5b3e3707.3aa6c8",
+    "x": 715.9981231689453,
+    "y": 1469.1229600906372,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "5ffc81bd.b86cd",
-        "2fd24486.c6bc7c"
+        "22758979.541926",
+        "97cd05b9.e37ec8"
       ]
     ]
   },
   {
-    "id": "2fd24486.c6bc7c",
+    "id": "97cd05b9.e37ec8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 887.998025894165,
-    "y": 1458.1229249238968,
-    "z": "5b3e3707.3aa6c8",
+    "x": 935.998025894165,
+    "y": 1465.1229249238968,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "10a20cb7.762a63"
+        "a647eec3.a66d4"
       ]
     ]
   },
   {
-    "id": "10a20cb7.762a63",
+    "id": "a647eec3.a66d4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1057.9979648590088,
-    "y": 1461.1229249238968,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1105.9979648590088,
+    "y": 1468.1229249238968,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "bb44545a.967818",
+    "id": "8979ecea.209cb",
     "type": "returnFailure",
     "name": "return failure",
     "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 vpn failed\" />\n",
     "comments": "",
-    "x": 1057.9980869293213,
-    "y": 1417.1229249238968,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1105.9980869293213,
+    "y": 1424.1229249238968,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "5ffc81bd.b86cd",
+    "id": "22758979.541926",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 890.9979648590088,
-    "y": 1417.1229249238968,
-    "z": "5b3e3707.3aa6c8",
+    "x": 938.9979648590088,
+    "y": 1424.1229249238968,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "bb44545a.967818"
+        "8979ecea.209cb"
       ]
     ]
   },
   {
-    "id": "c6900049.d4f2a",
+    "id": "165fa503.fcc5db",
     "type": "set",
     "name": "set prop.name",
     "xml": "<set>\n<parameter name='prop.name' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n",
     "comments": "",
-    "x": 2467.9968280792236,
-    "y": 1057.1214628219604,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2515.9968280792236,
+    "y": 1064.1214628219604,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "6d71d4d6.b3bfec",
+    "id": "5a9c41c6.077e",
     "type": "switchNode",
     "name": "switch sdwanVpnName",
     "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'sdwanVpnName'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2147.4965839385986,
-    "y": 1062.1214628219604,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2195.4965839385986,
+    "y": 1069.1214628219604,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "95235e68.5208b"
+        "a0b6a8bd.407c18"
       ]
     ]
   },
   {
-    "id": "95235e68.5208b",
+    "id": "a0b6a8bd.407c18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2324.4968280792236,
-    "y": 1059.1214628219604,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2372.4968280792236,
+    "y": 1066.1214628219604,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "c6900049.d4f2a"
+        "165fa503.fcc5db"
       ]
     ]
   },
   {
-    "id": "5dc928bc.725628",
+    "id": "e752b141.db3aa",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1237.0269775390625,
-    "y": 880.3190307617188,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1285.0269775390625,
+    "y": 887.3190307617188,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "32321857.9b87a8",
-        "8e15f4fa.e90f28",
-        "9fc5f700.68a778"
+        "1f1e2af2.8cbfa5",
+        "7752d7f6.af8778",
+        "ccfd4281.11f42"
       ]
     ]
   },
   {
-    "id": "69e18ab9.627484",
+    "id": "6a1b7e4b.2ba26",
     "type": "for",
     "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 830.18115234375,
-    "y": 889.0944213867188,
-    "z": "5b3e3707.3aa6c8",
+    "x": 878.18115234375,
+    "y": 896.0944213867188,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "5dc928bc.725628"
+        "e752b141.db3aa"
       ]
     ]
   },
   {
-    "id": "8e15f4fa.e90f28",
+    "id": "7752d7f6.af8778",
     "type": "execute",
     "name": "generate tmp.ar-url-connection url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.provided-allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1485.9962997436523,
-    "y": 878.6668090820312,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1533.9962997436523,
+    "y": 885.6668090820312,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "9fc5f700.68a778",
+    "id": "ccfd4281.11f42",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1634.99609375,
-    "y": 917.3333740234375,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1682.99609375,
+    "y": 924.3333740234375,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "9ffe3ec9.11aa8",
-        "b156e259.c2b83"
+        "d6f3b7ed.897558",
+        "fc107783.f66638"
       ]
     ]
   },
   {
-    "id": "d8ea80f8.53dca",
+    "id": "eed01b55.d04f18",
     "type": "execute",
     "name": "generate prop.ar-parent-service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>      \n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar-parent-service-instance-id`\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1665.3295593261719,
-    "y": 1126.0003362894058,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1713.3295593261719,
+    "y": 1133.0003362894058,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f11b05ac.5891b8",
+    "id": "48c9897c.fcd5b8",
     "type": "execute",
     "name": "execute RestApiCallNode - get parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-parentsd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1684.3295288085938,
-    "y": 1160.0004221200943,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1732.3295288085938,
+    "y": 1167.0004221200943,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "21194342.fd75ac",
-        "c26e60ea.9b07b"
+        "6d849909.165408",
+        "96905d4d.266e3"
       ]
     ]
   },
   {
-    "id": "ff4ce46e.aa5008",
+    "id": "4483e9ee.7ffd68",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1944.0272235870361,
-    "y": 1036.5311307907104,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1992.0272235870361,
+    "y": 1043.5311307907104,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "17a801cc.ffa25e",
-        "6d71d4d6.b3bfec"
+        "c5da2f8.eb203d",
+        "5a9c41c6.077e"
       ]
     ]
   },
   {
-    "id": "e1df3461.3efed8",
+    "id": "d6c2bdb0.f6742",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1470.0277786254883,
-    "y": 1483.5313215255737,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1518.0277786254883,
+    "y": 1490.5313215255737,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "34f69c4e.e0acb4",
-        "f53c2301.9407e",
-        "c3f7512e.84f81",
-        "334c603e.da8c8"
+        "ecaeb85c.a23ad8",
+        "c5c238a2.297c08",
+        "ce3038ec.f99258",
+        "7a9df6e2.06b738"
       ]
     ]
   },
   {
-    "id": "86298d2a.4e81d",
+    "id": "d2c7de71.be999",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1580.6634063720703,
-    "y": 1350.667093873024,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1628.6634063720703,
+    "y": 1357.667093873024,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "9e5424eb.2e5b98"
+        "442e3eb2.30a6"
       ]
     ]
   },
   {
-    "id": "5784939.f29e76c",
+    "id": "b6197b80.43b5b8",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1805.9984703063965,
-    "y": 1887.667660355568,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1853.9984703063965,
+    "y": 1894.667660355568,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "200a6173.10b10e"
+        "dbd732d1.3a3c8"
       ]
     ]
   },
   {
-    "id": "1b29b6f3.84c7e9",
+    "id": "55fb20e6.ae2b8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2167.027723312378,
-    "y": 1443.5314317941666,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2215.027723312378,
+    "y": 1450.5314317941666,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "9dd144dd.7929d8",
-        "ecf33c6a.0e252"
+        "275c933d.3e84dc",
+        "d8436e7b.788fa"
       ]
     ]
   },
   {
-    "id": "5c15538f.0d810c",
+    "id": "f593f6af.001438",
     "type": "set",
     "name": "set prop.attach.siteId",
     "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n\n",
     "comments": "",
-    "x": 2058.665012359619,
-    "y": 1961.3338705301285,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2106.665012359619,
+    "y": 1968.3338705301285,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "81072e73.36a9b",
+    "id": "a89b6820.3b89d8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2238.255527496338,
-    "y": 1742.00441801548,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2286.255527496338,
+    "y": 1749.00441801548,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "fe54ca75.073228",
-        "452db2df.70966c"
+        "8d253099.60ab9",
+        "615b5e26.43cbe"
       ]
     ]
   },
   {
-    "id": "ea7d1279.422d1",
+    "id": "7763b485.9a224c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1861.755947113037,
-    "y": 1987.754342675209,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1909.755947113037,
+    "y": 1994.754342675209,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "5c15538f.0d810c",
-        "62f62c1c.d1f314",
-        "9f8585c2.03c528"
+        "f593f6af.001438",
+        "ae878fc7.06ea3",
+        "b4fdd461.f71598"
       ]
     ]
   },
   {
-    "id": "19a39c5d.bf96f4",
+    "id": "fb5be39e.fa586",
     "type": "call",
     "name": "call sdwan-wanport-vnf-topology-operation-underlay",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 717.7540149688721,
-    "y": 1670.254198551178,
-    "z": "5b3e3707.3aa6c8",
+    "x": 765.7540149688721,
+    "y": 1677.254198551178,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "497d8e2c.0cabf",
+    "id": "676ca60b.f8dc58",
     "type": "comment",
     "name": "underlay",
     "info": "1. Get consumed AR from service data\n2. for all the AR id's get the respective AR from MDSAL\n3. From MDSAL AR get parent service instance ID\n4. Get service data based in parent service instance ID to get parent service. i.e, SDWAN Infra service\n5. Get SDWAN connectivity from looping network and check for topology\n6. from parent service data get siteAttachInstance vnf and check the role\n7. from parent service data get wanportINstance vnf and check the transportNetworkName\n8. Get provided AR from the parent service data\n9. for each of the provided ARid get the AR from MDSAL\n10.in the AR check for hub\n\n",
     "comments": "",
-    "x": 625.722993850708,
-    "y": 1635.2231373786926,
-    "z": "5b3e3707.3aa6c8",
+    "x": 673.722993850708,
+    "y": 1642.2231373786926,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "bcfeb911.f55008",
+    "id": "7ad41615.6876c8",
     "type": "set",
     "name": "set prop.siteAttachement_length=0",
     "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",
     "comments": "",
-    "x": 666.9999694824219,
-    "y": 854.5311733484268,
-    "z": "5b3e3707.3aa6c8",
+    "x": 714.9999694824219,
+    "y": 861.5311733484268,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "f53c2301.9407e",
+    "id": "c5c238a2.297c08",
     "type": "set",
     "name": "set prop.ar-service-instance-id",
     "xml": "<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
     "comments": "",
-    "x": 1830.0003967285156,
-    "y": 1481.531231880188,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1878.0003967285156,
+    "y": 1488.531231880188,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "c3f7512e.84f81",
+    "id": "ce3038ec.f99258",
     "type": "execute",
     "name": "generate prop.ar-service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>      \n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1840.3326683044434,
-    "y": 1522.4093770980835,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1888.3326683044434,
+    "y": 1529.4093770980835,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "334c603e.da8c8",
+    "id": "7a9df6e2.06b738",
     "type": "execute",
     "name": "execute RestApiCallNode - get service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-sd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1869.3327331542969,
-    "y": 1563.4093770980835,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1917.3327331542969,
+    "y": 1570.4093770980835,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "c3928a9a.4b87b8",
-        "3258f9bd.5d9236"
+        "c31f95da.b397b8",
+        "e9b63d90.66cfc"
       ]
     ]
   },
   {
-    "id": "c3928a9a.4b87b8",
+    "id": "c31f95da.b397b8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2125.8524169921875,
-    "y": 1572.5972105264664,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2173.8524169921875,
+    "y": 1579.5972105264664,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "8e2c2a42.ebc3b8"
+        "7eac2788.499098"
       ]
     ]
   },
   {
-    "id": "3258f9bd.5d9236",
+    "id": "e9b63d90.66cfc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2128.000087738037,
-    "y": 1611.5310827493668,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2176.000087738037,
+    "y": 1618.5310827493668,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "db1a6308.98167"
+        "a04199d9.f1d158"
       ]
     ]
   },
   {
-    "id": "8e2c2a42.ebc3b8",
+    "id": "7eac2788.499098",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2255.5006103515625,
-    "y": 1566.0311704874039,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2303.5006103515625,
+    "y": 1573.0311704874039,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "db1a6308.98167",
+    "id": "a04199d9.f1d158",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1603.9998779296875,
-    "y": 1662.5311304330826,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1651.9998779296875,
+    "y": 1669.5311304330826,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "edc31606.488c38"
+        "69edf94d.eac048"
       ]
     ]
   },
   {
-    "id": "1a500d64.c038a3",
+    "id": "816baab6.7483d8",
     "type": "comment",
     "name": "TODO send Email",
     "info": "",
     "comments": "",
-    "x": 967.0000171661377,
-    "y": 1715.031527042389,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1015.0000171661377,
+    "y": 1722.031527042389,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "9f8585c2.03c528",
+    "id": "b4fdd461.f71598",
     "type": "set",
     "name": "Add site attachement to list and update length",
     "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",
     "comments": "",
-    "x": 2141.250045776367,
-    "y": 2074.753987789154,
-    "z": "5b3e3707.3aa6c8",
+    "x": 2189.250045776367,
+    "y": 2081.753987789154,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "86fafd91.f4f2f",
+    "id": "28b00a13.902c76",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 655.0038986206055,
-    "y": 1072.0041399002075,
-    "z": "5b3e3707.3aa6c8",
+    "x": 703.0038986206055,
+    "y": 1079.0041399002075,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "6e49d8b7.8b66c8",
-        "d4d84dda.9a08b"
+        "100f91ad.a8ab3e",
+        "b78fb1a0.9e74"
       ]
     ]
   },
   {
-    "id": "6e49d8b7.8b66c8",
+    "id": "100f91ad.a8ab3e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 907.0040245056152,
-    "y": 1053.003957748413,
-    "z": "5b3e3707.3aa6c8",
+    "x": 955.0040245056152,
+    "y": 1060.003957748413,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "2d072571.88985a"
+        "6b800958.b222d8"
       ]
     ]
   },
   {
-    "id": "d4d84dda.9a08b",
+    "id": "b78fb1a0.9e74",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 899.2540588378906,
-    "y": 1088.6470804214478,
-    "z": "5b3e3707.3aa6c8",
+    "x": 947.2540588378906,
+    "y": 1095.6470804214478,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "e6862503.c2ac28"
+        "eaf6ab13.cd7508"
       ]
     ]
   },
   {
-    "id": "e6862503.c2ac28",
+    "id": "eaf6ab13.cd7508",
     "type": "returnFailure",
     "name": "return failure",
     "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 get token rest api\" />\n",
     "comments": "",
-    "x": 1047.004051208496,
-    "y": 1086.3972024917603,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1095.004051208496,
+    "y": 1093.3972024917603,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "2d072571.88985a",
+    "id": "6b800958.b222d8",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1056.0040245056152,
-    "y": 1052.003927230835,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1104.0040245056152,
+    "y": 1059.003927230835,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "df3f5d3a.29e2c",
+    "id": "9a0f8d9a.4d443",
     "type": "get-resource",
     "name": "get-resource service-subscription",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type \n        AND customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data-tenant\">           ",
     "comments": "",
     "outputs": 1,
-    "x": 645.8993682861328,
-    "y": 1184.5660381317139,
-    "z": "5b3e3707.3aa6c8",
+    "x": 693.8993682861328,
+    "y": 1191.5660381317139,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "a39bcd10.58925",
-        "2937722a.892cce"
+        "47c8d5a9.ba16bc",
+        "14ed09d9.573ea6"
       ]
     ]
   },
   {
-    "id": "601b10b0.92d6e",
+    "id": "20fab7f5.802688",
     "type": "switchNode",
     "name": "switch temp-ub-sub-account-id",
     "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1057.8994598388672,
-    "y": 1149.3161191940308,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1105.8994598388672,
+    "y": 1156.3161191940308,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "9400efe1.833e2",
-        "af14c507.1fb9e8"
+        "f88ee31d.81b4",
+        "2987815d.d473be"
       ]
     ]
   },
   {
-    "id": "9400efe1.833e2",
+    "id": "f88ee31d.81b4",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1250.6139106750488,
-    "y": 1123.3161602020264,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1298.6139106750488,
+    "y": 1130.3161602020264,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "97ca3fa8.80b92"
+        "679b7c09.467594"
       ]
     ]
   },
   {
-    "id": "af14c507.1fb9e8",
+    "id": "2987815d.d473be",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1203.8994903564453,
-    "y": 1217.3162384033203,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1251.8994903564453,
+    "y": 1224.3162384033203,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "98cbe213.a0ab5"
+        "fba55779.a815d8"
       ]
     ]
   },
   {
-    "id": "a39bcd10.58925",
+    "id": "47c8d5a9.ba16bc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 856.3992309570312,
-    "y": 1157.3120965957642,
-    "z": "5b3e3707.3aa6c8",
+    "x": 904.3992309570312,
+    "y": 1164.3120965957642,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "601b10b0.92d6e"
+        "20fab7f5.802688"
       ]
     ]
   },
   {
-    "id": "2937722a.892cce",
+    "id": "14ed09d9.573ea6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 850.0778198242188,
-    "y": 1209.5264081954956,
-    "z": "5b3e3707.3aa6c8",
+    "x": 898.0778198242188,
+    "y": 1216.5264081954956,
+    "z": "92c42fbf.4d20f",
     "wires": [
       [
-        "b04b740c.a6ef58"
+        "51559d2e.77fa84"
       ]
     ]
   },
   {
-    "id": "b04b740c.a6ef58",
+    "id": "51559d2e.77fa84",
     "type": "returnFailure",
     "name": "return failure",
     "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 get token rest api\" />\n",
     "comments": "",
-    "x": 1002.8278198242188,
-    "y": 1209.2764692306519,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1050.8278198242188,
+    "y": 1216.2764692306519,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "98cbe213.a0ab5",
+    "id": "fba55779.a815d8",
     "type": "set",
     "name": "set prop.tenant-id",
     "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n",
     "comments": "",
-    "x": 1372.7566719055176,
-    "y": 1215.423252105713,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1420.7566719055176,
+    "y": 1222.423252105713,
+    "z": "92c42fbf.4d20f",
     "wires": []
   },
   {
-    "id": "55f46b97.799ce4",
+    "id": "f9894d64.11723",
     "type": "execute",
     "name": "execute RestApiCallNode Create tenant auth",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 683.3994293212891,
-    "y": 1251.4588842391968,
-    "z": "5b3e3707.3aa6c8",
+    "x": 731.3994293212891,
+    "y": 1258.4588842391968,
+    "z": "92c42fbf.4d20f",
     "wires": [
       []
     ]
   },
   {
-    "id": "97ca3fa8.80b92",
+    "id": "679b7c09.467594",
     "type": "returnFailure",
     "name": "return failure",
     "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 get token rest api\" />\n",
     "comments": "",
-    "x": 1363.042236328125,
-    "y": 1168.1375246047974,
-    "z": "5b3e3707.3aa6c8",
+    "x": 1411.042236328125,
+    "y": 1175.1375246047974,
+    "z": "92c42fbf.4d20f",
     "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
index b5d707a..bd27939 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "44d87731.3a3c18",
+    "id": "ad2ef973.e6a378",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 95.0000228881836,
-    "y": 25,
-    "z": "9c3e2040.51e8d",
+    "x": 131,
+    "y": 55,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "6fd2c371.0f81ec"
+        "151183ce.27c78c"
       ]
     ]
   },
   {
-    "id": "6fd2c371.0f81ec",
+    "id": "151183ce.27c78c",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1282 +22,1282 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 278.00002670288086,
-    "y": 99.00001811981201,
-    "z": "9c3e2040.51e8d",
+    "x": 314.00000381469727,
+    "y": 129.000018119812,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "45f888b.a092e78"
+        "89afc74f.956348"
       ]
     ]
   },
   {
-    "id": "45f888b.a092e78",
+    "id": "89afc74f.956348",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-create",
     "xml": "<method rpc='sdwan-attachment-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 266.0001449584961,
-    "y": 187.00000095367432,
-    "z": "9c3e2040.51e8d",
+    "x": 302.0001220703125,
+    "y": 217.00000095367432,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "13d40907.770c77"
+        "580de8c5.e06e78"
       ]
     ]
   },
   {
-    "id": "13d40907.770c77",
+    "id": "580de8c5.e06e78",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 186.0000762939453,
-    "y": 936.0002489089966,
-    "z": "9c3e2040.51e8d",
+    "x": 222.00005340576172,
+    "y": 966.0002489089966,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "7bc4c8b1.1d9f68",
-        "9cf88721.96ba18",
-        "f2e620b.7ad45e",
-        "5cd475b4.e29f6c",
-        "e3b4ab98.b00c28",
-        "31146b5a.f96304",
-        "337b8132.75507e",
-        "33eb09e.c2f17f6",
-        "d6792827.57dcf8",
-        "145b2990.9f1986",
-        "e23f7239.d2c",
-        "c7cc4539.500a68",
-        "eae0ae19.16041",
-        "d8cd962c.832e98",
-        "81f242e0.4cfb8",
-        "a785b9fe.8e2b78",
-        "e1b91be4.687fd8",
-        "6d2b2eaf.a08e",
-        "55176b7b.204274",
-        "e7eec3f2.e0455",
-        "a8dc15.338363e8",
-        "3040fa3e.5fdf76",
-        "48507d03.0cfd24"
+        "1fbb291d.155017",
+        "f8c6b86f.980db8",
+        "655b6d38.675514",
+        "87b8ca30.cf86e8",
+        "3718c342.00f4ac",
+        "3fc33b48.8d6bf4",
+        "15c0d821.288668",
+        "99b25b64.985da8",
+        "cc1d8a7e.c8e908",
+        "aec371b2.f4eb6",
+        "7c0d6a4c.141ba4",
+        "605ed84a.e90ef8",
+        "cf809c65.e205f",
+        "5ffc39de.e33178",
+        "b70e6d89.61807",
+        "2fe0bf35.0314b",
+        "4b90a515.ea737c",
+        "30825693.105b0a",
+        "a79587b.c624178",
+        "9d0211a4.58ce8",
+        "5c590a79.9e0264",
+        "adeabb6e.cf7758",
+        "7ee858c0.930c58"
       ]
     ]
   },
   {
-    "id": "b682cccd.903f2",
+    "id": "74beb7.011b0148",
     "type": "comment",
     "name": "Set allotted resource id if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 670.076774597168,
-    "y": 96.43391990661621,
-    "z": "9c3e2040.51e8d",
+    "x": 706.0767517089844,
+    "y": 126.43391990661621,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "7bc4c8b1.1d9f68",
+    "id": "1fbb291d.155017",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 616.0000534057617,
-    "y": 151.99999332427979,
-    "z": "9c3e2040.51e8d",
+    "x": 652.0000305175781,
+    "y": 181.99999332427979,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "576ebd26.f091e4",
-        "24a61a74.3f6846"
+        "4a85a033.b553c",
+        "de2e876a.0ba078"
       ]
     ]
   },
   {
-    "id": "576ebd26.f091e4",
+    "id": "4a85a033.b553c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 814.0001411437988,
-    "y": 121.99998188018799,
-    "z": "9c3e2040.51e8d",
+    "x": 850.0001182556152,
+    "y": 151.999981880188,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "3df307a8.733fb8"
+        "63eb9d84.765954"
       ]
     ]
   },
   {
-    "id": "24a61a74.3f6846",
+    "id": "de2e876a.0ba078",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 813.0000495910645,
-    "y": 158.99999237060547,
-    "z": "9c3e2040.51e8d",
+    "x": 849.0000267028809,
+    "y": 188.99999237060547,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "318df0c4.63f14"
+        "eef884cd.26a128"
       ]
     ]
   },
   {
-    "id": "318df0c4.63f14",
+    "id": "eef884cd.26a128",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n",
     "comments": "",
-    "x": 1011.0000381469727,
-    "y": 156.0000114440918,
-    "z": "9c3e2040.51e8d",
+    "x": 1047.000015258789,
+    "y": 186.0000114440918,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "9cf88721.96ba18",
+    "id": "f8c6b86f.980db8",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 583.9999771118164,
-    "y": 373.0001001358032,
-    "z": "9c3e2040.51e8d",
+    "x": 619.9999542236328,
+    "y": 403.0001001358032,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "f2e620b.7ad45e",
+    "id": "655b6d38.675514",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 584.2618942260742,
-    "y": 454.6667814254761,
-    "z": "9c3e2040.51e8d",
+    "x": 620.2618713378906,
+    "y": 484.6667814254761,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5cd475b4.e29f6c",
+    "id": "87b8ca30.cf86e8",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 637.2619552612305,
-    "y": 541.6666994094849,
-    "z": "9c3e2040.51e8d",
+    "x": 673.2619323730469,
+    "y": 571.6666994094849,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3df307a8.733fb8",
+    "id": "63eb9d84.765954",
     "type": "execute",
     "name": "execute tmp.ar.allotted-resource-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1029.0001182556152,
-    "y": 122.99998760223389,
-    "z": "9c3e2040.51e8d",
+    "x": 1065.0000953674316,
+    "y": 152.9999876022339,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "4abca60e.39e308"
+        "7fcc0333.e4b76c"
       ]
     ]
   },
   {
-    "id": "4abca60e.39e308",
+    "id": "7fcc0333.e4b76c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1247.0001602172852,
-    "y": 122.99995136260986,
-    "z": "9c3e2040.51e8d",
+    "x": 1283.0001373291016,
+    "y": 152.99995136260986,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "99c3fe86.a7edc"
+        "dc8faa82.0a80d8"
       ]
     ]
   },
   {
-    "id": "99c3fe86.a7edc",
+    "id": "dc8faa82.0a80d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
     "comments": "",
-    "x": 1413.000114440918,
-    "y": 122.99996566772461,
-    "z": "9c3e2040.51e8d",
+    "x": 1449.0000915527344,
+    "y": 152.9999656677246,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "4f647ff8.bc9ba",
+    "id": "83948a24.3af768",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1143.0002536773682,
-    "y": 613.7778720855713,
-    "z": "9c3e2040.51e8d",
+    "x": 1179.0002307891846,
+    "y": 643.7778720855713,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "926c698b.647238"
+        "64a66d0e.2cab24"
       ]
     ]
   },
   {
-    "id": "b4b47003.957fd",
+    "id": "fd6c452f.f52a18",
     "type": "returnFailure",
     "name": "return failure",
     "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: Existing connection attachment allotted resource\" />\n    \n",
     "comments": "",
-    "x": 1876.518632888794,
-    "y": 614.8439435958862,
-    "z": "9c3e2040.51e8d",
+    "x": 1912.5186100006104,
+    "y": 644.8439435958862,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "8e25385a.b2e448",
+    "id": "df1c313d.a9cf4",
     "type": "comment",
     "name": "Check for non existence of allotted resource",
     "info": "",
     "comments": "",
-    "x": 999.0001754760742,
-    "y": 547.7779388427734,
-    "z": "9c3e2040.51e8d",
+    "x": 1035.0001525878906,
+    "y": 577.7779388427734,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "164faa8f.422405",
+    "id": "3c6b3ac8.5f54b6",
     "type": "for",
     "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
     "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1519.6667213439941,
-    "y": 758.0000512599945,
-    "z": "9c3e2040.51e8d",
+    "x": 1555.6666984558105,
+    "y": 788.0000512599945,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "82bdbd96.1528d"
+        "e0e0a661.74b9e8"
       ]
     ]
   },
   {
-    "id": "31146b5a.f96304",
+    "id": "3fc33b48.8d6bf4",
     "type": "switchNode",
     "name": "switch service-data.consumed-allotted-resources_length",
     "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 701.6660461425781,
-    "y": 734.7140836715698,
-    "z": "9c3e2040.51e8d",
+    "x": 737.6660232543945,
+    "y": 764.7140836715698,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "89e1b0e1.b280a",
-        "42609e0d.0b1fc"
+        "98246edb.9d503",
+        "303d6837.0384d8"
       ]
     ]
   },
   {
-    "id": "89e1b0e1.b280a",
+    "id": "98246edb.9d503",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1005.8089447021484,
-    "y": 703.5715208053589,
-    "z": "9c3e2040.51e8d",
+    "x": 1041.8089218139648,
+    "y": 733.5715208053589,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "d2a66fcc.9de12"
+        "1bc15eed.fd45b1"
       ]
     ]
   },
   {
-    "id": "42609e0d.0b1fc",
+    "id": "303d6837.0384d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 982.8089942932129,
-    "y": 764.571475982666,
-    "z": "9c3e2040.51e8d",
+    "x": 1018.8089714050293,
+    "y": 794.571475982666,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "2a82891c.586b96"
+        "b930de42.50a21"
       ]
     ]
   },
   {
-    "id": "2a82891c.586b96",
+    "id": "b930de42.50a21",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1142.9360847473145,
-    "y": 762.697452545166,
-    "z": "9c3e2040.51e8d",
+    "x": 1178.9360618591309,
+    "y": 792.697452545166,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "164faa8f.422405",
-        "6d36a6c.f47fa58",
-        "eedafcbb.09c83"
+        "3c6b3ac8.5f54b6",
+        "7d532296.0d9bfc",
+        "6dd5cf93.f0258"
       ]
     ]
   },
   {
-    "id": "d2a66fcc.9de12",
+    "id": "1bc15eed.fd45b1",
     "type": "set",
     "name": "set cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n",
     "comments": "",
-    "x": 1155.665927886963,
-    "y": 701.2855710983276,
-    "z": "9c3e2040.51e8d",
+    "x": 1191.6659049987793,
+    "y": 731.2855710983276,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "337b8132.75507e",
+    "id": "15c0d821.288668",
     "type": "set",
     "name": "set consumed allotted resources",
     "xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n",
     "comments": "",
-    "x": 630.5233383178711,
-    "y": 838.2856483459473,
-    "z": "9c3e2040.51e8d",
+    "x": 666.5233154296875,
+    "y": 868.2856483459473,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "6d36a6c.f47fa58",
+    "id": "7d532296.0d9bfc",
     "type": "switchNode",
     "name": "switch tmp.found-cidx",
     "xml": "<switch test='`$tmp.found-cidx`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1332.0511322021484,
-    "y": 794.708975315094,
-    "z": "9c3e2040.51e8d",
+    "x": 1368.0511093139648,
+    "y": 824.708975315094,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "23de8d9f.e2dd32"
+        "106270aa.e9c6ff"
       ]
     ]
   },
   {
-    "id": "23de8d9f.e2dd32",
+    "id": "106270aa.e9c6ff",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1522.0510864257812,
-    "y": 794.7089123725891,
-    "z": "9c3e2040.51e8d",
+    "x": 1558.0510635375977,
+    "y": 824.7089123725891,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "64af2897.2703a8"
+        "e1144596.6d5ba8"
       ]
     ]
   },
   {
-    "id": "64af2897.2703a8",
+    "id": "e1144596.6d5ba8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1688.0510864257812,
-    "y": 794.7089123725891,
-    "z": "9c3e2040.51e8d",
+    "x": 1724.0510635375977,
+    "y": 824.7089123725891,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "923cdb1e.68a888"
+        "b93f3869.6459e8"
       ]
     ]
   },
   {
-    "id": "82bdbd96.1528d",
+    "id": "e0e0a661.74b9e8",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1936.7783508300781,
-    "y": 755.000078201294,
-    "z": "9c3e2040.51e8d",
+    "x": 1972.7783279418945,
+    "y": 785.000078201294,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "87fbbf54.c1a56"
+        "326d00a0.76b6c"
       ]
     ]
   },
   {
-    "id": "87fbbf54.c1a56",
+    "id": "326d00a0.76b6c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2118.5879249572754,
-    "y": 755.4645252227783,
-    "z": "9c3e2040.51e8d",
+    "x": 2154.587902069092,
+    "y": 785.4645252227783,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "98cf5592.16f948"
+        "cec76fbc.ec734"
       ]
     ]
   },
   {
-    "id": "923cdb1e.68a888",
+    "id": "b93f3869.6459e8",
     "type": "set",
     "name": "set tmp.cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n",
     "comments": "",
-    "x": 1849.9244689941406,
-    "y": 794.2206134796143,
-    "z": "9c3e2040.51e8d",
+    "x": 1885.924446105957,
+    "y": 824.2206134796143,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "b1e5bcf3.c8fd2",
+    "id": "9dc9afd9.071d8",
     "type": "comment",
     "name": "Add to consumed service consumed-allotted-resources in mdsal",
     "info": "Prepare data and add to service-data",
     "comments": "",
-    "x": 722.6672592163086,
-    "y": 665.0000476837158,
-    "z": "9c3e2040.51e8d",
+    "x": 758.667236328125,
+    "y": 695.0000476837158,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "7a7522d7.8a362c",
+    "id": "79d72e28.e5bf",
     "type": "comment",
     "name": "This set resource will be added to MDSAL by provider code",
     "info": "Below we add to service-data.consumed-allotted-resource at last index",
     "comments": "",
-    "x": 710.0001754760742,
-    "y": 803.7781400680542,
-    "z": "9c3e2040.51e8d",
+    "x": 746.0001525878906,
+    "y": 833.7781400680542,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "48507d03.0cfd24",
+    "id": "7ee858c0.930c58",
     "type": "update",
     "name": "save AAI allotted-resource",
-    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 620.6908798217773,
-    "y": 1763.531904220581,
-    "z": "9c3e2040.51e8d",
+    "x": 656.6908569335938,
+    "y": 1793.531904220581,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "d0cb3ffb.0f22",
-        "8cbfcb17.5674d8"
+        "54e2f563.b3af5c",
+        "291816ed.18393a"
       ]
     ]
   },
   {
-    "id": "d0cb3ffb.0f22",
+    "id": "54e2f563.b3af5c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 815.4528160095215,
-    "y": 1754.4845056533813,
-    "z": "9c3e2040.51e8d",
+    "x": 851.4527931213379,
+    "y": 1784.4845056533813,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "551edb9d.a56dc4"
+        "a3778d99.3c015"
       ]
     ]
   },
   {
-    "id": "551edb9d.a56dc4",
+    "id": "a3778d99.3c015",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 981.9766960144043,
-    "y": 1766.1035766601562,
-    "z": "9c3e2040.51e8d",
+    "x": 1017.9766731262207,
+    "y": 1796.1035766601562,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "8cbfcb17.5674d8",
+    "id": "291816ed.18393a",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 822.5481033325195,
-    "y": 1787.246473312378,
-    "z": "9c3e2040.51e8d",
+    "x": 858.5480804443359,
+    "y": 1817.246473312378,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "551edb9d.a56dc4"
+        "a3778d99.3c015"
       ]
     ]
   },
   {
-    "id": "7964b486.89bffc",
+    "id": "ac365c56.4b2",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 654.5005569458008,
-    "y": 1731.833875656128,
-    "z": "9c3e2040.51e8d",
+    "x": 690.5005340576172,
+    "y": 1761.833875656128,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "24a443b3.cdd5dc",
+    "id": "81ef7e04.cd917",
     "type": "comment",
     "name": "Set allotted resource type if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 656.0000228881836,
-    "y": 205.00000095367432,
-    "z": "9c3e2040.51e8d",
+    "x": 692,
+    "y": 235.00000095367432,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "e3b4ab98.b00c28",
+    "id": "3718c342.00f4ac",
     "type": "switchNode",
     "name": "switch allotted-resource-type",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 617.9233322143555,
-    "y": 245.5660572052002,
-    "z": "9c3e2040.51e8d",
+    "x": 653.9233093261719,
+    "y": 275.5660572052002,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "7cb47d8a.56e0d4",
-        "161c8b14.4822c5"
+        "64aa0e9c.b1d09",
+        "7800ea8d.a7f124"
       ]
     ]
   },
   {
-    "id": "7cb47d8a.56e0d4",
+    "id": "64aa0e9c.b1d09",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 820.9234848022461,
-    "y": 230.56606006622314,
-    "z": "9c3e2040.51e8d",
+    "x": 856.9234619140625,
+    "y": 260.56606006622314,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "b02b0441.1428c8"
+        "f530af4a.706e5"
       ]
     ]
   },
   {
-    "id": "161c8b14.4822c5",
+    "id": "7800ea8d.a7f124",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 813.9233131408691,
-    "y": 270.5660800933838,
-    "z": "9c3e2040.51e8d",
+    "x": 849.9232902526855,
+    "y": 300.5660800933838,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "40a66352.bcb05c"
+        "7a986711.0ca2d8"
       ]
     ]
   },
   {
-    "id": "40a66352.bcb05c",
+    "id": "7a986711.0ca2d8",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n",
     "comments": "",
-    "x": 1045.92329788208,
-    "y": 270.56608486175537,
-    "z": "9c3e2040.51e8d",
+    "x": 1081.9232749938965,
+    "y": 300.56608486175537,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "8a266541.a12688",
+    "id": "369cb772.706cb8",
     "type": "comment",
     "name": "For storage in AAI connection-attachment-topology",
     "info": "",
     "comments": "",
-    "x": 680.9999847412109,
-    "y": 340.0000009536743,
-    "z": "9c3e2040.51e8d",
+    "x": 716.9999618530273,
+    "y": 370.0000009536743,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "755897d2.b185f8",
+    "id": "492255d4.2adf4c",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 655.9999694824219,
-    "y": 421.8889102935791,
-    "z": "9c3e2040.51e8d",
+    "x": 691.9999465942383,
+    "y": 451.8889102935791,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "6815830a.cf38ec",
+    "id": "ddea3893.c96cd8",
     "type": "comment",
     "name": "Used for Put AR by id to MDSAL",
     "info": "",
     "comments": "",
-    "x": 622.0000534057617,
-    "y": 510.8889274597168,
-    "z": "9c3e2040.51e8d",
+    "x": 658.0000305175781,
+    "y": 540.8889274597168,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "6533f8ad.391638",
+    "id": "a440e95e.3176f8",
     "type": "comment",
     "name": "Obtain the last index in services",
     "info": "ServiceData is added by Provider code",
     "comments": "",
-    "x": 623.4444961547852,
-    "y": 696.8888721466064,
-    "z": "9c3e2040.51e8d",
+    "x": 659.4444732666016,
+    "y": 726.8888721466064,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "55176b7b.204274",
+    "id": "a79587b.c624178",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 606.2681655883789,
-    "y": 1670.359203338623,
-    "z": "9c3e2040.51e8d",
+    "x": 642.2681427001953,
+    "y": 1700.359203338623,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "e7eec3f2.e0455",
+    "id": "9d0211a4.58ce8",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 574.6812515258789,
-    "y": 1832.9749298095703,
-    "z": "9c3e2040.51e8d",
+    "x": 610.6812286376953,
+    "y": 1862.9749298095703,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "b02b0441.1428c8",
+    "id": "f530af4a.706e5",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SDWANAttachmentInstance\" />\n",
     "comments": "",
-    "x": 1060.000171661377,
-    "y": 230.99998664855957,
-    "z": "9c3e2040.51e8d",
+    "x": 1096.0001487731934,
+    "y": 260.99998664855957,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "6d2b2eaf.a08e",
+    "id": "30825693.105b0a",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sdwan-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 657.0002975463867,
-    "y": 1604.00013256073,
-    "z": "9c3e2040.51e8d",
+    "x": 693.0002746582031,
+    "y": 1634.00013256073,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "2544cf2e.7797d",
-        "d0176f37.1631f",
-        "3214e8f5.c864c8"
+        "7725804e.b7ea",
+        "ff126c78.d9f65",
+        "34ce7aa1.c96186"
       ]
     ]
   },
   {
-    "id": "2544cf2e.7797d",
+    "id": "7725804e.b7ea",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 906.6416511535645,
-    "y": 1642.3314628601074,
-    "z": "9c3e2040.51e8d",
+    "x": 942.6416282653809,
+    "y": 1672.3314628601074,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "93bb925b.d10a9"
+        "d7cd6db2.d2286"
       ]
     ]
   },
   {
-    "id": "d0176f37.1631f",
+    "id": "ff126c78.d9f65",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 897.6417007446289,
-    "y": 1610.831488609314,
-    "z": "9c3e2040.51e8d",
+    "x": 933.6416778564453,
+    "y": 1640.831488609314,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "93bb925b.d10a9"
+        "d7cd6db2.d2286"
       ]
     ]
   },
   {
-    "id": "3214e8f5.c864c8",
+    "id": "34ce7aa1.c96186",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 901.3917388916016,
-    "y": 1581.1885934844613,
-    "z": "9c3e2040.51e8d",
+    "x": 937.391716003418,
+    "y": 1611.1885934844613,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "92a0c9d6.d7b8b8"
+        "6ccc24c6.03b4dc"
       ]
     ]
   },
   {
-    "id": "93bb925b.d10a9",
+    "id": "d7cd6db2.d2286",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1067.3917388916016,
-    "y": 1611.5815124511719,
-    "z": "9c3e2040.51e8d",
+    "x": 1103.391716003418,
+    "y": 1641.5815124511719,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "92a0c9d6.d7b8b8",
+    "id": "6ccc24c6.03b4dc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1043.047706604004,
-    "y": 1577.3807626739144,
-    "z": "9c3e2040.51e8d",
+    "x": 1079.0476837158203,
+    "y": 1607.3807626739144,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e23f7239.d2c",
+    "id": "7c0d6a4c.141ba4",
     "type": "execute",
     "name": "execute RestApiCallNode - Update parent provided service AR",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 721.9999771118164,
-    "y": 1120.000165939331,
-    "z": "9c3e2040.51e8d",
+    "x": 757.9999542236328,
+    "y": 1150.000165939331,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "42d4726.f4b8f8c",
-        "fcb14e51.71cdd",
-        "ed9689dc.1ce198"
+        "494a716e.866ba",
+        "227c3021.44dc4",
+        "ff8b452c.8d9bc8"
       ]
     ]
   },
   {
-    "id": "42d4726.f4b8f8c",
+    "id": "494a716e.866ba",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1030.3080368041992,
-    "y": 1151.998441696167,
-    "z": "9c3e2040.51e8d",
+    "x": 1066.3080139160156,
+    "y": 1181.998441696167,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "91022749.be6058"
+        "aaeb645f.80fed8"
       ]
     ]
   },
   {
-    "id": "fcb14e51.71cdd",
+    "id": "227c3021.44dc4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1021.3080863952637,
-    "y": 1120.4984674453735,
-    "z": "9c3e2040.51e8d",
+    "x": 1057.30806350708,
+    "y": 1150.4984674453735,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "91022749.be6058"
+        "aaeb645f.80fed8"
       ]
     ]
   },
   {
-    "id": "ed9689dc.1ce198",
+    "id": "ff8b452c.8d9bc8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1025.0581245422363,
-    "y": 1090.8555723205209,
-    "z": "9c3e2040.51e8d",
+    "x": 1061.0581016540527,
+    "y": 1120.8555723205209,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "c35c0848.28fbf8"
+        "74f3a310.0128fc"
       ]
     ]
   },
   {
-    "id": "91022749.be6058",
+    "id": "aaeb645f.80fed8",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1191.0581245422363,
-    "y": 1121.2484912872314,
-    "z": "9c3e2040.51e8d",
+    "x": 1227.0581016540527,
+    "y": 1151.2484912872314,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "c35c0848.28fbf8",
+    "id": "74f3a310.0128fc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1166.7140922546387,
-    "y": 1087.047741509974,
-    "z": "9c3e2040.51e8d",
+    "x": 1202.714069366455,
+    "y": 1117.047741509974,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "bd46d511.3b0d08",
+    "id": "9405156b.c649a8",
     "type": "comment",
     "name": "Put the parent allotted resource in mdsal",
     "info": "",
     "comments": "",
-    "x": 650.9999237060547,
-    "y": 1082.000072479248,
-    "z": "9c3e2040.51e8d",
+    "x": 686.9999008178711,
+    "y": 1112.000072479248,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "eae0ae19.16041",
+    "id": "cf809c65.e205f",
     "type": "set",
     "name": "set connection-attachment-ar-identifiers",
     "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
     "comments": "",
-    "x": 647.3571090698242,
-    "y": 1284.5716915130615,
-    "z": "9c3e2040.51e8d",
+    "x": 683.3570861816406,
+    "y": 1314.5716915130615,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "c7cc4539.500a68",
+    "id": "605ed84a.e90ef8",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />",
     "comments": "",
-    "x": 567.2139358520508,
-    "y": 1252.381194114685,
-    "z": "9c3e2040.51e8d",
+    "x": 603.2139129638672,
+    "y": 1282.381194114685,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "d8cd962c.832e98",
+    "id": "5ffc39de.e33178",
     "type": "set",
     "name": "set identifiers in overall structure",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n",
     "comments": "",
-    "x": 626.1669082641602,
-    "y": 1318.6668767929077,
-    "z": "9c3e2040.51e8d",
+    "x": 662.1668853759766,
+    "y": 1348.6668767929077,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "81f242e0.4cfb8",
+    "id": "b70e6d89.61807",
     "type": "execute",
     "name": "execute getTime",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 578.4997482299805,
-    "y": 1392.0004043579102,
-    "z": "9c3e2040.51e8d",
+    "x": 614.4997253417969,
+    "y": 1422.0004043579102,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a785b9fe.8e2b78",
+    "id": "2fe0bf35.0314b",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 629.4867858886719,
-    "y": 1447.9516372680664,
-    "z": "9c3e2040.51e8d",
+    "x": 665.4867630004883,
+    "y": 1477.9516372680664,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "e1b91be4.687fd8",
+    "id": "4b90a515.ea737c",
     "type": "set",
     "name": "set model-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
     "comments": "",
-    "x": 574.0554046630859,
-    "y": 1353.5557622909546,
-    "z": "9c3e2040.51e8d",
+    "x": 610.0553817749023,
+    "y": 1383.5557622909546,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "4b42ac54.3e0884",
+    "id": "a3fd3ef0.9cf2",
     "type": "comment",
     "name": "Prepare data for allotted-resource addition to MDSAL",
     "info": "This will add to allotted-resource which is present inside service.",
     "comments": "",
-    "x": 691.3888931274414,
-    "y": 1218.5556087493896,
-    "z": "9c3e2040.51e8d",
+    "x": 727.3888702392578,
+    "y": 1248.5556087493896,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "145b2990.9f1986",
+    "id": "aec371b2.f4eb6",
     "type": "execute",
     "name": "generate parent-ar url - replace allotted-resource-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 686.5000381469727,
-    "y": 1046.0000114440918,
-    "z": "9c3e2040.51e8d",
+    "x": 722.5000152587891,
+    "y": 1076.0000114440918,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d6792827.57dcf8",
+    "id": "cc1d8a7e.c8e908",
     "type": "execute",
     "name": "generate parent-ar url - replace service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 682.4999618530273,
-    "y": 1003.000147819519,
-    "z": "9c3e2040.51e8d",
+    "x": 718.4999389648438,
+    "y": 1033.000147819519,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "78c9708b.d276a",
+    "id": "af622d17.e96e6",
     "type": "comment",
     "name": "Prepare Parent AR URL",
     "info": "Preparation to set provided-allotted-resource in parent service instance",
     "comments": "",
-    "x": 600.5004196166992,
-    "y": 932.0001010894775,
-    "z": "9c3e2040.51e8d",
+    "x": 636.5003967285156,
+    "y": 962.0001010894775,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "33eb09e.c2f17f6",
+    "id": "99b25b64.985da8",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 639.5002136230469,
-    "y": 965.5000405311584,
-    "z": "9c3e2040.51e8d",
+    "x": 675.5001907348633,
+    "y": 995.5000405311584,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "98cf5592.16f948",
+    "id": "cec76fbc.ec734",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n",
     "comments": "",
-    "x": 2196.756996154785,
-    "y": 803.645830154419,
-    "z": "9c3e2040.51e8d",
+    "x": 2232.7569732666016,
+    "y": 833.645830154419,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "eedafcbb.09c83",
+    "id": "6dd5cf93.f0258",
     "type": "set",
     "name": "set tmp.found-cidx",
     "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
     "comments": "",
-    "x": 1322.646167755127,
-    "y": 715.3125731945038,
-    "z": "9c3e2040.51e8d",
+    "x": 1358.6461448669434,
+    "y": 745.3125731945038,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "e5b4f922.408cd8",
+    "id": "fcf58d3f.726c9",
     "type": "comment",
     "name": "Add to parent services provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 711.201530456543,
-    "y": 899.9792575836182,
-    "z": "9c3e2040.51e8d",
+    "x": 747.2015075683594,
+    "y": 929.9792575836182,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "367dfa87.13b4b6",
+    "id": "edb39741.2151b8",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 631.9687194824219,
-    "y": 1185.9689378738403,
-    "z": "9c3e2040.51e8d",
+    "x": 667.9686965942383,
+    "y": 1215.9689378738403,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "926c698b.647238",
+    "id": "64a66d0e.2cab24",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1305.0000743865967,
-    "y": 613.2777614593506,
-    "z": "9c3e2040.51e8d",
+    "x": 1341.000051498413,
+    "y": 643.2777614593506,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "34cda0a8.01ed1"
+        "c5b1dd9f.c626c"
       ]
     ]
   },
   {
-    "id": "34cda0a8.01ed1",
+    "id": "c5b1dd9f.c626c",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1492.8574542999268,
-    "y": 613.8968968391418,
-    "z": "9c3e2040.51e8d",
+    "x": 1528.8574314117432,
+    "y": 643.8968968391418,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "4253f13d.3a8c2"
+        "dea64b0a.33d1a8"
       ]
     ]
   },
   {
-    "id": "4253f13d.3a8c2",
+    "id": "dea64b0a.33d1a8",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1692.1905765533447,
-    "y": 613.896975517273,
-    "z": "9c3e2040.51e8d",
+    "x": 1728.1905536651611,
+    "y": 643.896975517273,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "b4b47003.957fd"
+        "fd6c452f.f52a18"
       ]
     ]
   },
   {
-    "id": "a8dc15.338363e8",
+    "id": "5c590a79.9e0264",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 777.0000762939453,
-    "y": 608.0000371932983,
-    "z": "9c3e2040.51e8d",
+    "x": 813.0000534057617,
+    "y": 638.0000371932983,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "4f647ff8.bc9ba",
-        "37dd5f16.a8f17"
+        "83948a24.3af768",
+        "a688402e.6a3a9"
       ]
     ]
   },
   {
-    "id": "37dd5f16.a8f17",
+    "id": "a688402e.6a3a9",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1145.0001068115234,
-    "y": 578.0000352859497,
-    "z": "9c3e2040.51e8d",
+    "x": 1181.0000839233398,
+    "y": 608.0000352859497,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "7fea5096.61664"
+        "a6697dc2.ce9f3"
       ]
     ]
   },
   {
-    "id": "7fea5096.61664",
+    "id": "a6697dc2.ce9f3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1297.0001068115234,
-    "y": 577.0000352859497,
-    "z": "9c3e2040.51e8d",
+    "x": 1333.0000839233398,
+    "y": 607.0000352859497,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3040fa3e.5fdf76",
+    "id": "adeabb6e.cf7758",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 583.0039443969727,
-    "y": 1523.2500038146973,
-    "z": "9c3e2040.51e8d",
+    "x": 619.0039215087891,
+    "y": 1553.2500038146973,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "a477b468.1a1198",
-        "df63659d.a31038"
+        "96f36120.1f9af",
+        "6b505cd5.c78924"
       ]
     ]
   },
   {
-    "id": "a477b468.1a1198",
+    "id": "96f36120.1f9af",
     "type": "for",
     "name": "for each sdwan-get-request-input-param",
     "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 918.0041427612305,
-    "y": 1469.2501260638237,
-    "z": "9c3e2040.51e8d",
+    "x": 954.0041198730469,
+    "y": 1499.2501260638237,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "f75d6e3.e38f69"
+        "7401fe63.179e9"
       ]
     ]
   },
   {
-    "id": "bcc416f0.2895c8",
+    "id": "4e61fb49.c94114",
     "type": "comment",
     "name": "Required for filling template values",
     "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters",
     "comments": "",
-    "x": 940.4486465454102,
-    "y": 1503.0832867622375,
-    "z": "9c3e2040.51e8d",
+    "x": 976.4486236572266,
+    "y": 1533.0832867622375,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "40c178cb.5bcab8",
+    "id": "d4660c0f.147f3",
     "type": "comment",
     "name": "Remove VNFC prefix",
     "info": "",
     "comments": "",
-    "x": 1001.0039863586426,
-    "y": 1425.6944618225098,
-    "z": "9c3e2040.51e8d",
+    "x": 1037.003963470459,
+    "y": 1455.6944618225098,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "f75d6e3.e38f69",
+    "id": "7401fe63.179e9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1165.0039901733398,
-    "y": 1470.6943712234497,
-    "z": "9c3e2040.51e8d",
+    "x": 1201.0039672851562,
+    "y": 1500.6943712234497,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "a64439d1.ae5a88",
-        "3b97b61d.424c1a"
+        "6a638cf5.ebb554",
+        "3e399a15.de4336"
       ]
     ]
   },
   {
-    "id": "9ddd821f.74043",
+    "id": "50ce4566.040d7c",
     "type": "comment",
     "name": "Take the parameter names by removing prefix",
     "info": "",
     "comments": "",
-    "x": 1433.0038375854492,
-    "y": 1386.250369310379,
-    "z": "9c3e2040.51e8d",
+    "x": 1469.0038146972656,
+    "y": 1416.250369310379,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "a64439d1.ae5a88",
+    "id": "6a638cf5.ebb554",
     "type": "execute",
     "name": "execute split parameterName",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1384.0385055541992,
-    "y": 1421.2294654846191,
-    "z": "9c3e2040.51e8d",
+    "x": 1420.0384826660156,
+    "y": 1451.2294654846191,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b97b61d.424c1a",
+    "id": "3e399a15.de4336",
     "type": "set",
     "name": "set parameterName",
     "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
     "comments": "",
-    "x": 1372.4829788208008,
-    "y": 1525.2294359207153,
-    "z": "9c3e2040.51e8d",
+    "x": 1408.4829559326172,
+    "y": 1555.2294359207153,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "df63659d.a31038",
+    "id": "6b505cd5.c78924",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 959.0039901733398,
-    "y": 1543.2500658035278,
-    "z": "9c3e2040.51e8d",
+    "x": 995.0039672851562,
+    "y": 1573.2500658035278,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json
index b2e9f71..c8e24f5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "3141f6c5.a52fda",
+    "id": "f8331c4a.37167",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 91.00000190734863,
-    "y": 30.000000476837158,
-    "z": "36b7dca4.321614",
+    "x": 115,
+    "y": 35,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "528c7612.26f178"
+        "2f57f4b9.7848fc"
       ]
     ]
   },
   {
-    "id": "528c7612.26f178",
+    "id": "2f57f4b9.7848fc",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2586 +22,2586 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 275.00000381469727,
-    "y": 101.0000171661377,
-    "z": "36b7dca4.321614",
+    "x": 299.00000190734863,
+    "y": 106.00001668930054,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "1e8ab7f2.25f3b8"
+        "606390f2.8a1db"
       ]
     ]
   },
   {
-    "id": "1e8ab7f2.25f3b8",
+    "id": "606390f2.8a1db",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-deactivate",
     "xml": "<method rpc='sdwan-attachment-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 263.0001220703125,
-    "y": 189,
-    "z": "36b7dca4.321614",
+    "x": 287.00012016296387,
+    "y": 193.99999952316284,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "64150157.da1a5"
+        "4ba95650.840ef8"
       ]
     ]
   },
   {
-    "id": "64150157.da1a5",
+    "id": "4ba95650.840ef8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 279.0001220703125,
-    "y": 744.0002446174622,
-    "z": "36b7dca4.321614",
+    "x": 303.00012016296387,
+    "y": 749.000244140625,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "563dda64.17acc4",
-        "19755347.d05f3d",
-        "2f1e916c.daf57e",
-        "ff9c9326.09054",
-        "b6c9d7ee.523f68",
-        "d85e62b3.69a86",
-        "18a74ff1.92546",
-        "201a455d.c2e4fa",
-        "552d726e.db02dc",
-        "ed4b4b67.4cc708",
-        "b195de1c.2a671",
-        "98b3af96.5e7de",
-        "15eb2076.5c064",
-        "df909612.fb6138",
-        "ec442d3.475ffd",
-        "d5f5fd72.fb157",
-        "984be839.303c58",
-        "d0fca62a.672dd8",
-        "ce4d5b8.f77d2a8",
-        "2b9c4213.cf45fe",
-        "aac6b4b9.62d5b8",
-        "2888718c.b9c46e",
-        "217830b4.c0fbe",
-        "ddc38088.8a3fe",
-        "4044e726.54dc28",
-        "67ff0ce7.080b74",
-        "bf17376.0f432c8"
+        "7bfab5a3.06caac",
+        "45a84e1e.bdf7b",
+        "169fcb74.40e255",
+        "b2e9aacc.581ff8",
+        "e34f2e02.a4351",
+        "96bf45ea.f31428",
+        "ade80637.81d448",
+        "9fb629bb.9a3648",
+        "4bdb1ae.9bc94e4",
+        "85c9e5e0.4b2808",
+        "321fef32.53b0b",
+        "57a853e.4687fac",
+        "c17cdc10.1ceea",
+        "94474a0.f7cc5b8",
+        "500ce0c3.5b4ed",
+        "8054d01.53e0b3",
+        "9c9d490e.b9a1b8",
+        "75448c50.567d34",
+        "965fc969.fd32d8",
+        "d94628e2.163098",
+        "b8f3c1af.8a68d",
+        "5450bfab.9413e",
+        "d6353ac9.cd8368",
+        "de426682.23e5b8",
+        "9c358a1f.148518",
+        "7e6a4a74.fb8064",
+        "e6e54d59.f029"
       ]
     ]
   },
   {
-    "id": "563dda64.17acc4",
+    "id": "7bfab5a3.06caac",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id,etc",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 675.9935607910156,
-    "y": 142.9934868812561,
-    "z": "36b7dca4.321614",
+    "x": 699.993558883667,
+    "y": 147.99348640441895,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "b26eaf7f.105fd",
+    "id": "af7814ef.59e2e8",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 704.9538726806641,
-    "y": 107.02528285980225,
-    "z": "36b7dca4.321614",
+    "x": 728.9538707733154,
+    "y": 112.02528238296509,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "19755347.d05f3d",
+    "id": "45a84e1e.bdf7b",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 629.9934997558594,
-    "y": 235.99349212646484,
-    "z": "36b7dca4.321614",
+    "x": 653.9934978485107,
+    "y": 240.99349164962769,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "ff9c9326.09054",
+    "id": "b2e9aacc.581ff8",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 636.2553901672363,
-    "y": 323.6602210998535,
-    "z": "36b7dca4.321614",
+    "x": 660.2553882598877,
+    "y": 328.66022062301636,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f1e916c.daf57e",
+    "id": "169fcb74.40e255",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 686.2554931640625,
-    "y": 410.66022205352783,
-    "z": "36b7dca4.321614",
+    "x": 710.2554912567139,
+    "y": 415.6602215766907,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "33dbe9f9.3e0e86",
+    "id": "a1f59482.c2e3a8",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 729.8085174560547,
-    "y": 502.53876781463623,
-    "z": "36b7dca4.321614",
+    "x": 753.808515548706,
+    "y": 507.5387673377991,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "7a97d908.325eb8",
+    "id": "48f7ab81.dd3f54",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 683.9935302734375,
-    "y": 202.993501663208,
-    "z": "36b7dca4.321614",
+    "x": 707.9935283660889,
+    "y": 207.99350118637085,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "3fa36e27.322c42",
+    "id": "c7689a40.af6f68",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 701.9934959411621,
-    "y": 288.8823823928833,
-    "z": "36b7dca4.321614",
+    "x": 725.9934940338135,
+    "y": 293.88238191604614,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "5088b8ea.1a2868",
+    "id": "5bb7cd3a.b035e4",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 727.9935150146484,
-    "y": 375.8823413848877,
-    "z": "36b7dca4.321614",
+    "x": 751.9935131072998,
+    "y": 380.88234090805054,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "758df544.297bec",
+    "id": "255752ab.e0974e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1170.6668281555176,
-    "y": 529.0000286102295,
-    "z": "36b7dca4.321614",
+    "x": 1194.666826248169,
+    "y": 534.0000281333923,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "50aac25b.5a95fc"
+        "7b548c16.84a074"
       ]
     ]
   },
   {
-    "id": "50aac25b.5a95fc",
+    "id": "7b548c16.84a074",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1339.6668319702148,
-    "y": 527.4999294281006,
-    "z": "36b7dca4.321614",
+    "x": 1363.6668300628662,
+    "y": 532.4999289512634,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "7cf78dbb.742bf4"
+        "30903850.9efd78"
       ]
     ]
   },
   {
-    "id": "7cf78dbb.742bf4",
+    "id": "30903850.9efd78",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1512.5241012573242,
-    "y": 465.11909198760986,
-    "z": "36b7dca4.321614",
+    "x": 1536.5240993499756,
+    "y": 470.1190915107727,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "e18ada9c.684278",
-        "c1fde691.c1a3e8"
+        "f5872089.49e85",
+        "fd0f2962.8ae6b8"
       ]
     ]
   },
   {
-    "id": "e18ada9c.684278",
+    "id": "f5872089.49e85",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1749.8573455810547,
-    "y": 443.1190423965454,
-    "z": "36b7dca4.321614",
+    "x": 1773.857343673706,
+    "y": 448.11904191970825,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "13bc9514.12e8bb"
+        "ddd5f356.20fb3"
       ]
     ]
   },
   {
-    "id": "13bc9514.12e8bb",
+    "id": "ddd5f356.20fb3",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1934.3812351226807,
-    "y": 440.02387619018555,
-    "z": "36b7dca4.321614",
+    "x": 1958.381233215332,
+    "y": 445.0238757133484,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "50a0dec4.4003e",
-        "ac41a03e.121ee",
-        "77bc2227.abfd3c"
+        "26efebde.981c54",
+        "f909f530.6858a8",
+        "aab72afb.6cac28"
       ]
     ]
   },
   {
-    "id": "70cd8379.2fdf1c",
+    "id": "49c172c3.b6fc6c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1858.5190773010254,
-    "y": 565.0661172866821,
-    "z": "36b7dca4.321614",
+    "x": 1882.5190753936768,
+    "y": 570.066116809845,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "eebf6b21.03ca48",
+    "id": "1a7aa44a.cd34ac",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1162.5186309814453,
-    "y": 564.0661134719849,
-    "z": "36b7dca4.321614",
+    "x": 1186.5186290740967,
+    "y": 569.0661129951477,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "6e2aefa.c6ce31"
+        "ea618a2d.cb5e38"
       ]
     ]
   },
   {
-    "id": "6e2aefa.c6ce31",
+    "id": "ea618a2d.cb5e38",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1342.5185813903809,
-    "y": 564.7326641082764,
-    "z": "36b7dca4.321614",
+    "x": 1366.5185794830322,
+    "y": 569.7326636314392,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "70cd8379.2fdf1c"
+        "49c172c3.b6fc6c"
       ]
     ]
   },
   {
-    "id": "c1fde691.c1a3e8",
+    "id": "fd0f2962.8ae6b8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1738.1852989196777,
-    "y": 480.3994026184082,
-    "z": "36b7dca4.321614",
+    "x": 1762.185297012329,
+    "y": 485.39940214157104,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "70cd8379.2fdf1c"
+        "49c172c3.b6fc6c"
       ]
     ]
   },
   {
-    "id": "50a0dec4.4003e",
+    "id": "26efebde.981c54",
     "type": "set",
     "name": "set connection-attachment-ar from get",
     "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
     "comments": "",
-    "x": 2180.444793701172,
-    "y": 400.0001058578491,
-    "z": "36b7dca4.321614",
+    "x": 2204.4447917938232,
+    "y": 405.00010538101196,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "77bc2227.abfd3c",
+    "id": "aab72afb.6cac28",
     "type": "set",
     "name": "set oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
     "comments": "",
-    "x": 2113.4447898864746,
-    "y": 490.42866039276123,
-    "z": "36b7dca4.321614",
+    "x": 2137.444787979126,
+    "y": 495.4286599159241,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "ac41a03e.121ee",
+    "id": "f909f530.6858a8",
     "type": "switchNode",
     "name": "switch order-status",
     "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2124.444625854492,
-    "y": 444.0001096725464,
-    "z": "36b7dca4.321614",
+    "x": 2148.4446239471436,
+    "y": 449.00010919570923,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "d58b4ded.2510b",
-        "aa0b471a.e14908"
+        "dcae652b.a678c8",
+        "61137107.6ab3"
       ]
     ]
   },
   {
-    "id": "d58b4ded.2510b",
+    "id": "dcae652b.a678c8",
     "type": "outcome",
     "name": "outcome Active",
     "xml": "<outcome value='Active'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2331.044574737549,
-    "y": 434.0001096725464,
-    "z": "36b7dca4.321614",
+    "x": 2355.0445728302,
+    "y": 439.00010919570923,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "48037.fd500fc9"
+        "f4b4f2e4.a75bd"
       ]
     ]
   },
   {
-    "id": "aa0b471a.e14908",
+    "id": "61137107.6ab3",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2330.7590942382812,
-    "y": 476.4287004470825,
-    "z": "36b7dca4.321614",
+    "x": 2354.7590923309326,
+    "y": 481.42869997024536,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "e35bc0de.32ae1"
+        "a2c4e7e4.8b9478"
       ]
     ]
   },
   {
-    "id": "48037.fd500fc9",
+    "id": "f4b4f2e4.a75bd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2483.5151290893555,
-    "y": 432.3757600784302,
-    "z": "36b7dca4.321614",
+    "x": 2507.515127182007,
+    "y": 437.375759601593,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "e35bc0de.32ae1",
+    "id": "a2c4e7e4.8b9478",
     "type": "returnFailure",
     "name": "return failure",
     "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
     "comments": "",
-    "x": 2503.6669845581055,
-    "y": 473.000111579895,
-    "z": "36b7dca4.321614",
+    "x": 2527.666982650757,
+    "y": 478.00011110305786,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "91894f21.7c315",
+    "id": "8746fbbb.5c4dd8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 891.3031158447266,
-    "y": 625.4935908317566,
-    "z": "36b7dca4.321614",
+    "x": 915.3031139373779,
+    "y": 630.4935903549194,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "b6c9d7ee.523f68",
+    "id": "e34f2e02.a4351",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 588.3092803955078,
-    "y": 626.4999389648438,
-    "z": "36b7dca4.321614",
+    "x": 612.3092784881592,
+    "y": 631.4999384880066,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "91894f21.7c315"
+        "8746fbbb.5c4dd8"
       ]
     ]
   },
   {
-    "id": "45ae063f.ddd9a8",
+    "id": "96352635.65ff08",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 770.0004425048828,
-    "y": 687.5316982269287,
-    "z": "36b7dca4.321614",
+    "x": 794.0004405975342,
+    "y": 692.5316977500916,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "a44115de.ea89b8",
+    "id": "eb439772.0db3a8",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2163.472946166992,
-    "y": 364.5039691925049,
-    "z": "36b7dca4.321614",
+    "x": 2187.4729442596436,
+    "y": 369.5039687156677,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "d6f0728e.e8007",
+    "id": "678453f3.6e4c2c",
     "type": "comment",
     "name": "Set source end point",
     "info": "",
     "comments": "",
-    "x": 601.9728393554688,
-    "y": 594.2540645599365,
-    "z": "36b7dca4.321614",
+    "x": 625.9728374481201,
+    "y": 599.2540640830994,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "d85e62b3.69a86",
+    "id": "96bf45ea.f31428",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 654.9689178466797,
-    "y": 719.0002088546753,
-    "z": "36b7dca4.321614",
+    "x": 678.968915939331,
+    "y": 724.0002083778381,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "c65a917f.0654d",
+    "id": "14706c37.53ff04",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1032.9689140319824,
-    "y": 768.000207901001,
-    "z": "36b7dca4.321614",
+    "x": 1056.9689121246338,
+    "y": 773.0002074241638,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "a84f11cf.944ed"
+        "f7881611.1e7fc8"
       ]
     ]
   },
   {
-    "id": "6f7e92ff.c163ec",
+    "id": "415e2268.5d0d3c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1024.8207168579102,
-    "y": 803.0662927627563,
-    "z": "36b7dca4.321614",
+    "x": 1048.8207149505615,
+    "y": 808.0662922859192,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "fcea4987.f76f78"
+        "400a8be0.06c244"
       ]
     ]
   },
   {
-    "id": "fcea4987.f76f78",
+    "id": "400a8be0.06c244",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1199.9694023132324,
-    "y": 799.3336429595947,
-    "z": "36b7dca4.321614",
+    "x": 1223.9694004058838,
+    "y": 804.3336424827576,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "a84f11cf.944ed",
+    "id": "f7881611.1e7fc8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1183.9689140319824,
-    "y": 766.000207901001,
-    "z": "36b7dca4.321614",
+    "x": 1207.9689121246338,
+    "y": 771.0002074241638,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "c1b43a2f.b6d498",
+    "id": "6055aad6.cfe2c4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1013.730827331543,
-    "y": 2270.9528436660767,
-    "z": "36b7dca4.321614",
+    "x": 1037.7308254241943,
+    "y": 2275.9528431892395,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "37d1e2b4.1ecc0e"
+        "3f6ad50.2555b2c"
       ]
     ]
   },
   {
-    "id": "37d1e2b4.1ecc0e",
+    "id": "3f6ad50.2555b2c",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 1175.2546615600586,
-    "y": 2315.57188975811,
-    "z": "36b7dca4.321614",
+    "x": 1199.25465965271,
+    "y": 2320.571889281273,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "46e90256.1233fc",
+    "id": "235942f0.e7b26e",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1015.8260688781738,
-    "y": 2336.7147864103317,
-    "z": "36b7dca4.321614",
+    "x": 1039.8260669708252,
+    "y": 2341.7147859334946,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "37d1e2b4.1ecc0e"
+        "3f6ad50.2555b2c"
       ]
     ]
   },
   {
-    "id": "38a39849.f42568",
+    "id": "48fc4721.99e218",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 727.7784957885742,
-    "y": 2286.302206993103,
-    "z": "36b7dca4.321614",
+    "x": 751.7784938812256,
+    "y": 2291.302206516266,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "98b3af96.5e7de",
+    "id": "57a853e.4687fac",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 742.5461921691895,
-    "y": 2207.827688217163,
-    "z": "36b7dca4.321614",
+    "x": 766.5461902618408,
+    "y": 2212.827687740326,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "15eb2076.5c064",
+    "id": "c17cdc10.1ceea",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 689.9593315124512,
-    "y": 2402.443507194519,
-    "z": "36b7dca4.321614",
+    "x": 713.9593296051025,
+    "y": 2407.443506717682,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "b195de1c.2a671",
+    "id": "321fef32.53b0b",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sdwan-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 792.2782936096191,
-    "y": 2115.4684619903564,
-    "z": "36b7dca4.321614",
+    "x": 816.2782917022705,
+    "y": 2120.4684615135193,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "710256d4.ce9368",
-        "9d8f4fc7.29648",
-        "1056e6c3.05afa9"
+        "51856f43.e53b6",
+        "1d0bebfe.eab134",
+        "559d3f61.79c98"
       ]
     ]
   },
   {
-    "id": "710256d4.ce9368",
+    "id": "51856f43.e53b6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1060.9196701049805,
-    "y": 2166.7998737320304,
-    "z": "36b7dca4.321614",
+    "x": 1084.9196681976318,
+    "y": 2171.7998732551932,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "8d13b843.178988"
+        "60114e3f.8f3c6"
       ]
     ]
   },
   {
-    "id": "9d8f4fc7.29648",
+    "id": "1d0bebfe.eab134",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1051.919719696045,
-    "y": 2135.299899481237,
-    "z": "36b7dca4.321614",
+    "x": 1075.9197177886963,
+    "y": 2140.2998990044,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "8d13b843.178988"
+        "60114e3f.8f3c6"
       ]
     ]
   },
   {
-    "id": "1056e6c3.05afa9",
+    "id": "559d3f61.79c98",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1055.6697578430176,
-    "y": 2105.6570043563843,
-    "z": "36b7dca4.321614",
+    "x": 1079.669755935669,
+    "y": 2110.657003879547,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "d9dd1fc6.57ca5"
+        "f983099f.d54368"
       ]
     ]
   },
   {
-    "id": "8d13b843.178988",
+    "id": "60114e3f.8f3c6",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1221.6697578430176,
-    "y": 2136.049923323095,
-    "z": "36b7dca4.321614",
+    "x": 1245.669755935669,
+    "y": 2141.0499228462577,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "d9dd1fc6.57ca5",
+    "id": "f983099f.d54368",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1197.32572555542,
-    "y": 2101.8491735458374,
-    "z": "36b7dca4.321614",
+    "x": 1221.3257236480713,
+    "y": 2106.8491730690002,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "18a74ff1.92546",
+    "id": "ade80637.81d448",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n",
     "comments": "",
-    "x": 692.4919128417969,
-    "y": 1965.849385023117,
-    "z": "36b7dca4.321614",
+    "x": 716.4919109344482,
+    "y": 1970.84938454628,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "552d726e.db02dc",
+    "id": "4bdb1ae.9bc94e4",
     "type": "execute",
     "name": "execute getTime",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 709.7777557373047,
-    "y": 2038.4689826965332,
-    "z": "36b7dca4.321614",
+    "x": 733.777753829956,
+    "y": 2043.468982219696,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed4b4b67.4cc708",
+    "id": "85c9e5e0.4b2808",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 764.7648124694824,
-    "y": 2076.420120239258,
-    "z": "36b7dca4.321614",
+    "x": 788.7648105621338,
+    "y": 2081.4201197624207,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "201a455d.c2e4fa",
+    "id": "9fb629bb.9a3648",
     "type": "set",
     "name": "set model-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
     "comments": "",
-    "x": 706.3334541320801,
-    "y": 2005.0240354537964,
-    "z": "36b7dca4.321614",
+    "x": 730.3334522247314,
+    "y": 2010.0240349769592,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "dc1f553a.3746d8",
+    "id": "71e134cd.34ff8c",
     "type": "comment",
     "name": "Prepare data for allotted-resource addition to MDSAL",
     "info": "This will add to allotted-resource which is present inside service.",
     "comments": "",
-    "x": 815.6668853759766,
-    "y": 1921.0239102840424,
-    "z": "36b7dca4.321614",
+    "x": 839.6668834686279,
+    "y": 1926.0239098072052,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "4d3306db.2fbdf8",
+    "id": "616f171a.47daa8",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 757.246711730957,
-    "y": 1888.4372119903564,
-    "z": "36b7dca4.321614",
+    "x": 781.2467098236084,
+    "y": 1893.4372115135193,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "2888718c.b9c46e",
+    "id": "5450bfab.9413e",
     "type": "update",
     "name": "update AAI allotted-resource",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 754.2227745056152,
-    "y": 2323.754349708557,
-    "z": "36b7dca4.321614",
+    "x": 778.2227725982666,
+    "y": 2328.75434923172,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "c1b43a2f.b6d498",
-        "46e90256.1233fc"
+        "6055aad6.cfe2c4",
+        "235942f0.e7b26e"
       ]
     ]
   },
   {
-    "id": "df909612.fb6138",
+    "id": "94474a0.f7cc5b8",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 803.3339538574219,
-    "y": 545.4999494552612,
-    "z": "36b7dca4.321614",
+    "x": 827.3339519500732,
+    "y": 550.4999489784241,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "758df544.297bec",
-        "eebf6b21.03ca48"
+        "255752ab.e0974e",
+        "1a7aa44a.cd34ac"
       ]
     ]
   },
   {
-    "id": "ec442d3.475ffd",
+    "id": "500ce0c3.5b4ed",
     "type": "execute",
     "name": "get parent-service-data tmp.ar-url-psd",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 657.0001983642578,
-    "y": 754.0002107620239,
-    "z": "36b7dca4.321614",
+    "x": 681.0001964569092,
+    "y": 759.0002102851868,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5f5fd72.fb157",
+    "id": "8054d01.53e0b3",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 724.0001602172852,
-    "y": 789.0002946853638,
-    "z": "36b7dca4.321614",
+    "x": 748.0001583099365,
+    "y": 794.0002942085266,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "c65a917f.0654d",
-        "6f7e92ff.c163ec"
+        "14706c37.53ff04",
+        "415e2268.5d0d3c"
       ]
     ]
   },
   {
-    "id": "4db8d90d.4f7238",
+    "id": "c6e4843.cf19e78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2544.812660217285,
-    "y": 806.329451084137,
-    "z": "36b7dca4.321614",
+    "x": 2568.8126583099365,
+    "y": 811.3294506072998,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "5ae4c974.91c268"
+        "5596c62d.3bd3a8"
       ]
     ]
   },
   {
-    "id": "d1626b48.25fc18",
+    "id": "e43e013.c1cc8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2578.66414642334,
-    "y": 752.3954176902771,
-    "z": "36b7dca4.321614",
+    "x": 2602.664144515991,
+    "y": 757.3954172134399,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "ab84a2c3.2ae2b"
+        "6247e999.5c9548"
       ]
     ]
   },
   {
-    "id": "a8b146e3.827bd8",
+    "id": "d9e74637.02a718",
     "type": "for",
     "name": "for arvidx.. mdsal-sd.service-data.vnfs.vnf_length[]",
     "xml": "<for index='arvidx' start='0' end='`$mdsal-sd.service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2063.81356048584,
-    "y": 1633.9966716766357,
-    "z": "36b7dca4.321614",
+    "x": 2087.813558578491,
+    "y": 1638.9966711997986,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "151d247e.ada54c"
+        "9c851968.c2df88"
       ]
     ]
   },
   {
-    "id": "151d247e.ada54c",
+    "id": "9c851968.c2df88",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2339.4801330566406,
-    "y": 1634.9967045783997,
-    "z": "36b7dca4.321614",
+    "x": 2363.480131149292,
+    "y": 1639.9967041015625,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "ce8318c6.862998"
+        "54b544e3.42d4bc"
       ]
     ]
   },
   {
-    "id": "ce8318c6.862998",
+    "id": "54b544e3.42d4bc",
     "type": "switchNode",
     "name": "switch ActivateSiteInstance",
     "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == ActivateSiteInstance`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2576.34383392334,
-    "y": 1639.1946682929993,
-    "z": "36b7dca4.321614",
+    "x": 2600.343832015991,
+    "y": 1644.194667816162,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "38959100.baa79"
+        "aa6e75db.b48038"
       ]
     ]
   },
   {
-    "id": "38959100.baa79",
+    "id": "aa6e75db.b48038",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2785.343349456787,
-    "y": 1639.194821357727,
-    "z": "36b7dca4.321614",
+    "x": 2809.3433475494385,
+    "y": 1644.19482088089,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "8dc66f20.128aa"
+        "3132632f.4cad6c"
       ]
     ]
   },
   {
-    "id": "ae283116.659c4",
+    "id": "2aa66f72.5e93f",
     "type": "set",
     "name": "set tmp.sitevidx ",
     "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 2182.3442993164062,
-    "y": 1743.1952500343323,
-    "z": "36b7dca4.321614",
+    "x": 2206.3442974090576,
+    "y": 1748.1952495574951,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "cc813b15.219a98",
+    "id": "4f450f5a.52d67",
     "type": "set",
     "name": "set prop.ar-parent-service-instance-id",
     "xml": "<set>\n<parameter name='prop.ar-parent-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />\n",
     "comments": "",
-    "x": 2098.8124618530273,
-    "y": 1056.9961004257202,
-    "z": "36b7dca4.321614",
+    "x": 2122.8124599456787,
+    "y": 1061.996099948883,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "16d565c8.6fce0a",
+    "id": "2d8849eb.21e096",
     "type": "for",
     "name": "for loop aridx - Get role from allotted resource",
     "xml": "<for index=\"aridx\" start=\"0\" end=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2124.812255859375,
-    "y": 1005.4959716796875,
-    "z": "36b7dca4.321614",
+    "x": 2148.8122539520264,
+    "y": 1010.4959712028503,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "412ffbe3.a86674"
+        "d84d5dca.fda43"
       ]
     ]
   },
   {
-    "id": "412ffbe3.a86674",
+    "id": "d84d5dca.fda43",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2379.81258392334,
-    "y": 1002.496431350708,
-    "z": "36b7dca4.321614",
+    "x": 2403.812582015991,
+    "y": 1007.4964308738708,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "e0854b83.a59ed8",
-        "67be11c6.fc4b4"
+        "f1205a89.ab0798",
+        "52dd7727.f5fe18"
       ]
     ]
   },
   {
-    "id": "e0854b83.a59ed8",
+    "id": "f1205a89.ab0798",
     "type": "switchNode",
     "name": "switch Role",
     "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'Role'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2509.8124046325684,
-    "y": 974.4963684082031,
-    "z": "36b7dca4.321614",
+    "x": 2533.8124027252197,
+    "y": 979.496367931366,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "60e8b373.f2f1cc"
+        "c09b2335.3fa2e"
       ]
     ]
   },
   {
-    "id": "60e8b373.f2f1cc",
+    "id": "c09b2335.3fa2e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2650.8127365112305,
-    "y": 973.4963674545288,
-    "z": "36b7dca4.321614",
+    "x": 2674.812734603882,
+    "y": 978.4963669776917,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "564d6e3.a986e9"
+        "a9576f56.b9348"
       ]
     ]
   },
   {
-    "id": "564d6e3.a986e9",
+    "id": "a9576f56.b9348",
     "type": "set",
     "name": "set prop.role",
     "xml": "<set>\n<parameter name='prop.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n",
     "comments": "",
-    "x": 2816.8134002685547,
-    "y": 968.0962705612183,
-    "z": "36b7dca4.321614",
+    "x": 2840.813398361206,
+    "y": 973.0962700843811,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "bef02da7.b5697",
+    "id": "fa09f12.7306b1",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2396.8130836486816,
-    "y": 1151.9963779449463,
-    "z": "36b7dca4.321614",
+    "x": 2420.813081741333,
+    "y": 1156.9963774681091,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "e69aff22.57aef"
+        "949549ca.fec9a8"
       ]
     ]
   },
   {
-    "id": "108f0456.69aaac",
+    "id": "a6b8177b.a72a88",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2390.664825439453,
-    "y": 1108.0624151229858,
-    "z": "36b7dca4.321614",
+    "x": 2414.6648235321045,
+    "y": 1113.0624146461487,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "d2cf1da5.9ee9a"
+        "ffd5545.891d1a8"
       ]
     ]
   },
   {
-    "id": "ab84a2c3.2ae2b",
+    "id": "6247e999.5c9548",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2704.812271118164,
-    "y": 749.4958510398865,
-    "z": "36b7dca4.321614",
+    "x": 2728.8122692108154,
+    "y": 754.4958505630493,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "5ae4c974.91c268",
+    "id": "5596c62d.3bd3a8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1834.3121337890625,
-    "y": 1023.4959716796875,
-    "z": "36b7dca4.321614",
+    "x": 1858.3121318817139,
+    "y": 1028.4959712028503,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "16d565c8.6fce0a",
-        "cc813b15.219a98",
-        "6c3854b6.659a5c",
-        "ddb36283.9977d"
+        "2d8849eb.21e096",
+        "4f450f5a.52d67",
+        "fc8ba65.b9ce358",
+        "4d147f57.4dac2"
       ]
     ]
   },
   {
-    "id": "d2cf1da5.9ee9a",
+    "id": "ffd5545.891d1a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2520.3129444122314,
-    "y": 1101.496335029602,
-    "z": "36b7dca4.321614",
+    "x": 2544.312942504883,
+    "y": 1106.496334552765,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "e69aff22.57aef",
+    "id": "949549ca.fec9a8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1910.3124237060547,
-    "y": 1228.495985031128,
-    "z": "36b7dca4.321614",
+    "x": 1934.312421798706,
+    "y": 1233.4959845542908,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "a7e7f8fb.8ee848"
+        "3f440bd9.75daa4"
       ]
     ]
   },
   {
-    "id": "5dfa5d99.6db7b4",
+    "id": "9c405c37.6c68b",
     "type": "for",
     "name": "for loop siteidx - Get site ID from servicedata",
     "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2274.3151473999023,
-    "y": 1784.4970078468323,
-    "z": "36b7dca4.321614",
+    "x": 2298.3151454925537,
+    "y": 1789.4970073699951,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "824eb6f3.bc12a8"
+        "b4cc5d95.f9e96"
       ]
     ]
   },
   {
-    "id": "4af98bb7.a04904",
+    "id": "58af8ae9.984c54",
     "type": "switchNode",
     "name": "switch siteId",
     "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2346.3171310424805,
-    "y": 1852.4979872703552,
-    "z": "36b7dca4.321614",
+    "x": 2370.317129135132,
+    "y": 1857.497986793518,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "1cabca59.917da6"
+        "545beb56.93d714"
       ]
     ]
   },
   {
-    "id": "ad1a1b89.af61c8",
+    "id": "a5f8b7de.41e8d8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2200.8154067993164,
-    "y": 1925.99702501297,
-    "z": "36b7dca4.321614",
+    "x": 2224.815404891968,
+    "y": 1930.9970245361328,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "fbdfeb83.50c018",
-        "6ab1dd86.bc5ac4",
-        "dfe3d1ff.2a521"
+        "40a92cd6.b03f74",
+        "92d18c15.f7ea6",
+        "6fed1bc4.775804"
       ]
     ]
   },
   {
-    "id": "bf17376.0f432c8",
+    "id": "e6e54d59.f029",
     "type": "execute",
     "name": "execute RestApiCallNode delete vpn topology",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\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=\"put\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 790.812915802002,
-    "y": 1713.496741771698,
-    "z": "36b7dca4.321614",
+    "x": 814.8129138946533,
+    "y": 1718.4967412948608,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "dd133500.c9b588",
-        "4ff52f01.dec2a"
+        "41dfdc02.d499c4",
+        "13592df6.00f3c2"
       ]
     ]
   },
   {
-    "id": "dd133500.c9b588",
+    "id": "41dfdc02.d499c4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1045.8126831054688,
-    "y": 1729.496741771698,
-    "z": "36b7dca4.321614",
+    "x": 1069.8126811981201,
+    "y": 1734.4967412948608,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "fedffe27.13d88"
+        "899d6eb4.6e43e"
       ]
     ]
   },
   {
-    "id": "fedffe27.13d88",
+    "id": "899d6eb4.6e43e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1215.8126220703125,
-    "y": 1732.496741771698,
-    "z": "36b7dca4.321614",
+    "x": 1239.8126201629639,
+    "y": 1737.4967412948608,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "93a1a55.98e1f58",
+    "id": "9460e156.0dbc9",
     "type": "returnFailure",
     "name": "return failure",
     "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 vpn rest api\" />\n",
     "comments": "",
-    "x": 1215.812744140625,
-    "y": 1688.496741771698,
-    "z": "36b7dca4.321614",
+    "x": 1239.8127422332764,
+    "y": 1693.4967412948608,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "4ff52f01.dec2a",
+    "id": "13592df6.00f3c2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1048.8126220703125,
-    "y": 1688.496741771698,
-    "z": "36b7dca4.321614",
+    "x": 1072.8126201629639,
+    "y": 1693.4967412948608,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "93a1a55.98e1f58"
+        "9460e156.0dbc9"
       ]
     ]
   },
   {
-    "id": "9c440320.0009b",
+    "id": "23c44741.0683a8",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1216.3796367645264,
-    "y": 1251.1728959083557,
-    "z": "36b7dca4.321614",
+    "x": 1240.3796348571777,
+    "y": 1256.1728954315186,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "aac6b4b9.62d5b8",
+    "id": "b8f3c1af.8a68d",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "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 = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 785.8793792724609,
-    "y": 1302.173246383667,
-    "z": "36b7dca4.321614",
+    "x": 809.8793773651123,
+    "y": 1307.1732459068298,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "f554c450.4c9bc8",
-        "250a3c3a.bfa264",
-        "1866c1d3.5923ee"
+        "6754723.b98c58c",
+        "6d29272.a552fd8",
+        "9b336b2d.6145a8"
       ]
     ]
   },
   {
-    "id": "f554c450.4c9bc8",
+    "id": "6754723.b98c58c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1044.8796710968018,
-    "y": 1257.1728796958923,
-    "z": "36b7dca4.321614",
+    "x": 1068.8796691894531,
+    "y": 1262.1728792190552,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "9c440320.0009b"
+        "23c44741.0683a8"
       ]
     ]
   },
   {
-    "id": "250a3c3a.bfa264",
+    "id": "6d29272.a552fd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1041.3703880310059,
-    "y": 1295.7469763755798,
-    "z": "36b7dca4.321614",
+    "x": 1065.3703861236572,
+    "y": 1300.7469758987427,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "6a9152f3.8b088c"
+        "34fe0d3d.2375f2"
       ]
     ]
   },
   {
-    "id": "1866c1d3.5923ee",
+    "id": "9b336b2d.6145a8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1036.7033958435059,
-    "y": 1337.080289363861,
-    "z": "36b7dca4.321614",
+    "x": 1060.7033939361572,
+    "y": 1342.080288887024,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "90697580.51d788"
+        "6298bcb0.bae674"
       ]
     ]
   },
   {
-    "id": "6a9152f3.8b088c",
+    "id": "34fe0d3d.2375f2",
     "type": "returnFailure",
     "name": "return failure",
     "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1191.9417037963867,
-    "y": 1290.0327286720276,
-    "z": "36b7dca4.321614",
+    "x": 1215.941701889038,
+    "y": 1295.0327281951904,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "90697580.51d788",
+    "id": "6298bcb0.bae674",
     "type": "returnFailure",
     "name": "return failure",
     "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1198.4758567810059,
-    "y": 1338.519498348236,
-    "z": "36b7dca4.321614",
+    "x": 1222.4758548736572,
+    "y": 1343.519497871399,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "a7e7f8fb.8ee848",
+    "id": "3f440bd9.75daa4",
     "type": "for",
     "name": "for pnidx.. mdsal-parentsd.service-data.networks.network_length[]",
     "xml": "<for index='pnidx' start='0' end='`$mdsal-parentsd.service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2235.311996459961,
-    "y": 1227.9957127571106,
-    "z": "36b7dca4.321614",
+    "x": 2259.3119945526123,
+    "y": 1232.9957122802734,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "134d81a7.f5395e"
+        "ad8228ad.984598"
       ]
     ]
   },
   {
-    "id": "bce6e7ae.f035f8",
+    "id": "adf75159.a4939",
     "type": "switchNode",
     "name": "switch ActivateSDWANConnectivityInstance",
     "xml": "<switch test=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2158.979820251465,
-    "y": 1320.9959144592285,
-    "z": "36b7dca4.321614",
+    "x": 2182.979818344116,
+    "y": 1325.9959139823914,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "8b710972.a5d448"
+        "152fe76d.8c87b9"
       ]
     ]
   },
   {
-    "id": "8b710972.a5d448",
+    "id": "152fe76d.8c87b9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2415.9793128967285,
-    "y": 1319.9960446357727,
-    "z": "36b7dca4.321614",
+    "x": 2439.97931098938,
+    "y": 1324.9960441589355,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "ad16d848.956c28"
+        "bff21d24.0b57f"
       ]
     ]
   },
   {
-    "id": "e503187.dfdbbe8",
+    "id": "94eca419.a27f98",
     "type": "for",
     "name": "for loop paramidx - Get topology from servicedata",
     "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2217.9799995422363,
-    "y": 1409.995632648468,
-    "z": "36b7dca4.321614",
+    "x": 2241.9799976348877,
+    "y": 1414.9956321716309,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "2aaa98b1.97fbe8"
+        "de02d4be.b70b88"
       ]
     ]
   },
   {
-    "id": "2aaa98b1.97fbe8",
+    "id": "de02d4be.b70b88",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2483.979688644409,
-    "y": 1406.9959559440613,
-    "z": "36b7dca4.321614",
+    "x": 2507.9796867370605,
+    "y": 1411.9959554672241,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "93e924c8.1cbc78",
-        "9a3cf2e3.de00a"
+        "a00734cd.6de4c8",
+        "641cbedf.bffd9"
       ]
     ]
   },
   {
-    "id": "93e924c8.1cbc78",
+    "id": "a00734cd.6de4c8",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2654.98002243042,
-    "y": 1375.9954657554626,
-    "z": "36b7dca4.321614",
+    "x": 2678.9800205230713,
+    "y": 1380.9954652786255,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "3f47b224.ea53fe"
+        "26c02eae.b386b2"
       ]
     ]
   },
   {
-    "id": "3f47b224.ea53fe",
+    "id": "26c02eae.b386b2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2806.9800128936768,
-    "y": 1377.9954962730408,
-    "z": "36b7dca4.321614",
+    "x": 2830.980010986328,
+    "y": 1382.9954957962036,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "2d4beaeb.2d5ae6"
+        "fa1994f9.3ab1f8"
       ]
     ]
   },
   {
-    "id": "2d4beaeb.2d5ae6",
+    "id": "fa1994f9.3ab1f8",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 2950.9800243377686,
-    "y": 1377.5954308509827,
-    "z": "36b7dca4.321614",
+    "x": 2974.98002243042,
+    "y": 1382.5954303741455,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "9a3cf2e3.de00a",
+    "id": "641cbedf.bffd9",
     "type": "switchNode",
     "name": "switch vpnId",
     "xml": "<switch test=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2646.645746231079,
-    "y": 1418.328447818756,
-    "z": "36b7dca4.321614",
+    "x": 2670.6457443237305,
+    "y": 1423.328447341919,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "805a8b6a.884b08"
+        "8be0360b.142cf8"
       ]
     ]
   },
   {
-    "id": "805a8b6a.884b08",
+    "id": "8be0360b.142cf8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2798.645736694336,
-    "y": 1420.3284783363342,
-    "z": "36b7dca4.321614",
+    "x": 2822.6457347869873,
+    "y": 1425.328477859497,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "47c03332.4437ec"
+        "d6238463.67fb38"
       ]
     ]
   },
   {
-    "id": "47c03332.4437ec",
+    "id": "d6238463.67fb38",
     "type": "set",
     "name": "set prop.vpn1Id",
     "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 2942.6457481384277,
-    "y": 1419.9284129142761,
-    "z": "36b7dca4.321614",
+    "x": 2966.645746231079,
+    "y": 1424.928412437439,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "2b9c4213.cf45fe",
+    "id": "d94628e2.163098",
     "type": "execute",
     "name": "execute RestApiCallNode delete vpn ",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\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=\"put\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 763.8125877380371,
-    "y": 1824.9967069625854,
-    "z": "36b7dca4.321614",
+    "x": 787.8125858306885,
+    "y": 1829.9967064857483,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "b5d353ac.0589e",
-        "2c7732a6.dbeb5e"
+        "ad8a5a19.5d2dc8",
+        "a192274c.875558"
       ]
     ]
   },
   {
-    "id": "b5d353ac.0589e",
+    "id": "ad8a5a19.5d2dc8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 996.812665939331,
-    "y": 1849.9967060089111,
-    "z": "36b7dca4.321614",
+    "x": 1020.8126640319824,
+    "y": 1854.996705532074,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "35c412a7.ab087e"
+        "f3ab5240.5c692"
       ]
     ]
   },
   {
-    "id": "35c412a7.ab087e",
+    "id": "f3ab5240.5c692",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1166.8126049041748,
-    "y": 1852.9967060089111,
-    "z": "36b7dca4.321614",
+    "x": 1190.8126029968262,
+    "y": 1857.996705532074,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "3622d573.b4a8aa",
+    "id": "bd5bcef5.5eb46",
     "type": "returnFailure",
     "name": "return failure",
     "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 vpn rest api\" />\n",
     "comments": "",
-    "x": 1166.8127269744873,
-    "y": 1808.9967060089111,
-    "z": "36b7dca4.321614",
+    "x": 1190.8127250671387,
+    "y": 1813.996705532074,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "2c7732a6.dbeb5e",
+    "id": "a192274c.875558",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 999.8126049041748,
-    "y": 1808.9967060089111,
-    "z": "36b7dca4.321614",
+    "x": 1023.8126029968262,
+    "y": 1813.996705532074,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "3622d573.b4a8aa"
+        "bd5bcef5.5eb46"
       ]
     ]
   },
   {
-    "id": "72ba670d.964b28",
+    "id": "82cffc44.23091",
     "type": "set",
     "name": "set prop.name",
     "xml": "<set>\n<parameter name='prop.name' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n",
     "comments": "",
-    "x": 2864.8124046325684,
-    "y": 1020.9959411621094,
-    "z": "36b7dca4.321614",
+    "x": 2888.8124027252197,
+    "y": 1025.9959406852722,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "67be11c6.fc4b4",
+    "id": "52dd7727.f5fe18",
     "type": "switchNode",
     "name": "switch sdwanVpnName",
     "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'sdwanVpnName'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2545.312244415283,
-    "y": 1023.9959335327148,
-    "z": "36b7dca4.321614",
+    "x": 2569.3122425079346,
+    "y": 1028.9959330558777,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "9940a94a.c22938"
+        "68d65f0e.41b06"
       ]
     ]
   },
   {
-    "id": "9940a94a.c22938",
+    "id": "68d65f0e.41b06",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2716.3124046325684,
-    "y": 1022.9960021972656,
-    "z": "36b7dca4.321614",
+    "x": 2740.3124027252197,
+    "y": 1027.9960017204285,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "72ba670d.964b28"
+        "82cffc44.23091"
       ]
     ]
   },
   {
-    "id": "c293dea2.46ad3",
+    "id": "56e2d584.03ab4c",
     "type": "set",
     "name": "set prop.ar.provided-allotted-resource-id",
     "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />\n\n\n",
     "comments": "",
-    "x": 2030.81201171875,
-    "y": 764.9960656166077,
-    "z": "36b7dca4.321614",
+    "x": 2054.8120098114014,
+    "y": 769.9960651397705,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "bfa616d6.8ac5b8",
+    "id": "bb8d7398.e602a",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1343.8424682617188,
-    "y": 1166.1932730674744,
-    "z": "36b7dca4.321614",
+    "x": 1367.8424663543701,
+    "y": 1171.1932725906372,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "afc6f5e9.2167e8"
+        "f1cd9602.486d48"
       ]
     ]
   },
   {
-    "id": "97d5dacd.f274d8",
+    "id": "667f1405.f078ac",
     "type": "execute",
     "name": "generate tmp.ar-url-connection url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.provided-allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2015.3296737670898,
-    "y": 798.329541683197,
-    "z": "36b7dca4.321614",
+    "x": 2039.3296718597412,
+    "y": 803.3295412063599,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "a06e500e.c5ed3",
+    "id": "a0d61f91.413f4",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2155.329303741455,
-    "y": 833.9958329200745,
-    "z": "36b7dca4.321614",
+    "x": 2179.3293018341064,
+    "y": 838.9958324432373,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "d1626b48.25fc18",
-        "4db8d90d.4f7238"
+        "e43e013.c1cc8",
+        "c6e4843.cf19e78"
       ]
     ]
   },
   {
-    "id": "6c3854b6.659a5c",
+    "id": "fc8ba65.b9ce358",
     "type": "execute",
     "name": "execute RestApiCallNode - get parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-parentsd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2130.9965438842773,
-    "y": 1126.9958896636963,
-    "z": "36b7dca4.321614",
+    "x": 2154.9965419769287,
+    "y": 1131.9958891868591,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "bef02da7.b5697",
-        "108f0456.69aaac"
+        "fa09f12.7306b1",
+        "a6b8177b.a72a88"
       ]
     ]
   },
   {
-    "id": "ad16d848.956c28",
+    "id": "bff21d24.0b57f",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1875.329963684082,
-    "y": 1416.6630954742432,
-    "z": "36b7dca4.321614",
+    "x": 1899.3299617767334,
+    "y": 1421.663094997406,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "e503187.dfdbbe8",
-        "8d2d1c34.602ed",
-        "d55381bc.ca39b",
-        "376fcdda.5c0302"
+        "94eca419.a27f98",
+        "ad1d91e2.9fb76",
+        "b140ba23.8a1858",
+        "c40e517f.50767"
       ]
     ]
   },
   {
-    "id": "fbdfeb83.50c018",
+    "id": "40a92cd6.b03f74",
     "type": "set",
     "name": "set prop.attach.siteId",
     "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n\n",
     "comments": "",
-    "x": 2466.998279571533,
-    "y": 1907.663851261139,
-    "z": "36b7dca4.321614",
+    "x": 2490.9982776641846,
+    "y": 1912.6638507843018,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "1cabca59.917da6",
+    "id": "545beb56.93d714",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2486.99853515625,
-    "y": 1852.6636776924133,
-    "z": "36b7dca4.321614",
+    "x": 2510.9985332489014,
+    "y": 1857.6636772155762,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "ad1a1b89.af61c8"
+        "a5f8b7de.41e8d8"
       ]
     ]
   },
   {
-    "id": "8dc66f20.128aa",
+    "id": "3132632f.4cad6c",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1979.664421081543,
-    "y": 1738.3301882743835,
-    "z": "36b7dca4.321614",
+    "x": 2003.6644191741943,
+    "y": 1743.3301877975464,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "5dfa5d99.6db7b4",
-        "ae283116.659c4"
+        "9c405c37.6c68b",
+        "2aa66f72.5e93f"
       ]
     ]
   },
   {
-    "id": "984be839.303c58",
+    "id": "9c9d490e.b9a1b8",
     "type": "for",
     "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 951.181224822998,
-    "y": 1201.6358733177185,
-    "z": "36b7dca4.321614",
+    "x": 975.1812229156494,
+    "y": 1206.6358728408813,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "bfa616d6.8ac5b8"
+        "bb8d7398.e602a"
       ]
     ]
   },
   {
-    "id": "824eb6f3.bc12a8",
+    "id": "b4cc5d95.f9e96",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2191.664779663086,
-    "y": 1849.0008358955383,
-    "z": "36b7dca4.321614",
+    "x": 2215.6647777557373,
+    "y": 1854.0008354187012,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "4af98bb7.a04904"
+        "58af8ae9.984c54"
       ]
     ]
   },
   {
-    "id": "d0fca62a.672dd8",
+    "id": "75448c50.567d34",
     "type": "set",
     "name": "set prop.siteAttachement_length=0",
     "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",
     "comments": "",
-    "x": 797,
-    "y": 1144.531229019165,
-    "z": "36b7dca4.321614",
+    "x": 820.9999980926514,
+    "y": 1149.5312285423279,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "6ab1dd86.bc5ac4",
+    "id": "92d18c15.f7ea6",
     "type": "set",
     "name": "Add sites to list and update length",
     "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n",
     "comments": "",
-    "x": 2494.502113342285,
-    "y": 1952.5316562652588,
-    "z": "36b7dca4.321614",
+    "x": 2518.5021114349365,
+    "y": 1957.5316557884216,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "ddb36283.9977d",
+    "id": "4d147f57.4dac2",
     "type": "execute",
     "name": "generate prop.ar-parent-service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>      \n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar-parent-service-instance-id`\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2115.500144958496,
-    "y": 1089.5314102172852,
-    "z": "36b7dca4.321614",
+    "x": 2139.5001430511475,
+    "y": 1094.531409740448,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d2d1c34.602ed",
+    "id": "ad1d91e2.9fb76",
     "type": "set",
     "name": "set prop.ar-service-instance-id",
     "xml": "<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
     "comments": "",
-    "x": 2148.5005645751953,
-    "y": 1478.531328201294,
-    "z": "36b7dca4.321614",
+    "x": 2172.5005626678467,
+    "y": 1483.5313277244568,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "d55381bc.ca39b",
+    "id": "b140ba23.8a1858",
     "type": "execute",
     "name": "generate prop.ar-service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>      \n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2173.833023071289,
-    "y": 1511.4096240997314,
-    "z": "36b7dca4.321614",
+    "x": 2197.8330211639404,
+    "y": 1516.4096236228943,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "376fcdda.5c0302",
+    "id": "c40e517f.50767",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-sd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2224.8331451416016,
-    "y": 1548.4094429016113,
-    "z": "36b7dca4.321614",
+    "x": 2248.833143234253,
+    "y": 1553.4094424247742,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "24c5b010.6c228",
-        "5d5ea42b.5dad9c"
+        "6f8bfcf3.2cbda4",
+        "671b3b67.714c24"
       ]
     ]
   },
   {
-    "id": "5d5ea42b.5dad9c",
+    "id": "671b3b67.714c24",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2503.5002098083496,
-    "y": 1544.5311546325684,
-    "z": "36b7dca4.321614",
+    "x": 2527.500207901001,
+    "y": 1549.5311541557312,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "70e96035.e38c9"
+        "1fc5d55c.4c864b"
       ]
     ]
   },
   {
-    "id": "24c5b010.6c228",
+    "id": "6f8bfcf3.2cbda4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2501.3525390625,
-    "y": 1505.597282409668,
-    "z": "36b7dca4.321614",
+    "x": 2525.3525371551514,
+    "y": 1510.5972819328308,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "b0b3ac1b.bb725"
+        "2fe21dd5.a9ca62"
       ]
     ]
   },
   {
-    "id": "b0b3ac1b.bb725",
+    "id": "2fe21dd5.a9ca62",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2631.000732421875,
-    "y": 1499.0312423706055,
-    "z": "36b7dca4.321614",
+    "x": 2655.0007305145264,
+    "y": 1504.0312418937683,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "70e96035.e38c9",
+    "id": "1fc5d55c.4c864b",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2652.501106262207,
-    "y": 1545.5313396453857,
-    "z": "36b7dca4.321614",
+    "x": 2676.5011043548584,
+    "y": 1550.5313391685486,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "a8b146e3.827bd8"
+        "d9e74637.02a718"
       ]
     ]
   },
   {
-    "id": "afc6f5e9.2167e8",
+    "id": "f1cd9602.486d48",
     "type": "switchNode",
     "name": "switch allotted resource ID match",
     "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1567.500114440918,
-    "y": 1163.031301498413,
-    "z": "36b7dca4.321614",
+    "x": 1591.5001125335693,
+    "y": 1168.031301021576,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "54c627b4.10bfd8"
+        "a2faeb8f.9adb58"
       ]
     ]
   },
   {
-    "id": "54c627b4.10bfd8",
+    "id": "a2faeb8f.9adb58",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1646.5001792907715,
-    "y": 800.0312943458557,
-    "z": "36b7dca4.321614",
+    "x": 1670.5001773834229,
+    "y": 805.0312938690186,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "3a3f312b.b33afe"
+        "7036cf78.a5aa3"
       ]
     ]
   },
   {
-    "id": "3a3f312b.b33afe",
+    "id": "7036cf78.a5aa3",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1788.5004272460938,
-    "y": 799.0312352180481,
-    "z": "36b7dca4.321614",
+    "x": 1812.5004253387451,
+    "y": 804.0312347412109,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "c293dea2.46ad3",
-        "97d5dacd.f274d8",
-        "a06e500e.c5ed3"
+        "56e2d584.03ab4c",
+        "667f1405.f078ac",
+        "a0d61f91.413f4"
       ]
     ]
   },
   {
-    "id": "d22dbfd2.187be",
+    "id": "15b04770.9781e9",
     "type": "comment",
     "name": "if allotted resource Id match with the incomming allotted resource ID,  sites in this service vnf should not be included",
     "info": "parent instId 200 |  parent instId 200\nservice instId 100| service InstId 200\n site1            |       site2\n allotted resId 1 | allotted resId 2 \n --------------------------------------\n Deactivate:\n loop for provided allotted res ID\n If allotted resId 1 matches with incomming allotted resource Id then we should delete the sites available in the service data 100\n for this we have to send request for deleting with site IDs site2 without including site1.\n \n \n ",
     "comments": "",
-    "x": 1741.5000305175781,
-    "y": 732.0312962532043,
-    "z": "36b7dca4.321614",
+    "x": 1765.5000286102295,
+    "y": 737.0312957763672,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "21d740e7.f725a",
+    "id": "7505e39f.a765fc",
     "type": "comment",
     "name": "loop for provided allotted rsource Id",
     "info": "",
     "comments": "",
-    "x": 1063.5,
-    "y": 1165.5312900543213,
-    "z": "36b7dca4.321614",
+    "x": 1087.4999980926514,
+    "y": 1170.5312895774841,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "c63c4b12.9b5788",
+    "id": "2f9e3c20.0207a4",
     "type": "comment",
     "name": "get allotted resource for the allotted resource ID",
     "info": "",
     "comments": "",
-    "x": 2302.500328063965,
-    "y": 733.5311741828918,
-    "z": "36b7dca4.321614",
+    "x": 2326.500326156616,
+    "y": 738.5311737060547,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "830c94e.1851168",
+    "id": "7fd25f7d.205ea",
     "type": "comment",
     "name": "get parent service data to get connectivity which has connectivity and vpn ID",
     "info": "",
     "comments": "",
-    "x": 2085.499855041504,
-    "y": 960.5312519073486,
-    "z": "36b7dca4.321614",
+    "x": 2109.4998531341553,
+    "y": 965.5312514305115,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "3044102e.74314",
+    "id": "53cc3005.40ef",
     "type": "comment",
     "name": "get service data from service instance id from allotted reosurce Id to get sites vnf",
     "info": "",
     "comments": "",
-    "x": 2274.499855041504,
-    "y": 1442.5310516357422,
-    "z": "36b7dca4.321614",
+    "x": 2298.4998531341553,
+    "y": 1447.531051158905,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "ce4d5b8.f77d2a8",
+    "id": "965fc969.fd32d8",
     "type": "call",
     "name": "call sdwan-vnf-topology-operation-underlay for delete",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 824.5001182556152,
-    "y": 1629.531358718872,
-    "z": "36b7dca4.321614",
+    "x": 848.5001163482666,
+    "y": 1634.531358242035,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "dfe3d1ff.2a521",
+    "id": "6fed1bc4.775804",
     "type": "set",
     "name": "Add site attachement to list and update length",
     "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",
     "comments": "",
-    "x": 2524.2500915527344,
-    "y": 1993.2539834976196,
-    "z": "36b7dca4.321614",
+    "x": 2548.2500896453857,
+    "y": 1998.2539830207825,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "217830b4.c0fbe",
+    "id": "d6353ac9.cd8368",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 798.0000381469727,
-    "y": 1392.0001511573792,
-    "z": "36b7dca4.321614",
+    "x": 822.000036239624,
+    "y": 1397.000150680542,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "96b3b1d6.6853f",
-        "1031f4ad.8e47bb"
+        "58744a52.9052b4",
+        "2cb21a31.a626b6"
       ]
     ]
   },
   {
-    "id": "96b3b1d6.6853f",
+    "id": "58744a52.9052b4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1050.0001640319824,
-    "y": 1372.9999690055847,
-    "z": "36b7dca4.321614",
+    "x": 1074.0001621246338,
+    "y": 1377.9999685287476,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "8b0a89e.ac4be78"
+        "1cd6b02.062c05"
       ]
     ]
   },
   {
-    "id": "8b0a89e.ac4be78",
+    "id": "1cd6b02.062c05",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1199.0001640319824,
-    "y": 1371.9999384880066,
-    "z": "36b7dca4.321614",
+    "x": 1223.0001621246338,
+    "y": 1376.9999380111694,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "736e51fc.b11ae",
+    "id": "8b511642.cc8a88",
     "type": "returnFailure",
     "name": "return failure",
     "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 get token rest api\" />\n",
     "comments": "",
-    "x": 1190.0001907348633,
-    "y": 1406.3932137489319,
-    "z": "36b7dca4.321614",
+    "x": 1214.0001888275146,
+    "y": 1411.3932132720947,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "1031f4ad.8e47bb",
+    "id": "2cb21a31.a626b6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1042.2501983642578,
-    "y": 1408.6430916786194,
-    "z": "36b7dca4.321614",
+    "x": 1066.2501964569092,
+    "y": 1413.6430912017822,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "736e51fc.b11ae"
+        "8b511642.cc8a88"
       ]
     ]
   },
   {
-    "id": "ddc38088.8a3fe",
+    "id": "de426682.23e5b8",
     "type": "get-resource",
     "name": "get-resource service-subscription",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type \n        AND customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data-tenant\">      ",
     "comments": "",
     "outputs": 1,
-    "x": 788.8955078125,
-    "y": 1504.5620493888855,
-    "z": "36b7dca4.321614",
+    "x": 812.8955059051514,
+    "y": 1509.5620489120483,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "7ac360ff.5d939",
-        "31a85191.f2ba9e"
+        "4a6eca43.810a44",
+        "6a29a6d.e51e358"
       ]
     ]
   },
   {
-    "id": "4044e726.54dc28",
+    "id": "9c358a1f.148518",
     "type": "execute",
     "name": "execute RestApiCallNode Create tenant auth",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 826.3955688476562,
-    "y": 1571.4548954963684,
-    "z": "36b7dca4.321614",
+    "x": 850.3955669403076,
+    "y": 1576.4548950195312,
+    "z": "7c522092.2b01d",
     "wires": [
       []
     ]
   },
   {
-    "id": "31a85191.f2ba9e",
+    "id": "6a29a6d.e51e358",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 993.0739593505859,
-    "y": 1529.5224194526672,
-    "z": "36b7dca4.321614",
+    "x": 1017.0739574432373,
+    "y": 1534.52241897583,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "78002f69.6a616"
+        "bcbf10f7.b7993"
       ]
     ]
   },
   {
-    "id": "7ac360ff.5d939",
+    "id": "4a6eca43.810a44",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 999.3953704833984,
-    "y": 1477.3081078529358,
-    "z": "36b7dca4.321614",
+    "x": 1023.3953685760498,
+    "y": 1482.3081073760986,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "267dc5cf.01d6aa"
+        "67730720.8e4a18"
       ]
     ]
   },
   {
-    "id": "78002f69.6a616",
+    "id": "bcbf10f7.b7993",
     "type": "returnFailure",
     "name": "return failure",
     "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 get token rest api\" />\n",
     "comments": "",
-    "x": 1145.823959350586,
-    "y": 1529.2724804878235,
-    "z": "36b7dca4.321614",
+    "x": 1169.8239574432373,
+    "y": 1534.2724800109863,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "267dc5cf.01d6aa",
+    "id": "67730720.8e4a18",
     "type": "switchNode",
     "name": "switch temp-ub-sub-account-id",
     "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1200.8955993652344,
-    "y": 1469.3121304512024,
-    "z": "36b7dca4.321614",
+    "x": 1224.8955974578857,
+    "y": 1474.3121299743652,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "b4bcdfc8.e4aa9",
-        "8620a0c4.6231"
+        "ffa06abb.9a2a48",
+        "cc923e40.7eb57"
       ]
     ]
   },
   {
-    "id": "8620a0c4.6231",
+    "id": "cc923e40.7eb57",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1434.00390625,
-    "y": 1428.0039439201355,
-    "z": "36b7dca4.321614",
+    "x": 1458.0039043426514,
+    "y": 1433.0039434432983,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "3c0adb4c.ddc524"
+        "7c9ff36f.d8d7bc"
       ]
     ]
   },
   {
-    "id": "b4bcdfc8.e4aa9",
+    "id": "ffa06abb.9a2a48",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1387.2894859313965,
-    "y": 1522.0040221214294,
-    "z": "36b7dca4.321614",
+    "x": 1411.2894840240479,
+    "y": 1527.0040216445923,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "89d850bf.fd785"
+        "d1efa0cc.71a21"
       ]
     ]
   },
   {
-    "id": "89d850bf.fd785",
+    "id": "d1efa0cc.71a21",
     "type": "set",
     "name": "set prop.tenant-id",
     "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n",
     "comments": "",
-    "x": 1556.1466674804688,
-    "y": 1520.111035823822,
-    "z": "36b7dca4.321614",
+    "x": 1580.1466655731201,
+    "y": 1525.1110353469849,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "3c0adb4c.ddc524",
+    "id": "7c9ff36f.d8d7bc",
     "type": "returnFailure",
     "name": "return failure",
     "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 get token rest api\" />\n",
     "comments": "",
-    "x": 1546.4322319030762,
-    "y": 1472.8253083229065,
-    "z": "36b7dca4.321614",
+    "x": 1570.4322299957275,
+    "y": 1477.8253078460693,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "67ff0ce7.080b74",
+    "id": "7e6a4a74.fb8064",
     "type": "for",
     "name": "for ntidx.. mdsal-psd.service-data.networks.network_length[]",
     "xml": "<for index='ntidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 752.03125,
-    "y": 898.03125,
-    "z": "36b7dca4.321614",
+    "x": 776.0312480926514,
+    "y": 903.0312495231628,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "fd716ada.4b1c28"
+        "b21fb0ff.7db48"
       ]
     ]
   },
   {
-    "id": "134d81a7.f5395e",
+    "id": "ad8228ad.984598",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1883.0312728881836,
-    "y": 1319.0312900543213,
-    "z": "36b7dca4.321614",
+    "x": 1907.031270980835,
+    "y": 1324.0312895774841,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "bce6e7ae.f035f8"
+        "adf75159.a4939"
       ]
     ]
   },
   {
-    "id": "fd716ada.4b1c28",
+    "id": "b21fb0ff.7db48",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 716.03125,
-    "y": 970.03125,
-    "z": "36b7dca4.321614",
+    "x": 740.0312480926514,
+    "y": 975.0312495231628,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "f4a48bf3.c3a368"
+        "e497173b.c24408"
       ]
     ]
   },
   {
-    "id": "f4a48bf3.c3a368",
+    "id": "e497173b.c24408",
     "type": "switchNode",
     "name": "switch ActivateSDWANConnectivityInstance",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 991.9797973632812,
-    "y": 971.9958744049072,
-    "z": "36b7dca4.321614",
+    "x": 1015.9797954559326,
+    "y": 976.9958739280701,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "f6cd9004.4ba44"
+        "d6c139b3.090dd8"
       ]
     ]
   },
   {
-    "id": "f6cd9004.4ba44",
+    "id": "d6c139b3.090dd8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1248.979290008545,
-    "y": 970.9960045814514,
-    "z": "36b7dca4.321614",
+    "x": 1272.9792881011963,
+    "y": 975.9960041046143,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "eb687439.718738"
+        "b4139f80.a76b4"
       ]
     ]
   },
   {
-    "id": "eb687439.718738",
+    "id": "b4139f80.a76b4",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 708.3299407958984,
-    "y": 1067.6630554199219,
-    "z": "36b7dca4.321614",
+    "x": 732.3299388885498,
+    "y": 1072.6630549430847,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "e1ac1018.71d85"
+        "ba5ecb28.66e198"
       ]
     ]
   },
   {
-    "id": "e1ac1018.71d85",
+    "id": "ba5ecb28.66e198",
     "type": "for",
     "name": "for loop paramidx - Get topology from servicedata",
     "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 987.9800415039062,
-    "y": 1056.995677947998,
-    "z": "36b7dca4.321614",
+    "x": 1011.9800395965576,
+    "y": 1061.995677471161,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "512abcd4.05e604"
+        "bcfcaf76.f471a"
       ]
     ]
   },
   {
-    "id": "512abcd4.05e604",
+    "id": "bcfcaf76.f471a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1185.9796714782715,
-    "y": 1109.996166229248,
-    "z": "36b7dca4.321614",
+    "x": 1209.9796695709229,
+    "y": 1114.996165752411,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "3dd20169.7a4b1e",
-        "5ac591b5.a102a",
-        "2a45587b.540128"
+        "808f1a6b.ade978",
+        "8fc5fee9.2e70f",
+        "7c2cd6d7.da9468"
       ]
     ]
   },
   {
-    "id": "5ac591b5.a102a",
+    "id": "8fc5fee9.2e70f",
     "type": "switchNode",
     "name": "switch vpnId",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1335.6458187103271,
-    "y": 1124.3284702301025,
-    "z": "36b7dca4.321614",
+    "x": 1359.6458168029785,
+    "y": 1129.3284697532654,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "a59aadb.7fc765"
+        "5eeff931.68f088"
       ]
     ]
   },
   {
-    "id": "3dd20169.7a4b1e",
+    "id": "808f1a6b.ade978",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1343.980094909668,
-    "y": 1081.995488166809,
-    "z": "36b7dca4.321614",
+    "x": 1367.9800930023193,
+    "y": 1086.995487689972,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "ed3b57c2.963288"
+        "385cddcb.23c372"
       ]
     ]
   },
   {
-    "id": "a59aadb.7fc765",
+    "id": "5eeff931.68f088",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1487.645809173584,
-    "y": 1126.3285007476807,
-    "z": "36b7dca4.321614",
+    "x": 1511.6458072662354,
+    "y": 1131.3285002708435,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "9a98c08c.190ca"
+        "827b7756.0101b8"
       ]
     ]
   },
   {
-    "id": "ed3b57c2.963288",
+    "id": "385cddcb.23c372",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1495.9800853729248,
-    "y": 1083.9955186843872,
-    "z": "36b7dca4.321614",
+    "x": 1519.9800834655762,
+    "y": 1088.99551820755,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "30eaf968.c9a7c6"
+        "9cc5fb84.591a88"
       ]
     ]
   },
   {
-    "id": "30eaf968.c9a7c6",
+    "id": "9cc5fb84.591a88",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 1580.9800987243652,
-    "y": 1021.59543800354,
-    "z": "36b7dca4.321614",
+    "x": 1604.9800968170166,
+    "y": 1026.5954375267029,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "9a98c08c.190ca",
+    "id": "827b7756.0101b8",
     "type": "set",
     "name": "set prop.vpn1Id",
     "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 1635.6458740234375,
-    "y": 1115.928415298462,
-    "z": "36b7dca4.321614",
+    "x": 1659.6458721160889,
+    "y": 1120.9284148216248,
+    "z": "7c522092.2b01d",
     "wires": []
   },
   {
-    "id": "2a45587b.540128",
+    "id": "7c2cd6d7.da9468",
     "type": "switchNode",
     "name": "switch vpn name",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1307.0312728881836,
-    "y": 1040.0312776565552,
-    "z": "36b7dca4.321614",
+    "x": 1331.031270980835,
+    "y": 1045.031277179718,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "94f1ab0.72fe658"
+        "829e0f12.c7157"
       ]
     ]
   },
   {
-    "id": "94f1ab0.72fe658",
+    "id": "829e0f12.c7157",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1417.0312767028809,
-    "y": 984.031247138977,
-    "z": "36b7dca4.321614",
+    "x": 1441.0312747955322,
+    "y": 989.0312466621399,
+    "z": "7c522092.2b01d",
     "wires": [
       [
-        "4b5a252a.c365bc"
+        "16fe2ddd.1cfe92"
       ]
     ]
   },
   {
-    "id": "4b5a252a.c365bc",
+    "id": "16fe2ddd.1cfe92",
     "type": "set",
     "name": "set vpn name",
     "xml": "<set>\n<parameter name='prop.name' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 1538.0312767028809,
-    "y": 949.6312837600708,
-    "z": "36b7dca4.321614",
+    "x": 1562.0312747955322,
+    "y": 954.6312832832336,
+    "z": "7c522092.2b01d",
     "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json
index 49ba9cf..074dee3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "de2bb8e4.c4dbd8",
+    "id": "b9f06b07.f3a768",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 89,
-    "y": 38,
-    "z": "5256b6fe.7fc0a8",
+    "x": 131,
+    "y": 70,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "4df3844d.66920c"
+        "56d70828.f50c48"
       ]
     ]
   },
   {
-    "id": "4df3844d.66920c",
+    "id": "56d70828.f50c48",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,918 +22,918 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 301.00000381469727,
-    "y": 110.0000171661377,
-    "z": "5256b6fe.7fc0a8",
+    "x": 343.00000381469727,
+    "y": 142.0000171661377,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "defa06c2.08a958"
+        "8c1c122c.922b4"
       ]
     ]
   },
   {
-    "id": "defa06c2.08a958",
+    "id": "8c1c122c.922b4",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-delete",
     "xml": "<method rpc='sdwan-attachment-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 289.0001220703125,
-    "y": 198,
-    "z": "5256b6fe.7fc0a8",
+    "x": 331.0001220703125,
+    "y": 230,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "6f0fe5c1.42509c"
+        "b8453101.deebe"
       ]
     ]
   },
   {
-    "id": "6f0fe5c1.42509c",
+    "id": "b8453101.deebe",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 305.0001220703125,
-    "y": 753.0002446174622,
-    "z": "5256b6fe.7fc0a8",
+    "x": 347.0001220703125,
+    "y": 785.0002446174622,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "d4b618b3.e243f8",
-        "daa2fd1c.e15f9",
-        "98a0548f.d105b8",
-        "4086ba28.5e7fb4",
-        "3a054970.ddb4f6",
-        "6a9e6940.dc60c8",
-        "1dcc043a.41212c",
-        "cfbf99ba.e9ea08",
-        "a788afc2.3b764",
-        "9bec45ba.823fc8",
-        "295f039a.2c737c",
-        "2676412c.7c20ee",
-        "8b527b2a.81e648",
-        "e2838697.661268",
-        "d9f8d014.bcccd"
+        "57dbee5c.be95e",
+        "ca7d47f1.45f358",
+        "7673909c.5a2e3",
+        "ecea06e3.25a318",
+        "da0989a1.945518",
+        "ae3090d.67bd97",
+        "3ac1cb4a.bcc3b4",
+        "e3865992.7e3fc8",
+        "4734b343.474b9c",
+        "b32dbc09.e3051",
+        "d3caba2b.d332f8",
+        "cfc2e19e.1fcac",
+        "61e84275.3bc6fc",
+        "cc50854b.9b5d18",
+        "2036e77.af47618"
       ]
     ]
   },
   {
-    "id": "d4b618b3.e243f8",
+    "id": "57dbee5c.be95e",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id,etc",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 701.9935607910156,
-    "y": 151.9934868812561,
-    "z": "5256b6fe.7fc0a8",
+    "x": 743.9935607910156,
+    "y": 183.9934868812561,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "2548027c.9fde3e",
+    "id": "dd97f979.9eaae8",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 730.9538726806641,
-    "y": 116.02528285980225,
-    "z": "5256b6fe.7fc0a8",
+    "x": 772.9538726806641,
+    "y": 148.02528285980225,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "daa2fd1c.e15f9",
+    "id": "ca7d47f1.45f358",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 655.9934997558594,
-    "y": 244.99349212646484,
-    "z": "5256b6fe.7fc0a8",
+    "x": 697.9934997558594,
+    "y": 276.99349212646484,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "3a054970.ddb4f6",
+    "id": "da0989a1.945518",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 662.2553901672363,
-    "y": 332.6602210998535,
-    "z": "5256b6fe.7fc0a8",
+    "x": 704.2553901672363,
+    "y": 364.6602210998535,
+    "z": "4de23974.164008",
     "wires": [
       []
     ]
   },
   {
-    "id": "98a0548f.d105b8",
+    "id": "7673909c.5a2e3",
     "type": "execute",
     "name": "generate allotted-resource url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 694.2554168701172,
-    "y": 420.66020250320435,
-    "z": "5256b6fe.7fc0a8",
+    "x": 736.2554168701172,
+    "y": 452.66020250320435,
+    "z": "4de23974.164008",
     "wires": [
       []
     ]
   },
   {
-    "id": "7276eff0.df0a8",
+    "id": "8315ba14.0dc648",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 709.9935302734375,
-    "y": 211.993501663208,
-    "z": "5256b6fe.7fc0a8",
+    "x": 751.9935302734375,
+    "y": 243.993501663208,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "e3eaa523.b8fec8",
+    "id": "3c54e364.ade40c",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 727.9934959411621,
-    "y": 297.8823823928833,
-    "z": "5256b6fe.7fc0a8",
+    "x": 769.9934959411621,
+    "y": 329.8823823928833,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "94cc654b.383a58",
+    "id": "67f0dba1.ee0bc4",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 753.9935150146484,
-    "y": 384.8823413848877,
-    "z": "5256b6fe.7fc0a8",
+    "x": 795.9935150146484,
+    "y": 416.8823413848877,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "860c0bbd.079788",
+    "id": "22c383eb.e7131c",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 821.0003280639648,
-    "y": 839.5316228866577,
-    "z": "5256b6fe.7fc0a8",
+    "x": 863.0003280639648,
+    "y": 871.5316228866577,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "1bc8c1a0.e4996e",
+    "id": "810e2b6c.9f1de8",
     "type": "for",
     "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1649.1849365234375,
-    "y": 1073.00425863266,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1691.1849365234375,
+    "y": 1105.00425863266,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "389840a4.f6186"
+        "690c4edc.5f401"
       ]
     ]
   },
   {
-    "id": "4086ba28.5e7fb4",
+    "id": "ecea06e3.25a318",
     "type": "switchNode",
     "name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
     "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 800.1842956542969,
-    "y": 1079.718041419983,
-    "z": "5256b6fe.7fc0a8",
+    "x": 842.1842956542969,
+    "y": 1111.718041419983,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "6019a57.13f705c",
-        "4a21aa00.3b1ac8"
+        "384921c2.c1fd6e",
+        "9a1aea32.687248"
       ]
     ]
   },
   {
-    "id": "30a78dd9.3c8b22",
+    "id": "e406b111.f8cad",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1250.4544582366943,
-    "y": 1119.7015271186829,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1292.4544582366943,
+    "y": 1151.7015271186829,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "1bc8c1a0.e4996e",
-        "e9fadefb.0c149"
+        "810e2b6c.9f1de8",
+        "9caa2a43.39ddb8"
       ]
     ]
   },
   {
-    "id": "389840a4.f6186",
+    "id": "690c4edc.5f401",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2099.296142578125,
-    "y": 1071.0041165351868,
-    "z": "5256b6fe.7fc0a8",
+    "x": 2141.296142578125,
+    "y": 1103.0041165351868,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "87f0a9d.62cd658"
+        "e114982a.497cc8"
       ]
     ]
   },
   {
-    "id": "6a9e6940.dc60c8",
+    "id": "ae3090d.67bd97",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 711.9687118530273,
-    "y": 875.0000677108765,
-    "z": "5256b6fe.7fc0a8",
+    "x": 753.9687118530273,
+    "y": 907.0000677108765,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "9c6dc3c.897554",
+    "id": "7a941a2c.6b5534",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1091.968994140625,
-    "y": 953.0001826286316,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1133.968994140625,
+    "y": 985.0001826286316,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "1e4f6a7c.485c96"
+        "f87fdce1.8f426"
       ]
     ]
   },
   {
-    "id": "f96c62b7.b194",
+    "id": "616b8620.cffa38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1083.8207969665527,
-    "y": 988.066267490387,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1125.8207969665527,
+    "y": 1020.066267490387,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "ecfe720a.b902e"
+        "c66c8fc5.25841"
       ]
     ]
   },
   {
-    "id": "ecfe720a.b902e",
+    "id": "c66c8fc5.25841",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1258.969482421875,
-    "y": 984.3336176872253,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1300.969482421875,
+    "y": 1016.3336176872253,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "1e4f6a7c.485c96",
+    "id": "f87fdce1.8f426",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1242.968994140625,
-    "y": 951.0001826286316,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1284.968994140625,
+    "y": 983.0001826286316,
+    "z": "4de23974.164008",
     "wires": [
       []
     ]
   },
   {
-    "id": "5fa2362a.75f678",
+    "id": "ba29c90b.a2ba18",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 945.7307624816895,
-    "y": 1268.952815413475,
-    "z": "5256b6fe.7fc0a8",
+    "x": 987.7307624816895,
+    "y": 1300.952815413475,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "3cb41c0b.eae2b4"
+        "a31d3239.91ffa"
       ]
     ]
   },
   {
-    "id": "3cb41c0b.eae2b4",
+    "id": "a31d3239.91ffa",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 1112.2546424865723,
-    "y": 1280.57188642025,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1154.2546424865723,
+    "y": 1312.57188642025,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "144dae97.c82161",
+    "id": "30824867.291518",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 952.8260498046875,
-    "y": 1301.7147830724716,
-    "z": "5256b6fe.7fc0a8",
+    "x": 994.8260498046875,
+    "y": 1333.7147830724716,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "3cb41c0b.eae2b4"
+        "a31d3239.91ffa"
       ]
     ]
   },
   {
-    "id": "2d8a7679.e4417a",
+    "id": "a9de303.1918dd",
     "type": "comment",
     "name": "TODO: Rework after confirmation from AAI",
     "info": "",
     "comments": "",
-    "x": 1077.1374282836914,
-    "y": 1219.8732151985168,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1119.1374282836914,
+    "y": 1251.8732151985168,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "1dcc043a.41212c",
+    "id": "3ac1cb4a.bcc3b4",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 678.5461502075195,
-    "y": 1232.8276824951172,
-    "z": "5256b6fe.7fc0a8",
+    "x": 720.5461502075195,
+    "y": 1264.8276824951172,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "cfbf99ba.e9ea08",
+    "id": "e3865992.7e3fc8",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 647.9592666625977,
-    "y": 1339.4435625076294,
-    "z": "5256b6fe.7fc0a8",
+    "x": 689.9592666625977,
+    "y": 1371.4435625076294,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "a788afc2.3b764",
+    "id": "4734b343.474b9c",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='Delete' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 727.6666641235352,
-    "y": 509.3333625793457,
-    "z": "5256b6fe.7fc0a8",
+    "x": 769.6666641235352,
+    "y": 541.3333625793457,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "694caf54.7b798",
-        "ae592dd1.c9cc1",
-        "f4c65729.068fc8"
+        "6ade3c12.7994f4",
+        "e1a0637a.9ebf2",
+        "b8627e78.eb192"
       ]
     ]
   },
   {
-    "id": "694caf54.7b798",
+    "id": "6ade3c12.7994f4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 967.3081665039062,
-    "y": 549.6649107933044,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1009.3081665039062,
+    "y": 581.6649107933044,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "cccfb0fc.4d54b"
+        "a87c397.af463c8"
       ]
     ]
   },
   {
-    "id": "ae592dd1.c9cc1",
+    "id": "e1a0637a.9ebf2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 964.3081665039062,
-    "y": 506.16490840911865,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1006.3081665039062,
+    "y": 538.1649084091187,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "cccfb0fc.4d54b"
+        "a87c397.af463c8"
       ]
     ]
   },
   {
-    "id": "f4c65729.068fc8",
+    "id": "b8627e78.eb192",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 971.0582466125488,
-    "y": 465.5220036506653,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1013.0582466125488,
+    "y": 497.5220036506653,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "f5848024.451b6"
+        "b1cd793e.5e9dc8"
       ]
     ]
   },
   {
-    "id": "cccfb0fc.4d54b",
+    "id": "a87c397.af463c8",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1123.058334350586,
-    "y": 527.9149088859558,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1165.058334350586,
+    "y": 559.9149088859558,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "f5848024.451b6",
+    "id": "b1cd793e.5e9dc8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1108.7141780853271,
-    "y": 465.7141833305359,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1150.7141780853271,
+    "y": 497.7141833305359,
+    "z": "4de23974.164008",
     "wires": [
       []
     ]
   },
   {
-    "id": "ace0db7.0de1828",
+    "id": "bd3b6f56.caa65",
     "type": "comment",
     "name": "Delete Allotted Resource",
     "info": "",
     "comments": "",
-    "x": 675.0000457763672,
-    "y": 478.0000286102295,
-    "z": "5256b6fe.7fc0a8",
+    "x": 717.0000457763672,
+    "y": 510.0000286102295,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "8845d317.b4499",
+    "id": "7503ea37.fd6c04",
     "type": "for",
     "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
     "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1625.00390625,
-    "y": 715.00390625,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1667.00390625,
+    "y": 747.00390625,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "f7e8e6c4.e21498"
+        "f40e177b.0b9868"
       ]
     ]
   },
   {
-    "id": "9bec45ba.823fc8",
+    "id": "b32dbc09.e3051",
     "type": "switchNode",
     "name": "switch service-data.consumed-allotted-resources_length",
     "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 778.0032920837402,
-    "y": 675.71790766716,
-    "z": "5256b6fe.7fc0a8",
+    "x": 820.0032920837402,
+    "y": 707.71790766716,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "105cf808.d9fc58",
-        "5f964ad4.a47694"
+        "c43d45d0.725118",
+        "b1813741.d0a008"
       ]
     ]
   },
   {
-    "id": "105cf808.d9fc58",
+    "id": "c43d45d0.725118",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1102.1461563110352,
-    "y": 658.5753421783447,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1144.1461563110352,
+    "y": 690.5753421783447,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "c721eaa0.d90778"
+        "494b4b44.f09f14"
       ]
     ]
   },
   {
-    "id": "5f964ad4.a47694",
+    "id": "b1813741.d0a008",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1088.1461791992188,
-    "y": 721.5753309726715,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1130.1461791992188,
+    "y": 753.5753309726715,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "d487336b.5c21"
+        "a0d3a795.96d2a8"
       ]
     ]
   },
   {
-    "id": "d487336b.5c21",
+    "id": "a0d3a795.96d2a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1248.2732696533203,
-    "y": 719.7013075351715,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1290.2732696533203,
+    "y": 751.7013075351715,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "8845d317.b4499",
-        "2a5719f4.0daa06"
+        "7503ea37.fd6c04",
+        "8fef3486.f53f48"
       ]
     ]
   },
   {
-    "id": "295f039a.2c737c",
+    "id": "d3caba2b.d332f8",
     "type": "set",
     "name": "set consumed allotted resources for deletion",
     "xml": "<set>\n<parameter name=\"service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].\" value=\"\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n",
     "comments": "",
-    "x": 734.8606262207031,
-    "y": 746.28955078125,
-    "z": "5256b6fe.7fc0a8",
+    "x": 776.8606262207031,
+    "y": 778.28955078125,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "f7e8e6c4.e21498",
+    "id": "f40e177b.0b9868",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2063.1155166625977,
-    "y": 711.0040283203125,
-    "z": "5256b6fe.7fc0a8",
+    "x": 2105.1155166625977,
+    "y": 743.0040283203125,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "129a19f.57049e6"
+        "5f3df777.af7b38"
       ]
     ]
   },
   {
-    "id": "129a19f.57049e6",
+    "id": "5f3df777.af7b38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2258.925338745117,
-    "y": 710.4683527946472,
-    "z": "5256b6fe.7fc0a8",
+    "x": 2300.925338745117,
+    "y": 742.4683527946472,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "e64da982.d670b8"
+        "6d89866f.0d32c8"
       ]
     ]
   },
   {
-    "id": "a61544d0.afeca8",
+    "id": "e9496ef8.3a3c5",
     "type": "set",
     "name": "set tmp.cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n",
     "comments": "",
-    "x": 2574.2618713378906,
-    "y": 711.2246108055115,
-    "z": "5256b6fe.7fc0a8",
+    "x": 2616.2618713378906,
+    "y": 743.2246108055115,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "77efab9.9957c54",
+    "id": "e2abacaf.782bf",
     "type": "comment",
     "name": "Delete consumed service consumed-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 789.0045623779297,
-    "y": 608.0038724095793,
-    "z": "5256b6fe.7fc0a8",
+    "x": 831.0045623779297,
+    "y": 640.0038724095793,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "78d83bc7.d44d54",
+    "id": "e6fb5c22.b2976",
     "type": "comment",
     "name": "This set resource will be deleted in MDSAL by provider code",
     "info": "",
     "comments": "",
-    "x": 779.337345123291,
-    "y": 712.781964302063,
-    "z": "5256b6fe.7fc0a8",
+    "x": 821.337345123291,
+    "y": 744.781964302063,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "a9f71f74.85a1",
+    "id": "e963214.b61b0e",
     "type": "comment",
     "name": "Obtain the index of conusumed AR",
     "info": "",
     "comments": "",
-    "x": 701.7817535400391,
-    "y": 639.8927326202393,
-    "z": "5256b6fe.7fc0a8",
+    "x": 743.7817535400391,
+    "y": 671.8927326202393,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "c721eaa0.d90778",
+    "id": "494b4b44.f09f14",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n",
     "comments": "",
-    "x": 1264.00390625,
-    "y": 659.00390625,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1306.00390625,
+    "y": 691.00390625,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "e64da982.d670b8",
+    "id": "6d89866f.0d32c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2408.003936767578,
-    "y": 711.2539558410645,
-    "z": "5256b6fe.7fc0a8",
+    "x": 2450.003936767578,
+    "y": 743.2539558410645,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "a61544d0.afeca8"
+        "e9496ef8.3a3c5"
       ]
     ]
   },
   {
-    "id": "15284a02.c01676",
+    "id": "851fd9bb.09d5f8",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"resource to be deleted is not available in mdsal\" />\n",
     "comments": "",
-    "x": 1718.25390625,
-    "y": 768.25390625,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1760.25390625,
+    "y": 800.25390625,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "3056effb.bf63e",
+    "id": "d98b4681.77ed08",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1580.75390625,
-    "y": 768.25390625,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1622.75390625,
+    "y": 800.25390625,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "15284a02.c01676"
+        "851fd9bb.09d5f8"
       ]
     ]
   },
   {
-    "id": "2a5719f4.0daa06",
+    "id": "8fef3486.f53f48",
     "type": "switchNode",
     "name": "switch tmp.cidx ",
     "xml": "<switch test=\"`$tmp.cidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1426.75390625,
-    "y": 768.25390625,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1468.75390625,
+    "y": 800.25390625,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "3056effb.bf63e"
+        "d98b4681.77ed08"
       ]
     ]
   },
   {
-    "id": "7516e2f4.527d0c",
+    "id": "3dd9973a.4ea7a8",
     "type": "comment",
     "name": "Delete provided service provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 775.5039215087891,
-    "y": 804.00390625,
-    "z": "5256b6fe.7fc0a8",
+    "x": 817.5039215087891,
+    "y": 836.00390625,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "4a21aa00.3b1ac8",
+    "id": "9a1aea32.687248",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1103.5041770935059,
-    "y": 1118.7540984153748,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1145.5041770935059,
+    "y": 1150.7540984153748,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "30a78dd9.3c8b22"
+        "e406b111.f8cad"
       ]
     ]
   },
   {
-    "id": "6019a57.13f705c",
+    "id": "384921c2.c1fd6e",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1120.5040969848633,
-    "y": 1030.7539324760437,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1162.5040969848633,
+    "y": 1062.7539324760437,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "949446a8.12d2b8"
+        "a35171cd.d90da"
       ]
     ]
   },
   {
-    "id": "949446a8.12d2b8",
+    "id": "a35171cd.d90da",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n",
     "comments": "",
-    "x": 1284.3616943359375,
-    "y": 1031.1824774742126,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1326.3616943359375,
+    "y": 1063.1824774742126,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "f670e307.a2a7a",
+    "id": "702543f3.ec4a8c",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"resource to be deleted is not available in mdsal\" />\n",
     "comments": "",
-    "x": 1715.7539501190186,
-    "y": 1148.753936290741,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1757.7539501190186,
+    "y": 1180.753936290741,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "66a217ce.0565f8",
+    "id": "f0b84e69.39376",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1578.2539501190186,
-    "y": 1148.753936290741,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1620.2539501190186,
+    "y": 1180.753936290741,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "f670e307.a2a7a"
+        "702543f3.ec4a8c"
       ]
     ]
   },
   {
-    "id": "e9fadefb.0c149",
+    "id": "9caa2a43.39ddb8",
     "type": "switchNode",
     "name": "switch tmp.pidx ",
     "xml": "<switch test=\"`$tmp.pidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1424.2539501190186,
-    "y": 1148.753936290741,
-    "z": "5256b6fe.7fc0a8",
+    "x": 1466.2539501190186,
+    "y": 1180.753936290741,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "66a217ce.0565f8"
+        "f0b84e69.39376"
       ]
     ]
   },
   {
-    "id": "87f0a9d.62cd658",
+    "id": "e114982a.497cc8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2288.504367828369,
-    "y": 1068.7540946006775,
-    "z": "5256b6fe.7fc0a8",
+    "x": 2330.504367828369,
+    "y": 1100.7540946006775,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "9a3770db.667c5"
+        "5dc21145.7fddd"
       ]
     ]
   },
   {
-    "id": "30ce9227.a6174e",
+    "id": "9af67acf.f5f308",
     "type": "set",
     "name": "set tmp.pidx",
     "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n",
     "comments": "",
-    "x": 2356.8404846191406,
-    "y": 1203.5101914405823,
-    "z": "5256b6fe.7fc0a8",
+    "x": 2398.8404846191406,
+    "y": 1235.5101914405823,
+    "z": "4de23974.164008",
     "wires": []
   },
   {
-    "id": "9a3770db.667c5",
+    "id": "5dc21145.7fddd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2348.582820892334,
-    "y": 1139.539580821991,
-    "z": "5256b6fe.7fc0a8",
+    "x": 2390.582820892334,
+    "y": 1171.539580821991,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "30ce9227.a6174e"
+        "9af67acf.f5f308"
       ]
     ]
   },
   {
-    "id": "d9f8d014.bcccd",
+    "id": "2036e77.af47618",
     "type": "update",
     "name": "update AAI allotted-resource",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='allotted-resource'  \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\">\n",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='allotted-resource'  \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 691.2227554321289,
-    "y": 1288.754346370697,
-    "z": "5256b6fe.7fc0a8",
+    "x": 733.2227554321289,
+    "y": 1320.754346370697,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "5fa2362a.75f678",
-        "144dae97.c82161"
+        "ba29c90b.a2ba18",
+        "30824867.291518"
       ]
     ]
   },
   {
-    "id": "8b527b2a.81e648",
+    "id": "61e84275.3bc6fc",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 781.3334197998047,
-    "y": 974.333366394043,
-    "z": "5256b6fe.7fc0a8",
+    "x": 823.3334197998047,
+    "y": 1006.333366394043,
+    "z": "4de23974.164008",
     "wires": [
       [
-        "9c6dc3c.897554",
-        "f96c62b7.b194"
+        "7a941a2c.6b5534",
+        "616b8620.cffa38"
       ]
     ]
   },
   {
-    "id": "2676412c.7c20ee",
+    "id": "cfc2e19e.1fcac",
     "type": "execute",
     "name": "get parent-service-data tmp.ar-url-psd",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 715.3333587646484,
-    "y": 932.3332056999207,
-    "z": "5256b6fe.7fc0a8",
+    "x": 757.3333587646484,
+    "y": 964.3332056999207,
+    "z": "4de23974.164008",
     "wires": [
       []
     ]
   },
   {
-    "id": "e2838697.661268",
+    "id": "cc50854b.9b5d18",
     "type": "execute",
     "name": "execute RestApiCallNode - delete-resource parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.controller.url + $tmp.ar-url-psd + '/provided-allotted-resources/provided-allotted-resource/' + $tmp.ar.allotted-resource-id`\" />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd-delete\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 797.00390625,
-    "y": 1179.00390625,
-    "z": "5256b6fe.7fc0a8",
+    "x": 839.00390625,
+    "y": 1211.00390625,
+    "z": "4de23974.164008",
     "wires": [
       []
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
index 20bd1ea..12e88e0 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
@@ -1 +1,1623 @@
-[{"id":"46d6fdfc.0d3d74","type":"dgstart","name":"DGSTART","outputs":1,"x":142.00390625,"y":70.00390625,"z":"941656e1.8095c8","wires":[["3dff9ac3.bb3cb6"]]},{"id":"3dff9ac3.bb3cb6","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","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}'>","outputs":1,"x":273.2895965576172,"y":119.24201488494873,"z":"941656e1.8095c8","wires":[["2ef3e2.eacdfc1e"]]},{"id":"2ef3e2.eacdfc1e","type":"method","name":"method sdwan-vnf-topology-operation-wanport-activate","xml":"<method rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync'>\n","comments":"","outputs":1,"x":276.4325256347656,"y":204.00393867492676,"z":"941656e1.8095c8","wires":[["4424dee4.7277c"]]},{"id":"4424dee4.7277c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":339.67066192626953,"y":809.670895576477,"z":"941656e1.8095c8","wires":[["6e86cc91.e0dec4","5bdbf2ca.b4e3dc","151081d2.0192fe","c29d81d2.26164","a2e7cf45.ff9e2","38e08d51.507ad2","94bebe02.1a335","a5bbfdf4.35473","a43c9c13.d97cd","32a8d1f7.681cde","92918d15.6311e","11b93136.6ca9cf","539afc44.b0e354","141979cd.9670c6","b7e436fa.b674a8","1b1c84a1.cf917b","c375f7fa.294358","811217d2.ba2838","d9fd9ca8.ebcd1","626cbb77.e952f4"]]},{"id":"6e86cc91.e0dec4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":666.338436126709,"y":1541.3386178016663,"z":"941656e1.8095c8","wires":[]},{"id":"32a8d1f7.681cde","type":"execute","name":"execute RestApiCallNode device port create","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\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`\" />","comments":"","outputs":1,"x":754.3380165100098,"y":804.893404006958,"z":"941656e1.8095c8","wires":[["5cc9a68e.86df28","fed901a6.fef5b"]]},{"id":"5cc9a68e.86df28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1003.3380756378174,"y":818.8936100006104,"z":"941656e1.8095c8","wires":[["19629438.2f203c"]]},{"id":"fed901a6.fef5b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1003.3380756378174,"y":780.8934454917908,"z":"941656e1.8095c8","wires":[["b43125d5.1cbe28"]]},{"id":"b43125d5.1cbe28","type":"returnFailure","name":"return failure","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 device port rest api\" />\n","comments":"","x":1147.3384094238281,"y":779.8934450149536,"z":"941656e1.8095c8","wires":[]},{"id":"19629438.2f203c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1150.3380870819092,"y":819.8934488296509,"z":"941656e1.8095c8","wires":[[]]},{"id":"92918d15.6311e","type":"execute","name":"execute RestApiCallNode get transport network info","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\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=\"transportNetworksResp\"/>\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`\" />","comments":"","outputs":1,"x":777.0043678283691,"y":984.0045094490051,"z":"941656e1.8095c8","wires":[["3327c1fb.4d24fe","c55988fe.a0e798"]]},{"id":"539afc44.b0e354","type":"execute","name":"execute RestApiCallNode wan port create","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"wanPortResp\"/>\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`\" />","comments":"","outputs":1,"x":750.0044593811035,"y":1221.004557609558,"z":"941656e1.8095c8","wires":[["ad0f8d25.41a07","6aa8a6c5.0c81c8"]]},{"id":"5bdbf2ca.b4e3dc","type":"switchNode","name":"switch service-data.vnfs.vnf_length","xml":"<switch test='`$service-data.vnfs.vnf_length`'>\n","comments":"","outputs":1,"x":736.0248413085938,"y":148.02481842041016,"z":"941656e1.8095c8","wires":[["a576fae9.715c48","c3727d96.694c","c11796b3.901648"]]},{"id":"a576fae9.715c48","type":"other","name":"Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":988.0248756408691,"y":149.02489948272705,"z":"941656e1.8095c8","wires":[["5f0271db.92f1e"]]},{"id":"5f0271db.92f1e","type":"returnFailure","name":"return failure","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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n","comments":"","x":1149.8026237487793,"y":128.91384649276733,"z":"941656e1.8095c8","wires":[]},{"id":"c3727d96.694c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":981.0252838134766,"y":182.02490329742432,"z":"941656e1.8095c8","wires":[["dfdaa60f.2c4798"]]},{"id":"dfdaa60f.2c4798","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1004.2947998046875,"y":280.5794982910156,"z":"941656e1.8095c8","wires":[["29ab81e8.aad05e","1ff5f2ad.bd779d","d40815b2.6f0e48","ae71fbba.546708","cda43949.a48508"]]},{"id":"29ab81e8.aad05e","type":"for","name":"for vidx..service-data.vnfs.vnf_length[]","xml":"<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":1284.3109436035156,"y":174.45346450805664,"z":"941656e1.8095c8","wires":[["27d5ec0c.5024d4"]]},{"id":"1ff5f2ad.bd779d","type":"switchNode","name":"switch tmp.vidx ","xml":"<switch test=\"`$tmp.vidx`\">\n\n","comments":"","outputs":1,"x":1210.612247467041,"y":320.43669986724854,"z":"941656e1.8095c8","wires":[["e7d084a0.2326d8"]]},{"id":"e7d084a0.2326d8","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1358.0408897399902,"y":320.0081100463867,"z":"941656e1.8095c8","wires":[["2ada3281.d776de"]]},{"id":"d3e4c80f.d09fa8","type":"switchNode","name":"switch vnfid found","xml":"<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n","comments":"","outputs":1,"x":1657.7401733398438,"y":173.70362663269043,"z":"941656e1.8095c8","wires":[["2986fb68.2295a4"]]},{"id":"2ada3281.d776de","type":"returnFailure","name":"return failure","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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n","comments":"","x":1507.4696159362793,"y":321.15102767944336,"z":"941656e1.8095c8","wires":[]},{"id":"2986fb68.2295a4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1812.6921653747559,"y":174.59630584716797,"z":"941656e1.8095c8","wires":[["18f7dec7.63c771"]]},{"id":"c972958e.ff1258","type":"set","name":"set tmp.vidx and ctx.vnf-data","xml":"<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n","comments":"","x":2220.224250793457,"y":84.34636402130127,"z":"941656e1.8095c8","wires":[]},{"id":"c11796b3.901648","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":989.9936256408691,"y":112.99358558654785,"z":"941656e1.8095c8","wires":[["5f0271db.92f1e"]]},{"id":"141979cd.9670c6","type":"set","name":"set device PortId to service data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.wan.devicePortId`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n","comments":"","x":718.9948272705078,"y":1277.9951152801514,"z":"941656e1.8095c8","wires":[]},{"id":"40c1c1e5.e807e","type":"comment","name":"Get siteId from site resource created for this service","info":"","comments":"","x":761.9938888549805,"y":333.32712268829346,"z":"941656e1.8095c8","wires":[]},{"id":"27d5ec0c.5024d4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1503.6605758666992,"y":173.99354457855225,"z":"941656e1.8095c8","wires":[["d3e4c80f.d09fa8"]]},{"id":"151081d2.0192fe","type":"set","name":"set vnfId and vnf-object-path","xml":"<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />","comments":"","x":699.5501403808594,"y":1420.217029094696,"z":"941656e1.8095c8","wires":[]},{"id":"c29d81d2.26164","type":"set","name":"set vnf-level-oper-status to Active","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n","comments":"","x":716.9946022033691,"y":1459.9948649406433,"z":"941656e1.8095c8","wires":[]},{"id":"d9fd9ca8.ebcd1","type":"update","name":"update SDWAN wan port instance configuration in AAI","xml":"<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name=\"wan-port-config-id\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='Active' />\n<parameter name='device-port-id' value='`$prop.wan.devicePortId`' />\n<parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n","comments":"","outputs":1,"x":779.657527923584,"y":1499.1423268318176,"z":"941656e1.8095c8","wires":[[]]},{"id":"540113a8.f6e3bc","type":"set","name":"set prop.wan.transportNetworkId","xml":"<set>\n<parameter name='prop.wan.transportNetworkId' value='`$transportNetworksResp.data.transportNetworks[$tidx].id`' />\n","comments":"","x":1531.995449066162,"y":1060.9945812225342,"z":"941656e1.8095c8","wires":[]},{"id":"811217d2.ba2838","type":"for","name":"for loop sidx - Get siteId from servicedata","xml":"<for index=\"sidx\" start=\"0\" end=\"`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":741.9939117431641,"y":483.9937791824341,"z":"941656e1.8095c8","wires":[["5a526d31.0941f4"]]},{"id":"eb17c95f.c77458","type":"switchNode","name":"switch siteId","xml":"<switch test=\"`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'siteId'`\">\n","comments":"","outputs":1,"x":1172.994239807129,"y":484.99390983581543,"z":"941656e1.8095c8","wires":[["fec4cb2a.2c7e38"]]},{"id":"fec4cb2a.2c7e38","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1310.9946975708008,"y":482.99389457702637,"z":"941656e1.8095c8","wires":[["b43cbcc4.04945"]]},{"id":"b43cbcc4.04945","type":"set","name":"set prop.wan.siteId","xml":"<set>\n<parameter name='prop.wan.siteId' value='`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n\n\n","comments":"","x":1474.9947319030762,"y":484.59374809265137,"z":"941656e1.8095c8","wires":[]},{"id":"11b93136.6ca9cf","type":"execute","name":"execute split ip and mask","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.wan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n","comments":"","outputs":1,"x":700.9942359924316,"y":1129.3275499343872,"z":"941656e1.8095c8","wires":[["8bee1efd.9d6b2","15fadf5a.5c3931"]]},{"id":"15fadf5a.5c3931","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":901.994255065918,"y":1107.3275413513184,"z":"941656e1.8095c8","wires":[["8296d7d6.8486f8"]]},{"id":"8bee1efd.9d6b2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":901.9942588806152,"y":1148.3275451660156,"z":"941656e1.8095c8","wires":[["202ce5b1.58685a"]]},{"id":"8296d7d6.8486f8","type":"set","name":"set ipAddress prefixLength","xml":"<set>\n<parameter name='prop.wan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.wan.prefixLength' value='`$ipandMask[1]`' />","comments":"","x":1098.9942741394043,"y":1105.3275413513184,"z":"941656e1.8095c8","wires":[]},{"id":"202ce5b1.58685a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n","comments":"","x":1056.9942665100098,"y":1145.3275442123413,"z":"941656e1.8095c8","wires":[]},{"id":"a5bbfdf4.35473","type":"get-resource","name":"get-resource esr-thirdparty-sdnc","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 = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n","comments":"","outputs":1,"x":716.4940795898438,"y":581.9938354492188,"z":"941656e1.8095c8","wires":[["a1fae638.ce0e38","c7e4f763.873648","695a6a89.62d134"]]},{"id":"a1fae638.ce0e38","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":948.4941635131836,"y":545.9938583374023,"z":"941656e1.8095c8","wires":[["43c09877.81b248"]]},{"id":"c7e4f763.873648","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":950.9850463867188,"y":581.5678949356079,"z":"941656e1.8095c8","wires":[["7bb99ede.125ea"]]},{"id":"695a6a89.62d134","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":946.3180541992188,"y":617.9012537002563,"z":"941656e1.8095c8","wires":[["7755af9b.62a34"]]},{"id":"7755af9b.62a34","type":"returnFailure","name":"return failure","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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n","comments":"","x":1100.0905456542969,"y":615.3403406143188,"z":"941656e1.8095c8","wires":[]},{"id":"7bb99ede.125ea","type":"returnFailure","name":"return failure","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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n","comments":"","x":1096.5564422607422,"y":579.8535823822021,"z":"941656e1.8095c8","wires":[]},{"id":"43c09877.81b248","type":"set","name":"set controller data","xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n","comments":"","x":1108.9942741394043,"y":543.9937982559204,"z":"941656e1.8095c8","wires":[]},{"id":"a2e7cf45.ff9e2","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-wanport-vnf-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n","comments":"","outputs":1,"x":654.0040016174316,"y":204.00393629074097,"z":"941656e1.8095c8","wires":[[]]},{"id":"38e08d51.507ad2","type":"execute","name":"execute Properties","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' />\n","comments":"","outputs":1,"x":690.3061256408691,"y":239.00398015975952,"z":"941656e1.8095c8","wires":[[]]},{"id":"a43c9c13.d97cd","type":"execute","name":"execute RestApiCallNode Get token","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>","comments":"","outputs":1,"x":731.0042114257812,"y":669.6708374023438,"z":"941656e1.8095c8","wires":[["7b139fe2.0d3ea","5f5e8987.ed1188"]]},{"id":"7b139fe2.0d3ea","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":966.004337310791,"y":655.670825958252,"z":"941656e1.8095c8","wires":[["64afeedb.7ff63"]]},{"id":"64afeedb.7ff63","type":"set","name":"set token-id","xml":"<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n","comments":"","x":1108.0043449401855,"y":654.6708269119263,"z":"941656e1.8095c8","wires":[]},{"id":"8c817f35.4dc83","type":"returnFailure","name":"return failure","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 get token rest api\" />\n","comments":"","x":1114.0043449401855,"y":692.0638151168823,"z":"941656e1.8095c8","wires":[]},{"id":"5f5e8987.ed1188","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":965.254337310791,"y":691.3137331008911,"z":"941656e1.8095c8","wires":[["8c817f35.4dc83"]]},{"id":"550c76f1.771f98","type":"switchNode","name":"switch transportNetworkName same","xml":"<switch test=\"`$transportNetworksResp.data.transportNetworks[$tidx].name == $prop.wan.transportNetworkName`\">\n\n","comments":"","outputs":1,"x":1171.0050621032715,"y":1018.6709794998169,"z":"941656e1.8095c8","wires":[["32465786.9bb1f8"]]},{"id":"32465786.9bb1f8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1384.0045127868652,"y":1018.6708974838257,"z":"941656e1.8095c8","wires":[["540113a8.f6e3bc"]]},{"id":"f0dc5ee5.ceaf8","type":"switchNode","name":"switch ActivateSDWANDeviceInstance","xml":"<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n","comments":"","outputs":1,"x":1598.3375091552734,"y":251.00396347045898,"z":"941656e1.8095c8","wires":[["f3b0bb97.35fe78"]]},{"id":"f3b0bb97.35fe78","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1821.3375186920166,"y":251.00396347045898,"z":"941656e1.8095c8","wires":[["8f1b5c96.10d07"]]},{"id":"9ea18cc5.bcded","type":"set","name":"set tmp.devicevidx","xml":"<set>\n<parameter name='tmp.devicevidx' value='`$vidx`' />\n\n","comments":"","x":2786.3368530273438,"y":682.0039882659912,"z":"941656e1.8095c8","wires":[]},{"id":"cda43949.a48508","type":"switchNode","name":"switch tmp.devicevidx","xml":"<switch test=\"`$tmp.devicevidx`\">\n\n","comments":"","outputs":1,"x":1251.3374366760254,"y":409.0040259361267,"z":"941656e1.8095c8","wires":[["cab806dc.723728"]]},{"id":"cab806dc.723728","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1435.7660026550293,"y":409.57546281814575,"z":"941656e1.8095c8","wires":[["ce137ba4.ab4808"]]},{"id":"ce137ba4.ab4808","type":"returnFailure","name":"return failure","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=\"ActivateSDWANDeviceInstance not found in service-data\" />\n","comments":"","x":1576.1947441101074,"y":409.71834230422974,"z":"941656e1.8095c8","wires":[]},{"id":"273aead0.9eb3a6","type":"comment","name":"Get deviceId from device resource created for this service","info":"","comments":"","x":2235.6707916259766,"y":348.33724212646484,"z":"941656e1.8095c8","wires":[]},{"id":"4e13b56.4d1d64c","type":"for","name":"for loop didx - Get deviceId from servicedata","xml":"<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2221.671001434326,"y":272.00388622283936,"z":"941656e1.8095c8","wires":[["92766af3.12d248"]]},{"id":"c477fc4d.b0d32","type":"switchNode","name":"switch name (DeviceName)","xml":"<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].name == 'name'`\">\n","comments":"","outputs":1,"x":2239.671600341797,"y":410.0041313171387,"z":"941656e1.8095c8","wires":[["41bc9702.e49d18"]]},{"id":"41bc9702.e49d18","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2441.672092437744,"y":404.0041913986206,"z":"941656e1.8095c8","wires":[["2a414e7.1dfdeb2"]]},{"id":"5a526d31.0941f4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1004.0041046142578,"y":484.67060375213623,"z":"941656e1.8095c8","wires":[["eb17c95f.c77458"]]},{"id":"92766af3.12d248","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2014.003890991211,"y":408.6706323623657,"z":"941656e1.8095c8","wires":[["c477fc4d.b0d32"]]},{"id":"300379eb.34eba6","type":"switchNode","name":"switch deviceId","xml":"<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n","comments":"","outputs":1,"x":3085.0050506591797,"y":622.6709289550781,"z":"941656e1.8095c8","wires":[["1e04fb03.c02275"]]},{"id":"1e04fb03.c02275","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3238.0054206848145,"y":623.6710062026978,"z":"941656e1.8095c8","wires":[["febe1667.67dc28"]]},{"id":"febe1667.67dc28","type":"set","name":"set prop.wan.deviceId","xml":"<set>\n<parameter name='prop.wan.deviceId' value='`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n","comments":"","x":3407.0060272216797,"y":622.2710409164429,"z":"941656e1.8095c8","wires":[]},{"id":"8f1b5c96.10d07","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1962.6708374023438,"y":273.00398349761963,"z":"941656e1.8095c8","wires":[["4e13b56.4d1d64c"]]},{"id":"2a414e7.1dfdeb2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2260.0051345825195,"y":487.0041608810425,"z":"941656e1.8095c8","wires":[["97c6ed04.8c4b6"]]},{"id":"7cbc77f3.7157c8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2649.0058403015137,"y":490.00428581237793,"z":"941656e1.8095c8","wires":[["fc9feae5.213678"]]},{"id":"18f7dec7.63c771","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1951.3376846313477,"y":175.00393962860107,"z":"941656e1.8095c8","wires":[["c972958e.ff1258","20413b2e.a4e934","d5207b14.483ab8","4003ca14.00a3a4"]]},{"id":"54164621.634478","type":"set","name":"set prop.wan.wanPortId","xml":"<set>\n<parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />\n","comments":"","x":1326.3287029266357,"y":1239.6612844467163,"z":"941656e1.8095c8","wires":[]},{"id":"b7e436fa.b674a8","type":"set","name":"set prop.wan.devicePortId","xml":"<set>\n<parameter name='prop.wan.devicePortId' value='`$portResp.success[0].id`' />\n","comments":"","x":708.9952239990234,"y":866.9945602416992,"z":"941656e1.8095c8","wires":[]},{"id":"147912c.8f205ed","type":"comment","name":"Create port","info":"","comments":"","x":656.0039558410645,"y":771.3374280929565,"z":"941656e1.8095c8","wires":[]},{"id":"f901209e.dc4fb","type":"comment","name":"Get network id","info":"","comments":"","x":707.0040283203125,"y":949.3373865485191,"z":"941656e1.8095c8","wires":[]},{"id":"166789be.de4306","type":"comment","name":"Create wan port","info":"","comments":"","x":674.0041122436523,"y":1082.3375997543335,"z":"941656e1.8095c8","wires":[]},{"id":"6aa8a6c5.0c81c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":986.0041160583496,"y":1207.0041790008545,"z":"941656e1.8095c8","wires":[["c6f20e4e.e6f5"]]},{"id":"ad0f8d25.41a07","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":990.0040855407715,"y":1241.004285812378,"z":"941656e1.8095c8","wires":[["4d940881.eaca88"]]},{"id":"4d940881.eaca88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1134.0041007995605,"y":1240.0041227340698,"z":"941656e1.8095c8","wires":[["54164621.634478"]]},{"id":"93fe9fd5.c023","type":"returnFailure","name":"return failure","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 wan port rest api\" />\n","comments":"","x":1308.004482269287,"y":1206.004210472107,"z":"941656e1.8095c8","wires":[]},{"id":"c55988fe.a0e798","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1083.0039558410645,"y":932.0040845870972,"z":"941656e1.8095c8","wires":[["3bae7b03.73d364"]]},{"id":"3327c1fb.4d24fe","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1083.0039520263672,"y":972.0042495727539,"z":"941656e1.8095c8","wires":[["f0b104fa.c0deb8"]]},{"id":"f0b104fa.c0deb8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1227.0039672851562,"y":971.0040864944458,"z":"941656e1.8095c8","wires":[[]]},{"id":"3bae7b03.73d364","type":"returnFailure","name":"return failure","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 Get transport network info rest api\" />\n","comments":"","x":1225.0042877197266,"y":931.0040845870972,"z":"941656e1.8095c8","wires":[]},{"id":"d5207b14.483ab8","type":"call","name":"call sdwan-get-wan-param","xml":"<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n","comments":"","outputs":1,"x":2223.670539855957,"y":181.0039825439453,"z":"941656e1.8095c8","wires":[[]]},{"id":"20413b2e.a4e934","type":"set","name":"set vnf-request-input.","xml":"<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n","comments":"","x":2192.670539855957,"y":131.003999710083,"z":"941656e1.8095c8","wires":[]},{"id":"5b0f6055.7179","type":"comment","name":"This is also required for template parameters update","info":"","comments":"","x":2588.0043029785156,"y":227.00394248962402,"z":"941656e1.8095c8","wires":[]},{"id":"50e23754.b09268","type":"switchNode","name":"switch ActivateSiteInstance","xml":"<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n","comments":"","outputs":1,"x":1561.0043487548828,"y":216.00395584106445,"z":"941656e1.8095c8","wires":[["97fa566d.a78ef8"]]},{"id":"97fa566d.a78ef8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1757.0045318603516,"y":217.00395584106445,"z":"941656e1.8095c8","wires":[["f588a589.b88298"]]},{"id":"f588a589.b88298","type":"set","name":"set tmp.siteVidx","xml":"<set>\n<parameter name='tmp.siteVidx' value='`$vidx`' />\n<parameter name='ctx.site.' value='`$service-data.vnfs.vnf[$vidx].`' />\n\n","comments":"","x":1943.0038299560547,"y":214.00395965576172,"z":"941656e1.8095c8","wires":[]},{"id":"ae71fbba.546708","type":"switchNode","name":"switch tmp.siteVidx","xml":"<switch test=\"`$tmp.siteVidx`\">\n\n","comments":"","outputs":1,"x":1234.6706581115723,"y":358.00397634506226,"z":"941656e1.8095c8","wires":[["3f02b2e3.e5e5ae"]]},{"id":"3f02b2e3.e5e5ae","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1409.0993690490723,"y":358.5754280090332,"z":"941656e1.8095c8","wires":[["54b3eb72.36f954"]]},{"id":"54b3eb72.36f954","type":"returnFailure","name":"return failure","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=\"ActivateSiteInstance not found in service-data\" />\n","comments":"","x":1551.5280876159668,"y":357.71829080581665,"z":"941656e1.8095c8","wires":[]},{"id":"97c6ed04.8c4b6","type":"switchNode","name":"switch deviceName match","xml":"<switch test=\"`$prop.wan.deviceName == $service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].value`\">\n\n\n","comments":"","outputs":1,"x":2465.671859741211,"y":488.0042247772217,"z":"941656e1.8095c8","wires":[["7cbc77f3.7157c8"]]},{"id":"fc9feae5.213678","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2548.3377990722656,"y":562.0040683746338,"z":"941656e1.8095c8","wires":[["6c43560b.6674b8","9ea18cc5.bcded"]]},{"id":"6c43560b.6674b8","type":"for","name":"for loop deviceidx - Get deviceId from servicedata","xml":"<for index=\"deviceidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2828.5349502563477,"y":557.0352573394775,"z":"941656e1.8095c8","wires":[["95b06241.a3403"]]},{"id":"95b06241.a3403","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2905.5356826782227,"y":621.0353565216064,"z":"941656e1.8095c8","wires":[["300379eb.34eba6"]]},{"id":"4003ca14.00a3a4","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\".....\"/>\n<parameter name=\"field3\" value=\"prop.wan.deviceName\"/>\n<parameter name=\"field4\" value='`$prop.wan.deviceName`'/>\n","comments":"","outputs":1,"x":2151.535285949707,"y":229.0351734161377,"z":"941656e1.8095c8","wires":[[]]},{"id":"d40815b2.6f0e48","type":"for","name":"for vidx..service-data.vnfs.vnf_length[]","xml":"<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":1277.003978729248,"y":252.0039234161377,"z":"941656e1.8095c8","wires":[["f0dc5ee5.ceaf8","50e23754.b09268"]]},{"id":"94bebe02.1a335","type":"set","name":"copy input data to service data","xml":"<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />","comments":"","x":712.0351943969727,"y":1374.5353388786316,"z":"941656e1.8095c8","wires":[]},{"id":"83fdb698.dfc008","type":"comment","name":"TODO: split ip/mask","info":"","comments":"","x":1098.00390625,"y":1067.5078134536743,"z":"941656e1.8095c8","wires":[]},{"id":"538e6756.86b638","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":950.0047798156738,"y":1020.3376731872559,"z":"941656e1.8095c8","wires":[["550c76f1.771f98"]]},{"id":"1b1c84a1.cf917b","type":"for","name":"for loop tidx - Get transportNetwork ID","xml":"<for index=\"tidx\" start=\"0\" end=\"`$transportNetworksResp.data.transportNetworks_length`\">\n    \n    \n","comments":"","outputs":1,"x":734.0043983459473,"y":1019.3374290466309,"z":"941656e1.8095c8","wires":[["538e6756.86b638"]]},{"id":"c375f7fa.294358","type":"set","name":"set wan portId to service data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='wanPortId' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.wan.wanPortId`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n","comments":"","x":713.0039215087891,"y":1324.254180431366,"z":"941656e1.8095c8","wires":[]},{"id":"626cbb77.e952f4","type":"call","name":"call sdwan-get-tenant-auth","xml":"<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n","comments":"","outputs":1,"x":706.00390625,"y":725.00390625,"z":"941656e1.8095c8","wires":[[]]},{"id":"c6f20e4e.e6f5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1130.0079612731934,"y":1205.5078706741333,"z":"941656e1.8095c8","wires":[[]]}]
\ No newline at end of file
+[
+  {
+    "id": "d6f12b23.a89678",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 97,
+    "y": 43,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "c865ab04.6af178"
+      ]
+    ]
+  },
+  {
+    "id": "c865ab04.6af178",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "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}'>",
+    "outputs": 1,
+    "x": 228.2856903076172,
+    "y": 92.23810863494873,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "6872e2ee.d6997c"
+      ]
+    ]
+  },
+  {
+    "id": "6872e2ee.d6997c",
+    "type": "method",
+    "name": "method sdwan-vnf-topology-operation-wanport-activate",
+    "xml": "<method rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 231.42861938476562,
+    "y": 177.00003242492676,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "e8a5051a.b42f68"
+      ]
+    ]
+  },
+  {
+    "id": "e8a5051a.b42f68",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 294.66675567626953,
+    "y": 782.666989326477,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "8f3957a7.d167f8",
+        "4891bde.3538244",
+        "ffc944ec.552788",
+        "d579e51d.f36088",
+        "d09273d4.34d5b",
+        "d8cffa08.c70f58",
+        "272d2403.37c86c",
+        "b6ab2db8.206f6",
+        "e9d254c6.c408a8",
+        "2a8c1af8.df5bf6",
+        "ee4c5d7e.eaa99",
+        "455c32c0.dc954c",
+        "dc56d269.4a63b",
+        "1286c83c.18ccc8",
+        "de66785c.628fe8",
+        "8b82d2e5.53604",
+        "a401887.73e5778",
+        "863a36e8.4a5b78",
+        "2c809153.c42dee",
+        "2c725167.90a60e"
+      ]
+    ]
+  },
+  {
+    "id": "8f3957a7.d167f8",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+    "comments": "",
+    "x": 621.334529876709,
+    "y": 1514.3347115516663,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "2a8c1af8.df5bf6",
+    "type": "execute",
+    "name": "execute RestApiCallNode device port create",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 709.3341102600098,
+    "y": 777.889497756958,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "e20e98c1.35cd38",
+        "6f78988b.f50df8"
+      ]
+    ]
+  },
+  {
+    "id": "e20e98c1.35cd38",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 958.3341693878174,
+    "y": 791.8897037506104,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "bed4bc3f.f5932"
+      ]
+    ]
+  },
+  {
+    "id": "6f78988b.f50df8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 958.3341693878174,
+    "y": 753.8895392417908,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "8f1b4806.f6c948"
+      ]
+    ]
+  },
+  {
+    "id": "8f1b4806.f6c948",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 device port rest api\" />\n",
+    "comments": "",
+    "x": 1102.3345031738281,
+    "y": 752.8895387649536,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "bed4bc3f.f5932",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1105.3341808319092,
+    "y": 792.8895425796509,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ee4c5d7e.eaa99",
+    "type": "execute",
+    "name": "execute RestApiCallNode get transport network info",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\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=\"transportNetworksResp\"/>\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 732.0004615783691,
+    "y": 957.0006031990051,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "72b3b752.f6bbf8",
+        "f75c8efc.5bc38"
+      ]
+    ]
+  },
+  {
+    "id": "dc56d269.4a63b",
+    "type": "execute",
+    "name": "execute RestApiCallNode wan port create",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"wanPortResp\"/>\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 705.0005531311035,
+    "y": 1194.000651359558,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "b358fdc8.47501",
+        "e8f33bf4.d74a28"
+      ]
+    ]
+  },
+  {
+    "id": "4891bde.3538244",
+    "type": "switchNode",
+    "name": "switch service-data.vnfs.vnf_length",
+    "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 691.0209350585938,
+    "y": 121.02091217041016,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "bba0a2df.9b7fe",
+        "f5df4ed9.043ee",
+        "ad1fb0e6.30f2b"
+      ]
+    ]
+  },
+  {
+    "id": "bba0a2df.9b7fe",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 943.0209693908691,
+    "y": 122.02099323272705,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "2105bad4.c6ead6"
+      ]
+    ]
+  },
+  {
+    "id": "2105bad4.c6ead6",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 1104.7987174987793,
+    "y": 101.90994024276733,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "f5df4ed9.043ee",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 936.0213775634766,
+    "y": 155.02099704742432,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "e4ac49d6.f30708"
+      ]
+    ]
+  },
+  {
+    "id": "e4ac49d6.f30708",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 959.2908935546875,
+    "y": 253.57559204101562,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "3335cf85.18b",
+        "646eb0ad.764a7",
+        "47895138.250a9",
+        "af3fc11d.805b3",
+        "38c64027.0dbb1"
+      ]
+    ]
+  },
+  {
+    "id": "3335cf85.18b",
+    "type": "for",
+    "name": "for vidx..service-data.vnfs.vnf_length[]",
+    "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1239.3070373535156,
+    "y": 147.44955825805664,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "a85a6118.25ae3"
+      ]
+    ]
+  },
+  {
+    "id": "646eb0ad.764a7",
+    "type": "switchNode",
+    "name": "switch tmp.vidx ",
+    "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1165.608341217041,
+    "y": 293.43279361724854,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "e159f8e9.ab1288"
+      ]
+    ]
+  },
+  {
+    "id": "e159f8e9.ab1288",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1313.0369834899902,
+    "y": 293.0042037963867,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "50911a7c.bcb394"
+      ]
+    ]
+  },
+  {
+    "id": "ce82d617.853858",
+    "type": "switchNode",
+    "name": "switch vnfid found",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1612.7362670898438,
+    "y": 146.69972038269043,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "bc627350.7812f"
+      ]
+    ]
+  },
+  {
+    "id": "50911a7c.bcb394",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 1462.4657096862793,
+    "y": 294.14712142944336,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "bc627350.7812f",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1767.6882591247559,
+    "y": 147.59239959716797,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "2709419e.cb1d4e"
+      ]
+    ]
+  },
+  {
+    "id": "f97e5dae.1c8e2",
+    "type": "set",
+    "name": "set tmp.vidx and ctx.vnf-data",
+    "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
+    "comments": "",
+    "x": 2175.220344543457,
+    "y": 57.34245777130127,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "ad1fb0e6.30f2b",
+    "type": "outcome",
+    "name": "0",
+    "xml": "<outcome value='0'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 944.9897193908691,
+    "y": 85.98967933654785,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "2105bad4.c6ead6"
+      ]
+    ]
+  },
+  {
+    "id": "1286c83c.18ccc8",
+    "type": "set",
+    "name": "set device PortId to service data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.wan.devicePortId`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 673.9909210205078,
+    "y": 1250.9912090301514,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "57e2b01e.38cf7",
+    "type": "comment",
+    "name": "Get siteId from site resource created for this service",
+    "info": "",
+    "comments": "",
+    "x": 716.9899826049805,
+    "y": 306.32321643829346,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "a85a6118.25ae3",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1458.6566696166992,
+    "y": 146.98963832855225,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "ce82d617.853858"
+      ]
+    ]
+  },
+  {
+    "id": "ffc944ec.552788",
+    "type": "set",
+    "name": "set vnfId and vnf-object-path",
+    "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",
+    "comments": "",
+    "x": 654.5462341308594,
+    "y": 1393.213122844696,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "d579e51d.f36088",
+    "type": "set",
+    "name": "set vnf-level-oper-status to Active",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
+    "comments": "",
+    "x": 671.9906959533691,
+    "y": 1432.9909586906433,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "2c809153.c42dee",
+    "type": "update",
+    "name": "update SDWAN wan port instance configuration in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name=\"wan-port-config-id\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='Active' />\n<parameter name='device-port-id' value='`$prop.wan.devicePortId`' />\n<parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 734.653621673584,
+    "y": 1472.1384205818176,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1e8c7f90.773b9",
+    "type": "set",
+    "name": "set prop.wan.transportNetworkId",
+    "xml": "<set>\n<parameter name='prop.wan.transportNetworkId' value='`$transportNetworksResp.data.transportNetworks[$tidx].id`' />\n",
+    "comments": "",
+    "x": 1486.991542816162,
+    "y": 1033.9906749725342,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "863a36e8.4a5b78",
+    "type": "for",
+    "name": "for loop sidx - Get siteId from servicedata",
+    "xml": "<for index=\"sidx\" start=\"0\" end=\"`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 696.9900054931641,
+    "y": 456.9898729324341,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "72a58ce.4542a74"
+      ]
+    ]
+  },
+  {
+    "id": "4130ca31.df2bc4",
+    "type": "switchNode",
+    "name": "switch siteId",
+    "xml": "<switch test=\"`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'siteId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1127.990333557129,
+    "y": 457.99000358581543,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "8e36b04f.9057d"
+      ]
+    ]
+  },
+  {
+    "id": "8e36b04f.9057d",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1265.9907913208008,
+    "y": 455.98998832702637,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "b3f426b3.22a238"
+      ]
+    ]
+  },
+  {
+    "id": "b3f426b3.22a238",
+    "type": "set",
+    "name": "set prop.wan.siteId",
+    "xml": "<set>\n<parameter name='prop.wan.siteId' value='`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n\n\n",
+    "comments": "",
+    "x": 1429.9908256530762,
+    "y": 457.58984184265137,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "455c32c0.dc954c",
+    "type": "execute",
+    "name": "execute split ip and mask",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.wan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 655.9903297424316,
+    "y": 1102.3236436843872,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "33727da5.4478c2",
+        "c855dead.051b"
+      ]
+    ]
+  },
+  {
+    "id": "c855dead.051b",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 856.990348815918,
+    "y": 1080.3236351013184,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "fd37a12c.b50dd"
+      ]
+    ]
+  },
+  {
+    "id": "33727da5.4478c2",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 856.9903526306152,
+    "y": 1121.3236389160156,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "92f41c8f.e77c6"
+      ]
+    ]
+  },
+  {
+    "id": "fd37a12c.b50dd",
+    "type": "set",
+    "name": "set ipAddress prefixLength",
+    "xml": "<set>\n<parameter name='prop.wan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.wan.prefixLength' value='`$ipandMask[1]`' />",
+    "comments": "",
+    "x": 1053.9903678894043,
+    "y": 1078.3236351013184,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "92f41c8f.e77c6",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+    "comments": "",
+    "x": 1011.9903602600098,
+    "y": 1118.3236379623413,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "b6ab2db8.206f6",
+    "type": "get-resource",
+    "name": "get-resource esr-thirdparty-sdnc",
+    "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 = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 671.4901733398438,
+    "y": 554.9899291992188,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "a209acee.17706",
+        "69e80906.c6c388",
+        "4690f303.905dfc"
+      ]
+    ]
+  },
+  {
+    "id": "a209acee.17706",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 903.4902572631836,
+    "y": 518.9899520874023,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "fb6bcdc7.90b7a"
+      ]
+    ]
+  },
+  {
+    "id": "69e80906.c6c388",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 905.9811401367188,
+    "y": 554.5639886856079,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "deef5ce.ffc72a"
+      ]
+    ]
+  },
+  {
+    "id": "4690f303.905dfc",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 901.3141479492188,
+    "y": 590.8973474502563,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "340f62b3.ca041e"
+      ]
+    ]
+  },
+  {
+    "id": "340f62b3.ca041e",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 1055.0866394042969,
+    "y": 588.3364343643188,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "deef5ce.ffc72a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 1051.5525360107422,
+    "y": 552.8496761322021,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "fb6bcdc7.90b7a",
+    "type": "set",
+    "name": "set controller data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
+    "comments": "",
+    "x": 1063.9903678894043,
+    "y": 516.9898920059204,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "d09273d4.34d5b",
+    "type": "record",
+    "name": "record",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-wanport-vnf-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 609.0000953674316,
+    "y": 177.00003004074097,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d8cffa08.c70f58",
+    "type": "execute",
+    "name": "execute Properties",
+    "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' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 645.3022193908691,
+    "y": 212.00007390975952,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e9d254c6.c408a8",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 686.0003051757812,
+    "y": 642.6669311523438,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "a2457d23.490bb",
+        "5d853693.ee5348"
+      ]
+    ]
+  },
+  {
+    "id": "a2457d23.490bb",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 921.000431060791,
+    "y": 628.666919708252,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "7f12a9ec.69af78"
+      ]
+    ]
+  },
+  {
+    "id": "7f12a9ec.69af78",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+    "comments": "",
+    "x": 1063.0004386901855,
+    "y": 627.6669206619263,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "e009ac00.02e288",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 get token rest api\" />\n",
+    "comments": "",
+    "x": 1069.0004386901855,
+    "y": 665.0599088668823,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "5d853693.ee5348",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 920.250431060791,
+    "y": 664.3098268508911,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "e009ac00.02e288"
+      ]
+    ]
+  },
+  {
+    "id": "693677dc.0ea4c8",
+    "type": "switchNode",
+    "name": "switch transportNetworkName same",
+    "xml": "<switch test=\"`$transportNetworksResp.data.transportNetworks[$tidx].name == $prop.wan.transportNetworkName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1126.0011558532715,
+    "y": 991.6670732498169,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "9e43cce2.daed1"
+      ]
+    ]
+  },
+  {
+    "id": "9e43cce2.daed1",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1339.0006065368652,
+    "y": 991.6669912338257,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "1e8c7f90.773b9"
+      ]
+    ]
+  },
+  {
+    "id": "29298ea3.31ff42",
+    "type": "switchNode",
+    "name": "switch ActivateSDWANDeviceInstance",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1553.3336029052734,
+    "y": 224.00005722045898,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "fb2628da.07ec78"
+      ]
+    ]
+  },
+  {
+    "id": "fb2628da.07ec78",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1776.3336124420166,
+    "y": 224.00005722045898,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "9e951e79.2dbb"
+      ]
+    ]
+  },
+  {
+    "id": "252b812c.b944de",
+    "type": "set",
+    "name": "set tmp.devicevidx",
+    "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$vidx`' />\n\n",
+    "comments": "",
+    "x": 2741.3329467773438,
+    "y": 655.0000820159912,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "38c64027.0dbb1",
+    "type": "switchNode",
+    "name": "switch tmp.devicevidx",
+    "xml": "<switch test=\"`$tmp.devicevidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1206.3335304260254,
+    "y": 382.0001196861267,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "6a752755.afd058"
+      ]
+    ]
+  },
+  {
+    "id": "6a752755.afd058",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1390.7620964050293,
+    "y": 382.57155656814575,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "12b129f0.1b9176"
+      ]
+    ]
+  },
+  {
+    "id": "12b129f0.1b9176",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"ActivateSDWANDeviceInstance not found in service-data\" />\n",
+    "comments": "",
+    "x": 1531.1908378601074,
+    "y": 382.71443605422974,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "c3c15a47.6f9888",
+    "type": "comment",
+    "name": "Get deviceId from device resource created for this service",
+    "info": "",
+    "comments": "",
+    "x": 2190.6668853759766,
+    "y": 321.33333587646484,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "ebfe3788.f179e8",
+    "type": "for",
+    "name": "for loop didx - Get deviceId from servicedata",
+    "xml": "<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2176.667095184326,
+    "y": 244.99997997283936,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "f245906e.04acd"
+      ]
+    ]
+  },
+  {
+    "id": "3b8aa7d6.529fd8",
+    "type": "switchNode",
+    "name": "switch name (DeviceName)",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].name == 'name'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2194.667694091797,
+    "y": 383.0002250671387,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "ce416efb.e644d"
+      ]
+    ]
+  },
+  {
+    "id": "ce416efb.e644d",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2396.668186187744,
+    "y": 377.0002851486206,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "f3d4ecf0.f7b57"
+      ]
+    ]
+  },
+  {
+    "id": "72a58ce.4542a74",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 959.0001983642578,
+    "y": 457.66669750213623,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "4130ca31.df2bc4"
+      ]
+    ]
+  },
+  {
+    "id": "f245906e.04acd",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1968.999984741211,
+    "y": 381.6667261123657,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "3b8aa7d6.529fd8"
+      ]
+    ]
+  },
+  {
+    "id": "ab84c87e.6641a8",
+    "type": "switchNode",
+    "name": "switch deviceId",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3040.0011444091797,
+    "y": 595.6670227050781,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "dad5dabe.45cb08"
+      ]
+    ]
+  },
+  {
+    "id": "dad5dabe.45cb08",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3193.0015144348145,
+    "y": 596.6670999526978,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "38c10a48.67b606"
+      ]
+    ]
+  },
+  {
+    "id": "38c10a48.67b606",
+    "type": "set",
+    "name": "set prop.wan.deviceId",
+    "xml": "<set>\n<parameter name='prop.wan.deviceId' value='`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n",
+    "comments": "",
+    "x": 3362.0021209716797,
+    "y": 595.2671346664429,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "9e951e79.2dbb",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1917.6669311523438,
+    "y": 246.00007724761963,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "ebfe3788.f179e8"
+      ]
+    ]
+  },
+  {
+    "id": "f3d4ecf0.f7b57",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2215.0012283325195,
+    "y": 460.0002546310425,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "794ddeb5.82822"
+      ]
+    ]
+  },
+  {
+    "id": "a5f1b6ac.935608",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2604.0019340515137,
+    "y": 463.00037956237793,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "900215dc.3d2d28"
+      ]
+    ]
+  },
+  {
+    "id": "2709419e.cb1d4e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1906.3337783813477,
+    "y": 148.00003337860107,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "f97e5dae.1c8e2",
+        "8b284d74.9bbdc",
+        "12ee38df.f58297",
+        "21551932.828fc6"
+      ]
+    ]
+  },
+  {
+    "id": "d5734767.c41348",
+    "type": "set",
+    "name": "set prop.wan.wanPortId",
+    "xml": "<set>\n<parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />\n",
+    "comments": "",
+    "x": 1353.3246459960938,
+    "y": 1194.6573886871338,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "de66785c.628fe8",
+    "type": "set",
+    "name": "set prop.wan.devicePortId",
+    "xml": "<set>\n<parameter name='prop.wan.devicePortId' value='`$portResp.success[0].id`' />\n",
+    "comments": "",
+    "x": 663.9913177490234,
+    "y": 839.9906539916992,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "cf3fd46b.92ea68",
+    "type": "comment",
+    "name": "Create port",
+    "info": "",
+    "comments": "",
+    "x": 611.0000495910645,
+    "y": 744.3335218429565,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "712fc701.3b6c28",
+    "type": "comment",
+    "name": "Get network id",
+    "info": "",
+    "comments": "",
+    "x": 662.0001220703125,
+    "y": 922.3334802985191,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "4db86c63.765344",
+    "type": "comment",
+    "name": "Create wan port",
+    "info": "",
+    "comments": "",
+    "x": 629.0002059936523,
+    "y": 1055.3336935043335,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "e8f33bf4.d74a28",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 991.0001220703125,
+    "y": 1154.0002393722534,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "18a023ce.91febc"
+      ]
+    ]
+  },
+  {
+    "id": "b358fdc8.47501",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 991.0001182556152,
+    "y": 1194.0004043579102,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "c181c64d.e790a8"
+      ]
+    ]
+  },
+  {
+    "id": "c181c64d.e790a8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1135.0001335144043,
+    "y": 1193.000241279602,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "d5734767.c41348"
+      ]
+    ]
+  },
+  {
+    "id": "2ecf07cd.e22e08",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 wan port rest api\" />\n",
+    "comments": "",
+    "x": 1313.00048828125,
+    "y": 1153.0002708435059,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "f75c8efc.5bc38",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1038.0000495910645,
+    "y": 905.0001783370972,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "cd3f079c.c86e78"
+      ]
+    ]
+  },
+  {
+    "id": "72b3b752.f6bbf8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1038.0000457763672,
+    "y": 945.0003433227539,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "7039d1d0.8c0e2"
+      ]
+    ]
+  },
+  {
+    "id": "7039d1d0.8c0e2",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1182.0000610351562,
+    "y": 944.0001802444458,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "cd3f079c.c86e78",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 Get transport network info rest api\" />\n",
+    "comments": "",
+    "x": 1180.0003814697266,
+    "y": 904.0001783370972,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "12ee38df.f58297",
+    "type": "call",
+    "name": "call sdwan-get-wan-param",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2178.666633605957,
+    "y": 154.0000762939453,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8b284d74.9bbdc",
+    "type": "set",
+    "name": "set vnf-request-input.",
+    "xml": "<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n",
+    "comments": "",
+    "x": 2147.666633605957,
+    "y": 104.00009346008301,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "6fa219f1.a7d198",
+    "type": "comment",
+    "name": "This is also required for template parameters update",
+    "info": "",
+    "comments": "",
+    "x": 2543.0003967285156,
+    "y": 200.00003623962402,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "7a10e528.449ffc",
+    "type": "switchNode",
+    "name": "switch ActivateSiteInstance",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1516.0004425048828,
+    "y": 189.00004959106445,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "8d8e3a.201b51c8"
+      ]
+    ]
+  },
+  {
+    "id": "8d8e3a.201b51c8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1712.0006256103516,
+    "y": 190.00004959106445,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "3f667c94.ca8ee4"
+      ]
+    ]
+  },
+  {
+    "id": "3f667c94.ca8ee4",
+    "type": "set",
+    "name": "set tmp.siteVidx",
+    "xml": "<set>\n<parameter name='tmp.siteVidx' value='`$vidx`' />\n<parameter name='ctx.site.' value='`$service-data.vnfs.vnf[$vidx].`' />\n\n",
+    "comments": "",
+    "x": 1897.9999237060547,
+    "y": 187.00005340576172,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "af3fc11d.805b3",
+    "type": "switchNode",
+    "name": "switch tmp.siteVidx",
+    "xml": "<switch test=\"`$tmp.siteVidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1189.6667518615723,
+    "y": 331.00007009506226,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "bee9b4a0.4631e8"
+      ]
+    ]
+  },
+  {
+    "id": "bee9b4a0.4631e8",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1364.0954627990723,
+    "y": 331.5715217590332,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "cf86c583.f350f8"
+      ]
+    ]
+  },
+  {
+    "id": "cf86c583.f350f8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"ActivateSiteInstance not found in service-data\" />\n",
+    "comments": "",
+    "x": 1506.5241813659668,
+    "y": 330.71438455581665,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "794ddeb5.82822",
+    "type": "switchNode",
+    "name": "switch deviceName match",
+    "xml": "<switch test=\"`$prop.wan.deviceName == $service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].value`\">\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2420.667953491211,
+    "y": 461.0003185272217,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "a5f1b6ac.935608"
+      ]
+    ]
+  },
+  {
+    "id": "900215dc.3d2d28",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2503.3338928222656,
+    "y": 535.0001621246338,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "841824ee.9d9cb8",
+        "252b812c.b944de"
+      ]
+    ]
+  },
+  {
+    "id": "841824ee.9d9cb8",
+    "type": "for",
+    "name": "for loop deviceidx - Get deviceId from servicedata",
+    "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2783.5310440063477,
+    "y": 530.0313510894775,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "3d6ed093.e41e3"
+      ]
+    ]
+  },
+  {
+    "id": "3d6ed093.e41e3",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2860.5317764282227,
+    "y": 594.0314502716064,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "ab84c87e.6641a8"
+      ]
+    ]
+  },
+  {
+    "id": "21551932.828fc6",
+    "type": "record",
+    "name": "record",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\".....\"/>\n<parameter name=\"field3\" value=\"prop.wan.deviceName\"/>\n<parameter name=\"field4\" value='`$prop.wan.deviceName`'/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2106.531379699707,
+    "y": 202.0312671661377,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "47895138.250a9",
+    "type": "for",
+    "name": "for vidx..service-data.vnfs.vnf_length[]",
+    "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1232.000072479248,
+    "y": 225.0000171661377,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "29298ea3.31ff42",
+        "7a10e528.449ffc"
+      ]
+    ]
+  },
+  {
+    "id": "272d2403.37c86c",
+    "type": "set",
+    "name": "copy input data to service data",
+    "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
+    "comments": "",
+    "x": 667.0312881469727,
+    "y": 1347.5314326286316,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "41e3ce3b.fd6",
+    "type": "comment",
+    "name": "TODO: split ip/mask",
+    "info": "",
+    "comments": "",
+    "x": 1053,
+    "y": 1040.5039072036743,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "bddbd7b0.3cac18",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 905.0008735656738,
+    "y": 993.3337669372559,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "693677dc.0ea4c8"
+      ]
+    ]
+  },
+  {
+    "id": "8b82d2e5.53604",
+    "type": "for",
+    "name": "for loop tidx - Get transportNetwork ID",
+    "xml": "<for index=\"tidx\" start=\"0\" end=\"`$transportNetworksResp.data.transportNetworks_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 689.0004920959473,
+    "y": 992.3335227966309,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      [
+        "bddbd7b0.3cac18"
+      ]
+    ]
+  },
+  {
+    "id": "a401887.73e5778",
+    "type": "set",
+    "name": "set wan portId to service data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='wanPortId' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.wan.wanPortId`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 668.0000152587891,
+    "y": 1297.250274181366,
+    "z": "725c7d45.19d1f4",
+    "wires": []
+  },
+  {
+    "id": "2c725167.90a60e",
+    "type": "call",
+    "name": "call sdwan-get-tenant-auth",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 661,
+    "y": 698,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "18a023ce.91febc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1135.0039672851562,
+    "y": 1152.5039310455322,
+    "z": "725c7d45.19d1f4",
+    "wires": [
+      []
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
index d017cac..b04fe60 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
@@ -1 +1,4315 @@
-[{"id":"587a4e4b.449f1","type":"dgstart","name":"DGSTART","outputs":1,"x":104.00390625,"y":51.99999871850014,"z":"b1d019b.6dbd8e8","wires":[["cf04b901.3d6f98"]]},{"id":"cf04b901.3d6f98","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","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}'>","outputs":1,"x":220.2895965576172,"y":103.23810639977455,"z":"b1d019b.6dbd8e8","wires":[["a2d12571.0378a8"]]},{"id":"a2d12571.0378a8","type":"method","name":"method sdwan-wanport-vnf-topology-operation-underlay","xml":"<method rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync'>\n","comments":"","outputs":1,"x":223.43252563476562,"y":188.00003018975258,"z":"b1d019b.6dbd8e8","wires":[["a47337eb.18b358"]]},{"id":"a47337eb.18b358","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":155.67059326171875,"y":296.6667315065861,"z":"b1d019b.6dbd8e8","wires":[["718fab21.36f054","3f81fe79.041ff2","f5abf897.1c94a8","e484905a.ff144","e2e0c9ba.1ae298"]]},{"id":"718fab21.36f054","type":"for","name":"for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]","xml":"<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n","comments":"","outputs":1,"x":590.004337310791,"y":435.66685262322426,"z":"b1d019b.6dbd8e8","wires":[["95ab5318.2e5c4"]]},{"id":"8881f8e.5bc9208","type":"set","name":"set prop.ar.allotted-resource-id","xml":"<set>\n<parameter name='prop.ar.allotted-resource-id' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id`' />\n","comments":"","x":1380.0052490234375,"y":124.96877732872963,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"ca0bbb68.4e6518","type":"comment","name":"Query MDSAL for AR","info":"","comments":"","x":1705.3379211425781,"y":148.96864667534828,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"88a9e795.e489e8","type":"comment","name":"Query MDSAL to get parent service based on service instance id from AR","info":"","comments":"","x":2175.338779449463,"y":167.96862569451332,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"61804941.42b278","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1954.67232131958,"y":203.63526597619057,"z":"b1d019b.6dbd8e8","wires":[["b4949dcd.ebcd1"]]},{"id":"b4949dcd.ebcd1","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2109.672161102295,"y":203.1350990831852,"z":"b1d019b.6dbd8e8","wires":[["e88c8316.b28a7"]]},{"id":"4119fddc.bb6d24","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":2433.3626976013184,"y":199.7542397081852,"z":"b1d019b.6dbd8e8","wires":[["e113bdd7.9bdab"]]},{"id":"672a20f.a0083e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachement resource not found\" />\n    \n","comments":"","x":2579.1314735412598,"y":239.20122781395912,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"17977b69.262195","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1947.5240478515625,"y":250.701272636652,"z":"b1d019b.6dbd8e8","wires":[["4a7edd74.b9a034"]]},{"id":"4a7edd74.b9a034","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2097.5238914489746,"y":251.36782804131508,"z":"b1d019b.6dbd8e8","wires":[["889c4ad9.edb108"]]},{"id":"f51f9f7c.c2466","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2421.6906509399414,"y":237.034599930048,"z":"b1d019b.6dbd8e8","wires":[["672a20f.a0083e"]]},{"id":"e88c8316.b28a7","type":"switchNode","name":"switch cr length","xml":"<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n","comments":"","outputs":1,"x":2273.672336578369,"y":203.63528218865395,"z":"b1d019b.6dbd8e8","wires":[["4119fddc.bb6d24","f51f9f7c.c2466"]]},{"id":"ad5ef81b.eca5b8","type":"set","name":"set parent-service-instance-id","xml":"<set>\n<parameter name='prop.parent-service-instance-id' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />\n\n","comments":"","x":2829.0059356689453,"y":200.63526311516762,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"e113bdd7.9bdab","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":2583.4817276000977,"y":199.80179944634438,"z":"b1d019b.6dbd8e8","wires":[["ad5ef81b.eca5b8","5b3adfc2.d795f"]]},{"id":"889c4ad9.edb108","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachement resource not found\" />\n    \n","comments":"","x":2265.005344390869,"y":249.63520398736,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"936de3e0.c6a2e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2052.307460784912,"y":521.7709299623966,"z":"b1d019b.6dbd8e8","wires":[["2fdbbace.5a0386"]]},{"id":"56dafc4a.8aaae4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2044.1592636108398,"y":556.837014824152,"z":"b1d019b.6dbd8e8","wires":[["2a42a293.fba3ae"]]},{"id":"2a42a293.fba3ae","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n","comments":"","x":2190.308036804199,"y":557.1045109331608,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"2fdbbace.5a0386","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2172.3077087402344,"y":521.7710129320621,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"a13ee754.9515f8","type":"for","name":"for pnidx.. mdsal-psd.networks.network_length[]","xml":"<for index='pnidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n","comments":"","outputs":1,"x":1735.6722564697266,"y":621.3028880655766,"z":"b1d019b.6dbd8e8","wires":[["684cbe0.d0ae544"]]},{"id":"9bdd2027.61dcf","type":"switchNode","name":"switch ActivateSDWANConnectivityInstance","xml":"<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n    \n    \n\n","comments":"","outputs":1,"x":2265.3388900756836,"y":590.302889496088,"z":"b1d019b.6dbd8e8","wires":[["4800da5e.9f4d14"]]},{"id":"4800da5e.9f4d14","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2517.338424682617,"y":591.3028270304203,"z":"b1d019b.6dbd8e8","wires":[["e64d626e.5a50e"]]},{"id":"e64d626e.5a50e","type":"set","name":"set tmp.pnidx ","xml":"<set>\n<parameter name='tmp.pnidx' value='`$pnidx`' />\n\n","comments":"","x":2673.3381118774414,"y":591.3028270304203,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"dd934675.d4e888","type":"for","name":"for loop paramidx - Get topology from servicedata","xml":"<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":1667.3390655517578,"y":706.3025175631046,"z":"b1d019b.6dbd8e8","wires":[["8db55ac9.a24998"]]},{"id":"62066499.8552ec","type":"switchNode","name":"switch topology","xml":"<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n","comments":"","outputs":1,"x":2119.339157104492,"y":685.3024231493473,"z":"b1d019b.6dbd8e8","wires":[["4f33474b.e43bc8"]]},{"id":"4f33474b.e43bc8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2270.339168548584,"y":683.3024651110172,"z":"b1d019b.6dbd8e8","wires":[["8246d892.e05918"]]},{"id":"8246d892.e05918","type":"set","name":"set topology","xml":"<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n","comments":"","x":2411.338897705078,"y":682.9023987352848,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"88c5e553.ee7048","type":"switchNode","name":"switch tmp.pnidx ","xml":"<switch test=\"`$tmp.pnidx`\">\n\n","comments":"","outputs":1,"x":1638.338882446289,"y":665.9690901339054,"z":"b1d019b.6dbd8e8","wires":[["11715e8.eb7eca2"]]},{"id":"11715e8.eb7eca2","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1793.7675552368164,"y":664.5404697954655,"z":"b1d019b.6dbd8e8","wires":[["49bf685a.de5378"]]},{"id":"49bf685a.de5378","type":"returnFailure","name":"return failure","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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n","comments":"","x":1934.1961784362793,"y":665.6835590898991,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"de9858f.b81a8a8","type":"switchNode","name":"switch topology hub-spoke","xml":"<switch test=\"`$prop.topology == 'hub-spoke'`\">\n","comments":"","outputs":1,"x":1546.3387489318848,"y":768.3023392260075,"z":"b1d019b.6dbd8e8","wires":[["24d293b9.ebe98c","4bfa75a0.97649c"]]},{"id":"24d293b9.ebe98c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1736.338436126709,"y":793.3028246462345,"z":"b1d019b.6dbd8e8","wires":[["fc31272f.d20a28"]]},{"id":"4bfa75a0.97649c","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1730.3393630981445,"y":754.3024870455265,"z":"b1d019b.6dbd8e8","wires":[["a1325102.a1698"]]},{"id":"a1325102.a1698","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1866.3393669128418,"y":754.3024260103703,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"fc31272f.d20a28","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1741.67138671875,"y":861.3020588457584,"z":"b1d019b.6dbd8e8","wires":[["e126a9e.93d2358"]]},{"id":"e126a9e.93d2358","type":"for","name":"for ppidx.. mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]","xml":"<for index='ppidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n","comments":"","outputs":1,"x":2149.004638671875,"y":861.6356770098209,"z":"b1d019b.6dbd8e8","wires":[["a3874818.96b4a8"]]},{"id":"fafd1fed.9ce1b","type":"set","name":"set prop.ar.provided-allotted-resource-id","xml":"<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$ppidx].allotted-resource-id`' />\n\n","comments":"","x":2240.0057525634766,"y":939.6359750330448,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"8b5306cb.0a00b8","type":"for","name":"for loop aridx - Get role from allotted resource","xml":"<for index=\"aridx\" start=\"0\" end=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2258.0064544677734,"y":1050.3027664721012,"z":"b1d019b.6dbd8e8","wires":[["35d495b.f10696a"]]},{"id":"2ab4ecb3.a0e7b4","type":"switchNode","name":"switch Role","xml":"<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'Role'`\">\n","comments":"","outputs":1,"x":2667.006565093994,"y":1053.302853256464,"z":"b1d019b.6dbd8e8","wires":[["f82626a6.b9ef58"]]},{"id":"f82626a6.b9ef58","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2808.0068969726562,"y":1052.3028523027897,"z":"b1d019b.6dbd8e8","wires":[["7f118497.e5e81c"]]},{"id":"7f118497.e5e81c","type":"set","name":"set prop.role","xml":"<set>\n<parameter name='prop.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n","comments":"","x":2949.0069313049316,"y":1053.9027439653873,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"9f0875d3.47e2b8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2744.0059509277344,"y":956.9692687094212,"z":"b1d019b.6dbd8e8","wires":[["36139e8.434ce62"]]},{"id":"807962c4.90f77","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2740.8576736450195,"y":1011.0353519022465,"z":"b1d019b.6dbd8e8","wires":[["9edc0016.5374a"]]},{"id":"dbadbe13.1677b","type":"switchNode","name":"switch role hub","xml":"<switch test=\"`$prop.role == hub`\">\n","comments":"","outputs":1,"x":2124.3390884399414,"y":1115.635806709528,"z":"b1d019b.6dbd8e8","wires":[["dcf9daa3.e54cc8","5d1cf617.14b6b8"]]},{"id":"9271766e.fe0c48","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2440.3384742736816,"y":1091.6354099810123,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"6d9b82e0.ee0e5c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2850.3081092834473,"y":1187.1045166552067,"z":"b1d019b.6dbd8e8","wires":[["f48b85ad.740008"]]},{"id":"1f5ff987.3fd166","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2852.159679412842,"y":1247.170598655939,"z":"b1d019b.6dbd8e8","wires":[["f995184a.d07fa8"]]},{"id":"f995184a.d07fa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SDWAN service-data not found\" />\n    \n","comments":"","x":2996.308452606201,"y":1209.4380127489567,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"f48b85ad.740008","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2980.3081283569336,"y":1176.1046768724918,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"928e3eb0.849cd","type":"set","name":"set prop.ar-service-instance-id","xml":"<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n","comments":"","x":2452.3395080566406,"y":1175.6360094845295,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"3730c8a.de81d38","type":"for","name":"for arvidx.. mdsal-arsd.service-data.vnfs.vnf_length[]","xml":"<for index='arvidx' start='0' end='`$mdsal-arsd.service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":2496.0059814453125,"y":1297.6357990801334,"z":"b1d019b.6dbd8e8","wires":[["993a1752.84b598"]]},{"id":"993a1752.84b598","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2842.6723022460938,"y":1287.6357752382755,"z":"b1d019b.6dbd8e8","wires":[["9bd685d3.b9a5b8","2be5604d.8b517","34da5cb3.ec0254"]]},{"id":"9bd685d3.b9a5b8","type":"switchNode","name":"switch ActivateSDWANPortInstance","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n    \n\n","comments":"","outputs":1,"x":3104.672410964966,"y":1258.6367346346378,"z":"b1d019b.6dbd8e8","wires":[["22ea8a6b.a17296"]]},{"id":"2f97be15.e601c2","type":"switchNode","name":"switch tmp.wanportvidx ","xml":"<switch test=\"`$tmp.wanportvidx`\">\n\n","comments":"","outputs":1,"x":2577.672119140625,"y":1342.3024441301823,"z":"b1d019b.6dbd8e8","wires":[["54e2ca7c.2e5f44"]]},{"id":"43b2a05a.a7d9b","type":"for","name":"for loop wportidx - Get wan port ID from servicedata","xml":"<for index=\"wportidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":3759.6728897094727,"y":1251.6369148790836,"z":"b1d019b.6dbd8e8","wires":[["bca2a06e.4f682"]]},{"id":"54e2ca7c.2e5f44","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":2749.100841522217,"y":1345.8741499483585,"z":"b1d019b.6dbd8e8","wires":[["2f27c837.ae4c68"]]},{"id":"2f27c837.ae4c68","type":"returnFailure","name":"return failure","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=\"vnf-topology-operation-input.vnf-request-input.vnf-id (port) not found in service-data\" />\n","comments":"","x":2893.529556274414,"y":1348.0174299776554,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"22ea8a6b.a17296","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3332.67209815979,"y":1256.6367355883121,"z":"b1d019b.6dbd8e8","wires":[["2c880b10.265824"]]},{"id":"bca2a06e.4f682","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3711.6741046905518,"y":1335.6374413073063,"z":"b1d019b.6dbd8e8","wires":[["960aea00.c2c228"]]},{"id":"960aea00.c2c228","type":"switchNode","name":"switch transportNetworkName","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`\">\n","comments":"","outputs":1,"x":3929.6750202178955,"y":1333.6379295885563,"z":"b1d019b.6dbd8e8","wires":[["19a0a134.cbff5f"]]},{"id":"c82b1262.885e1","type":"set","name":"set tmp.portvidx ","xml":"<set>\n<parameter name='tmp.portvidx' value='`$arvidx`' />\n\n","comments":"","x":3656.671901702881,"y":1209.6369024813175,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"19a0a134.cbff5f","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4126.675447463989,"y":1332.6380983889103,"z":"b1d019b.6dbd8e8","wires":[["27cac422.cfe53c"]]},{"id":"b05226c4.bd3a28","type":"set","name":"set prop.hub.transportNetworkName","xml":"<set>\n<parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n","comments":"","x":4383.6772813797,"y":1532.2391153872013,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"f4c45443.bb3768","type":"switchNode","name":"switch  prop.hub.transportNetworkName==prop.spoke.transportNetworkName","xml":"<switch test=\"`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`\">\n","comments":"","outputs":1,"x":2576.00821685791,"y":1492.3046661913395,"z":"b1d019b.6dbd8e8","wires":[["29701c33.546bc4","9d7af116.cbe09"]]},{"id":"29701c33.546bc4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2922.0077476501465,"y":1529.304740101099,"z":"b1d019b.6dbd8e8","wires":[["f21133c1.0bade"]]},{"id":"9d7af116.cbe09","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2916.008556365967,"y":1466.3046003878117,"z":"b1d019b.6dbd8e8","wires":[["35e3a287.99da5e"]]},{"id":"35e3a287.99da5e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3046.008743286133,"y":1466.3047529757023,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"a3874818.96b4a8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1891.0361328125,"y":970.8333088457584,"z":"b1d019b.6dbd8e8","wires":[["fafd1fed.9ce1b","252298c8.827288","de70a181.95e65","dbadbe13.1677b","8b5306cb.0a00b8"]]},{"id":"40faa7d6.f30958","type":"switchNode","name":"switch vpnId","xml":"<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n","comments":"","outputs":1,"x":2109.005172729492,"y":729.6354338228703,"z":"b1d019b.6dbd8e8","wires":[["244fa8f2.0e98c8"]]},{"id":"244fa8f2.0e98c8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2253.005184173584,"y":729.6354748308659,"z":"b1d019b.6dbd8e8","wires":[["542e22e9.06eebc"]]},{"id":"542e22e9.06eebc","type":"set","name":"set prop.vpnId","xml":"<set>\n<parameter name='prop.vpnId' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n","comments":"","x":2411.0049057006836,"y":728.2354094088078,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"3945c5e7.6c14ea","type":"set","name":"Set prop.hubTnpId","xml":"<set>\n<parameter name='prop.hubTnpId' value='$prop.hub.wanPortId' />\n\n","comments":"","x":2628.3407135009766,"y":1765.636424690485,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"32aaac62.305534","type":"execute","name":"execute RestApiCallNode underlay route","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayHubResp\"/>\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`\" />","comments":"","outputs":1,"x":3449.34015083313,"y":2597.9708580076694,"z":"b1d019b.6dbd8e8","wires":[["89fb14c8.94ed18","c79239ca.a0f328"]]},{"id":"c79239ca.a0f328","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3716.3400592803955,"y":2625.9708875715733,"z":"b1d019b.6dbd8e8","wires":[["3b45764d.017e4a"]]},{"id":"89fb14c8.94ed18","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3714.339738845825,"y":2581.97087803483,"z":"b1d019b.6dbd8e8","wires":[["a62325e4.8d0b68"]]},{"id":"d9e2a3b8.be3d7","type":"set","name":"Add prop.hub.route","xml":"<set>\n<parameter name='prop.route.id' value='`$prop.hubRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n","comments":"","x":3393.6735305786133,"y":2554.6373659670353,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"b552a294.7e377","type":"execute","name":"execute RestApiCallNode underlay route","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayspokeResp\"/>\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`\" />","comments":"","outputs":1,"x":3468.6735305786133,"y":2696.637831121683,"z":"b1d019b.6dbd8e8","wires":[["a12e36eb.943458","ededbddd.7250a"]]},{"id":"ededbddd.7250a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3720.673677444458,"y":2725.6381277143955,"z":"b1d019b.6dbd8e8","wires":[["29ad144c.f2690c"]]},{"id":"a12e36eb.943458","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3718.6733570098877,"y":2681.6381181776524,"z":"b1d019b.6dbd8e8","wires":[["8c851f6f.caa55"]]},{"id":"92a20fbe.e0e62","type":"returnFailure","name":"return failure","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 sdwan spoke route underlay rest api\" />\n","comments":"","x":4008.6742248535156,"y":2675.6383101046085,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"2be5604d.8b517","type":"switchNode","name":"switch ActivateSDWANDeviceInstance","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n","comments":"","outputs":1,"x":3115.535987854004,"y":1291.833693176508,"z":"b1d019b.6dbd8e8","wires":[["46f77d85.1bbce4"]]},{"id":"75db0ba8.f32084","type":"switchNode","name":"switch tmp.devicevidx ","xml":"<switch test=\"`$tmp.devicevidx`\">\n\n","comments":"","outputs":1,"x":2583.5355377197266,"y":1384.4999252855778,"z":"b1d019b.6dbd8e8","wires":[["294637bf.dcbd08"]]},{"id":"294637bf.dcbd08","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":2749.9639739990234,"y":1384.0714584887028,"z":"b1d019b.6dbd8e8","wires":[["a4ca51de.1aa11"]]},{"id":"a4ca51de.1aa11","type":"returnFailure","name":"return failure","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=\"vnf-topology-operation-input.vnf-request-input.vnf-id (device) not found in service-data\" />\n","comments":"","x":2890.392906188965,"y":1386.2144333422184,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"46f77d85.1bbce4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3343.535675048828,"y":1289.8336941301823,"z":"b1d019b.6dbd8e8","wires":[["b2e4dc18.108ae"]]},{"id":"b2e4dc18.108ae","type":"set","name":"set tmp.devicevidx ","xml":"<set>\n<parameter name='tmp.devicevidx' value='`$arvidx`' />\n\n","comments":"","x":3498.535358428955,"y":1289.833693176508,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"34da5cb3.ec0254","type":"switchNode","name":"switch ActivateSiteInstance","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n","comments":"","outputs":1,"x":3078.5360584259033,"y":1325.8337570726871,"z":"b1d019b.6dbd8e8","wires":[["1e8bb4ff.b8f57b"]]},{"id":"c3aa018f.4dc1a","type":"switchNode","name":"switch tmp.sitevidx ","xml":"<switch test=\"`$tmp.sitevidx`\">\n\n","comments":"","outputs":1,"x":2582.5354080200195,"y":1422.4998032152653,"z":"b1d019b.6dbd8e8","wires":[["1f12a8eb.1a8507"]]},{"id":"1f12a8eb.1a8507","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":2742.963872909546,"y":1422.0713230669498,"z":"b1d019b.6dbd8e8","wires":[["b92b68d7.8e4328"]]},{"id":"b92b68d7.8e4328","type":"returnFailure","name":"return failure","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=\"vnf-topology-operation-input.vnf-request-input.vnf-id (site) not found in service-data\" />\n","comments":"","x":2891.392827987671,"y":1424.214329391718,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"1e8bb4ff.b8f57b","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3266.535623550415,"y":1325.8339230120182,"z":"b1d019b.6dbd8e8","wires":[["4cf0c35.9e60c3c"]]},{"id":"4cf0c35.9e60c3c","type":"set","name":"set tmp.sitevidx ","xml":"<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n","comments":"","x":3421.535306930542,"y":1325.833922058344,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"6de714ed.d3061c","type":"for","name":"for loop deviceidx - Get wan port ID from servicedata","xml":"<for index=\"deviceidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2715.5372161865234,"y":1807.8342405855656,"z":"b1d019b.6dbd8e8","wires":[["3adcf839.875688"]]},{"id":"e169850b.ca2b98","type":"switchNode","name":"switch deviceId","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n","comments":"","outputs":1,"x":3200.5384674072266,"y":1738.8350941240788,"z":"b1d019b.6dbd8e8","wires":[["7f1b4a03.77b0c4"]]},{"id":"7f1b4a03.77b0c4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3351.5388412475586,"y":1735.8353382647038,"z":"b1d019b.6dbd8e8","wires":[["8b5c9421.71a558"]]},{"id":"8b5c9421.71a558","type":"set","name":"set prop.hub.deviceId","xml":"<set>\n<parameter name='prop.hub.deviceId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n","comments":"","x":3526.539089202881,"y":1735.4358631670475,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"8506f90c.f30458","type":"for","name":"for loop siteidx - Get site ID from servicedata","xml":"<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2682.0370330810547,"y":1869.8342100679874,"z":"b1d019b.6dbd8e8","wires":[["ff9f298a.cca7f8"]]},{"id":"8d61be2.a51494","type":"comment","name":"Add route src->dst, dst->src","info":"","comments":"","x":3017.672622680664,"y":1886.6360289156437,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"e5d1673d.e9dbe8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2127.338134765625,"y":1247.9687458574772,"z":"b1d019b.6dbd8e8","wires":[["3730c8a.de81d38","f4c45443.bb3768","3d7d87cf.2688a8","928e3eb0.849cd","e69efead.6b9ed","2aa6f09e.c6474"]]},{"id":"3d7d87cf.2688a8","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2382.337890625,"y":1384.3021198809147,"z":"b1d019b.6dbd8e8","wires":[["75db0ba8.f32084","c3aa018f.4dc1a","2f97be15.e601c2"]]},{"id":"f21133c1.0bade","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2402.3389282226562,"y":1756.6356417238712,"z":"b1d019b.6dbd8e8","wires":[["3945c5e7.6c14ea","6de714ed.d3061c","8506f90c.f30458","23a8e35f.4687ac","eb5f2e.bb7a50d"]]},{"id":"7877847f.fa07bc","type":"set","name":"Add prop.spoke.route","xml":"<set>\n<parameter name='prop.route.id' value='`$prop.spokeRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n\n\n","comments":"","x":3403.537546157837,"y":2665.3345922529697,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"3f81fe79.041ff2","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":352.3382110595703,"y":1122.3343378603458,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"52b0eddb.8791b4","type":"execute","name":"generate connection attachment AR url ","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":1401.6711120605469,"y":184.3018356859684,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"532b1f7d.9c604","type":"execute","name":"execute RestApiCallNode - get-resource connection-attachment-allotted-resource","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":1528.671142578125,"y":232.30182614922523,"z":"b1d019b.6dbd8e8","wires":[["61804941.42b278","17977b69.262195"]]},{"id":"1eb0dd45.2d88f3","type":"execute","name":"execute RestApiCallNode - get parent service data","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-parent-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n","comments":"","outputs":1,"x":1753.0052947998047,"y":566.3021399080753,"z":"b1d019b.6dbd8e8","wires":[["936de3e0.c6a2e","56dafc4a.8aaae4"]]},{"id":"4ecf397b.0a23f8","type":"execute","name":"generate connection attachment parent url ","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-parent-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.parent-service-instance-id`\"/>\n","comments":"","outputs":1,"x":1730.0049438476562,"y":512.3020674288273,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"43c6b758.a87968","type":"comment","name":"full mesh do nothing","info":"","comments":"","x":1564.671745300293,"y":723.3021055757999,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"717df1f.c979e1","type":"comment","name":"hub-spoke","info":"","comments":"","x":2565.6711463928223,"y":820.3019954264164,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"252298c8.827288","type":"execute","name":"generate connection attachment AR url ","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.provided-allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":2238.0042991638184,"y":971.3019906580448,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"de70a181.95e65","type":"execute","name":"execute RestApiCallNode - get-resource connection-attachment-allotted-resource","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n\n","comments":"","outputs":1,"x":2369.004379272461,"y":1010.9686204493046,"z":"b1d019b.6dbd8e8","wires":[["9f0875d3.47e2b8","807962c4.90f77"]]},{"id":"e69efead.6b9ed","type":"execute","name":"generate service data url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n","comments":"","outputs":1,"x":2419.508274078369,"y":1212.3058907091618,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"2aa6f09e.c6474","type":"execute","name":"execute RestApiCallNode - get service data of allotted resource","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-arsd\" />\n\n","comments":"","outputs":1,"x":2535.5084075927734,"y":1249.3057819902897,"z":"b1d019b.6dbd8e8","wires":[["6d9b82e0.ee0e5c","1f5ff987.3fd166"]]},{"id":"5d1cf617.14b6b8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2299.5039710998535,"y":1134.8018547594547,"z":"b1d019b.6dbd8e8","wires":[["e5d1673d.e9dbe8"]]},{"id":"dcf9daa3.e54cc8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2305.504219055176,"y":1091.801946312189,"z":"b1d019b.6dbd8e8","wires":[["9271766e.fe0c48"]]},{"id":"5b3adfc2.d795f","type":"for","name":"for loop roleidx - Get role from allotted resource","xml":"<for index=\"roleidx\" start=\"0\" end=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2880.5047760009766,"y":239.3017717897892,"z":"b1d019b.6dbd8e8","wires":[["a590c534.c72538"]]},{"id":"a590c534.c72538","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3139.5050888061523,"y":238.30208745598793,"z":"b1d019b.6dbd8e8","wires":[["24fabbc8.4ee6a4"]]},{"id":"24fabbc8.4ee6a4","type":"switchNode","name":"switch Role","xml":"<switch test=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].name == 'role'`\">\n","comments":"","outputs":1,"x":3288.505100250244,"y":239.30192437767982,"z":"b1d019b.6dbd8e8","wires":[["13c03783.386d28"]]},{"id":"f7ff32b9.16d69","type":"set","name":"set prop.spoke.role","xml":"<set>\n<parameter name='prop.spoke.role' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].value`' />\n","comments":"","x":3593.505661010742,"y":236.90183225274086,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"13c03783.386d28","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3424.00492477417,"y":236.30176416039467,"z":"b1d019b.6dbd8e8","wires":[["f7ff32b9.16d69"]]},{"id":"30347a07.26c8f6","type":"switchNode","name":"switch spoke","xml":"<switch test=\"`$prop.spoke.role == 'spoke'`\">\n","comments":"","outputs":1,"x":1316.004280090332,"y":383.30169931054115,"z":"b1d019b.6dbd8e8","wires":[["2d380018.3e87c"]]},{"id":"2d380018.3e87c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1457.004035949707,"y":384.3017365038395,"z":"b1d019b.6dbd8e8","wires":[["1b9dfff3.6a8e9"]]},{"id":"356b426.2684ebe","type":"for","name":"for i.. service-data.vnfs.vnf_length[]","xml":"<for index='i' start='0' end='`$service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":1729.5045623779297,"y":438.3017317354679,"z":"b1d019b.6dbd8e8","wires":[["bfdedc49.050ca"]]},{"id":"bfdedc49.050ca","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2063.170753479004,"y":382.3016621172428,"z":"b1d019b.6dbd8e8","wires":[["fd950685.06ac48","2d8b9375.2ddaac","257f4a9c.1ed446"]]},{"id":"fd950685.06ac48","type":"switchNode","name":"switch ActivateSDWANPortInstance","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n    \n    \n\n","comments":"","outputs":1,"x":2334.1707916259766,"y":328.3025485575199,"z":"b1d019b.6dbd8e8","wires":[["fc67008d.091db"]]},{"id":"fc67008d.091db","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2547.170555114746,"y":329.30255141854286,"z":"b1d019b.6dbd8e8","wires":[["1a445db7.1fd752"]]},{"id":"1a445db7.1fd752","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2696.0042991638184,"y":331.3017407953739,"z":"b1d019b.6dbd8e8","wires":[["3c007d2e.edc602"]]},{"id":"3c007d2e.edc602","type":"for","name":"for loop widx - Get wan port ID from servicedata","xml":"<for index=\"widx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2969.004249572754,"y":329.66895881295204,"z":"b1d019b.6dbd8e8","wires":[["f1345e2.c9f7ea"]]},{"id":"f1345e2.c9f7ea","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3238.0051765441895,"y":328.6692048609257,"z":"b1d019b.6dbd8e8","wires":[["ba5679ba.3ede18","3e5320cd.89f1e","efdc38fc.1f5628","8e38557b.879d28"]]},{"id":"ba5679ba.3ede18","type":"switchNode","name":"switch transportNetworkName","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'transportNetworkName'`\">\n","comments":"","outputs":1,"x":3481.0062103271484,"y":283.66977801918983,"z":"b1d019b.6dbd8e8","wires":[["8f69b44d.c2f088"]]},{"id":"8f69b44d.c2f088","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3681.0059852600098,"y":283.6699401438236,"z":"b1d019b.6dbd8e8","wires":[["a5483223.dc4b1"]]},{"id":"a5483223.dc4b1","type":"set","name":"set prop.spoke.transportNetworkName","xml":"<set>\n<parameter name='prop.spoke.transportNetworkName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n","comments":"","x":3908.006721496582,"y":285.27052226662636,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"1b9dfff3.6a8e9","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1209.9733276367188,"y":694.270647674799,"z":"b1d019b.6dbd8e8","wires":[["356b426.2684ebe","4ecf397b.0a23f8","1eb0dd45.2d88f3","a13ee754.9515f8","dd934675.d4e888","de9858f.b81a8a8","88c5e553.ee7048","2e975a9d.1a4246"]]},{"id":"2d8b9375.2ddaac","type":"switchNode","name":"switch ActivateSDWANDeviceInstance","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n","comments":"","outputs":1,"x":2326.5042266845703,"y":402.30175319314003,"z":"b1d019b.6dbd8e8","wires":[["74821dd.148afe4"]]},{"id":"74821dd.148afe4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2545.5039768218994,"y":403.30173793435097,"z":"b1d019b.6dbd8e8","wires":[["c6b3d98e.b714c8"]]},{"id":"c6b3d98e.b714c8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2696.3379669189453,"y":409.30092921853065,"z":"b1d019b.6dbd8e8","wires":[["57f2bdad.e02274"]]},{"id":"57f2bdad.e02274","type":"for","name":"for loop didx - Get device ID from servicedata","xml":"<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2955.338218688965,"y":411.6682244837284,"z":"b1d019b.6dbd8e8","wires":[["ca5f7c6e.be6de"]]},{"id":"ca5f7c6e.be6de","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3241.338726043701,"y":444.6684094965458,"z":"b1d019b.6dbd8e8","wires":[["a11b64a3.1c2778"]]},{"id":"a11b64a3.1c2778","type":"switchNode","name":"switch deviceId","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].name == 'deviceId'`\">\n","comments":"","outputs":1,"x":3424.3396377563477,"y":444.6690198481083,"z":"b1d019b.6dbd8e8","wires":[["b3a0e9d7.649ff8"]]},{"id":"b3a0e9d7.649ff8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3624.339412689209,"y":444.6691819727421,"z":"b1d019b.6dbd8e8","wires":[["a6327912.f3f9d8"]]},{"id":"a6327912.f3f9d8","type":"set","name":"set prop.spoke.deviceId","xml":"<set>\n<parameter name='prop.spoke.deviceId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].value`' />\n","comments":"","x":3819.3400955200195,"y":441.2697631418705,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"257f4a9c.1ed446","type":"switchNode","name":"switch ActivateSiteInstance","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n","comments":"","outputs":1,"x":2305.5043411254883,"y":463.30178466439247,"z":"b1d019b.6dbd8e8","wires":[["9ba2d06.8f6be3"]]},{"id":"9ba2d06.8f6be3","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2539.503978729248,"y":464.30172458291054,"z":"b1d019b.6dbd8e8","wires":[["a15d8c7c.78012"]]},{"id":"a15d8c7c.78012","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2691.3379669189453,"y":486.3009606897831,"z":"b1d019b.6dbd8e8","wires":[["44322235.a2372c","d545295b.570bb8"]]},{"id":"44322235.a2372c","type":"for","name":"for loop widx - Get wan site ID from servicedata","xml":"<for index=\"sidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2972.3377990722656,"y":485.66816344857216,"z":"b1d019b.6dbd8e8","wires":[["e3395281.b0fe4"]]},{"id":"e3395281.b0fe4","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3241.338726043701,"y":484.6684094965458,"z":"b1d019b.6dbd8e8","wires":[["2466c56a.c4304a","fe259139.fb262","9b298a8b.b4f888"]]},{"id":"2466c56a.c4304a","type":"switchNode","name":"switch siteId","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'siteId'`\">\n","comments":"","outputs":1,"x":3430.33992767334,"y":534.6690813601017,"z":"b1d019b.6dbd8e8","wires":[["8bd2628f.d7e06"]]},{"id":"8bd2628f.d7e06","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3630.3394050598145,"y":522.6691958010197,"z":"b1d019b.6dbd8e8","wires":[["4379d5c4.4bf5fc"]]},{"id":"4379d5c4.4bf5fc","type":"set","name":"set prop.spoke.siteId","xml":"<set>\n<parameter name='prop.spoke.siteId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n","comments":"","x":3823.340358734131,"y":529.2698260843754,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"3e5320cd.89f1e","type":"switchNode","name":"switch wanPortId","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'wanPortId'`\">\n","comments":"","outputs":1,"x":3454.50390625,"y":320.3018342554569,"z":"b1d019b.6dbd8e8","wires":[["42e60a6a.aa3574"]]},{"id":"42e60a6a.aa3574","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3684.5039100646973,"y":320.30194583535194,"z":"b1d019b.6dbd8e8","wires":[["ae0a5d97.a78e5"]]},{"id":"ae0a5d97.a78e5","type":"set","name":"set prop.spoke.wanPortId","xml":"<set>\n<parameter name='prop.spoke.wanPortId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n","comments":"","x":3911.5046463012695,"y":321.9025279581547,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"efdc38fc.1f5628","type":"switchNode","name":"switch providerIpAddress","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'providerIpAddress'`\">\n","comments":"","outputs":1,"x":3472.504066467285,"y":364.30178466439247,"z":"b1d019b.6dbd8e8","wires":[["ac0b6cb5.77b59"]]},{"id":"ac0b6cb5.77b59","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3672.5038414001465,"y":364.30194678902626,"z":"b1d019b.6dbd8e8","wires":[["f9d16c81.a3a79"]]},{"id":"f9d16c81.a3a79","type":"set","name":"set prop.spoke.providerIpAddress","xml":"<set>\n<parameter name='prop.spoke.providerIpAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n","comments":"","x":3899.5045776367188,"y":365.902528911829,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"8e38557b.879d28","type":"switchNode","name":"switch ipAddress","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'ipAddress'`\">\n","comments":"","outputs":1,"x":3452.503894805908,"y":403.3018209040165,"z":"b1d019b.6dbd8e8","wires":[["3e49c027.9158a"]]},{"id":"3e49c027.9158a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3676.5037231445312,"y":403.3019382059574,"z":"b1d019b.6dbd8e8","wires":[["63fb7b99.9c4f54"]]},{"id":"63fb7b99.9c4f54","type":"set","name":"set prop.spoke.ipAddress","xml":"<set>\n<parameter name='prop.spoke.ipAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n","comments":"","x":3903.5044593811035,"y":404.90252032876015,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"95ab5318.2e5c4","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1020.0038070678711,"y":262.50004068017006,"z":"b1d019b.6dbd8e8","wires":[["8881f8e.5bc9208","52b0eddb.8791b4","532b1f7d.9c604","30347a07.26c8f6"]]},{"id":"6dbd8249.403ccc","type":"comment","name":"get spoke device,site,wanport info","info":"","comments":"","x":1776.97265625,"y":385.9687458574772,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"6c52be5d.b4d02","type":"comment","name":"Add routes only on activation of spoke Attach site","info":"","comments":"","x":1437.5038223266602,"y":329.0000597536564,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"ac54d054.7cd81","type":"comment","name":"Loop for all the hub allotted resources, get respective service data and get vnfs info","info":"","comments":"","x":2193.50390625,"y":824.5000559389591,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"ff9f298a.cca7f8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2957.5037384033203,"y":1845.000134140253,"z":"b1d019b.6dbd8e8","wires":[["d59362d2.ef947","b082a709.11f708"]]},{"id":"3adcf839.875688","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3024.5037384033203,"y":1741.000010162592,"z":"b1d019b.6dbd8e8","wires":[["e169850b.ca2b98"]]},{"id":"d59362d2.ef947","type":"switchNode","name":"switch siteId","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n","comments":"","outputs":1,"x":3134.503547668457,"y":1816.9998003542423,"z":"b1d019b.6dbd8e8","wires":[["6377b71d.78eda8"]]},{"id":"6377b71d.78eda8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3285.503917694092,"y":1815.999983459711,"z":"b1d019b.6dbd8e8","wires":[["d846e28e.6f3b8"]]},{"id":"d846e28e.6f3b8","type":"set","name":"set prop.hub.siteId","xml":"<set>\n<parameter name='prop.hub.siteId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n","comments":"","x":3457.5039253234863,"y":1813.6005522310734,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"23a8e35f.4687ac","type":"switchNode","name":"switch request-action","xml":"<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":2611.0036544799805,"y":2169.000444084406,"z":"b1d019b.6dbd8e8","wires":[["98e33ddb.b0dca","c2b4abbd.4bca28"]]},{"id":"98e33ddb.b0dca","type":"outcome","name":"ActivateSDWANAttachmentInstance","xml":"<outcome value='ActivateSDWANAttachmentInstance'>","comments":"","outputs":1,"x":2881.0310592651367,"y":1980.0314766466618,"z":"b1d019b.6dbd8e8","wires":[["6bb4758a.3f2dbc"]]},{"id":"d343e9eb.f9d438","type":"execute","name":"execute RestApiCallNode underlay route","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayHubResp\"/>\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`\" />","comments":"","outputs":1,"x":3469.504180908203,"y":1950.0004482269287,"z":"b1d019b.6dbd8e8","wires":[["6e0b715b.cb6d1","1b5945c5.1fa10a"]]},{"id":"1b5945c5.1fa10a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3716.504009246826,"y":1929.000280380249,"z":"b1d019b.6dbd8e8","wires":[["2019f4f3.e1c6cc"]]},{"id":"6e0b715b.cb6d1","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3714.503688812256,"y":1885.0002708435059,"z":"b1d019b.6dbd8e8","wires":[["76b9bae0.83f2b4"]]},{"id":"df42caf7.594ce8","type":"returnFailure","name":"return failure","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 sdwan hub route underlay rest api\" />\n","comments":"","x":4002.505043029785,"y":1884.0006313323975,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"543ffebe.107f8","type":"set","name":"Add prop.hub.route","xml":"<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n","comments":"","x":3404.8377838134766,"y":1920.6669883728027,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"2e8b8d76.b2d882","type":"execute","name":"execute RestApiCallNode underlay route","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayspokeResp\"/>\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`\" />","comments":"","outputs":1,"x":3486.838050842285,"y":2114.667499214411,"z":"b1d019b.6dbd8e8","wires":[["9396f713.11f4f8","348aaf89.0950a"]]},{"id":"348aaf89.0950a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3731.8382873535156,"y":2140.667496204376,"z":"b1d019b.6dbd8e8","wires":[["928f88f0.d6ee18"]]},{"id":"9396f713.11f4f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3729.8379669189453,"y":2096.667486667633,"z":"b1d019b.6dbd8e8","wires":[["58d448af.a07fd8"]]},{"id":"38cd6644.9bd7ea","type":"returnFailure","name":"return failure","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 sdwan spoke route underlay rest api\" />\n","comments":"","x":4019.8393936157227,"y":2089.6679944992065,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"b2b73fd8.a499a","type":"set","name":"Add prop.spoke.route","xml":"<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />                                                \n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n","comments":"","x":3427.7019233703613,"y":2077.3642114698887,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"f670e4e2.ed4a18","type":"set","name":"set  prop.underlay.routeIds","xml":"<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<!--parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeSiteId' value='`$prop.spoke.siteId`' /-->\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$underlayHubResp.success[0].id`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$underlayspokeResp.success[0].id`' />\n\n\n\n","comments":"","x":3437.669448852539,"y":2237.0309874117374,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"6bb4758a.3f2dbc","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3117.003578186035,"y":1977.4999100267887,"z":"b1d019b.6dbd8e8","wires":[["543ffebe.107f8","b2b73fd8.a499a","f670e4e2.ed4a18","2e8b8d76.b2d882","d343e9eb.f9d438","154b4cb.99625b3","497ef4.1532d10c","7ece27e0.0e9908","aeaf4169.ad4e1","7b6ea599.d556bc"]]},{"id":"cda2bd2c.f7f2b","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3149.0036811828613,"y":2619.500260025263,"z":"b1d019b.6dbd8e8","wires":[["d9e2a3b8.be3d7","7877847f.fa07bc","32aaac62.305534","b552a294.7e377","4d9ba6d6.4948a8","5011194.82bcce8","aa5933c2.13ab"]]},{"id":"c2b4abbd.4bca28","type":"outcome","name":"DeactivateSDWANAttachmentInstance","xml":"<outcome value='DeactivateSDWANAttachmentInstance'>","comments":"","outputs":1,"x":2897.5037384033203,"y":2613.500071197748,"z":"b1d019b.6dbd8e8","wires":[["cda2bd2c.f7f2b"]]},{"id":"497ef4.1532d10c","type":"set","name":"Add sites to list and update length","xml":"<set>\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteName' value='`$prop.hub.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteName' value='`$prop.spoke.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteId' value='`$prop.spoke.siteId`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n","comments":"","x":3442.0357360839844,"y":2362.0318676531315,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"536b45e5.f1ae4c","type":"comment","name":"save hubsiteIds and spoke siteIds for provision","info":"","comments":"","x":3474.0361099243164,"y":2318.0317417681217,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"fe259139.fb262","type":"switchNode","name":"switch name","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'name'`\">\n","comments":"","outputs":1,"x":3431.034912109375,"y":484.03124871850014,"z":"b1d019b.6dbd8e8","wires":[["1eff9aea.08d565"]]},{"id":"1eff9aea.08d565","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3631.0346870422363,"y":484.0314108431339,"z":"b1d019b.6dbd8e8","wires":[["498b6b56.a99af4"]]},{"id":"498b6b56.a99af4","type":"set","name":"set prop.spoke.siteName","xml":"<set>\n<parameter name='prop.spoke.siteName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n","comments":"","x":3819.0354919433594,"y":482.6320244371891,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"b082a709.11f708","type":"switchNode","name":"switch name","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'name'`\">\n","comments":"","outputs":1,"x":3133.0349349975586,"y":1783.5311075747013,"z":"b1d019b.6dbd8e8","wires":[["66b911d8.08a74"]]},{"id":"66b911d8.08a74","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3284.0353050231934,"y":1782.53129068017,"z":"b1d019b.6dbd8e8","wires":[["e9fd7b0e.9d3c98"]]},{"id":"e9fd7b0e.9d3c98","type":"set","name":"set prop.hub.siteName","xml":"<set>\n<parameter name='prop.hub.siteName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n","comments":"","x":3456.035312652588,"y":1780.1318594515324,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"f5abf897.1c94a8","type":"set","name":"set prop.provision.siteIds_length=0","xml":"<set>\n<parameter name='prop.provision.siteIds_length' value='0' />\n\n\n\n","comments":"","x":456.03517150878906,"y":370.0312534868717,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"487dcb6d.a39b04","type":"execute","name":"execute RestApiCallNode site provision urls","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site-provision.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites/provision-urls'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"provisionUrlRsp\"/>\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`\" />","comments":"","outputs":1,"x":796.0352783203125,"y":786.031494140625,"z":"b1d019b.6dbd8e8","wires":[["ffc902c4.10ca6","e8f294ed.ea5b38"]]},{"id":"e8f294ed.ea5b38","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1051.0354766845703,"y":821.0315399169922,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"ffc902c4.10ca6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1047.0352783203125,"y":748.0314774513245,"z":"b1d019b.6dbd8e8","wires":[["f3276258.b0845"]]},{"id":"f3276258.b0845","type":"returnFailure","name":"return failure","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 provision url rest api\" />\n","comments":"","x":1218.0357704162598,"y":779.0314909517765,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"e484905a.ff144","type":"for","name":"for providx..prop.provision.siteIds[]","xml":"<for index='providx' start='0' end='`$prop.provision.siteIds_length`' >\n","comments":"","outputs":1,"x":449.0352020263672,"y":574.031293541193,"z":"b1d019b.6dbd8e8","wires":[["632e756e.6e9b1c"]]},{"id":"632e756e.6e9b1c","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":473.0352439880371,"y":784.0312668383121,"z":"b1d019b.6dbd8e8","wires":[["2e3f9820.f1c8a8","487dcb6d.a39b04","b564c84.911a938"]]},{"id":"2e3f9820.f1c8a8","type":"set","name":"set prop.spoke.hubSiteId, spokeSiteId","xml":"<set>\n<parameter name='prop.provision.hubSitename' value='`$prop.provision.siteIds[$providx].hubSiteName`' />\n<parameter name='prop.provision.spokeSitename' value='`$prop.provision.siteIds[$providx].spokeSiteName`' />\n<parameter name='prop.provision.hubspokesite[0]' value='`$prop.provision.siteIds[$providx].hubSiteId`' />\n<parameter name='prop.provision.hubspokesite[1]' value='`$prop.provision.siteIds[$providx].spokeSiteId`' />\n<parameter name='prop.provision.hubspokesite_length' value='2' />\n","comments":"","x":779.0379333496094,"y":736.6330394744873,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"b564c84.911a938","type":"record","name":"record provision url response to the file","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`'/opt/opendaylight/current/data/log/' + 'HUB-' + $prop.provision.hubSitename + '-SPOKE-' + $prop.provision.spokeSitename + '-provisionUrl'`\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value='`$provisionUrlRsp.success[0].url`'/>\n\n","comments":"","outputs":1,"x":785.0353393554688,"y":835.0314025878906,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"35d495b.f10696a","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2522.035388946533,"y":1051.0313250124454,"z":"b1d019b.6dbd8e8","wires":[["2ab4ecb3.a0e7b4"]]},{"id":"684cbe0.d0ae544","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":2002.0350646972656,"y":614.0313078463078,"z":"b1d019b.6dbd8e8","wires":[["9bdd2027.61dcf"]]},{"id":"8db55ac9.a24998","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1946.0352325439453,"y":705.0312162935734,"z":"b1d019b.6dbd8e8","wires":[["62066499.8552ec","40faa7d6.f30958"]]},{"id":"154b4cb.99625b3","type":"set","name":"set prop.underlay.routeIds_length++","xml":"<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n\n\n\n\n","comments":"","x":3467.0050659179688,"y":2273.250064522028,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"7ece27e0.0e9908","type":"set","name":"Update prop.provision.siteIds_length","xml":"<set>\n<parameter name='prop.provision.siteIds_length' value='`$prop.provision.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n","comments":"","x":3450.5048065185547,"y":2397.2501598894596,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"d545295b.570bb8","type":"set","name":"set prop.spoke.siteidx","xml":"<set>\n<parameter name='prop.spoke.siteidx' value='`$i`' />\n\n","comments":"","x":2890.7540969848633,"y":450.00002732872963,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"f0e8f4fb.c20608","type":"set","name":"set  underlay route ids to service data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"underlayRouteIds\" />\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$tmp.routeString`' />\n\n\n","comments":"","x":1913.0045471191406,"y":1937.0003973543644,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"e2e0c9ba.1ae298","type":"set","name":"set prop.underlay.routeIds_length=0","xml":"<set>\n<parameter name='prop.underlay.routeIds_length' value='0' />\n\n\n\n","comments":"","x":461.0000305175781,"y":321.99611154198647,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"4d9ba6d6.4948a8","type":"for","name":"for loop uidx - Get route Id from prop.underlay.routeIds","xml":"<for index=\"uidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n    \n    \n","comments":"","outputs":1,"x":3504.6669387817383,"y":2492.3294989168644,"z":"b1d019b.6dbd8e8","wires":[["b779a699.2b9d28"]]},{"id":"b779a699.2b9d28","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3796.3336334228516,"y":2492.3294989168644,"z":"b1d019b.6dbd8e8","wires":[["a219586f.d987c8"]]},{"id":"a219586f.d987c8","type":"switchNode","name":"switch prop.hub.siteId","xml":"<switch test=\"`$prop.underlay.routeIds[$uidx].hubSiteId == $prop.hub.siteId`\">\n","comments":"","outputs":1,"x":3985.3336486816406,"y":2492.3296619951725,"z":"b1d019b.6dbd8e8","wires":[["55260cd6.1fda94"]]},{"id":"55260cd6.1fda94","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4156.333084106445,"y":2492.329661041498,"z":"b1d019b.6dbd8e8","wires":[["7c71da62.bde474"]]},{"id":"7c71da62.bde474","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":4310.333084106445,"y":2496.3296686708927,"z":"b1d019b.6dbd8e8","wires":[["ddeb2690.5c2138"]]},{"id":"ddeb2690.5c2138","type":"set","name":"set prop.hubRouteId prop.spokeRouteId","xml":"<set>\n<parameter name='prop.hubRouteId' value='`$prop.underlay.routeIds[$uidx].hubRouteId`' />\n<parameter name='prop.spokeRouteId' value='`$prop.underlay.routeIds[$uidx].spokeRouteId`' />\n","comments":"","x":4396.33309173584,"y":2568.32967248559,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"9b298a8b.b4f888","type":"switchNode","name":"switch underlayRouteIds","xml":"<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'underlayRouteIds'`\">\n","comments":"","outputs":1,"x":3436,"y":588.6627184450626,"z":"b1d019b.6dbd8e8","wires":[["3be394fa.ba925c"]]},{"id":"3be394fa.ba925c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3635.9994773864746,"y":576.6628328859806,"z":"b1d019b.6dbd8e8","wires":[["9920e23b.cd7d6"]]},{"id":"b59167a6.831738","type":"set","name":"set prop.underlay.routeIds","xml":"<set>\n<parameter name='prop.underlay.routeIdsString' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n","comments":"","x":4007.000877380371,"y":576.2635428011417,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"2e975a9d.1a4246","type":"switchNode","name":"switch request-action","xml":"<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1123.0002899169922,"y":2028.329627662897,"z":"b1d019b.6dbd8e8","wires":[["50fd57d3.4e6908","75c971c8.2ade9"]]},{"id":"50fd57d3.4e6908","type":"outcome","name":"ActivateSDWANAttachmentInstance","xml":"<outcome value='ActivateSDWANAttachmentInstance'>","comments":"","outputs":1,"x":1387.0003356933594,"y":1983.3296248018742,"z":"b1d019b.6dbd8e8","wires":[["392209cf.5e8ed6"]]},{"id":"392209cf.5e8ed6","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1628.9728469848633,"y":1979.7983757555485,"z":"b1d019b.6dbd8e8","wires":[["f0e8f4fb.c20608","c79bd758.d1a228","c32378d4.836d48","ec775956.c66808"]]},{"id":"c8905137.4ae61","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1632.9728355407715,"y":2063.7985445559025,"z":"b1d019b.6dbd8e8","wires":[["b63c926.b7d007"]]},{"id":"75c971c8.2ade9","type":"outcome","name":"DeactivateSDWANAttachmentInstance","xml":"<outcome value='DeactivateSDWANAttachmentInstance'>","comments":"","outputs":1,"x":1384.4729766845703,"y":2065.7983814775944,"z":"b1d019b.6dbd8e8","wires":[["c8905137.4ae61"]]},{"id":"b63c926.b7d007","type":"set","name":"set input parameter length -1","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length - 1`' />\n\n\n\n\n","comments":"","x":1861.6665344238281,"y":2062.32963052392,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"ada095aa.2b5138","type":"comment","name":"Get route routes IDs","info":"","comments":"","x":3404.3334045410156,"y":2453.6627356112003,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"c79bd758.d1a228","type":"set","name":"set  underlay route ids to service data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n","comments":"","x":1902.333480834961,"y":2011.6626717150211,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"c32378d4.836d48","type":"for","name":"for jidx paramidx - Get topology from servicedata","xml":"<for index=\"jidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n    \n    \n","comments":"","outputs":1,"x":1991.3334045410156,"y":1558.329443603754,"z":"b1d019b.6dbd8e8","wires":[["59aabb37.7454e4"]]},{"id":"81edad0c.4f5ac","type":"execute","name":"execute concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat1\"/>\n    <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].hubRouteId`'/>\n\n\n","comments":"","outputs":1,"x":2175.333740234375,"y":1691.996646553278,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"7fab8278.4c656c","type":"execute","name":"execute concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$prop.underlay.routeIds[$jidx].hubSiteId`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat\"/>\n    <parameter name=\"target\" value=\",\"/>\n\n\n","comments":"","outputs":1,"x":2185.3337326049805,"y":1644.662984520197,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"59aabb37.7454e4","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1898.333423614502,"y":1743.662773758173,"z":"b1d019b.6dbd8e8","wires":[["7fab8278.4c656c","81edad0c.4f5ac","bd7613d0.c6069","cafff242.d3dff","2fe3b3bd.2bc2ac","6f5dac0d.df1414"]]},{"id":"bd7613d0.c6069","type":"execute","name":"execute concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat1`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat2\"/>\n    <parameter name=\"target\" value=\",\"/>\n\n\n","comments":"","outputs":1,"x":2182.3334426879883,"y":1731.6628777086735,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"cafff242.d3dff","type":"execute","name":"execute concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat2`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat3\"/>\n    <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].spokeRouteId`'/>\n\n\n","comments":"","outputs":1,"x":2182.3334426879883,"y":1767.6628777086735,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"2fe3b3bd.2bc2ac","type":"execute","name":"execute concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat3`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat4\"/>\n    <parameter name=\"target\" value=\" | \"/>\n\n\n","comments":"","outputs":1,"x":2175.3334426879883,"y":1807.996251732111,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"6f5dac0d.df1414","type":"execute","name":"execute concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.routeString`'/>\n    <parameter name=\"outputPath\" value=\"tmp.routeString\"/>\n    <parameter name=\"target\" value='`$tmp.concat4`'/>\n\n\n","comments":"","outputs":1,"x":2178.333381652832,"y":1862.6627909243107,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"ec775956.c66808","type":"set","name":"Set tmp.routeString","xml":"<set>\n<parameter name='tmp.routeString' value=\"\" />\n\n","comments":"","x":1895.3334045410156,"y":1499.6627747118473,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"9920e23b.cd7d6","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3784.0002250671387,"y":622.9961306154728,"z":"b1d019b.6dbd8e8","wires":[["b59167a6.831738","c00c7b4.2e5c088"]]},{"id":"c00c7b4.2e5c088","type":"execute","name":"execute split |","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsString`'/>\n<parameter name=\"regex\" value=\" | \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValue\"/>\n","comments":"","outputs":1,"x":3962.0002365112305,"y":642.9961306154728,"z":"b1d019b.6dbd8e8","wires":[["d71d5ee6.5fb61","71f30ffd.74297"]]},{"id":"71f30ffd.74297","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4139.0002517700195,"y":623.9961296617985,"z":"b1d019b.6dbd8e8","wires":[["5a3e2b9e.9c82d4"]]},{"id":"d71d5ee6.5fb61","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":4128.0002517700195,"y":671.9961315691471,"z":"b1d019b.6dbd8e8","wires":[["e2b81ef4.58103"]]},{"id":"3ae500a3.3e9bf","type":"set","name":"set ipAddress prefixLength","xml":"<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.underlay.routeIdsValues[0]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$prop.underlay.routeIdsValues[1]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$prop.underlay.routeIdsValues[2]`' />","comments":"","x":5325.001117706299,"y":557.9963718950748,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"e2b81ef4.58103","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":4258.000255584717,"y":671.9961315691471,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"5a3e2b9e.9c82d4","type":"for","name":"for loop ridx ","xml":"<for index=\"ridx\" start=\"0\" end=\"`$prop.underlay.routeIdsValue_length`\">\n    \n    \n","comments":"","outputs":1,"x":4284.999938964844,"y":621.9961296617985,"z":"b1d019b.6dbd8e8","wires":[["51bc75fb.70c9ec"]]},{"id":"51bc75fb.70c9ec","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":4463.332950592041,"y":618.9961306154728,"z":"b1d019b.6dbd8e8","wires":[["96fd714e.32a33"]]},{"id":"96fd714e.32a33","type":"execute","name":"execute split ,","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsValue[$ridx]`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValues\"/>\n","comments":"","outputs":1,"x":4638.332962036133,"y":617.9961287081242,"z":"b1d019b.6dbd8e8","wires":[["1c090ebd.4b1411","d83771e1.cb93f"]]},{"id":"1c090ebd.4b1411","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4795.33296585083,"y":594.9961363375187,"z":"b1d019b.6dbd8e8","wires":[["669de5ac.6729ac"]]},{"id":"d83771e1.cb93f","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":4784.33296585083,"y":642.9961382448673,"z":"b1d019b.6dbd8e8","wires":[["cb663456.f36218"]]},{"id":"cb663456.f36218","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":4914.332969665527,"y":642.9961382448673,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"c59be3a3.5f1ff","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":5117.665496826172,"y":573.9962903559208,"z":"b1d019b.6dbd8e8","wires":[["3ae500a3.3e9bf","52bf6eab.78af3"]]},{"id":"52bf6eab.78af3","type":"set","name":"set ipAddress prefixLength","xml":"<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n","comments":"","x":5317.333156585693,"y":599.9961678087711,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"669de5ac.6729ac","type":"switchNode","name":"switch prop.underlay.routeIdsValues_length","xml":"<switch test='`$prop.underlay.routeIdsValues_length`'>\n","comments":"","outputs":1,"x":4993.667121887207,"y":475.9961611330509,"z":"b1d019b.6dbd8e8","wires":[["43831c53.32aa44","286a0e51.c7df42"]]},{"id":"43831c53.32aa44","type":"outcome","name":"3","xml":"<outcome value='3'>\n","comments":"","outputs":1,"x":5228.636054992676,"y":512.9648882448673,"z":"b1d019b.6dbd8e8","wires":[["c59be3a3.5f1ff"]]},{"id":"286a0e51.c7df42","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":5245.666980743408,"y":394.9961020052433,"z":"b1d019b.6dbd8e8","wires":[["b1a5d346.3c838"]]},{"id":"b1a5d346.3c838","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":5406.66650390625,"y":434.99609246850014,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"9edc0016.5374a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n","comments":"","x":2886.006446838379,"y":1008.3028489649296,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"36139e8.434ce62","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2872.0059547424316,"y":956.969269901514,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"aeaf4169.ad4e1","type":"set","name":"hardcode hub route","xml":"<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n","comments":"","x":3406.0079498291016,"y":1889.0040550231934,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"7b6ea599.d556bc","type":"set","name":"hardcode spoke route","xml":"<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />","comments":"","x":3421.008316040039,"y":2046.0039640963078,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"5011194.82bcce8","type":"set","name":"hardcode hub route","xml":"<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n","comments":"","x":3437.3374786376953,"y":2522.000064522028,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"aa5933c2.13ab","type":"set","name":"hardcode spoke route","xml":"<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />","comments":"","x":3462.337158203125,"y":2633.9999987185,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"2c880b10.265824","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3473.0080757141113,"y":1253.5040480196476,"z":"b1d019b.6dbd8e8","wires":[["c82b1262.885e1","43b2a05a.a7d9b"]]},{"id":"27cac422.cfe53c","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3803.2580280303955,"y":1421.0040365755558,"z":"b1d019b.6dbd8e8","wires":[["4095ea96.600eb4"]]},{"id":"4095ea96.600eb4","type":"switchNode","name":"switch transportNetworkName==prop.spoke.transportNetworkName","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value == $prop.spoke.transportNetworkName`\">\n","comments":"","outputs":1,"x":4136.008050918579,"y":1423.0043121874332,"z":"b1d019b.6dbd8e8","wires":[["62cc8a78.a53c54"]]},{"id":"62cc8a78.a53c54","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4003.0094957351685,"y":1519.0042206346989,"z":"b1d019b.6dbd8e8","wires":[["79266ace.3e0f24"]]},{"id":"79266ace.3e0f24","type":"block","name":"block atmoic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":4158.759503364563,"y":1511.0042206346989,"z":"b1d019b.6dbd8e8","wires":[["b05226c4.bd3a28","eaeb7669.551da8"]]},{"id":"eaeb7669.551da8","type":"set","name":"set tmp.wanportvidx ","xml":"<set>\n<parameter name='tmp.wanportvidx' value='`$arvidx`' />\n\n","comments":"","x":4336.2604722976685,"y":1487.004341751337,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"eb5f2e.bb7a50d","type":"for","name":"for loop wanportvidx - Get wan port ID from servicedata","xml":"<for index=\"wportidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n","comments":"","outputs":1,"x":2744.5081939697266,"y":1699.0043436586857,"z":"b1d019b.6dbd8e8","wires":[["94ca8906.8e1df8"]]},{"id":"94ca8906.8e1df8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":3047.5095977783203,"y":1657.004679352045,"z":"b1d019b.6dbd8e8","wires":[["de2e10d.04cb7f","c3406431.579fb8","5a48c14b.c2614"]]},{"id":"de2e10d.04cb7f","type":"switchNode","name":"switch wanPortId","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`\">\n","comments":"","outputs":1,"x":3246.8432846069336,"y":1614.0048920214176,"z":"b1d019b.6dbd8e8","wires":[["31fd8292.a950ce"]]},{"id":"31fd8292.a950ce","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3407.8436126708984,"y":1615.0049721300602,"z":"b1d019b.6dbd8e8","wires":[["d6943196.7494d"]]},{"id":"d6943196.7494d","type":"set","name":"set prop.hub.wanPortId","xml":"<set>\n<parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n","comments":"","x":3597.8440742492676,"y":1614.6052481234074,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"c3406431.579fb8","type":"switchNode","name":"switch providerIpAddress","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`\">\n","comments":"","outputs":1,"x":3268.371768951416,"y":1651.2011968195438,"z":"b1d019b.6dbd8e8","wires":[["db88a61d.083358"]]},{"id":"db88a61d.083358","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3444.3727531433105,"y":1651.2013193666935,"z":"b1d019b.6dbd8e8","wires":[["5328c878.a15168"]]},{"id":"5328c878.a15168","type":"set","name":"set prop.hub.providerIpAddress","xml":"<set>\n<parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n","comments":"","x":3646.372791290283,"y":1651.8012396395206,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"5a48c14b.c2614","type":"switchNode","name":"switch ipAddress","xml":"<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`\">\n","comments":"","outputs":1,"x":3240.871850967407,"y":1688.7012821733952,"z":"b1d019b.6dbd8e8","wires":[["1b2197ee.121938"]]},{"id":"1b2197ee.121938","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3444.872791290283,"y":1688.7012340128422,"z":"b1d019b.6dbd8e8","wires":[["fe46a76e.a6fa58"]]},{"id":"fe46a76e.a6fa58","type":"set","name":"set prop.hub.ipAddress","xml":"<set>\n<parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n","comments":"","x":3639.8727951049805,"y":1688.3012095987797,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"76b9bae0.83f2b4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3847.258213043213,"y":1882.2540187835693,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"2019f4f3.e1c6cc","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3846.258029937744,"y":1928.253957748413,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"58d448af.a07fd8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3865.258399963379,"y":2090.254084587097,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"928f88f0.d6ee18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3866.2581577301025,"y":2137.2540855407715,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"a62325e4.8d0b68","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3864.2582054138184,"y":2580.0039698183537,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"3b45764d.017e4a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3865.257963180542,"y":2627.003970772028,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"8336cdde.f9fe3","type":"returnFailure","name":"return failure","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 sdwan hub route underlay rest api\" />\n","comments":"","x":4017.340606689453,"y":2581.9710108339787,"z":"b1d019b.6dbd8e8","wires":[]},{"id":"8c851f6f.caa55","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3864.2578125,"y":2671.0039049685,"z":"b1d019b.6dbd8e8","wires":[[]]},{"id":"29ad144c.f2690c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3865.2575702667236,"y":2718.0039059221745,"z":"b1d019b.6dbd8e8","wires":[[]]}]
\ No newline at end of file
+[
+  {
+    "id": "df1ca662.8747b8",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 92,
+    "y": 26,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f03eb016.75be2"
+      ]
+    ]
+  },
+  {
+    "id": "f03eb016.75be2",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "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}'>",
+    "outputs": 1,
+    "x": 208.2856903076172,
+    "y": 77.23810768127441,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "d1c55e79.a107d"
+      ]
+    ]
+  },
+  {
+    "id": "d1c55e79.a107d",
+    "type": "method",
+    "name": "method sdwan-wanport-vnf-topology-operation-underlay",
+    "xml": "<method rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 211.42861938476562,
+    "y": 162.00003147125244,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "39b0cbc5.a6e634"
+      ]
+    ]
+  },
+  {
+    "id": "39b0cbc5.a6e634",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 143.66668701171875,
+    "y": 270.66673278808594,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "6e5ac20d.e60c4c",
+        "b99b3963.4b1368",
+        "962ad5c3.0da1a8",
+        "da982ae7.c19088",
+        "546d6174.f994f"
+      ]
+    ]
+  },
+  {
+    "id": "6e5ac20d.e60c4c",
+    "type": "for",
+    "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
+    "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 578.000431060791,
+    "y": 409.6668539047241,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ad0a3663.ab8598"
+      ]
+    ]
+  },
+  {
+    "id": "2acab811.c13ee8",
+    "type": "set",
+    "name": "set prop.ar.allotted-resource-id",
+    "xml": "<set>\n<parameter name='prop.ar.allotted-resource-id' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id`' />\n",
+    "comments": "",
+    "x": 1368.0013427734375,
+    "y": 98.96877861022949,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "4102e103.78e0d",
+    "type": "comment",
+    "name": "Query MDSAL for AR",
+    "info": "",
+    "comments": "",
+    "x": 1693.3340148925781,
+    "y": 122.96864795684814,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "2988c3dc.9f08bc",
+    "type": "comment",
+    "name": "Query MDSAL to get parent service based on service instance id from AR",
+    "info": "",
+    "comments": "",
+    "x": 2163.334873199463,
+    "y": 141.96862697601318,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "43ba54c6.bea31c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1942.66841506958,
+    "y": 177.63526725769043,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "90fef119.efb27"
+      ]
+    ]
+  },
+  {
+    "id": "90fef119.efb27",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2097.668254852295,
+    "y": 177.13510036468506,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3f50e700.ebbfb8"
+      ]
+    ]
+  },
+  {
+    "id": "22fe4487.ea79bc",
+    "type": "other",
+    "name": "outcome 1",
+    "xml": "<outcome value='1'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2421.3587913513184,
+    "y": 173.75424098968506,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "eb3089e9.bab518"
+      ]
+    ]
+  },
+  {
+    "id": "202db162.ce306e",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachement resource not found\" />\n    \n",
+    "comments": "",
+    "x": 2567.1275672912598,
+    "y": 213.20122909545898,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "b9e47095.da1a3",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1935.5201416015625,
+    "y": 224.70127391815186,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1559b306.93fa9d"
+      ]
+    ]
+  },
+  {
+    "id": "1559b306.93fa9d",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2085.5199851989746,
+    "y": 225.36782932281494,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "6807513b.840e7"
+      ]
+    ]
+  },
+  {
+    "id": "d76066f5.ec2ac8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2409.6867446899414,
+    "y": 211.03460121154785,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "202db162.ce306e"
+      ]
+    ]
+  },
+  {
+    "id": "3f50e700.ebbfb8",
+    "type": "switchNode",
+    "name": "switch cr length",
+    "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2261.668430328369,
+    "y": 177.6352834701538,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "22fe4487.ea79bc",
+        "d76066f5.ec2ac8"
+      ]
+    ]
+  },
+  {
+    "id": "1ecae18f.8c5d6e",
+    "type": "set",
+    "name": "set parent-service-instance-id",
+    "xml": "<set>\n<parameter name='prop.parent-service-instance-id' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />\n\n",
+    "comments": "",
+    "x": 2817.0020294189453,
+    "y": 174.63526439666748,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "eb3089e9.bab518",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic='true'>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2571.4778213500977,
+    "y": 173.80180072784424,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1ecae18f.8c5d6e",
+        "c22c6bf7.654618"
+      ]
+    ]
+  },
+  {
+    "id": "6807513b.840e7",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachement resource not found\" />\n    \n",
+    "comments": "",
+    "x": 2253.001438140869,
+    "y": 223.63520526885986,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "bc09ac7e.2dfa1",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2040.303554534912,
+    "y": 495.7709312438965,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "4a6d5f3.c343ea"
+      ]
+    ]
+  },
+  {
+    "id": "f0b156c6.5db3a8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2032.1553573608398,
+    "y": 530.8370161056519,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "22ca566e.18afda"
+      ]
+    ]
+  },
+  {
+    "id": "22ca566e.18afda",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
+    "comments": "",
+    "x": 2178.304130554199,
+    "y": 531.1045122146606,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "4a6d5f3.c343ea",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2160.3038024902344,
+    "y": 495.771014213562,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c9fcea4f.295c68",
+    "type": "for",
+    "name": "for pnidx.. mdsal-psd.networks.network_length[]",
+    "xml": "<for index='pnidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1723.6683502197266,
+    "y": 595.3028893470764,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "d063fbaf.bf9cb8"
+      ]
+    ]
+  },
+  {
+    "id": "4b3c3b19.b12c44",
+    "type": "switchNode",
+    "name": "switch ActivateSDWANConnectivityInstance",
+    "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n    \n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2253.3349838256836,
+    "y": 564.3028907775879,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "353c03be.8a3dec"
+      ]
+    ]
+  },
+  {
+    "id": "353c03be.8a3dec",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2505.334518432617,
+    "y": 565.3028283119202,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "8948df3b.5b4e8"
+      ]
+    ]
+  },
+  {
+    "id": "8948df3b.5b4e8",
+    "type": "set",
+    "name": "set tmp.pnidx ",
+    "xml": "<set>\n<parameter name='tmp.pnidx' value='`$pnidx`' />\n\n",
+    "comments": "",
+    "x": 2661.3342056274414,
+    "y": 565.3028283119202,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "f17464be.205b38",
+    "type": "for",
+    "name": "for loop paramidx - Get topology from servicedata",
+    "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1655.3351593017578,
+    "y": 680.3025188446045,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a24202ba.c8c7c"
+      ]
+    ]
+  },
+  {
+    "id": "1134832c.af388d",
+    "type": "switchNode",
+    "name": "switch topology",
+    "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2107.335250854492,
+    "y": 659.3024244308472,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "b4638122.81f25"
+      ]
+    ]
+  },
+  {
+    "id": "b4638122.81f25",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2258.335262298584,
+    "y": 657.3024663925171,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "6ab1ecb6.c4b6a4"
+      ]
+    ]
+  },
+  {
+    "id": "6ab1ecb6.c4b6a4",
+    "type": "set",
+    "name": "set topology",
+    "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
+    "comments": "",
+    "x": 2399.334991455078,
+    "y": 656.9024000167847,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "427fd71a.a641b8",
+    "type": "switchNode",
+    "name": "switch tmp.pnidx ",
+    "xml": "<switch test=\"`$tmp.pnidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1626.334976196289,
+    "y": 639.9690914154053,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3b308668.883fda"
+      ]
+    ]
+  },
+  {
+    "id": "3b308668.883fda",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1781.7636489868164,
+    "y": 638.5404710769653,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1025ab31.d734f5"
+      ]
+    ]
+  },
+  {
+    "id": "1025ab31.d734f5",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 1922.1922721862793,
+    "y": 639.6835603713989,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "3aec24fb.014f5c",
+    "type": "switchNode",
+    "name": "switch topology hub-spoke",
+    "xml": "<switch test=\"`$prop.topology == 'hub-spoke'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1534.3348426818848,
+    "y": 742.3023405075073,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "11a1e34f.7c4fdd",
+        "32341b46.a26b84"
+      ]
+    ]
+  },
+  {
+    "id": "11a1e34f.7c4fdd",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1724.334529876709,
+    "y": 767.3028259277344,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "26c0cc7e.899014"
+      ]
+    ]
+  },
+  {
+    "id": "32341b46.a26b84",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1718.3354568481445,
+    "y": 728.3024883270264,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "92373ae3.dba458"
+      ]
+    ]
+  },
+  {
+    "id": "92373ae3.dba458",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1854.3354606628418,
+    "y": 728.3024272918701,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "26c0cc7e.899014",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1729.66748046875,
+    "y": 835.3020601272583,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a5cfaff.0a25c5"
+      ]
+    ]
+  },
+  {
+    "id": "a5cfaff.0a25c5",
+    "type": "for",
+    "name": "for ppidx.. mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
+    "xml": "<for index='ppidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2137.000732421875,
+    "y": 835.6356782913208,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "528bb6e8.287b28"
+      ]
+    ]
+  },
+  {
+    "id": "45c7f2c8.9bbc9c",
+    "type": "set",
+    "name": "set prop.ar.provided-allotted-resource-id",
+    "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$ppidx].allotted-resource-id`' />\n\n",
+    "comments": "",
+    "x": 2228.0018463134766,
+    "y": 913.6359763145447,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "d3076636.df66e8",
+    "type": "for",
+    "name": "for loop aridx - Get role from allotted resource",
+    "xml": "<for index=\"aridx\" start=\"0\" end=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2246.0025482177734,
+    "y": 1024.302767753601,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "94a7fcab.3f18"
+      ]
+    ]
+  },
+  {
+    "id": "e9ad6cc9.abb1",
+    "type": "switchNode",
+    "name": "switch Role",
+    "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'Role'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2655.002658843994,
+    "y": 1027.3028545379639,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "356c0745.261588"
+      ]
+    ]
+  },
+  {
+    "id": "356c0745.261588",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2796.0029907226562,
+    "y": 1026.3028535842896,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "2ecc17c9.bbea08"
+      ]
+    ]
+  },
+  {
+    "id": "2ecc17c9.bbea08",
+    "type": "set",
+    "name": "set prop.role",
+    "xml": "<set>\n<parameter name='prop.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n",
+    "comments": "",
+    "x": 2937.0030250549316,
+    "y": 1027.9027452468872,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "7d6e3904.ff8ae8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2732.0020446777344,
+    "y": 930.969269990921,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "92d1a6eb.dd91a8"
+      ]
+    ]
+  },
+  {
+    "id": "b0148b51.89ec18",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2728.8537673950195,
+    "y": 985.0353531837463,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "c6ccd14a.96548"
+      ]
+    ]
+  },
+  {
+    "id": "59d6c0f4.defd7",
+    "type": "switchNode",
+    "name": "switch role hub",
+    "xml": "<switch test=\"`$prop.role == hub`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2112.3351821899414,
+    "y": 1089.6358079910278,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "d2d633b9.72ffd",
+        "10c92564.7d8f7b"
+      ]
+    ]
+  },
+  {
+    "id": "a9370615.1e0a18",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2428.3345680236816,
+    "y": 1065.6354112625122,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f944f364.78c47",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2838.3042030334473,
+    "y": 1161.1045179367065,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "b250bb74.e941e8"
+      ]
+    ]
+  },
+  {
+    "id": "e08d96d8.e1bd48",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2840.155773162842,
+    "y": 1221.170599937439,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "d9301d98.96024"
+      ]
+    ]
+  },
+  {
+    "id": "d9301d98.96024",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SDWAN service-data not found\" />\n    \n",
+    "comments": "",
+    "x": 2984.304546356201,
+    "y": 1183.4380140304565,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "b250bb74.e941e8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2968.3042221069336,
+    "y": 1150.1046781539917,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "31ca4096.fa657",
+    "type": "set",
+    "name": "set prop.ar-service-instance-id",
+    "xml": "<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
+    "comments": "",
+    "x": 2440.3356018066406,
+    "y": 1149.6360107660294,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "3250db4e.aae6c4",
+    "type": "for",
+    "name": "for arvidx.. mdsal-arsd.service-data.vnfs.vnf_length[]",
+    "xml": "<for index='arvidx' start='0' end='`$mdsal-arsd.service-data.vnfs.vnf_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2484.0020751953125,
+    "y": 1271.6358003616333,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "5be088b1.9bd9d8"
+      ]
+    ]
+  },
+  {
+    "id": "5be088b1.9bd9d8",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2830.6683959960938,
+    "y": 1261.6357765197754,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "b0a1b0f0.1cd88",
+        "64161d13.320da4",
+        "a305e869.75b198"
+      ]
+    ]
+  },
+  {
+    "id": "b0a1b0f0.1cd88",
+    "type": "switchNode",
+    "name": "switch ActivateSDWANPortInstance",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3092.668504714966,
+    "y": 1232.6367359161377,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f4aa7045.eb114"
+      ]
+    ]
+  },
+  {
+    "id": "494b8c51.d5a454",
+    "type": "switchNode",
+    "name": "switch tmp.wanportvidx ",
+    "xml": "<switch test=\"`$tmp.wanportvidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2565.668212890625,
+    "y": 1316.3024454116821,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a2447b78.519d38"
+      ]
+    ]
+  },
+  {
+    "id": "273881de.ee082e",
+    "type": "for",
+    "name": "for loop wportidx - Get wan port ID from servicedata",
+    "xml": "<for index=\"wportidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3747.6689834594727,
+    "y": 1225.6369161605835,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "b8659698.4fa9a8"
+      ]
+    ]
+  },
+  {
+    "id": "a2447b78.519d38",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2737.096935272217,
+    "y": 1319.8741512298584,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f6e26890.4d8a38"
+      ]
+    ]
+  },
+  {
+    "id": "f6e26890.4d8a38",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id (port) not found in service-data\" />\n",
+    "comments": "",
+    "x": 2881.525650024414,
+    "y": 1322.0174312591553,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "f4aa7045.eb114",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3320.66819190979,
+    "y": 1230.636736869812,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ab1ef1f9.e54ea"
+      ]
+    ]
+  },
+  {
+    "id": "b8659698.4fa9a8",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3699.6701984405518,
+    "y": 1309.6374425888062,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "79f89faa.fb19f"
+      ]
+    ]
+  },
+  {
+    "id": "79f89faa.fb19f",
+    "type": "switchNode",
+    "name": "switch transportNetworkName",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3917.6711139678955,
+    "y": 1307.6379308700562,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "863adb79.9947c8"
+      ]
+    ]
+  },
+  {
+    "id": "564bf8e9.5ea9e8",
+    "type": "set",
+    "name": "set tmp.portvidx ",
+    "xml": "<set>\n<parameter name='tmp.portvidx' value='`$arvidx`' />\n\n",
+    "comments": "",
+    "x": 3644.667995452881,
+    "y": 1183.6369037628174,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "863adb79.9947c8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4114.671541213989,
+    "y": 1306.6380996704102,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "896da4ec.a5e9f8"
+      ]
+    ]
+  },
+  {
+    "id": "662f75a8.5b0d6c",
+    "type": "set",
+    "name": "set prop.hub.transportNetworkName",
+    "xml": "<set>\n<parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
+    "comments": "",
+    "x": 4371.6733751297,
+    "y": 1506.2391166687012,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "372c4b67.d587a4",
+    "type": "switchNode",
+    "name": "switch  prop.hub.transportNetworkName==prop.spoke.transportNetworkName",
+    "xml": "<switch test=\"`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2564.00431060791,
+    "y": 1466.3046674728394,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ad67f3dd.ea7da",
+        "f32a34f9.fa2a88"
+      ]
+    ]
+  },
+  {
+    "id": "ad67f3dd.ea7da",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2910.0038414001465,
+    "y": 1503.3047413825989,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "6ddb13cd.d02b7c"
+      ]
+    ]
+  },
+  {
+    "id": "f32a34f9.fa2a88",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2904.004650115967,
+    "y": 1440.3046016693115,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "93fee3b6.b53b4"
+      ]
+    ]
+  },
+  {
+    "id": "93fee3b6.b53b4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3034.004837036133,
+    "y": 1440.3047542572021,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "528bb6e8.287b28",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1879.0322265625,
+    "y": 944.8333101272583,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "45c7f2c8.9bbc9c",
+        "9540984f.e97fb8",
+        "b384d688.b2dd28",
+        "59d6c0f4.defd7",
+        "d3076636.df66e8"
+      ]
+    ]
+  },
+  {
+    "id": "e393fec8.f9974",
+    "type": "switchNode",
+    "name": "switch vpnId",
+    "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2097.001266479492,
+    "y": 703.6354351043701,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "d6a90986.8eb118"
+      ]
+    ]
+  },
+  {
+    "id": "d6a90986.8eb118",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2241.001277923584,
+    "y": 703.6354761123657,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "c1f6fc9b.d909f"
+      ]
+    ]
+  },
+  {
+    "id": "c1f6fc9b.d909f",
+    "type": "set",
+    "name": "set prop.vpnId",
+    "xml": "<set>\n<parameter name='prop.vpnId' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
+    "comments": "",
+    "x": 2399.0009994506836,
+    "y": 702.2354106903076,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "56fbb125.4613b",
+    "type": "set",
+    "name": "Set prop.hubTnpId",
+    "xml": "<set>\n<parameter name='prop.hubTnpId' value='$prop.hub.wanPortId' />\n\n",
+    "comments": "",
+    "x": 2616.3368072509766,
+    "y": 1739.6364259719849,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "7c9721cc.23414",
+    "type": "execute",
+    "name": "execute RestApiCallNode underlay route",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayHubResp\"/>\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 3437.33624458313,
+    "y": 2571.9708592891693,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f29c10b7.ab96c",
+        "d1ca729c.637d"
+      ]
+    ]
+  },
+  {
+    "id": "d1ca729c.637d",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3704.3361530303955,
+    "y": 2599.970888853073,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "4079a316.d4531c"
+      ]
+    ]
+  },
+  {
+    "id": "f29c10b7.ab96c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3702.335832595825,
+    "y": 2555.97087931633,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "7b4a5da7.783c64"
+      ]
+    ]
+  },
+  {
+    "id": "31f4dc9.4459824",
+    "type": "set",
+    "name": "Add prop.hub.route",
+    "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.hubRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n",
+    "comments": "",
+    "x": 3381.6696243286133,
+    "y": 2528.637367248535,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "bd1192a1.70e0b",
+    "type": "execute",
+    "name": "execute RestApiCallNode underlay route",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayspokeResp\"/>\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 3456.6696243286133,
+    "y": 2670.637832403183,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1372bf53.f8d271",
+        "7d49f976.fe2c38"
+      ]
+    ]
+  },
+  {
+    "id": "7d49f976.fe2c38",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3708.669771194458,
+    "y": 2699.6381289958954,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a38da1c5.3c2df"
+      ]
+    ]
+  },
+  {
+    "id": "1372bf53.f8d271",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3706.6694507598877,
+    "y": 2655.638119459152,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ae6e8595.d05358"
+      ]
+    ]
+  },
+  {
+    "id": "1618d5.6f61e72c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 sdwan spoke route underlay rest api\" />\n",
+    "comments": "",
+    "x": 3996.6703186035156,
+    "y": 2649.6383113861084,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "64161d13.320da4",
+    "type": "switchNode",
+    "name": "switch ActivateSDWANDeviceInstance",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3103.532081604004,
+    "y": 1265.8336944580078,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "9f32e086.83793"
+      ]
+    ]
+  },
+  {
+    "id": "c2ac42b9.22b8d",
+    "type": "switchNode",
+    "name": "switch tmp.devicevidx ",
+    "xml": "<switch test=\"`$tmp.devicevidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2571.5316314697266,
+    "y": 1358.4999265670776,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "e36692fe.8d819"
+      ]
+    ]
+  },
+  {
+    "id": "e36692fe.8d819",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2737.9600677490234,
+    "y": 1358.0714597702026,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3d811052.fd24c"
+      ]
+    ]
+  },
+  {
+    "id": "3d811052.fd24c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id (device) not found in service-data\" />\n",
+    "comments": "",
+    "x": 2878.388999938965,
+    "y": 1360.2144346237183,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "9f32e086.83793",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3331.531768798828,
+    "y": 1263.8336954116821,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "869ea93a.54ef48"
+      ]
+    ]
+  },
+  {
+    "id": "869ea93a.54ef48",
+    "type": "set",
+    "name": "set tmp.devicevidx ",
+    "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$arvidx`' />\n\n",
+    "comments": "",
+    "x": 3486.531452178955,
+    "y": 1263.8336944580078,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "a305e869.75b198",
+    "type": "switchNode",
+    "name": "switch ActivateSiteInstance",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3066.5321521759033,
+    "y": 1299.833758354187,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ab60af44.1fc14"
+      ]
+    ]
+  },
+  {
+    "id": "aae2a2df.f7cc",
+    "type": "switchNode",
+    "name": "switch tmp.sitevidx ",
+    "xml": "<switch test=\"`$tmp.sitevidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2570.5315017700195,
+    "y": 1396.4998044967651,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "834ee4ef.5fe588"
+      ]
+    ]
+  },
+  {
+    "id": "834ee4ef.5fe588",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2730.959966659546,
+    "y": 1396.0713243484497,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "4979a718.8325b8"
+      ]
+    ]
+  },
+  {
+    "id": "4979a718.8325b8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id (site) not found in service-data\" />\n",
+    "comments": "",
+    "x": 2879.388921737671,
+    "y": 1398.2143306732178,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "ab60af44.1fc14",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3254.531717300415,
+    "y": 1299.833924293518,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1aaf3b5d.3c7645"
+      ]
+    ]
+  },
+  {
+    "id": "1aaf3b5d.3c7645",
+    "type": "set",
+    "name": "set tmp.sitevidx ",
+    "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
+    "comments": "",
+    "x": 3409.531400680542,
+    "y": 1299.8339233398438,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "409305d5.93be5c",
+    "type": "for",
+    "name": "for loop deviceidx - Get wan port ID from servicedata",
+    "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2703.5333099365234,
+    "y": 1781.8342418670654,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f3da0084.2ed3d"
+      ]
+    ]
+  },
+  {
+    "id": "490623bf.f5be2c",
+    "type": "switchNode",
+    "name": "switch deviceId",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3188.5345611572266,
+    "y": 1712.8350954055786,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "fe8795f9.d93fb8"
+      ]
+    ]
+  },
+  {
+    "id": "fe8795f9.d93fb8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3339.5349349975586,
+    "y": 1709.8353395462036,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "9a7de836.6030f8"
+      ]
+    ]
+  },
+  {
+    "id": "9a7de836.6030f8",
+    "type": "set",
+    "name": "set prop.hub.deviceId",
+    "xml": "<set>\n<parameter name='prop.hub.deviceId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n",
+    "comments": "",
+    "x": 3514.535182952881,
+    "y": 1709.4358644485474,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "e6c5f470.5c1408",
+    "type": "for",
+    "name": "for loop siteidx - Get site ID from servicedata",
+    "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2670.0331268310547,
+    "y": 1843.8342113494873,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ee5b33c3.334cb"
+      ]
+    ]
+  },
+  {
+    "id": "f647b09c.a81c",
+    "type": "comment",
+    "name": "Add route src->dst, dst->src",
+    "info": "",
+    "comments": "",
+    "x": 3005.668716430664,
+    "y": 1860.6360301971436,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "2ed283b9.4ced6c",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2115.334228515625,
+    "y": 1221.968747138977,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3250db4e.aae6c4",
+        "372c4b67.d587a4",
+        "8238d072.258df",
+        "31ca4096.fa657",
+        "a06e1b02.e2dcb8",
+        "5f595aa8.cf14c4"
+      ]
+    ]
+  },
+  {
+    "id": "8238d072.258df",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2370.333984375,
+    "y": 1358.3021211624146,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "c2ac42b9.22b8d",
+        "aae2a2df.f7cc",
+        "494b8c51.d5a454"
+      ]
+    ]
+  },
+  {
+    "id": "6ddb13cd.d02b7c",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2390.3350219726562,
+    "y": 1730.635643005371,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "56fbb125.4613b",
+        "409305d5.93be5c",
+        "e6c5f470.5c1408",
+        "74f0a419.baab7c",
+        "f5ec2256.55a71"
+      ]
+    ]
+  },
+  {
+    "id": "53da0cfd.4e5c84",
+    "type": "set",
+    "name": "Add prop.spoke.route",
+    "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.spokeRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 3391.533639907837,
+    "y": 2639.3345935344696,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "b99b3963.4b1368",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+    "comments": "",
+    "x": 340.3343048095703,
+    "y": 1096.3343391418457,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "9692ac6c.5b398",
+    "type": "execute",
+    "name": "generate connection attachment AR url ",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.allotted-resource-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1389.6672058105469,
+    "y": 158.30183696746826,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a88c4be0.5a96c8",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1516.667236328125,
+    "y": 206.3018274307251,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "43ba54c6.bea31c",
+        "b9e47095.da1a3"
+      ]
+    ]
+  },
+  {
+    "id": "fa697270.9a4c6",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get parent service data",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-parent-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1741.0013885498047,
+    "y": 540.3021411895752,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "bc09ac7e.2dfa1",
+        "f0b156c6.5db3a8"
+      ]
+    ]
+  },
+  {
+    "id": "9c710564.f70308",
+    "type": "execute",
+    "name": "generate connection attachment parent url ",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-parent-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.parent-service-instance-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1718.0010375976562,
+    "y": 486.30206871032715,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b113d667.018288",
+    "type": "comment",
+    "name": "full mesh do nothing",
+    "info": "",
+    "comments": "",
+    "x": 1552.667839050293,
+    "y": 697.3021068572998,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "9c493d3a.013fd",
+    "type": "comment",
+    "name": "hub-spoke",
+    "info": "",
+    "comments": "",
+    "x": 2553.6672401428223,
+    "y": 794.3019967079163,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "9540984f.e97fb8",
+    "type": "execute",
+    "name": "generate connection attachment AR url ",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.provided-allotted-resource-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2226.0003929138184,
+    "y": 945.3019919395447,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b384d688.b2dd28",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2357.000473022461,
+    "y": 984.9686217308044,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "7d6e3904.ff8ae8",
+        "b0148b51.89ec18"
+      ]
+    ]
+  },
+  {
+    "id": "a06e1b02.e2dcb8",
+    "type": "execute",
+    "name": "generate service data url",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2407.504367828369,
+    "y": 1186.3058919906616,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "5f595aa8.cf14c4",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get service data of allotted resource",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-arsd\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2523.5045013427734,
+    "y": 1223.3057832717896,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f944f364.78c47",
+        "e08d96d8.e1bd48"
+      ]
+    ]
+  },
+  {
+    "id": "10c92564.7d8f7b",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2287.5000648498535,
+    "y": 1108.8018560409546,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "2ed283b9.4ced6c"
+      ]
+    ]
+  },
+  {
+    "id": "d2d633b9.72ffd",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2293.500312805176,
+    "y": 1065.801947593689,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a9370615.1e0a18"
+      ]
+    ]
+  },
+  {
+    "id": "c22c6bf7.654618",
+    "type": "for",
+    "name": "for loop roleidx - Get role from allotted resource",
+    "xml": "<for index=\"roleidx\" start=\"0\" end=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2868.5008697509766,
+    "y": 213.30177307128906,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1e62939f.a940cc"
+      ]
+    ]
+  },
+  {
+    "id": "1e62939f.a940cc",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3127.5011825561523,
+    "y": 212.3020887374878,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "6368cbef.0c0714"
+      ]
+    ]
+  },
+  {
+    "id": "6368cbef.0c0714",
+    "type": "switchNode",
+    "name": "switch Role",
+    "xml": "<switch test=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].name == 'role'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3276.501194000244,
+    "y": 213.3019256591797,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "602b9a1d.1f8fa4"
+      ]
+    ]
+  },
+  {
+    "id": "9865389f.19f678",
+    "type": "set",
+    "name": "set prop.spoke.role",
+    "xml": "<set>\n<parameter name='prop.spoke.role' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].value`' />\n",
+    "comments": "",
+    "x": 3581.501754760742,
+    "y": 210.90183353424072,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "602b9a1d.1f8fa4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3412.00101852417,
+    "y": 210.30176544189453,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "9865389f.19f678"
+      ]
+    ]
+  },
+  {
+    "id": "c78c1bff.286648",
+    "type": "switchNode",
+    "name": "switch spoke",
+    "xml": "<switch test=\"`$prop.spoke.role == 'spoke'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1304.000373840332,
+    "y": 357.301700592041,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "45674b4e.4d0684"
+      ]
+    ]
+  },
+  {
+    "id": "45674b4e.4d0684",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1445.000129699707,
+    "y": 358.30173778533936,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "44bfeb73.8a2794"
+      ]
+    ]
+  },
+  {
+    "id": "c6974a98.f8b038",
+    "type": "for",
+    "name": "for i.. service-data.vnfs.vnf_length[]",
+    "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1717.5006561279297,
+    "y": 412.3017330169678,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "74ae021f.4e878c"
+      ]
+    ]
+  },
+  {
+    "id": "74ae021f.4e878c",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2051.166847229004,
+    "y": 356.3016633987427,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "e5568bc9.6c4a18",
+        "10bef5c5.4c95ea",
+        "d2557f72.d615e"
+      ]
+    ]
+  },
+  {
+    "id": "e5568bc9.6c4a18",
+    "type": "switchNode",
+    "name": "switch ActivateSDWANPortInstance",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n    \n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2322.1668853759766,
+    "y": 302.3025498390198,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "730af204.11fefc"
+      ]
+    ]
+  },
+  {
+    "id": "730af204.11fefc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2535.166648864746,
+    "y": 303.3025527000427,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "90e7c80d.95a148"
+      ]
+    ]
+  },
+  {
+    "id": "90e7c80d.95a148",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2684.0003929138184,
+    "y": 305.3017420768738,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "993b2158.a7204"
+      ]
+    ]
+  },
+  {
+    "id": "993b2158.a7204",
+    "type": "for",
+    "name": "for loop widx - Get wan port ID from servicedata",
+    "xml": "<for index=\"widx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2957.000343322754,
+    "y": 303.6689600944519,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a8fb6ac2.404148"
+      ]
+    ]
+  },
+  {
+    "id": "a8fb6ac2.404148",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3226.0012702941895,
+    "y": 302.66920614242554,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f56203d5.44648",
+        "844331fb.21709",
+        "c8a276bd.330448",
+        "878dc9b3.754498"
+      ]
+    ]
+  },
+  {
+    "id": "f56203d5.44648",
+    "type": "switchNode",
+    "name": "switch transportNetworkName",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'transportNetworkName'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3469.0023040771484,
+    "y": 257.6697793006897,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "c1622f74.5acec"
+      ]
+    ]
+  },
+  {
+    "id": "c1622f74.5acec",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3669.0020790100098,
+    "y": 257.6699414253235,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "484c0f29.65918"
+      ]
+    ]
+  },
+  {
+    "id": "484c0f29.65918",
+    "type": "set",
+    "name": "set prop.spoke.transportNetworkName",
+    "xml": "<set>\n<parameter name='prop.spoke.transportNetworkName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
+    "comments": "",
+    "x": 3896.002815246582,
+    "y": 259.2705235481262,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "44bfeb73.8a2794",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1197.9694213867188,
+    "y": 668.2706489562988,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "c6974a98.f8b038",
+        "9c710564.f70308",
+        "fa697270.9a4c6",
+        "c9fcea4f.295c68",
+        "f17464be.205b38",
+        "3aec24fb.014f5c",
+        "427fd71a.a641b8",
+        "3da7a5e7.865d8a"
+      ]
+    ]
+  },
+  {
+    "id": "10bef5c5.4c95ea",
+    "type": "switchNode",
+    "name": "switch ActivateSDWANDeviceInstance",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2314.5003204345703,
+    "y": 376.3017544746399,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3b1b3b34.55a514"
+      ]
+    ]
+  },
+  {
+    "id": "3b1b3b34.55a514",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2533.5000705718994,
+    "y": 377.30173921585083,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "371f6a10.c50d56"
+      ]
+    ]
+  },
+  {
+    "id": "371f6a10.c50d56",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2684.3340606689453,
+    "y": 383.3009305000305,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "53996c8e.9b7f34"
+      ]
+    ]
+  },
+  {
+    "id": "53996c8e.9b7f34",
+    "type": "for",
+    "name": "for loop didx - Get device ID from servicedata",
+    "xml": "<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2943.334312438965,
+    "y": 385.66822576522827,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f263db9e.f44158"
+      ]
+    ]
+  },
+  {
+    "id": "f263db9e.f44158",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3229.334819793701,
+    "y": 418.66841077804565,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "5249df60.eaa65"
+      ]
+    ]
+  },
+  {
+    "id": "5249df60.eaa65",
+    "type": "switchNode",
+    "name": "switch deviceId",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].name == 'deviceId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3412.3357315063477,
+    "y": 418.66902112960815,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "78ddeb0.2bf8314"
+      ]
+    ]
+  },
+  {
+    "id": "78ddeb0.2bf8314",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3612.335506439209,
+    "y": 418.66918325424194,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "842e3e5c.4cad"
+      ]
+    ]
+  },
+  {
+    "id": "842e3e5c.4cad",
+    "type": "set",
+    "name": "set prop.spoke.deviceId",
+    "xml": "<set>\n<parameter name='prop.spoke.deviceId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].value`' />\n",
+    "comments": "",
+    "x": 3807.3361892700195,
+    "y": 415.26976442337036,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "d2557f72.d615e",
+    "type": "switchNode",
+    "name": "switch ActivateSiteInstance",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2293.5004348754883,
+    "y": 437.30178594589233,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1c713318.89265d"
+      ]
+    ]
+  },
+  {
+    "id": "1c713318.89265d",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2527.500072479248,
+    "y": 438.3017258644104,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ed702e21.07c0b"
+      ]
+    ]
+  },
+  {
+    "id": "ed702e21.07c0b",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2679.3340606689453,
+    "y": 460.30096197128296,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "8ec1a47c.55b508",
+        "68bdc58a.c36e2c"
+      ]
+    ]
+  },
+  {
+    "id": "8ec1a47c.55b508",
+    "type": "for",
+    "name": "for loop widx - Get wan site ID from servicedata",
+    "xml": "<for index=\"sidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2960.3338928222656,
+    "y": 459.668164730072,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "edd6a6a1.36e3f8"
+      ]
+    ]
+  },
+  {
+    "id": "edd6a6a1.36e3f8",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3229.334819793701,
+    "y": 458.66841077804565,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "12472c4.5235bd4",
+        "96a23bd5.060968",
+        "af471c20.d9cb7"
+      ]
+    ]
+  },
+  {
+    "id": "12472c4.5235bd4",
+    "type": "switchNode",
+    "name": "switch siteId",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'siteId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3418.33602142334,
+    "y": 508.66908264160156,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3940a3b0.f06d3c"
+      ]
+    ]
+  },
+  {
+    "id": "3940a3b0.f06d3c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3618.3354988098145,
+    "y": 496.66919708251953,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "bc674b05.78b928"
+      ]
+    ]
+  },
+  {
+    "id": "bc674b05.78b928",
+    "type": "set",
+    "name": "set prop.spoke.siteId",
+    "xml": "<set>\n<parameter name='prop.spoke.siteId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
+    "comments": "",
+    "x": 3811.336452484131,
+    "y": 503.26982736587524,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "844331fb.21709",
+    "type": "switchNode",
+    "name": "switch wanPortId",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'wanPortId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3442.5,
+    "y": 294.3018355369568,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "6b71a698.d33fe8"
+      ]
+    ]
+  },
+  {
+    "id": "6b71a698.d33fe8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3672.5000038146973,
+    "y": 294.3019471168518,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "92bbf4e4.47a9a8"
+      ]
+    ]
+  },
+  {
+    "id": "92bbf4e4.47a9a8",
+    "type": "set",
+    "name": "set prop.spoke.wanPortId",
+    "xml": "<set>\n<parameter name='prop.spoke.wanPortId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
+    "comments": "",
+    "x": 3899.5007400512695,
+    "y": 295.90252923965454,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "c8a276bd.330448",
+    "type": "switchNode",
+    "name": "switch providerIpAddress",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'providerIpAddress'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3460.500160217285,
+    "y": 338.30178594589233,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "adb74c6c.ec9a"
+      ]
+    ]
+  },
+  {
+    "id": "adb74c6c.ec9a",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3660.4999351501465,
+    "y": 338.3019480705261,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1ca4e423.ffe23c"
+      ]
+    ]
+  },
+  {
+    "id": "1ca4e423.ffe23c",
+    "type": "set",
+    "name": "set prop.spoke.providerIpAddress",
+    "xml": "<set>\n<parameter name='prop.spoke.providerIpAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
+    "comments": "",
+    "x": 3887.5006713867188,
+    "y": 339.90253019332886,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "878dc9b3.754498",
+    "type": "switchNode",
+    "name": "switch ipAddress",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'ipAddress'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3440.499988555908,
+    "y": 377.30182218551636,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "728cf41e.771a8c"
+      ]
+    ]
+  },
+  {
+    "id": "728cf41e.771a8c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3664.4998168945312,
+    "y": 377.3019394874573,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "dd2dd25f.6f587"
+      ]
+    ]
+  },
+  {
+    "id": "dd2dd25f.6f587",
+    "type": "set",
+    "name": "set prop.spoke.ipAddress",
+    "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
+    "comments": "",
+    "x": 3891.5005531311035,
+    "y": 378.90252161026,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "ad0a3663.ab8598",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1007.9999008178711,
+    "y": 236.50004196166992,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "2acab811.c13ee8",
+        "9692ac6c.5b398",
+        "a88c4be0.5a96c8",
+        "c78c1bff.286648"
+      ]
+    ]
+  },
+  {
+    "id": "688f910f.1fade",
+    "type": "comment",
+    "name": "get spoke device,site,wanport info",
+    "info": "",
+    "comments": "",
+    "x": 1764.96875,
+    "y": 359.96874713897705,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "74cacf6d.c151",
+    "type": "comment",
+    "name": "Add routes only on activation of spoke Attach site",
+    "info": "",
+    "comments": "",
+    "x": 1425.4999160766602,
+    "y": 303.00006103515625,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "3d6571cf.a0a37e",
+    "type": "comment",
+    "name": "Loop for all the hub allotted resources, get respective service data and get vnfs info",
+    "info": "",
+    "comments": "",
+    "x": 2181.5,
+    "y": 798.500057220459,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "ee5b33c3.334cb",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2945.4998321533203,
+    "y": 1819.000135421753,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "c17add8f.67a28",
+        "229bba7c.508e96"
+      ]
+    ]
+  },
+  {
+    "id": "f3da0084.2ed3d",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3012.4998321533203,
+    "y": 1715.0000114440918,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "490623bf.f5be2c"
+      ]
+    ]
+  },
+  {
+    "id": "c17add8f.67a28",
+    "type": "switchNode",
+    "name": "switch siteId",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3122.499641418457,
+    "y": 1790.9998016357422,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "dbd1bbe9.db4a58"
+      ]
+    ]
+  },
+  {
+    "id": "dbd1bbe9.db4a58",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3273.500011444092,
+    "y": 1789.999984741211,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "5c117986.38cf28"
+      ]
+    ]
+  },
+  {
+    "id": "5c117986.38cf28",
+    "type": "set",
+    "name": "set prop.hub.siteId",
+    "xml": "<set>\n<parameter name='prop.hub.siteId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n",
+    "comments": "",
+    "x": 3445.5000190734863,
+    "y": 1787.6005535125732,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "74f0a419.baab7c",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2598.9997482299805,
+    "y": 2143.0004453659058,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "8a79d931.696778",
+        "c7717ba5.717ea8"
+      ]
+    ]
+  },
+  {
+    "id": "8a79d931.696778",
+    "type": "outcome",
+    "name": "ActivateSDWANAttachmentInstance",
+    "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2869.0271530151367,
+    "y": 1954.0314779281616,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "c591ad14.b9dd7"
+      ]
+    ]
+  },
+  {
+    "id": "a7156e9f.23a1b",
+    "type": "execute",
+    "name": "execute RestApiCallNode underlay route",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayHubResp\"/>\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 3457.500099182129,
+    "y": 1883.0003824234009,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3761bb2b.afc314",
+        "4ebe8079.3f11c"
+      ]
+    ]
+  },
+  {
+    "id": "4ebe8079.3f11c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3704.499927520752,
+    "y": 1862.0002145767212,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "78300110.b43b4"
+      ]
+    ]
+  },
+  {
+    "id": "3761bb2b.afc314",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3702.4996070861816,
+    "y": 1818.000205039978,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "722e84e9.8ab54c"
+      ]
+    ]
+  },
+  {
+    "id": "e4f1543b.8ca618",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 sdwan hub route underlay rest api\" />\n",
+    "comments": "",
+    "x": 3980.500762939453,
+    "y": 1796.0005054473877,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "54f01fb1.eab0c",
+    "type": "set",
+    "name": "Add prop.hub.route",
+    "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n",
+    "comments": "",
+    "x": 3392.8337020874023,
+    "y": 1853.666922569275,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "b0e30676.c2a618",
+    "type": "execute",
+    "name": "execute RestApiCallNode underlay route",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayspokeResp\"/>\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 3474.834144592285,
+    "y": 2088.6675004959106,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ad299c2d.b630e",
+        "51decbd4.61a7c4"
+      ]
+    ]
+  },
+  {
+    "id": "51decbd4.61a7c4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3726.83424949646,
+    "y": 2076.667459964752,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "b3f4e792.e33638"
+      ]
+    ]
+  },
+  {
+    "id": "ad299c2d.b630e",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3724.8339290618896,
+    "y": 2032.667450428009,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "e6f4e702.6d5b68"
+      ]
+    ]
+  },
+  {
+    "id": "c9cf02e0.97d29",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 sdwan spoke route underlay rest api\" />\n",
+    "comments": "",
+    "x": 3879.8350524902344,
+    "y": 1982.6677513122559,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "2726f205.443f6e",
+    "type": "set",
+    "name": "Add prop.spoke.route",
+    "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />                                                \n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n",
+    "comments": "",
+    "x": 3415.6980171203613,
+    "y": 2051.3642127513885,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "72173b95.fc02b4",
+    "type": "set",
+    "name": "set  prop.underlay.routeIds",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<!--parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeSiteId' value='`$prop.spoke.siteId`' /-->\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$underlayHubResp.success[0].id`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$underlayspokeResp.success[0].id`' />\n\n\n\n",
+    "comments": "",
+    "x": 3425.665542602539,
+    "y": 2211.0309886932373,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "c591ad14.b9dd7",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3104.999671936035,
+    "y": 1951.4999113082886,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "54f01fb1.eab0c",
+        "2726f205.443f6e",
+        "72173b95.fc02b4",
+        "b0e30676.c2a618",
+        "a7156e9f.23a1b",
+        "541b6902.dd6b58",
+        "77b69608.7345f8",
+        "75459c33.78c964",
+        "d5a685ee.a4f698",
+        "f073f95f.7848a8"
+      ]
+    ]
+  },
+  {
+    "id": "58ea94fe.88fe4c",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3136.9997749328613,
+    "y": 2593.5002613067627,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "31f4dc9.4459824",
+        "53da0cfd.4e5c84",
+        "7c9721cc.23414",
+        "bd1192a1.70e0b",
+        "de488f87.4a5ee",
+        "cc49685f.b2d5d8",
+        "7b57d512.398e6c"
+      ]
+    ]
+  },
+  {
+    "id": "c7717ba5.717ea8",
+    "type": "outcome",
+    "name": "DeactivateSDWANAttachmentInstance",
+    "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2885.4998321533203,
+    "y": 2587.500072479248,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "58ea94fe.88fe4c"
+      ]
+    ]
+  },
+  {
+    "id": "77b69608.7345f8",
+    "type": "set",
+    "name": "Add sites to list and update length",
+    "xml": "<set>\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteName' value='`$prop.hub.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteName' value='`$prop.spoke.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteId' value='`$prop.spoke.siteId`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
+    "comments": "",
+    "x": 3430.0318298339844,
+    "y": 2336.0318689346313,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "fd537752.3855d8",
+    "type": "comment",
+    "name": "save hubsiteIds and spoke siteIds for provision",
+    "info": "",
+    "comments": "",
+    "x": 3462.0322036743164,
+    "y": 2292.0317430496216,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "96a23bd5.060968",
+    "type": "switchNode",
+    "name": "switch name",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'name'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3419.031005859375,
+    "y": 458.03125,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "7dad2dd.add95d4"
+      ]
+    ]
+  },
+  {
+    "id": "7dad2dd.add95d4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3619.0307807922363,
+    "y": 458.0314121246338,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "deeabd26.1be7b"
+      ]
+    ]
+  },
+  {
+    "id": "deeabd26.1be7b",
+    "type": "set",
+    "name": "set prop.spoke.siteName",
+    "xml": "<set>\n<parameter name='prop.spoke.siteName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
+    "comments": "",
+    "x": 3807.0315856933594,
+    "y": 456.63202571868896,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "229bba7c.508e96",
+    "type": "switchNode",
+    "name": "switch name",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'name'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3121.0310287475586,
+    "y": 1757.5311088562012,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "980f0d4f.cfeac"
+      ]
+    ]
+  },
+  {
+    "id": "980f0d4f.cfeac",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3272.0313987731934,
+    "y": 1756.53129196167,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "bc242aa.e7cd1d8"
+      ]
+    ]
+  },
+  {
+    "id": "bc242aa.e7cd1d8",
+    "type": "set",
+    "name": "set prop.hub.siteName",
+    "xml": "<set>\n<parameter name='prop.hub.siteName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n",
+    "comments": "",
+    "x": 3444.031406402588,
+    "y": 1754.1318607330322,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "962ad5c3.0da1a8",
+    "type": "set",
+    "name": "set prop.provision.siteIds_length=0",
+    "xml": "<set>\n<parameter name='prop.provision.siteIds_length' value='0' />\n\n\n\n",
+    "comments": "",
+    "x": 444.03126525878906,
+    "y": 344.0312547683716,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "ba15291d.217778",
+    "type": "execute",
+    "name": "execute RestApiCallNode site provision urls",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site-provision.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites/provision-urls'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"provisionUrlRsp\"/>\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 796.0312957763672,
+    "y": 776.0314712524414,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "863c45b0.87f298",
+        "e8831f50.130f7"
+      ]
+    ]
+  },
+  {
+    "id": "e8831f50.130f7",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1060.0315551757812,
+    "y": 798.0315160751343,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "863c45b0.87f298",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1061.0313415527344,
+    "y": 755.0314540863037,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f11e1d9d.f9f63"
+      ]
+    ]
+  },
+  {
+    "id": "f11e1d9d.f9f63",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 provision url rest api\" />\n",
+    "comments": "",
+    "x": 1206.0318641662598,
+    "y": 753.0314922332764,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "da982ae7.c19088",
+    "type": "for",
+    "name": "for providx..prop.provision.siteIds[]",
+    "xml": "<for index='providx' start='0' end='`$prop.provision.siteIds_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 437.0312957763672,
+    "y": 548.0312948226929,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "2d873e7f.4b1bc2"
+      ]
+    ]
+  },
+  {
+    "id": "2d873e7f.4b1bc2",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 461.0313377380371,
+    "y": 758.031268119812,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "50fee5f7.6d296c",
+        "ba15291d.217778",
+        "89a54eb6.e2142"
+      ]
+    ]
+  },
+  {
+    "id": "50fee5f7.6d296c",
+    "type": "set",
+    "name": "set prop.spoke.hubSiteId, spokeSiteId",
+    "xml": "<set>\n<parameter name='prop.provision.hubSitename' value='`$prop.provision.siteIds[$providx].hubSiteName`' />\n<parameter name='prop.provision.spokeSitename' value='`$prop.provision.siteIds[$providx].spokeSiteName`' />\n<parameter name='prop.provision.hubspokesite[0]' value='`$prop.provision.siteIds[$providx].hubSiteId`' />\n<parameter name='prop.provision.hubspokesite[1]' value='`$prop.provision.siteIds[$providx].spokeSiteId`' />\n<parameter name='prop.provision.hubspokesite_length' value='2' />\n",
+    "comments": "",
+    "x": 772.0339965820312,
+    "y": 634.6329832077026,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "89a54eb6.e2142",
+    "type": "record",
+    "name": "record provision url response to the file",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`'/opt/opendaylight/current/data/log/' + 'HUB-' + $prop.provision.hubSitename + '-SPOKE-' + $prop.provision.spokeSitename + '-provisionUrl'`\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value='`$provisionUrlRsp.success[0].url`'/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 768.0313720703125,
+    "y": 870.0313358306885,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "94a7fcab.3f18",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2510.031482696533,
+    "y": 1025.0313262939453,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "e9ad6cc9.abb1"
+      ]
+    ]
+  },
+  {
+    "id": "d063fbaf.bf9cb8",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1990.0311584472656,
+    "y": 588.0313091278076,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "4b3c3b19.b12c44"
+      ]
+    ]
+  },
+  {
+    "id": "a24202ba.c8c7c",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1934.0313262939453,
+    "y": 679.0312175750732,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1134832c.af388d",
+        "e393fec8.f9974"
+      ]
+    ]
+  },
+  {
+    "id": "541b6902.dd6b58",
+    "type": "set",
+    "name": "set prop.underlay.routeIds_length++",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 3455.0011596679688,
+    "y": 2247.250065803528,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "75459c33.78c964",
+    "type": "set",
+    "name": "Update prop.provision.siteIds_length",
+    "xml": "<set>\n<parameter name='prop.provision.siteIds_length' value='`$prop.provision.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",
+    "comments": "",
+    "x": 3438.5009002685547,
+    "y": 2371.2501611709595,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "68bdc58a.c36e2c",
+    "type": "set",
+    "name": "set prop.spoke.siteidx",
+    "xml": "<set>\n<parameter name='prop.spoke.siteidx' value='`$i`' />\n\n",
+    "comments": "",
+    "x": 2878.7501907348633,
+    "y": 424.0000286102295,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "8706bf22.e777d",
+    "type": "set",
+    "name": "set  underlay route ids to service data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"underlayRouteIds\" />\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$tmp.routeString`' />\n\n\n",
+    "comments": "",
+    "x": 1901.0006408691406,
+    "y": 1911.0003986358643,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "546d6174.f994f",
+    "type": "set",
+    "name": "set prop.underlay.routeIds_length=0",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='0' />\n\n\n\n",
+    "comments": "",
+    "x": 448.9961242675781,
+    "y": 295.9961128234863,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "de488f87.4a5ee",
+    "type": "for",
+    "name": "for loop uidx - Get route Id from prop.underlay.routeIds",
+    "xml": "<for index=\"uidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3492.6630325317383,
+    "y": 2466.3295001983643,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "b94dca1b.799658"
+      ]
+    ]
+  },
+  {
+    "id": "b94dca1b.799658",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3784.3297271728516,
+    "y": 2466.3295001983643,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "f30a5bcf.2eba98"
+      ]
+    ]
+  },
+  {
+    "id": "f30a5bcf.2eba98",
+    "type": "switchNode",
+    "name": "switch prop.hub.siteId",
+    "xml": "<switch test=\"`$prop.underlay.routeIds[$uidx].hubSiteId == $prop.hub.siteId`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3973.3297424316406,
+    "y": 2466.3296632766724,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "9e731b50.667688"
+      ]
+    ]
+  },
+  {
+    "id": "9e731b50.667688",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4144.329177856445,
+    "y": 2466.329662322998,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "34e4e4e1.bf23ec"
+      ]
+    ]
+  },
+  {
+    "id": "34e4e4e1.bf23ec",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4298.329177856445,
+    "y": 2470.3296699523926,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "7f01b9d0.ef7bc8"
+      ]
+    ]
+  },
+  {
+    "id": "7f01b9d0.ef7bc8",
+    "type": "set",
+    "name": "set prop.hubRouteId prop.spokeRouteId",
+    "xml": "<set>\n<parameter name='prop.hubRouteId' value='`$prop.underlay.routeIds[$uidx].hubRouteId`' />\n<parameter name='prop.spokeRouteId' value='`$prop.underlay.routeIds[$uidx].spokeRouteId`' />\n",
+    "comments": "",
+    "x": 4384.32918548584,
+    "y": 2542.32967376709,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "af471c20.d9cb7",
+    "type": "switchNode",
+    "name": "switch underlayRouteIds",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'underlayRouteIds'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3423.99609375,
+    "y": 562.6627197265625,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3c3b3752.f46c08"
+      ]
+    ]
+  },
+  {
+    "id": "3c3b3752.f46c08",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3623.9955711364746,
+    "y": 550.6628341674805,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "981ac32e.958e4"
+      ]
+    ]
+  },
+  {
+    "id": "a4a704fd.090458",
+    "type": "set",
+    "name": "set prop.underlay.routeIds",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIdsString' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
+    "comments": "",
+    "x": 3994.996971130371,
+    "y": 550.2635440826416,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "3da7a5e7.865d8a",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1110.9963836669922,
+    "y": 2002.329628944397,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1f1cb6fc.4dc6b9",
+        "a206c36a.2d39f"
+      ]
+    ]
+  },
+  {
+    "id": "1f1cb6fc.4dc6b9",
+    "type": "outcome",
+    "name": "ActivateSDWANAttachmentInstance",
+    "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1374.9964294433594,
+    "y": 1957.329626083374,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3f4012bd.4d4d2e"
+      ]
+    ]
+  },
+  {
+    "id": "3f4012bd.4d4d2e",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1616.9689407348633,
+    "y": 1953.7983770370483,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "8706bf22.e777d",
+        "cb472a7b.dc7d38",
+        "879af91.a400b08",
+        "93dcb194.e6988"
+      ]
+    ]
+  },
+  {
+    "id": "1834840f.e68edc",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1620.9689292907715,
+    "y": 2037.7985458374023,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "92497dd5.46538"
+      ]
+    ]
+  },
+  {
+    "id": "a206c36a.2d39f",
+    "type": "outcome",
+    "name": "DeactivateSDWANAttachmentInstance",
+    "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1372.4690704345703,
+    "y": 2039.7983827590942,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1834840f.e68edc"
+      ]
+    ]
+  },
+  {
+    "id": "92497dd5.46538",
+    "type": "set",
+    "name": "set input parameter length -1",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length - 1`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 1849.6626281738281,
+    "y": 2036.32963180542,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "9af7165e.2d5758",
+    "type": "comment",
+    "name": "Get route routes IDs",
+    "info": "",
+    "comments": "",
+    "x": 3392.3294982910156,
+    "y": 2427.6627368927,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "cb472a7b.dc7d38",
+    "type": "set",
+    "name": "set  underlay route ids to service data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 1890.329574584961,
+    "y": 1985.662672996521,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "879af91.a400b08",
+    "type": "for",
+    "name": "for jidx paramidx - Get topology from servicedata",
+    "xml": "<for index=\"jidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1979.3294982910156,
+    "y": 1532.329444885254,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "cdfd8790.f983d8"
+      ]
+    ]
+  },
+  {
+    "id": "3e5fe1f4.4771be",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat1\"/>\n    <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].hubRouteId`'/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2163.329833984375,
+    "y": 1665.9966478347778,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "328df7f4.d9d5f8",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$prop.underlay.routeIds[$jidx].hubSiteId`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat\"/>\n    <parameter name=\"target\" value=\",\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2173.3298263549805,
+    "y": 1618.6629858016968,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "cdfd8790.f983d8",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1886.329517364502,
+    "y": 1717.6627750396729,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "328df7f4.d9d5f8",
+        "3e5fe1f4.4771be",
+        "413e65c4.2ce4ac",
+        "ce595947.f7b1e8",
+        "41c2276f.7ab7c8",
+        "a2941eac.dd47a"
+      ]
+    ]
+  },
+  {
+    "id": "413e65c4.2ce4ac",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat1`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat2\"/>\n    <parameter name=\"target\" value=\",\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2170.3295364379883,
+    "y": 1705.6628789901733,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ce595947.f7b1e8",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat2`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat3\"/>\n    <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].spokeRouteId`'/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2170.3295364379883,
+    "y": 1741.6628789901733,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "41c2276f.7ab7c8",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat3`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat4\"/>\n    <parameter name=\"target\" value=\" | \"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2163.3295364379883,
+    "y": 1781.9962530136108,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a2941eac.dd47a",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.routeString`'/>\n    <parameter name=\"outputPath\" value=\"tmp.routeString\"/>\n    <parameter name=\"target\" value='`$tmp.concat4`'/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2166.329475402832,
+    "y": 1836.6627922058105,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "93dcb194.e6988",
+    "type": "set",
+    "name": "Set tmp.routeString",
+    "xml": "<set>\n<parameter name='tmp.routeString' value=\"\" />\n\n",
+    "comments": "",
+    "x": 1883.3294982910156,
+    "y": 1473.6627759933472,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "981ac32e.958e4",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3771.9963188171387,
+    "y": 596.9961318969727,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a4a704fd.090458",
+        "474a807.5a3348"
+      ]
+    ]
+  },
+  {
+    "id": "474a807.5a3348",
+    "type": "execute",
+    "name": "execute split |",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsString`'/>\n<parameter name=\"regex\" value=\" | \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValue\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3949.9963302612305,
+    "y": 616.9961318969727,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "5c929964.4b8ce8",
+        "acedb986.795fa8"
+      ]
+    ]
+  },
+  {
+    "id": "acedb986.795fa8",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4126.9963455200195,
+    "y": 597.9961309432983,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "96ac3ef1.0da81"
+      ]
+    ]
+  },
+  {
+    "id": "5c929964.4b8ce8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4115.9963455200195,
+    "y": 645.996132850647,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "90fc0aec.112218"
+      ]
+    ]
+  },
+  {
+    "id": "62992e2c.a242f",
+    "type": "set",
+    "name": "set ipAddress prefixLength",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.underlay.routeIdsValues[0]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$prop.underlay.routeIdsValues[1]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$prop.underlay.routeIdsValues[2]`' />",
+    "comments": "",
+    "x": 5312.997211456299,
+    "y": 531.9963731765747,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "90fc0aec.112218",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4245.996349334717,
+    "y": 645.996132850647,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "96ac3ef1.0da81",
+    "type": "for",
+    "name": "for loop ridx ",
+    "xml": "<for index=\"ridx\" start=\"0\" end=\"`$prop.underlay.routeIdsValue_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4272.996032714844,
+    "y": 595.9961309432983,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "94fe12e4.b3272"
+      ]
+    ]
+  },
+  {
+    "id": "94fe12e4.b3272",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4451.329044342041,
+    "y": 592.9961318969727,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "bc1b307a.e9066"
+      ]
+    ]
+  },
+  {
+    "id": "bc1b307a.e9066",
+    "type": "execute",
+    "name": "execute split ,",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsValue[$ridx]`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValues\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4626.329055786133,
+    "y": 591.996129989624,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "479c7699.d03df8",
+        "992b4620.1b2238"
+      ]
+    ]
+  },
+  {
+    "id": "479c7699.d03df8",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4783.32905960083,
+    "y": 568.9961376190186,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "bee08918.a3dfe8"
+      ]
+    ]
+  },
+  {
+    "id": "992b4620.1b2238",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4772.32905960083,
+    "y": 616.9961395263672,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "1506d77b.2e8159"
+      ]
+    ]
+  },
+  {
+    "id": "1506d77b.2e8159",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4902.329063415527,
+    "y": 616.9961395263672,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "16eea4b9.2fb1ab",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5105.661590576172,
+    "y": 547.9962916374207,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "62992e2c.a242f",
+        "2107fdbe.561112"
+      ]
+    ]
+  },
+  {
+    "id": "2107fdbe.561112",
+    "type": "set",
+    "name": "set ipAddress prefixLength",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n",
+    "comments": "",
+    "x": 5305.329250335693,
+    "y": 573.996169090271,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "bee08918.a3dfe8",
+    "type": "switchNode",
+    "name": "switch prop.underlay.routeIdsValues_length",
+    "xml": "<switch test='`$prop.underlay.routeIdsValues_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4981.663215637207,
+    "y": 449.9961624145508,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "17f5531.c69dcad",
+        "9cd3fd30.65304"
+      ]
+    ]
+  },
+  {
+    "id": "17f5531.c69dcad",
+    "type": "outcome",
+    "name": "3",
+    "xml": "<outcome value='3'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5216.632148742676,
+    "y": 486.9648895263672,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "16eea4b9.2fb1ab"
+      ]
+    ]
+  },
+  {
+    "id": "9cd3fd30.65304",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5233.663074493408,
+    "y": 368.99610328674316,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "ae2b29d0.cafa18"
+      ]
+    ]
+  },
+  {
+    "id": "ae2b29d0.cafa18",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5394.66259765625,
+    "y": 408.99609375,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c6ccd14a.96548",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
+    "comments": "",
+    "x": 2874.002540588379,
+    "y": 982.3028502464294,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "92d1a6eb.dd91a8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2860.0020484924316,
+    "y": 930.9692711830139,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d5a685ee.a4f698",
+    "type": "set",
+    "name": "hardcode hub route",
+    "xml": "<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n",
+    "comments": "",
+    "x": 3394.0038681030273,
+    "y": 1822.0039892196655,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "f073f95f.7848a8",
+    "type": "set",
+    "name": "hardcode spoke route",
+    "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />",
+    "comments": "",
+    "x": 3409.004409790039,
+    "y": 2020.0039653778076,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "cc49685f.b2d5d8",
+    "type": "set",
+    "name": "hardcode hub route",
+    "xml": "<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n",
+    "comments": "",
+    "x": 3425.3335723876953,
+    "y": 2496.000065803528,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "7b57d512.398e6c",
+    "type": "set",
+    "name": "hardcode spoke route",
+    "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />",
+    "comments": "",
+    "x": 3450.333251953125,
+    "y": 2608,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "ab1ef1f9.e54ea",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3461.0041694641113,
+    "y": 1227.5040493011475,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "564bf8e9.5ea9e8",
+        "273881de.ee082e"
+      ]
+    ]
+  },
+  {
+    "id": "896da4ec.a5e9f8",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3791.2541217803955,
+    "y": 1395.0040378570557,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "9ec9fc87.5d09e"
+      ]
+    ]
+  },
+  {
+    "id": "9ec9fc87.5d09e",
+    "type": "switchNode",
+    "name": "switch transportNetworkName==prop.spoke.transportNetworkName",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value == $prop.spoke.transportNetworkName`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4124.004144668579,
+    "y": 1397.004313468933,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3f80722d.d94e9e"
+      ]
+    ]
+  },
+  {
+    "id": "3f80722d.d94e9e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3991.0055894851685,
+    "y": 1493.0042219161987,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "473f2da5.df7aa4"
+      ]
+    ]
+  },
+  {
+    "id": "473f2da5.df7aa4",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4146.755597114563,
+    "y": 1485.0042219161987,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "662f75a8.5b0d6c",
+        "d2c57b63.a72078"
+      ]
+    ]
+  },
+  {
+    "id": "d2c57b63.a72078",
+    "type": "set",
+    "name": "set tmp.wanportvidx ",
+    "xml": "<set>\n<parameter name='tmp.wanportvidx' value='`$arvidx`' />\n\n",
+    "comments": "",
+    "x": 4324.2565660476685,
+    "y": 1461.004343032837,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "f5ec2256.55a71",
+    "type": "for",
+    "name": "for loop wanportvidx - Get wan port ID from servicedata",
+    "xml": "<for index=\"wportidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2732.5042877197266,
+    "y": 1673.0043449401855,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a355c702.37b978"
+      ]
+    ]
+  },
+  {
+    "id": "a355c702.37b978",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3035.5056915283203,
+    "y": 1631.004680633545,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "4841755.e7a768c",
+        "7ff6e951.a32b78",
+        "803020cc.5b481"
+      ]
+    ]
+  },
+  {
+    "id": "4841755.e7a768c",
+    "type": "switchNode",
+    "name": "switch wanPortId",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3234.8393783569336,
+    "y": 1588.0048933029175,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "2cb90465.e59cdc"
+      ]
+    ]
+  },
+  {
+    "id": "2cb90465.e59cdc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3395.8397064208984,
+    "y": 1589.00497341156,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "406b564f.be2668"
+      ]
+    ]
+  },
+  {
+    "id": "406b564f.be2668",
+    "type": "set",
+    "name": "set prop.hub.wanPortId",
+    "xml": "<set>\n<parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
+    "comments": "",
+    "x": 3585.8401679992676,
+    "y": 1588.6052494049072,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "7ff6e951.a32b78",
+    "type": "switchNode",
+    "name": "switch providerIpAddress",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3256.367862701416,
+    "y": 1625.2011981010437,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "de4c4cc0.abc22"
+      ]
+    ]
+  },
+  {
+    "id": "de4c4cc0.abc22",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3432.3688468933105,
+    "y": 1625.2013206481934,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "409dc8c5.eeb998"
+      ]
+    ]
+  },
+  {
+    "id": "409dc8c5.eeb998",
+    "type": "set",
+    "name": "set prop.hub.providerIpAddress",
+    "xml": "<set>\n<parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
+    "comments": "",
+    "x": 3634.368885040283,
+    "y": 1625.8012409210205,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "803020cc.5b481",
+    "type": "switchNode",
+    "name": "switch ipAddress",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3228.867944717407,
+    "y": 1662.701283454895,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "25fd164b.117a3a"
+      ]
+    ]
+  },
+  {
+    "id": "25fd164b.117a3a",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3432.868885040283,
+    "y": 1662.701235294342,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "10522aa8.f003c5"
+      ]
+    ]
+  },
+  {
+    "id": "10522aa8.f003c5",
+    "type": "set",
+    "name": "set prop.hub.ipAddress",
+    "xml": "<set>\n<parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
+    "comments": "",
+    "x": 3627.8688888549805,
+    "y": 1662.3012108802795,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "722e84e9.8ab54c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3837.254180908203,
+    "y": 1815.2539224624634,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "78300110.b43b4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3849.25390625,
+    "y": 1859.25390625,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e6f4e702.6d5b68",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3860.2543621063232,
+    "y": 2026.2540483474731,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b3f4e792.e33638",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3861.254119873047,
+    "y": 2073.2540493011475,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7b4a5da7.783c64",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3852.2542991638184,
+    "y": 2554.0039710998535,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4079a316.d4531c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3853.254056930542,
+    "y": 2601.003972053528,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2a5c753b.10964a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 sdwan hub route underlay rest api\" />\n",
+    "comments": "",
+    "x": 4005.336700439453,
+    "y": 2555.9710121154785,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "ae6e8595.d05358",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3852.25390625,
+    "y": 2645.00390625,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a38da1c5.3c2df",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3853.2536640167236,
+    "y": 2692.0039072036743,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
index a7f0a98..bd24e0f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "f1032bbd.b31d28",
+    "id": "510329fc.5eb288",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 85,
-    "y": 38,
-    "z": "cbb28df7.1359",
+    "x": 92,
+    "y": 51,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ded6a886.414a98"
+        "d0754e51.43601"
       ]
     ]
   },
   {
-    "id": "ded6a886.414a98",
+    "id": "d0754e51.43601",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2904 +22,2976 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 297.00000381469727,
-    "y": 110.0000171661377,
-    "z": "cbb28df7.1359",
+    "x": 304.00000381469727,
+    "y": 123.0000171661377,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "a2425e96.87088"
+        "5324d186.c424e"
       ]
     ]
   },
   {
-    "id": "a2425e96.87088",
+    "id": "5324d186.c424e",
     "type": "method",
     "name": "sotn-attachment-topology-operation-activate",
     "xml": "<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 285.0001220703125,
-    "y": 198,
-    "z": "cbb28df7.1359",
+    "x": 292.0001220703125,
+    "y": 211,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "e7f36c41.5e57f"
+        "200d23ad.1ba52c"
       ]
     ]
   },
   {
-    "id": "e7f36c41.5e57f",
+    "id": "200d23ad.1ba52c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 301.0001220703125,
-    "y": 753.0002446174622,
-    "z": "cbb28df7.1359",
+    "x": 308.0001220703125,
+    "y": 766.0002446174622,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "e04b6e39.cae71",
-        "b9edbe74.6fc66",
-        "e027a6b9.d5fec8",
-        "6f3c3c57.eb6864",
-        "f719861e.58e0d8",
-        "c02fb64d.81dcb8",
-        "308c70eb.a087f",
-        "d993c33b.774ec",
-        "acc938bc.eae1d8",
-        "d519b726.ce9b88",
-        "8ad08551.c43818",
-        "dad7cff3.85c1b",
-        "f192b08c.ec685",
-        "17f7a6f0.5e20c9",
-        "f18db1f7.e4c95",
-        "7bf02ef8.1215c",
-        "f879cc99.b3ef8",
-        "75a3a30e.eab54c",
-        "bd9c39e4.8a1478",
-        "3b7ef3d8.70ae1c"
+        "50fa98f0.7c4998",
+        "6f233fc4.4456d",
+        "8ef678b.4678d88",
+        "41e3aa85.858d54",
+        "b2920bb5.1af8e8",
+        "525ecaee.ee9b24",
+        "ab2f4625.6243a8",
+        "b09745d8.bb7668",
+        "b13bf095.cdea1",
+        "dcca5b8a.14d818",
+        "5d5e7f8f.d3d28",
+        "b3a2976e.016ed8",
+        "33c05db5.bb8532",
+        "dde46f65.1623c",
+        "3d236d8e.1a1ed2",
+        "9dd9851c.cc5e08",
+        "21b8bdc2.b30a32",
+        "c4803883.47c5a8",
+        "ad2575da.f719b8",
+        "c4ade364.dff4"
       ]
     ]
   },
   {
-    "id": "e04b6e39.cae71",
+    "id": "50fa98f0.7c4998",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id,etc",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 697.9935607910156,
-    "y": 151.9934868812561,
-    "z": "cbb28df7.1359",
+    "x": 704.9935607910156,
+    "y": 164.9934868812561,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "afb2368f.9bd8f8",
+    "id": "d87c2a28.d4a808",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 726.9538726806641,
-    "y": 116.02528285980225,
-    "z": "cbb28df7.1359",
+    "x": 733.9538726806641,
+    "y": 129.02528285980225,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "b9edbe74.6fc66",
+    "id": "6f233fc4.4456d",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 651.9934997558594,
-    "y": 244.99349212646484,
-    "z": "cbb28df7.1359",
+    "x": 658.9934997558594,
+    "y": 257.99349212646484,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "f719861e.58e0d8",
+    "id": "b2920bb5.1af8e8",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 658.2553901672363,
-    "y": 332.6602210998535,
-    "z": "cbb28df7.1359",
+    "x": 665.2553901672363,
+    "y": 345.6602210998535,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "e027a6b9.d5fec8",
+    "id": "8ef678b.4678d88",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 705.2554473876953,
-    "y": 420.6602249145508,
-    "z": "cbb28df7.1359",
+    "x": 712.2554473876953,
+    "y": 433.6602249145508,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "452cf8b8.86cc88",
+    "id": "2c8ad64b.5a9c0a",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 751.8083801269531,
-    "y": 551.5386590957642,
-    "z": "cbb28df7.1359",
+    "x": 758.8083801269531,
+    "y": 564.5386590957642,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "12f54fa3.aaff3",
+    "id": "3f345735.382a78",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 705.9935302734375,
-    "y": 211.993501663208,
-    "z": "cbb28df7.1359",
+    "x": 712.9935302734375,
+    "y": 224.993501663208,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "926a67a.4a82498",
+    "id": "dc7c3756.7911f8",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 723.9934959411621,
-    "y": 297.8823823928833,
-    "z": "cbb28df7.1359",
+    "x": 730.9934959411621,
+    "y": 310.8823823928833,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "f41dfc4.f4cda",
+    "id": "385fcb45.8d58e4",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 749.9935150146484,
-    "y": 384.8823413848877,
-    "z": "cbb28df7.1359",
+    "x": 756.9935150146484,
+    "y": 397.8823413848877,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "a1fbf2bd.6b2d9",
+    "id": "fb3f3db1.2e857",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1211.6667919158936,
-    "y": 568.9999847412109,
-    "z": "cbb28df7.1359",
+    "x": 1218.6667919158936,
+    "y": 581.9999847412109,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "9cd08c09.1d068"
+        "7924d66d.1039e8"
       ]
     ]
   },
   {
-    "id": "9cd08c09.1d068",
+    "id": "7924d66d.1039e8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1355.6668701171875,
-    "y": 526.4999027252197,
-    "z": "cbb28df7.1359",
+    "x": 1362.6668701171875,
+    "y": 539.4999027252197,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "33641e94.7a0b72"
+        "2e9884a4.fb6aac"
       ]
     ]
   },
   {
-    "id": "33641e94.7a0b72",
+    "id": "2e9884a4.fb6aac",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1524.5242938995361,
-    "y": 524.1190738677979,
-    "z": "cbb28df7.1359",
+    "x": 1531.5242938995361,
+    "y": 537.1190738677979,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "affca4cd.d977a8",
-        "c376fca7.816d6"
+        "a5020a5a.1a8de8",
+        "a75f121c.781a7"
       ]
     ]
   },
   {
-    "id": "affca4cd.d977a8",
+    "id": "a5020a5a.1a8de8",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1679.8574295043945,
-    "y": 496.1189889907837,
-    "z": "cbb28df7.1359",
+    "x": 1686.8574295043945,
+    "y": 509.1189889907837,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "53c06015.6266b"
+        "dc7b8304.a3929"
       ]
     ]
   },
   {
-    "id": "53c06015.6266b",
+    "id": "dc7b8304.a3929",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1838.381233215332,
-    "y": 494.02383613586426,
-    "z": "cbb28df7.1359",
+    "x": 1845.381233215332,
+    "y": 507.02383613586426,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "7ac858c4.60b0b8",
-        "dad8eb30.a0d438",
-        "c39c89e4.ebe398"
+        "2e53bf10.53616",
+        "4d06247.7481adc",
+        "16d5ef9e.67621"
       ]
     ]
   },
   {
-    "id": "27d51102.19665e",
+    "id": "57e48b3f.e4d594",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachment resource not exist\" />\n    \n",
     "comments": "",
-    "x": 1778.5191650390625,
-    "y": 601.0660705566406,
-    "z": "cbb28df7.1359",
+    "x": 1785.5191650390625,
+    "y": 614.0660705566406,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "97f58790.fbe988",
+    "id": "549a2a73.774b74",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1203.5185947418213,
-    "y": 604.0660696029663,
-    "z": "cbb28df7.1359",
+    "x": 1210.5185947418213,
+    "y": 617.0660696029663,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "e6b498e7.ee1fb8"
+        "13c58b6.0463e75"
       ]
     ]
   },
   {
-    "id": "e6b498e7.ee1fb8",
+    "id": "13c58b6.0463e75",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1383.5185451507568,
-    "y": 604.7326202392578,
-    "z": "cbb28df7.1359",
+    "x": 1390.5185451507568,
+    "y": 617.7326202392578,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "27d51102.19665e"
+        "57e48b3f.e4d594"
       ]
     ]
   },
   {
-    "id": "c376fca7.816d6",
+    "id": "a75f121c.781a7",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1671.185432434082,
-    "y": 555.3993635177612,
-    "z": "cbb28df7.1359",
+    "x": 1678.185432434082,
+    "y": 568.3993635177612,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "27d51102.19665e"
+        "57e48b3f.e4d594"
       ]
     ]
   },
   {
-    "id": "7ac858c4.60b0b8",
+    "id": "2e53bf10.53616",
     "type": "set",
     "name": "set connection-attachment-ar from get",
     "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
     "comments": "",
-    "x": 2085.4446868896484,
-    "y": 467.00008821487427,
-    "z": "cbb28df7.1359",
+    "x": 2092.4446868896484,
+    "y": 480.00008821487427,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "c39c89e4.ebe398",
+    "id": "16d5ef9e.67621",
     "type": "set",
     "name": "set oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
     "comments": "",
-    "x": 2019.4447174072266,
-    "y": 540.4285907745361,
-    "z": "cbb28df7.1359",
+    "x": 2026.4447174072266,
+    "y": 553.4285907745361,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "dad8eb30.a0d438",
+    "id": "4d06247.7481adc",
     "type": "switchNode",
     "name": "switch order-status",
     "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2029.4444961547852,
-    "y": 506.0000247955322,
-    "z": "cbb28df7.1359",
+    "x": 2036.4444961547852,
+    "y": 519.0000247955322,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "cc20c996.8c9528",
-        "d77bf1ee.049a3",
-        "453143a6.32929c"
+        "13c3c1da.98e52e",
+        "c01b9863.c31138",
+        "bd2b5022.a474e"
       ]
     ]
   },
   {
-    "id": "cc20c996.8c9528",
+    "id": "13c3c1da.98e52e",
     "type": "outcome",
     "name": "outcome Created",
     "xml": "<outcome value='Created'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2265.044578552246,
-    "y": 500.0000557899475,
-    "z": "cbb28df7.1359",
+    "x": 2272.044578552246,
+    "y": 513.0000557899475,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "3a4bc81f.b971d8"
+        "29af8103.34f60e"
       ]
     ]
   },
   {
-    "id": "d77bf1ee.049a3",
+    "id": "c01b9863.c31138",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2258.759078979492,
-    "y": 580.4286904335022,
-    "z": "cbb28df7.1359",
+    "x": 2265.759078979492,
+    "y": 593.4286904335022,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "f8e833ae.2c3a5"
+        "869d355f.ff5a28"
       ]
     ]
   },
   {
-    "id": "3a4bc81f.b971d8",
+    "id": "29af8103.34f60e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2423.515251159668,
-    "y": 500.37571144104004,
-    "z": "cbb28df7.1359",
+    "x": 2430.515251159668,
+    "y": 513.37571144104,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "f8e833ae.2c3a5",
+    "id": "869d355f.ff5a28",
     "type": "returnFailure",
     "name": "return failure",
     "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
     "comments": "",
-    "x": 2434.666893005371,
-    "y": 579.0000896453857,
-    "z": "cbb28df7.1359",
+    "x": 2441.666893005371,
+    "y": 592.0000896453857,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "a031723a.72d45",
+    "id": "4c9dfad4.b5cb94",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 922.303050994873,
-    "y": 651.4936046600342,
-    "z": "cbb28df7.1359",
+    "x": 929.303050994873,
+    "y": 664.4936046600342,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "c02fb64d.81dcb8",
+    "id": "525ecaee.ee9b24",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 616.3091506958008,
-    "y": 652.4999752044678,
-    "z": "cbb28df7.1359",
+    "x": 623.3091506958008,
+    "y": 665.4999752044678,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "a031723a.72d45"
+        "4c9dfad4.b5cb94"
       ]
     ]
   },
   {
-    "id": "8474372c.daa338",
+    "id": "f0374b61.7fdcc8",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 804.00048828125,
-    "y": 697.5317525863647,
-    "z": "cbb28df7.1359",
+    "x": 811.00048828125,
+    "y": 710.5317525863647,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "dfd9ac30.4d327",
+    "id": "ee77ccab.555f2",
     "type": "for",
     "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1695.1851959228516,
-    "y": 850.0042300224304,
-    "z": "cbb28df7.1359",
+    "x": 1702.1851959228516,
+    "y": 863.0042300224304,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "69bb7e37.5502b"
+        "1d8e18c9.612a97"
       ]
     ]
   },
   {
-    "id": "6f3c3c57.eb6864",
+    "id": "41e3aa85.858d54",
     "type": "switchNode",
     "name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
     "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 779.1842193603516,
-    "y": 957.7182664871216,
-    "z": "cbb28df7.1359",
+    "x": 786.1842193603516,
+    "y": 970.7182664871216,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "e5034add.dc7ee8",
-        "ea87fbba.a1ee38",
-        "37719ae7.6e63d6"
+        "227fe562.bef93a",
+        "30f6347f.71f27c",
+        "8d3aa09e.93736"
       ]
     ]
   },
   {
-    "id": "e5034add.dc7ee8",
+    "id": "227fe562.bef93a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1107.3272399902344,
-    "y": 1030.5755405426025,
-    "z": "cbb28df7.1359",
+    "x": 1114.3272399902344,
+    "y": 1043.5755405426025,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "882cb355.05a04"
+        "70131877.497ee8"
       ]
     ]
   },
   {
-    "id": "4d6165bb.ea8a7c",
+    "id": "d8325992.1c7e08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1291.454502105713,
-    "y": 889.7015495300293,
-    "z": "cbb28df7.1359",
+    "x": 1298.454502105713,
+    "y": 902.7015495300293,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "dfd9ac30.4d327",
-        "3a395b7f.25dd64"
+        "ee77ccab.555f2",
+        "7fdc18ff.582858"
       ]
     ]
   },
   {
-    "id": "69bb7e37.5502b",
+    "id": "1d8e18c9.612a97",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2135.2965240478516,
-    "y": 847.0040321350098,
-    "z": "cbb28df7.1359",
+    "x": 2142.2965240478516,
+    "y": 860.0040321350098,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "cc363d65.ffc05",
-        "15afd920.4feac7"
+        "d475cadd.1a2f78",
+        "4ec4a51f.47decc"
       ]
     ]
   },
   {
-    "id": "cc363d65.ffc05",
+    "id": "d475cadd.1a2f78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2308.1067390441895,
-    "y": 818.4686470031738,
-    "z": "cbb28df7.1359",
+    "x": 2315.1067390441895,
+    "y": 831.4686470031738,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "1c47a88e.29f817"
+        "4ae70fe8.b24e9"
       ]
     ]
   },
   {
-    "id": "8ff402e2.b14b9",
+    "id": "7b37e59c.23ec7c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2456.8672103881836,
-    "y": 875.3257341384888,
-    "z": "cbb28df7.1359",
+    "x": 2463.8672103881836,
+    "y": 888.3257341384888,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "42b3d0fe.09e55"
+        "102e4d37.8fb7c3"
       ]
     ]
   },
   {
-    "id": "42b3d0fe.09e55",
+    "id": "102e4d37.8fb7c3",
     "type": "set",
     "name": "set tmp.pidx and ptx.consumed-ar",
     "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
     "comments": "",
-    "x": 2691.724636077881,
-    "y": 873.8972663879395,
-    "z": "cbb28df7.1359",
+    "x": 2698.724636077881,
+    "y": 886.8972663879395,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "b37984c.e70a578",
+    "id": "82ecf3e0.5c52b",
     "type": "comment",
     "name": "Check existence of other AR in parent service data",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 726.9626579284668,
-    "y": 862.8929615020752,
-    "z": "cbb28df7.1359",
+    "x": 733.9626579284668,
+    "y": 875.8929615020752,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "ea87fbba.a1ee38",
+    "id": "30f6347f.71f27c",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1121.9797096252441,
-    "y": 969.6772241592407,
-    "z": "cbb28df7.1359",
+    "x": 1128.9797096252441,
+    "y": 982.6772241592407,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "c0453fc3.0e237"
+        "2cd6df64.b8473"
       ]
     ]
   },
   {
-    "id": "882cb355.05a04",
+    "id": "70131877.497ee8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: End points not available\" />\n    \n",
     "comments": "",
-    "x": 1266.9795875549316,
-    "y": 1029.67746925354,
-    "z": "cbb28df7.1359",
+    "x": 1273.9795875549316,
+    "y": 1042.67746925354,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "37719ae7.6e63d6",
+    "id": "8d3aa09e.93736",
     "type": "other",
     "name": "outcome 2",
     "xml": "<outcome value='2'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1116.9795227050781,
-    "y": 890.6772499084473,
-    "z": "cbb28df7.1359",
+    "x": 1123.9795227050781,
+    "y": 903.6772499084473,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "4d6165bb.ea8a7c"
+        "d8325992.1c7e08"
       ]
     ]
   },
   {
-    "id": "1c47a88e.29f817",
+    "id": "4ae70fe8.b24e9",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2466.0909538269043,
-    "y": 817.6773900985718,
-    "z": "cbb28df7.1359",
+    "x": 2473.0909538269043,
+    "y": 830.6773900985718,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "15afd920.4feac7",
+    "id": "4ec4a51f.47decc",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2315.0905952453613,
-    "y": 874.6772499084473,
-    "z": "cbb28df7.1359",
+    "x": 2322.0905952453613,
+    "y": 887.6772499084473,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "8ff402e2.b14b9"
+        "7b37e59c.23ec7c"
       ]
     ]
   },
   {
-    "id": "3a395b7f.25dd64",
+    "id": "7fdc18ff.582858",
     "type": "switchNode",
     "name": "switch tmp.found-in-ar",
     "xml": "<switch test='`$tmp.found-in-ar`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1503.9794998168945,
-    "y": 943.4550676345825,
-    "z": "cbb28df7.1359",
+    "x": 1510.9794998168945,
+    "y": 956.4550676345825,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "620a8680.ec1638"
+        "92b2633f.8d761"
       ]
     ]
   },
   {
-    "id": "620a8680.ec1638",
+    "id": "92b2633f.8d761",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1674.97953414917,
-    "y": 944.5662889480591,
-    "z": "cbb28df7.1359",
+    "x": 1681.97953414917,
+    "y": 957.5662889480591,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "54a50118.05977"
+        "c3df20e.333b9e"
       ]
     ]
   },
   {
-    "id": "54a50118.05977",
+    "id": "c3df20e.333b9e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1823.9796295166016,
-    "y": 944.5662879943848,
-    "z": "cbb28df7.1359",
+    "x": 1830.9796295166016,
+    "y": 957.5662879943848,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "2fbf3350.d69d7c",
-        "51067155.cb254"
+        "8c502b5e.ba0e48",
+        "b7c302f0.0eaa4"
       ]
     ]
   },
   {
-    "id": "7d7dc112.d678b",
+    "id": "642168d6.c96a08",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2570.097454071045,
-    "y": 960.7951421737671,
-    "z": "cbb28df7.1359",
+    "x": 2577.097454071045,
+    "y": 973.7951421737671,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "94f95621.9a2ea8"
+        "28182687.5e2d2a"
       ]
     ]
   },
   {
-    "id": "79425b66.b91424",
+    "id": "d6797517.070b08",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2561.9492568969727,
-    "y": 995.8612270355225,
-    "z": "cbb28df7.1359",
+    "x": 2568.9492568969727,
+    "y": 1008.8612270355225,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "3ebc390b.802eb6"
+        "863cf5ba.41a538"
       ]
     ]
   },
   {
-    "id": "90be4eb6.fdc8c",
+    "id": "5a7b91f3.92074",
     "type": "switchNode",
     "name": "switch mdsal-psd.service-data.networks_length",
     "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1567.313003540039,
-    "y": 1044.899908065796,
-    "z": "cbb28df7.1359",
+    "x": 1574.313003540039,
+    "y": 1057.899908065796,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "b54c4867.028668",
-        "73000cce.d47514"
+        "5c7b0dd2.1db974",
+        "decd8771.495088"
       ]
     ]
   },
   {
-    "id": "73000cce.d47514",
+    "id": "decd8771.495088",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1831.3128509521484,
-    "y": 1024.7886543273926,
-    "z": "cbb28df7.1359",
+    "x": 1838.3128509521484,
+    "y": 1037.7886543273926,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "d471d131.1144d"
+        "26e27dfe.c23ed2"
       ]
     ]
   },
   {
-    "id": "b54c4867.028668",
+    "id": "5c7b0dd2.1db974",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1821.3129119873047,
-    "y": 1072.788625717163,
-    "z": "cbb28df7.1359",
+    "x": 1828.3129119873047,
+    "y": 1085.788625717163,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "5f3379.2755bc88"
+        "2701bab7.b74336"
       ]
     ]
   },
   {
-    "id": "5f3379.2755bc88",
+    "id": "2701bab7.b74336",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n    \n",
     "comments": "",
-    "x": 1959.9652557373047,
-    "y": 1074.890386581421,
-    "z": "cbb28df7.1359",
+    "x": 1966.9652557373047,
+    "y": 1087.890386581421,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "d6222ed2.2e3d3",
+    "id": "3f964f3.96aa1b",
     "type": "set",
     "name": "set tmp.network.",
     "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n\n\n",
     "comments": "",
-    "x": 2192.757709503174,
-    "y": 1025.788824081421,
-    "z": "cbb28df7.1359",
+    "x": 2199.757709503174,
+    "y": 1038.788824081421,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "c0453fc3.0e237",
+    "id": "2cd6df64.b8473",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1289.4240188598633,
-    "y": 968.7884912490845,
-    "z": "cbb28df7.1359",
+    "x": 1296.4240188598633,
+    "y": 981.7884912490845,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "90be4eb6.fdc8c"
+        "5a7b91f3.92074"
       ]
     ]
   },
   {
-    "id": "d471d131.1144d",
+    "id": "26e27dfe.c23ed2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1990.0906219482422,
-    "y": 1027.7884883880615,
-    "z": "cbb28df7.1359",
+    "x": 1997.0906219482422,
+    "y": 1040.7884883880615,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "d6222ed2.2e3d3",
-        "ce58bf5a.0189d"
+        "3f964f3.96aa1b",
+        "d34f3159.b7d95"
       ]
     ]
   },
   {
-    "id": "ce58bf5a.0189d",
+    "id": "d34f3159.b7d95",
     "type": "for",
     "name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
     "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 2353.090660095215,
-    "y": 1073.7886428833008,
-    "z": "cbb28df7.1359",
+    "x": 2360.090660095215,
+    "y": 1086.7886428833008,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "a4f1258e.f8f7e8"
+        "6c6f677c.4a6ae8"
       ]
     ]
   },
   {
-    "id": "a4f1258e.f8f7e8",
+    "id": "6c6f677c.4a6ae8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2399.646728515625,
-    "y": 1304.7884521484375,
-    "z": "cbb28df7.1359",
+    "x": 2406.646728515625,
+    "y": 1317.7884521484375,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ce9cca12.4f0af8",
-        "d379e536.6a0348",
-        "63d37889.57ca38",
-        "ff3897ba.b2c938",
-        "410b060d.0c2948",
-        "805eddea.23b52",
-        "623ff136.8ac42",
-        "3055227f.6b6a0e",
-        "830a582f.f084d8",
-        "f77b8935.e0ba38"
+        "5a5ff171.f67b5",
+        "5ac44b36.e6ed64",
+        "477598ab.94c4f8",
+        "bf3fd182.60613",
+        "ee0ac40b.7c8918",
+        "334ef95a.804996",
+        "6b4b64b0.8aa49c",
+        "f2f619ae.81dc88",
+        "7f22248e.623acc",
+        "1977cf51.112051"
       ]
     ]
   },
   {
-    "id": "ce9cca12.4f0af8",
+    "id": "5a5ff171.f67b5",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 2676.1569442749023,
-    "y": 1146.7991995811462,
-    "z": "cbb28df7.1359",
+    "x": 2683.1569442749023,
+    "y": 1159.7991995811462,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "c66b2919.5cf5d8"
+        "83c25cc5.35c9d"
       ]
     ]
   },
   {
-    "id": "c66b2919.5cf5d8",
+    "id": "83c25cc5.35c9d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2865.1565704345703,
-    "y": 1148.7990641593933,
-    "z": "cbb28df7.1359",
+    "x": 2872.1565704345703,
+    "y": 1161.7990641593933,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "f9c2cbff.de99a8"
+        "80bf2f28.f9eae"
       ]
     ]
   },
   {
-    "id": "f9c2cbff.de99a8",
+    "id": "80bf2f28.f9eae",
     "type": "set",
     "name": "set tmp.found-in-network tmp.ep-available",
     "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
     "comments": "",
-    "x": 3118.1567459106445,
-    "y": 1148.3991103172302,
-    "z": "cbb28df7.1359",
+    "x": 3125.1567459106445,
+    "y": 1161.3991103172302,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "d379e536.6a0348",
+    "id": "5ac44b36.e6ed64",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 2650.146396636963,
-    "y": 1520.7884907722473,
-    "z": "cbb28df7.1359",
+    "x": 2657.146396636963,
+    "y": 1533.7884907722473,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "dad7cff3.85c1b",
+    "id": "b3a2976e.016ed8",
     "type": "switchNode",
     "name": "switch tmp.ep-available",
     "xml": "<switch test='`$tmp.ep-available`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 642.3128204345703,
-    "y": 1153.232801437378,
-    "z": "cbb28df7.1359",
+    "x": 649.3128204345703,
+    "y": 1166.232801437378,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "6ca6c936.2c3768",
-        "eac664c0.e13b08"
+        "d67d36b.8c807c8",
+        "d4dded0c.3defe"
       ]
     ]
   },
   {
-    "id": "eac664c0.e13b08",
+    "id": "d4dded0c.3defe",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 860.9795398712158,
-    "y": 1202.5661582946777,
-    "z": "cbb28df7.1359",
+    "x": 867.9795398712158,
+    "y": 1215.5661582946777,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "750588ef.b99fe8"
+        "dac36818.3ade18"
       ]
     ]
   },
   {
-    "id": "6ca6c936.2c3768",
+    "id": "d67d36b.8c807c8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 865.8683414459229,
-    "y": 1111.566219329834,
-    "z": "cbb28df7.1359",
+    "x": 872.8683414459229,
+    "y": 1124.566219329834,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "749ef9db.5d3a08"
+        "fea8c889.837c28"
       ]
     ]
   },
   {
-    "id": "749ef9db.5d3a08",
+    "id": "fea8c889.837c28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1012.8683376312256,
-    "y": 1113.4550323486328,
-    "z": "cbb28df7.1359",
+    "x": 1019.8683376312256,
+    "y": 1126.4550323486328,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "750588ef.b99fe8",
+    "id": "dac36818.3ade18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1031.090627670288,
-    "y": 1200.5661163330078,
-    "z": "cbb28df7.1359",
+    "x": 1038.090627670288,
+    "y": 1213.5661163330078,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "fceb9616.eb61b8",
-        "7c3f1ab0.926054",
-        "d86d0f7e.bebac"
+        "47a53791.ce00e8",
+        "49abb372.8700ac",
+        "73f1353a.31fe0c"
       ]
     ]
   },
   {
-    "id": "fceb9616.eb61b8",
+    "id": "47a53791.ce00e8",
     "type": "switchNode",
     "name": "switch tmp.found-in-ar",
     "xml": "<switch test='`$tmp.found-in-ar`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1257.2016410827637,
-    "y": 1167.5661163330078,
-    "z": "cbb28df7.1359",
+    "x": 1264.2016410827637,
+    "y": 1180.5661163330078,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "c8457f81.3c93c",
-        "ce69f5f5.7107f8"
+        "f3f2f58d.f1fde8",
+        "73ae144b.6c716c"
       ]
     ]
   },
   {
-    "id": "c8457f81.3c93c",
+    "id": "f3f2f58d.f1fde8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1452.6460876464844,
-    "y": 1145.566177368164,
-    "z": "cbb28df7.1359",
+    "x": 1459.6460876464844,
+    "y": 1158.566177368164,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "7996be51.f87bd"
+        "a49cc189.c10f7"
       ]
     ]
   },
   {
-    "id": "ce69f5f5.7107f8",
+    "id": "73ae144b.6c716c",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1449.64599609375,
-    "y": 1193.566162109375,
-    "z": "cbb28df7.1359",
+    "x": 1456.64599609375,
+    "y": 1206.566162109375,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "1e79b4e5.a1cc3b"
+        "5c6b8964.10acc8"
       ]
     ]
   },
   {
-    "id": "7996be51.f87bd",
+    "id": "a49cc189.c10f7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1640.2017517089844,
-    "y": 1142.566177368164,
-    "z": "cbb28df7.1359",
+    "x": 1647.2017517089844,
+    "y": 1155.566177368164,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "2b6b416f.53780e"
+        "50540586.cfd78c"
       ]
     ]
   },
   {
-    "id": "1e79b4e5.a1cc3b",
+    "id": "5c6b8964.10acc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1637.20166015625,
-    "y": 1192.566162109375,
-    "z": "cbb28df7.1359",
+    "x": 1644.20166015625,
+    "y": 1205.566162109375,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "1a9c7979.469227"
+        "7849a3ee.c57b4c"
       ]
     ]
   },
   {
-    "id": "add86bf3.f17608",
+    "id": "b9bd1802.9893c8",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2149.4728355407715,
-    "y": 429.50394773483276,
-    "z": "cbb28df7.1359",
+    "x": 2156.4728355407715,
+    "y": 442.50394773483276,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "652dad92.494ca4",
+    "id": "811f13c4.a802b",
     "type": "comment",
     "name": "Set source end point",
     "info": "",
     "comments": "",
-    "x": 638.9727325439453,
-    "y": 518.2539677619934,
-    "z": "cbb28df7.1359",
+    "x": 645.9727325439453,
+    "y": 531.2539677619934,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "308c70eb.a087f",
+    "id": "ab2f4625.6243a8",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 689.9688262939453,
-    "y": 727.0000905990601,
-    "z": "cbb28df7.1359",
+    "x": 696.9688262939453,
+    "y": 740.0000905990601,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "76dc332e.fe177c",
+    "id": "e3a34e44.03f86",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1049.968978881836,
-    "y": 798.0000772476196,
-    "z": "cbb28df7.1359",
+    "x": 1056.968978881836,
+    "y": 811.0000772476196,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "9d0d7b21.e0ad98"
+        "1cfd4bb9.99d9a4"
       ]
     ]
   },
   {
-    "id": "cbf3f4e6.00aa98",
+    "id": "8447b050.f664b",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1041.8207817077637,
-    "y": 833.066162109375,
-    "z": "cbb28df7.1359",
+    "x": 1048.8207817077637,
+    "y": 846.066162109375,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "d8b072f9.d7c21"
+        "7bd6123e.8e599c"
       ]
     ]
   },
   {
-    "id": "d8b072f9.d7c21",
+    "id": "7bd6123e.8e599c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n    \n",
     "comments": "",
-    "x": 1187.9695625305176,
-    "y": 832.3335733413696,
-    "z": "cbb28df7.1359",
+    "x": 1194.9695625305176,
+    "y": 845.3335733413696,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "9d0d7b21.e0ad98",
+    "id": "1cfd4bb9.99d9a4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1180.9690742492676,
-    "y": 798.0001382827759,
-    "z": "cbb28df7.1359",
+    "x": 1187.9690742492676,
+    "y": 811.0001382827759,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "3ebc390b.802eb6",
+    "id": "863cf5ba.41a538",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN provided attachment resource not found\" />\n    \n",
     "comments": "",
-    "x": 2711.969306945801,
-    "y": 996.00026512146,
-    "z": "cbb28df7.1359",
+    "x": 2718.969306945801,
+    "y": 1009.00026512146,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "94f95621.9a2ea8",
+    "id": "28182687.5e2d2a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2696.9694290161133,
-    "y": 963.0002498626709,
-    "z": "cbb28df7.1359",
+    "x": 2703.9694290161133,
+    "y": 976.0002498626709,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "d993c33b.774ec",
+    "id": "b09745d8.bb7668",
     "type": "set",
     "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
     "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
     "comments": "",
-    "x": 775.9687652587891,
-    "y": 900.0000648498535,
-    "z": "cbb28df7.1359",
+    "x": 782.9687652587891,
+    "y": 913.0000648498535,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "336df829.2ff8b8",
+    "id": "53f5b769.1d9ac8",
     "type": "comment",
     "name": "If other EP exists set destination end point",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 692.9687652587891,
-    "y": 1078.0000133514404,
-    "z": "cbb28df7.1359",
+    "x": 699.9687652587891,
+    "y": 1091.0000133514404,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "917d1ab.d2608e8",
+    "id": "39192112.9a7a9e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1432.9688873291016,
-    "y": 1405.0002946853638,
-    "z": "cbb28df7.1359",
+    "x": 1439.9688873291016,
+    "y": 1418.0002946853638,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "a62deca7.bcade",
-        "81802c0b.6f8f",
-        "11a25f88.82eed",
-        "47a81553.315d4c",
-        "ee81a378.a7601",
-        "b4347cf5.49bc8",
-        "5c76f693.8395f8",
-        "59d53676.123ac8"
+        "29497381.2907dc",
+        "a8454134.72dfa",
+        "b437b233.85dc6",
+        "d5da4e92.fd9d5",
+        "527cda61.4c5444",
+        "21b345b.f16dcba",
+        "847549d0.8fada8",
+        "46d04af2.172014"
       ]
     ]
   },
   {
-    "id": "a62deca7.bcade",
+    "id": "29497381.2907dc",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1675.4791889190674,
-    "y": 1275.010691165924,
-    "z": "cbb28df7.1359",
+    "x": 1682.4791889190674,
+    "y": 1288.010691165924,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "fe688e94.da33b"
+        "b53954e3.75f548"
       ]
     ]
   },
   {
-    "id": "81802c0b.6f8f",
+    "id": "a8454134.72dfa",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1648.4691410064697,
-    "y": 1580.0006546974182,
-    "z": "cbb28df7.1359",
+    "x": 1655.4691410064697,
+    "y": 1593.0006546974182,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "11a25f88.82eed",
+    "id": "b437b233.85dc6",
     "type": "switchNode",
     "name": "switch access-ltp-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1666.9690189361572,
-    "y": 1318.7782225608826,
-    "z": "cbb28df7.1359",
+    "x": 1673.9690189361572,
+    "y": 1331.7782225608826,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "c02ee204.0e0d9"
+        "4beb5c8f.437a34"
       ]
     ]
   },
   {
-    "id": "47a81553.315d4c",
+    "id": "d5da4e92.fd9d5",
     "type": "switchNode",
     "name": "switch clientSignal",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1660.9690570831299,
-    "y": 1364.778269290924,
-    "z": "cbb28df7.1359",
+    "x": 1667.9690570831299,
+    "y": 1377.778269290924,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "54c81360.7adb5c"
+        "a652bfee.a4a86"
       ]
     ]
   },
   {
-    "id": "ee81a378.a7601",
+    "id": "527cda61.4c5444",
     "type": "switchNode",
     "name": "switch cVLAN",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1644.9585590362549,
-    "y": 1403.767771244049,
-    "z": "cbb28df7.1359",
+    "x": 1651.9585590362549,
+    "y": 1416.767771244049,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "99167636.bd39c8"
+        "b6d9ed74.687c9"
       ]
     ]
   },
   {
-    "id": "fe688e94.da33b",
+    "id": "b53954e3.75f548",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1853.1911029815674,
-    "y": 1275.6670632362366,
-    "z": "cbb28df7.1359",
+    "x": 1860.1911029815674,
+    "y": 1288.6670632362366,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ba53eaa4.9c9d68"
+        "b7855c9c.e078"
       ]
     ]
   },
   {
-    "id": "ba53eaa4.9c9d68",
+    "id": "b7855c9c.e078",
     "type": "set",
     "name": "set dst-access-node-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
     "comments": "",
-    "x": 2028.1911029815674,
-    "y": 1275.267038345337,
-    "z": "cbb28df7.1359",
+    "x": 2035.1911029815674,
+    "y": 1288.267038345337,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "c02ee204.0e0d9",
+    "id": "4beb5c8f.437a34",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1848.6809711456299,
-    "y": 1318.434519290924,
-    "z": "cbb28df7.1359",
+    "x": 1855.6809711456299,
+    "y": 1331.434519290924,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "d114cdd9.cd628"
+        "17f7ba24.7fa566"
       ]
     ]
   },
   {
-    "id": "54c81360.7adb5c",
+    "id": "a652bfee.a4a86",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1848.6809711456299,
-    "y": 1364.434519290924,
-    "z": "cbb28df7.1359",
+    "x": 1855.6809711456299,
+    "y": 1377.434519290924,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "b311a80c.06bd18"
+        "b4e0c929.110668"
       ]
     ]
   },
   {
-    "id": "99167636.bd39c8",
+    "id": "b6d9ed74.687c9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1848.6704730987549,
-    "y": 1403.4241433143616,
-    "z": "cbb28df7.1359",
+    "x": 1855.6704730987549,
+    "y": 1416.4241433143616,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "9a953c6c.d3922"
+        "90d8491c.861238"
       ]
     ]
   },
   {
-    "id": "7c3f1ab0.926054",
+    "id": "49abb372.8700ac",
     "type": "for",
     "name": "for idx..tmp.ep.parameters[]",
     "xml": "<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1285.96875,
-    "y": 1293,
-    "z": "cbb28df7.1359",
+    "x": 1292.96875,
+    "y": 1306,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "917d1ab.d2608e8"
+        "39192112.9a7a9e"
       ]
     ]
   },
   {
-    "id": "2b6b416f.53780e",
+    "id": "50540586.cfd78c",
     "type": "set",
     "name": "set tmp.ep.parameters",
     "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$mdsal-other-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.`' />\n",
     "comments": "",
-    "x": 1851.9688053131104,
-    "y": 1142.0000743865967,
-    "z": "cbb28df7.1359",
+    "x": 1858.9688053131104,
+    "y": 1155.0000743865967,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "1a9c7979.469227",
+    "id": "7849a3ee.c57b4c",
     "type": "set",
     "name": "set tmp.ep.parameters",
     "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />\n",
     "comments": "",
-    "x": 1848.968713760376,
-    "y": 1188.0000591278076,
-    "z": "cbb28df7.1359",
+    "x": 1855.968713760376,
+    "y": 1201.0000591278076,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "d114cdd9.cd628",
+    "id": "17f7ba24.7fa566",
     "type": "set",
     "name": "set dst-access-node-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
     "comments": "",
-    "x": 2025.9689350128174,
-    "y": 1318.0003151893616,
-    "z": "cbb28df7.1359",
+    "x": 2032.9689350128174,
+    "y": 1331.0003151893616,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "b311a80c.06bd18",
+    "id": "b4e0c929.110668",
     "type": "set",
     "name": "set dst-clientSignal",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />",
     "comments": "",
-    "x": 2019.9689350128174,
-    "y": 1362.0003151893616,
-    "z": "cbb28df7.1359",
+    "x": 2026.9689350128174,
+    "y": 1375.0003151893616,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "9a953c6c.d3922",
+    "id": "90d8491c.861238",
     "type": "set",
     "name": "set dst-cVLAN",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />",
     "comments": "",
-    "x": 2010.9689350128174,
-    "y": 1401.0003151893616,
-    "z": "cbb28df7.1359",
+    "x": 2017.9689350128174,
+    "y": 1414.0003151893616,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "41e007bc.b49c58",
+    "id": "7a6bd4c0.0a23ac",
     "type": "comment",
     "name": "Get controller info and send request",
     "info": "",
     "comments": "",
-    "x": 1892.968807220459,
-    "y": 1872.000153541565,
-    "z": "cbb28df7.1359",
+    "x": 1899.968807220459,
+    "y": 1885.000153541565,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "ce79c05a.55781",
+    "id": "e5ca51fb.cb5be",
     "type": "execute",
     "name": "execute RestApiCallNode Create ethernet Service",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"patch\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1945.96923828125,
-    "y": 2015.0009536743164,
-    "z": "cbb28df7.1359",
+    "x": 1963.9693450927734,
+    "y": 2159.001121520996,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "163df924.1c4a27",
-        "eec75b28.8ba118"
+        "4fd581be.ae7c5",
+        "cba0e7bf.640378"
       ]
     ]
   },
   {
-    "id": "163df924.1c4a27",
+    "id": "4fd581be.ae7c5",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2211.968963623047,
-    "y": 2044.0010766983032,
-    "z": "cbb28df7.1359",
+    "x": 2229.9690704345703,
+    "y": 2188.001244544983,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "638866f6.2498c8"
+        "9a1df066.c1be9"
       ]
     ]
   },
   {
-    "id": "638866f6.2498c8",
+    "id": "9a1df066.c1be9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 2359.968963623047,
-    "y": 2042.0009546279907,
-    "z": "cbb28df7.1359",
+    "x": 2377.9690704345703,
+    "y": 2186.0011224746704,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "bb864308.fd063",
+    "id": "434af439.625b6c",
     "type": "returnFailure",
     "name": "return failure",
     "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 vpn rest api\" />\n",
     "comments": "",
-    "x": 2341.968994140625,
-    "y": 1989.0010147094727,
-    "z": "cbb28df7.1359",
+    "x": 2359.9691009521484,
+    "y": 2133.0011825561523,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "eec75b28.8ba118",
+    "id": "cba0e7bf.640378",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2202.9689025878906,
-    "y": 1989.0010147094727,
-    "z": "cbb28df7.1359",
+    "x": 2220.969009399414,
+    "y": 2133.0011825561523,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "bb864308.fd063"
+        "434af439.625b6c"
       ]
     ]
   },
   {
-    "id": "4cd33402.f5bedc",
+    "id": "1a8278df.ac4137",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 864.7311744689941,
-    "y": 2095.9537086486816,
-    "z": "cbb28df7.1359",
+    "x": 871.7311744689941,
+    "y": 2108.9537086486816,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ed40bf1a.07a59"
+        "c4aa74e4.35ca78"
       ]
     ]
   },
   {
-    "id": "ed40bf1a.07a59",
+    "id": "c4aa74e4.35ca78",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 1031.2549953460693,
-    "y": 2122.5727157592773,
-    "z": "cbb28df7.1359",
+    "x": 1038.2549953460693,
+    "y": 2135.5727157592773,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "589b918b.e1a7",
+    "id": "33c28cf6.2b21a4",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 866.8264026641846,
-    "y": 2143.715551376343,
-    "z": "cbb28df7.1359",
+    "x": 873.8264026641846,
+    "y": 2156.715551376343,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ed40bf1a.07a59"
+        "c4aa74e4.35ca78"
       ]
     ]
   },
   {
-    "id": "489a8dba.917834",
+    "id": "cb1a048d.e95fc8",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 638.7788181304932,
-    "y": 2084.3028717041016,
-    "z": "cbb28df7.1359",
+    "x": 645.7788181304932,
+    "y": 2097.3028717041016,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "75a3a30e.eab54c",
+    "id": "c4803883.47c5a8",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 653.5465145111084,
-    "y": 2005.8283529281616,
-    "z": "cbb28df7.1359",
+    "x": 660.5465145111084,
+    "y": 2018.8283529281616,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "3b7ef3d8.70ae1c",
+    "id": "c4ade364.dff4",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 613.9596862792969,
-    "y": 2191.4441413879395,
-    "z": "cbb28df7.1359",
+    "x": 620.9596862792969,
+    "y": 2204.4441413879395,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "f879cc99.b3ef8",
+    "id": "21b8bdc2.b30a32",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 706.2785968780518,
-    "y": 1930.4692058563232,
-    "z": "cbb28df7.1359",
+    "x": 713.2785968780518,
+    "y": 1943.4692058563232,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "e695cbc9.963178",
-        "c00494c2.3f5b48",
-        "2e65b760.7a5738"
+        "72334169.43788",
+        "91c81d87.0f2e3",
+        "4377487a.aa9b58"
       ]
     ]
   },
   {
-    "id": "e695cbc9.963178",
+    "id": "72334169.43788",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 960.9200191497803,
-    "y": 1974.8006000518799,
-    "z": "cbb28df7.1359",
+    "x": 967.9200191497803,
+    "y": 1987.8006000518799,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "c996b950.fcda58"
+        "3aa37f14.b2a12"
       ]
     ]
   },
   {
-    "id": "c00494c2.3f5b48",
+    "id": "91c81d87.0f2e3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 962.9200420379639,
-    "y": 1933.3005641922355,
-    "z": "cbb28df7.1359",
+    "x": 969.9200420379639,
+    "y": 1946.3005641922355,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "c996b950.fcda58"
+        "3aa37f14.b2a12"
       ]
     ]
   },
   {
-    "id": "2e65b760.7a5738",
+    "id": "4377487a.aa9b58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 966.6701259613037,
-    "y": 1884.6577167510986,
-    "z": "cbb28df7.1359",
+    "x": 973.6701259613037,
+    "y": 1897.6577167510986,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "fe27e5ca.7550c8"
+        "ce3cc849.21f268"
       ]
     ]
   },
   {
-    "id": "c996b950.fcda58",
+    "id": "3aa37f14.b2a12",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1121.67014503479,
-    "y": 1953.050630569458,
-    "z": "cbb28df7.1359",
+    "x": 1128.67014503479,
+    "y": 1966.050630569458,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "fe27e5ca.7550c8",
+    "id": "ce3cc849.21f268",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1094.3260707855225,
-    "y": 1886.8498849868774,
-    "z": "cbb28df7.1359",
+    "x": 1101.3260707855225,
+    "y": 1899.8498849868774,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "f192b08c.ec685",
+    "id": "33c05db5.bb8532",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />",
     "comments": "",
-    "x": 608.4922122955322,
-    "y": 1764.8501069545746,
-    "z": "cbb28df7.1359",
+    "x": 615.4922122955322,
+    "y": 1777.8501069545746,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "f18db1f7.e4c95",
+    "id": "3d236d8e.1a1ed2",
     "type": "execute",
     "name": "execute getTime",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 625.77805519104,
-    "y": 1837.4697046279907,
-    "z": "cbb28df7.1359",
+    "x": 632.77805519104,
+    "y": 1850.4697046279907,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "7bf02ef8.1215c",
+    "id": "9dd9851c.cc5e08",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 675.7651348114014,
-    "y": 1874.4207849502563,
-    "z": "cbb28df7.1359",
+    "x": 682.7651348114014,
+    "y": 1887.4207849502563,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "17f7a6f0.5e20c9",
+    "id": "dde46f65.1623c",
     "type": "set",
     "name": "set model-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
     "comments": "",
-    "x": 622.3337535858154,
-    "y": 1804.024757385254,
-    "z": "cbb28df7.1359",
+    "x": 629.3337535858154,
+    "y": 1817.024757385254,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "59f6758a.f1882c",
+    "id": "c0243700.483a78",
     "type": "comment",
     "name": "Prepare data for allotted-resource addition to MDSAL",
     "info": "This will add to allotted-resource which is present inside service.",
     "comments": "",
-    "x": 735.66721534729,
-    "y": 1725.0247094631195,
-    "z": "cbb28df7.1359",
+    "x": 742.66721534729,
+    "y": 1738.0247094631195,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "e5584499.737208",
+    "id": "b128777a.bf8ad8",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 677.2470417022705,
-    "y": 1692.4380111694336,
-    "z": "cbb28df7.1359",
+    "x": 684.2470417022705,
+    "y": 1705.4380111694336,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "bd9c39e4.8a1478",
+    "id": "ad2575da.f719b8",
     "type": "update",
     "name": "update AAI allotted-resource",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 665.2230968475342,
-    "y": 2121.7550144195557,
-    "z": "cbb28df7.1359",
+    "x": 672.2230968475342,
+    "y": 2134.7550144195557,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "4cd33402.f5bedc",
-        "589b918b.e1a7"
+        "1a8278df.ac4137",
+        "33c28cf6.2b21a4"
       ]
     ]
   },
   {
-    "id": "dfdb9aed.f71ce8",
+    "id": "73456eef.45eac",
     "type": "execute",
     "name": "execute RestApiCallNode getPath from OOF",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"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`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1473.973056793213,
-    "y": 1684.2546663284302,
-    "z": "cbb28df7.1359",
+    "x": 1480.973056793213,
+    "y": 1697.2546663284302,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "5746b590.8e789c",
-        "dfadca6b.0a2088"
+        "473a6700.6236e8",
+        "5286278b.3b3cd8"
       ]
     ]
   },
   {
-    "id": "5746b590.8e789c",
+    "id": "473a6700.6236e8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1713.9731979370117,
-    "y": 1708.254635810852,
-    "z": "cbb28df7.1359",
+    "x": 1720.9731979370117,
+    "y": 1721.254635810852,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "6ae16eae.42967"
+        "cafce3b5.74fb5"
       ]
     ]
   },
   {
-    "id": "882eddea.960c4",
+    "id": "dc79f611.cf4238",
     "type": "returnFailure",
     "name": "return failure",
     "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 OOF api\" />\n",
     "comments": "",
-    "x": 1852.973232269287,
-    "y": 1657.2547273635864,
-    "z": "cbb28df7.1359",
+    "x": 1859.973232269287,
+    "y": 1670.2547273635864,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "dfadca6b.0a2088",
+    "id": "5286278b.3b3cd8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1712.9729843139648,
-    "y": 1657.254726409912,
-    "z": "cbb28df7.1359",
+    "x": 1719.9729843139648,
+    "y": 1670.254726409912,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "882eddea.960c4"
+        "dc79f611.cf4238"
       ]
     ]
   },
   {
-    "id": "4ef28c1a.417b14",
+    "id": "deb094f6.e597f8",
     "type": "comment",
     "name": "Get VPNs from OOF",
     "info": "",
     "comments": "",
-    "x": 1459.976978302002,
-    "y": 1651.2586660385132,
-    "z": "cbb28df7.1359",
+    "x": 1466.976978302002,
+    "y": 1664.2586660385132,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "14017773.15ade9",
+    "id": "da1582e5.d9e86",
     "type": "for",
     "name": "for vidx..oof.vpns_length[]",
     "xml": "<for index='vidx' start='0' end='`$oof.vpns_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 1413.972900390625,
-    "y": 1766.50439453125,
-    "z": "cbb28df7.1359",
+    "x": 1420.972900390625,
+    "y": 1779.50439453125,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "1e38af3f.f6ce71"
+        "b2ef8ded.b479a"
       ]
     ]
   },
   {
-    "id": "3e61c92c.93c8a6",
+    "id": "c9df49cc.0e8008",
     "type": "comment",
     "name": "Loop through VPN and configure them",
     "info": "",
     "comments": "",
-    "x": 1459.9733505249023,
-    "y": 1901.0047721862793,
-    "z": "cbb28df7.1359",
+    "x": 1466.9733505249023,
+    "y": 1914.0047721862793,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "63d37889.57ca38",
+    "id": "477598ab.94c4f8",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`\">\n                \n",
     "comments": "",
     "outputs": 1,
-    "x": 2653.757080078125,
-    "y": 1238.121826171875,
-    "z": "cbb28df7.1359",
+    "x": 2660.757080078125,
+    "y": 1251.121826171875,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "bead713d.d0c48"
+        "7c0be7f6.9e8c58"
       ]
     ]
   },
   {
-    "id": "bead713d.d0c48",
+    "id": "7c0be7f6.9e8c58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2842.757049560547,
-    "y": 1238.121811389923,
-    "z": "cbb28df7.1359",
+    "x": 2849.757049560547,
+    "y": 1251.121811389923,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "e5afa8f6.b33978"
+        "1cf5a70.cc26659"
       ]
     ]
   },
   {
-    "id": "e5afa8f6.b33978",
+    "id": "1cf5a70.cc26659",
     "type": "set",
     "name": "set etht-svc-name & bandwidth-profile-name",
     "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
     "comments": "",
-    "x": 3083.75736618042,
-    "y": 1237.7218661308289,
-    "z": "cbb28df7.1359",
+    "x": 3090.75736618042,
+    "y": 1250.7218661308289,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "ff3897ba.b2c938",
+    "id": "bf3fd182.60613",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2666.5969581604004,
-    "y": 1273.1219210624695,
-    "z": "cbb28df7.1359",
+    "x": 2673.5969581604004,
+    "y": 1286.1219210624695,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "7e0c933d.418d0c"
+        "f2fb468e.d467f8"
       ]
     ]
   },
   {
-    "id": "7e0c933d.418d0c",
+    "id": "f2fb468e.d467f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2841.597023010254,
-    "y": 1275.1219067573547,
-    "z": "cbb28df7.1359",
+    "x": 2848.597023010254,
+    "y": 1288.1219067573547,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "3819c097.d5b38"
+        "e7ce8468.64c938"
       ]
     ]
   },
   {
-    "id": "3819c097.d5b38",
+    "id": "e7ce8468.64c938",
     "type": "set",
     "name": "set etht-svc-descr",
     "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
     "comments": "",
-    "x": 2997.9303398132324,
-    "y": 1272.5829815864563,
-    "z": "cbb28df7.1359",
+    "x": 3004.9303398132324,
+    "y": 1285.5829815864563,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "410b060d.0c2948",
+    "id": "ee0ac40b.7c8918",
     "type": "switchNode",
     "name": "switch tenantId",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2661.979221343994,
-    "y": 1306.4553112983704,
-    "z": "cbb28df7.1359",
+    "x": 2668.979221343994,
+    "y": 1319.4553112983704,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "2df9d1b1.36383e"
+        "db11a89d.57ead8"
       ]
     ]
   },
   {
-    "id": "2df9d1b1.36383e",
+    "id": "db11a89d.57ead8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2839.9792251586914,
-    "y": 1310.4551892280579,
-    "z": "cbb28df7.1359",
+    "x": 2846.9792251586914,
+    "y": 1323.4551892280579,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "357ff876.835a78"
+        "a28b1daa.bce21"
       ]
     ]
   },
   {
-    "id": "357ff876.835a78",
+    "id": "a28b1daa.bce21",
     "type": "set",
     "name": "set tenantId",
     "xml": "<set>\n<parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
     "comments": "",
-    "x": 2977.9794120788574,
-    "y": 1307.0551648139954,
-    "z": "cbb28df7.1359",
+    "x": 2984.9794120788574,
+    "y": 1320.0551648139954,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "623ff136.8ac42",
+    "id": "6b4b64b0.8aa49c",
     "type": "switchNode",
     "name": "switch cir",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2644.818820953369,
-    "y": 1379.4552664756775,
-    "z": "cbb28df7.1359",
+    "x": 2651.818820953369,
+    "y": 1392.4552664756775,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "a057011b.3d0e6"
+        "779ba6d5.68a5b8"
       ]
     ]
   },
   {
-    "id": "a057011b.3d0e6",
+    "id": "779ba6d5.68a5b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2839.8188858032227,
-    "y": 1380.4552664756775,
-    "z": "cbb28df7.1359",
+    "x": 2846.8188858032227,
+    "y": 1393.4552664756775,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "25f349b7.7cabf6"
+        "51c8d37d.57c57c"
       ]
     ]
   },
   {
-    "id": "25f349b7.7cabf6",
+    "id": "51c8d37d.57c57c",
     "type": "set",
     "name": "set cir",
     "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
     "comments": "",
-    "x": 2964.15238571167,
-    "y": 1378.916341304779,
-    "z": "cbb28df7.1359",
+    "x": 2971.15238571167,
+    "y": 1391.916341304779,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "805eddea.23b52",
+    "id": "334ef95a.804996",
     "type": "switchNode",
     "name": "switch vpnType",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2659.127109527588,
-    "y": 1342.232976436615,
-    "z": "cbb28df7.1359",
+    "x": 2666.127109527588,
+    "y": 1355.232976436615,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "f566b2bd.002c1"
+        "edf65e2e.17eef"
       ]
     ]
   },
   {
-    "id": "f566b2bd.002c1",
+    "id": "edf65e2e.17eef",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2841.127296447754,
-    "y": 1345.232961177826,
-    "z": "cbb28df7.1359",
+    "x": 2848.127296447754,
+    "y": 1358.232961177826,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "69079e30.4f1f7"
+        "3a58a10e.af006e"
       ]
     ]
   },
   {
-    "id": "69079e30.4f1f7",
+    "id": "3a58a10e.af006e",
     "type": "set",
     "name": "set vpnType",
     "xml": "<set>\n<parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
     "comments": "",
-    "x": 2977.461040496826,
-    "y": 1341.6942028999329,
-    "z": "cbb28df7.1359",
+    "x": 2984.461040496826,
+    "y": 1354.6942028999329,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "3055227f.6b6a0e",
+    "id": "f2f619ae.81dc88",
     "type": "switchNode",
     "name": "switch eir",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2640.1091651916504,
-    "y": 1413.1531739234924,
-    "z": "cbb28df7.1359",
+    "x": 2647.1091651916504,
+    "y": 1426.1531739234924,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "2ee770d4.d5299"
+        "290775a.582758a"
       ]
     ]
   },
   {
-    "id": "2ee770d4.d5299",
+    "id": "290775a.582758a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2840.1094131469727,
-    "y": 1416.1531128883362,
-    "z": "cbb28df7.1359",
+    "x": 2847.1094131469727,
+    "y": 1429.1531128883362,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "b9ec2386.9ae27"
+        "be16065f.3cc068"
       ]
     ]
   },
   {
-    "id": "b9ec2386.9ae27",
+    "id": "be16065f.3cc068",
     "type": "set",
     "name": "set eir",
     "xml": "<set>\n<parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
     "comments": "",
-    "x": 2963.4430351257324,
-    "y": 1415.6141724586487,
-    "z": "cbb28df7.1359",
+    "x": 2970.4430351257324,
+    "y": 1428.6141724586487,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "830a582f.f084d8",
+    "id": "7f22248e.623acc",
     "type": "switchNode",
     "name": "switch colorAware",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2665.109775543213,
-    "y": 1447.1530528068542,
-    "z": "cbb28df7.1359",
+    "x": 2672.109775543213,
+    "y": 1460.1530528068542,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "e42ebbc6.466e88"
+        "60b638c9.9f5cf8"
       ]
     ]
   },
   {
-    "id": "e42ebbc6.466e88",
+    "id": "60b638c9.9f5cf8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2836.1095962524414,
-    "y": 1453.1529912948608,
-    "z": "cbb28df7.1359",
+    "x": 2843.1095962524414,
+    "y": 1466.1529912948608,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "6fd3f45c.5fea2c"
+        "6283050a.9a352c"
       ]
     ]
   },
   {
-    "id": "6fd3f45c.5fea2c",
+    "id": "6283050a.9a352c",
     "type": "set",
     "name": "set colorAware",
     "xml": "<set>\n<parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
     "comments": "",
-    "x": 2984.44291305542,
-    "y": 1453.6142039299011,
-    "z": "cbb28df7.1359",
+    "x": 2991.44291305542,
+    "y": 1466.6142039299011,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "f77b8935.e0ba38",
+    "id": "1977cf51.112051",
     "type": "switchNode",
     "name": "switch couplingFlag",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2667.1097145080566,
-    "y": 1483.1531147956848,
-    "z": "cbb28df7.1359",
+    "x": 2674.1097145080566,
+    "y": 1496.1531147956848,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "66020844.5e3b48"
+        "95d93fbe.f7437"
       ]
     ]
   },
   {
-    "id": "66020844.5e3b48",
+    "id": "95d93fbe.f7437",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2839.1095962524414,
-    "y": 1492.1530842781067,
-    "z": "cbb28df7.1359",
+    "x": 2846.1095962524414,
+    "y": 1505.1530842781067,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "74a5b014.5554d"
+        "ceecc29f.0a56b"
       ]
     ]
   },
   {
-    "id": "74a5b014.5554d",
+    "id": "ceecc29f.0a56b",
     "type": "set",
     "name": "set couplingFlag",
     "xml": "<set>\n<parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
     "comments": "",
-    "x": 2992.44291305542,
-    "y": 1492.6142048835754,
-    "z": "cbb28df7.1359",
+    "x": 2999.44291305542,
+    "y": 1505.6142048835754,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "4bea378a.ee8c98",
+    "id": "b4b830f7.2edfb",
     "type": "comment",
     "name": "Check if other EP exists in SOTNConnectionResource",
     "info": "",
     "comments": "",
-    "x": 2798.312744140625,
-    "y": 1101.7884521484375,
-    "z": "cbb28df7.1359",
+    "x": 2805.312744140625,
+    "y": 1114.7884521484375,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "c5b17466.a418c8",
+    "id": "85af2b8.2c027d8",
     "type": "comment",
     "name": "Get other global parameters from network",
     "info": "",
     "comments": "",
-    "x": 2734.3125,
-    "y": 1187.7884521484375,
-    "z": "cbb28df7.1359",
+    "x": 2741.3125,
+    "y": 1200.7884521484375,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "b4347cf5.49bc8",
+    "id": "21b345b.f16dcba",
     "type": "switchNode",
     "name": "switch access-provider-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1682.5348529815674,
-    "y": 1449.2329812049866,
-    "z": "cbb28df7.1359",
+    "x": 1689.5348529815674,
+    "y": 1462.2329812049866,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "1b940064.8ad79"
+        "88d75ee0.36aab"
       ]
     ]
   },
   {
-    "id": "1b940064.8ad79",
+    "id": "88d75ee0.36aab",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1869.5348529815674,
-    "y": 1445.2329812049866,
-    "z": "cbb28df7.1359",
+    "x": 1876.5348529815674,
+    "y": 1458.2329812049866,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "427c462c.3a8218"
+        "144324cd.dbe03b"
       ]
     ]
   },
   {
-    "id": "427c462c.3a8218",
+    "id": "144324cd.dbe03b",
     "type": "set",
     "name": "set access-provider-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2037.5348529815674,
-    "y": 1445.8329873085022,
-    "z": "cbb28df7.1359",
+    "x": 2044.5348529815674,
+    "y": 1458.8329873085022,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "5c76f693.8395f8",
+    "id": "847549d0.8fada8",
     "type": "switchNode",
     "name": "switch access-client-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1673.5348682403564,
-    "y": 1492.2434296607971,
-    "z": "cbb28df7.1359",
+    "x": 1680.5348682403564,
+    "y": 1505.2434296607971,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "8078ffd1.06781"
+        "429ac662.d36c08"
       ]
     ]
   },
   {
-    "id": "8078ffd1.06781",
+    "id": "429ac662.d36c08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1860.5348682403564,
-    "y": 1488.2434296607971,
-    "z": "cbb28df7.1359",
+    "x": 1867.5348682403564,
+    "y": 1501.2434296607971,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ee89727e.012f2"
+        "fdfea883.43ef38"
       ]
     ]
   },
   {
-    "id": "ee89727e.012f2",
+    "id": "fdfea883.43ef38",
     "type": "set",
     "name": "set access-client-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2028.5348682403564,
-    "y": 1488.8434357643127,
-    "z": "cbb28df7.1359",
+    "x": 2035.5348682403564,
+    "y": 1501.8434357643127,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "59d53676.123ac8",
+    "id": "46d04af2.172014",
     "type": "switchNode",
     "name": "switch access-topology-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1686.534812927246,
-    "y": 1534.2434606552124,
-    "z": "cbb28df7.1359",
+    "x": 1693.534812927246,
+    "y": 1547.2434606552124,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ad434cbd.d2efc"
+        "f9888c9d.14fbf"
       ]
     ]
   },
   {
-    "id": "ad434cbd.d2efc",
+    "id": "f9888c9d.14fbf",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1873.534812927246,
-    "y": 1530.2434606552124,
-    "z": "cbb28df7.1359",
+    "x": 1880.534812927246,
+    "y": 1543.2434606552124,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "2b625bb5.d8dfe4"
+        "9db1bbe8.d24ee8"
       ]
     ]
   },
   {
-    "id": "2b625bb5.d8dfe4",
+    "id": "9db1bbe8.d24ee8",
     "type": "set",
     "name": "set access-topology-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2041.534812927246,
-    "y": 1530.843466758728,
-    "z": "cbb28df7.1359",
+    "x": 2048.534812927246,
+    "y": 1543.843466758728,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "1e38af3f.f6ce71",
+    "id": "b2ef8ded.b479a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1637.090217590332,
-    "y": 1803.3444538116455,
-    "z": "cbb28df7.1359",
+    "x": 1644.090217590332,
+    "y": 1816.3444538116455,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "25129de9.186342",
-        "bf4d6589.d6b308",
-        "2c248924.320b46",
-        "97ef93ae.8225c",
-        "71bec3b2.6b692c",
-        "803aa791.a5b668",
-        "55ed92f3.9f37ac",
-        "b5e33c1e.9cd83",
-        "ce79c05a.55781",
-        "23370a9.5aed5f6"
+        "ca8a96be.c9e6a8",
+        "f4e8e4f3.f6e418",
+        "dea701ef.7abc9",
+        "644c2300.fecafc",
+        "8bddc111.2e08f",
+        "981ad4ae.e983a8",
+        "55066de5.c71104",
+        "3af624e0.31f91c",
+        "e5ca51fb.cb5be",
+        "2e8e574c.c64e68",
+        "b731c6a4.c3a218"
       ]
     ]
   },
   {
-    "id": "a8cc5d14.06bf4",
+    "id": "9f0b7f15.8c307",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 2278.534881591797,
-    "y": 1867.6776461601257,
-    "z": "cbb28df7.1359",
+    "x": 2285.534881591797,
+    "y": 1880.6776461601257,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "b5e33c1e.9cd83",
+    "id": "3af624e0.31f91c",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "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.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1895.0347900390625,
-    "y": 1904.6775856018066,
-    "z": "cbb28df7.1359",
+    "x": 1902.0347900390625,
+    "y": 1917.6775856018066,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "f21a66d9.8077a8",
-        "63593a58.c04864",
-        "7c8fedda.36f2d4"
+        "72570e2d.a62fe",
+        "c43ec6a3.683488",
+        "fb06874f.97c548"
       ]
     ]
   },
   {
-    "id": "f21a66d9.8077a8",
+    "id": "72570e2d.a62fe",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2115.034725189209,
-    "y": 1868.6775546073914,
-    "z": "cbb28df7.1359",
+    "x": 2122.034725189209,
+    "y": 1881.6775546073914,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "a8cc5d14.06bf4"
+        "9f0b7f15.8c307"
       ]
     ]
   },
   {
-    "id": "63593a58.c04864",
+    "id": "c43ec6a3.683488",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2124.525665283203,
-    "y": 1909.2515606880188,
-    "z": "cbb28df7.1359",
+    "x": 2131.525665283203,
+    "y": 1922.2515606880188,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ba7a24b5.83e278"
+        "c36ea2d9.d18c4"
       ]
     ]
   },
   {
-    "id": "7c8fedda.36f2d4",
+    "id": "fb06874f.97c548",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2119.858642578125,
-    "y": 1945.5848736763,
-    "z": "cbb28df7.1359",
+    "x": 2126.858642578125,
+    "y": 1958.5848736763,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "9d46cc37.6bebe"
+        "668b481.e36d4b8"
       ]
     ]
   },
   {
-    "id": "ba7a24b5.83e278",
+    "id": "c36ea2d9.d18c4",
     "type": "returnFailure",
     "name": "return failure",
     "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 2271.0970153808594,
-    "y": 1905.5373873710632,
-    "z": "cbb28df7.1359",
+    "x": 2278.0970153808594,
+    "y": 1918.5373873710632,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "9d46cc37.6bebe",
+    "id": "668b481.e36d4b8",
     "type": "returnFailure",
     "name": "return failure",
     "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 2274.6312866210938,
-    "y": 1947.0240216255188,
-    "z": "cbb28df7.1359",
+    "x": 2281.6312866210938,
+    "y": 1960.0240216255188,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "55ed92f3.9f37ac",
+    "id": "55066de5.c71104",
     "type": "get-resource",
     "name": "get-resource pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1840.534683227539,
-    "y": 1813.6772294044495,
-    "z": "cbb28df7.1359",
+    "x": 1847.534683227539,
+    "y": 1826.6772294044495,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "4c302da.addb0d4",
-        "5d24a360.057f4c",
-        "41a13e1a.fbbb1"
+        "84c5aa59.ee67d8",
+        "41b15be2.0ba8d4",
+        "f1b5d69a.0d7998"
       ]
     ]
   },
   {
-    "id": "4c302da.addb0d4",
+    "id": "84c5aa59.ee67d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2022.5347290039062,
-    "y": 1758.677339553833,
-    "z": "cbb28df7.1359",
+    "x": 2029.5347290039062,
+    "y": 1771.677339553833,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "5347e72e.2bfef8"
+        "7e1d241.12440dc"
       ]
     ]
   },
   {
-    "id": "5d24a360.057f4c",
+    "id": "41b15be2.0ba8d4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2023.0256309509277,
-    "y": 1796.2514362335205,
-    "z": "cbb28df7.1359",
+    "x": 2030.0256309509277,
+    "y": 1809.2514362335205,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "30e7544d.83010c"
+        "e55b495c.733518"
       ]
     ]
   },
   {
-    "id": "41a13e1a.fbbb1",
+    "id": "f1b5d69a.0d7998",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2014.358642578125,
-    "y": 1829.5848112106323,
-    "z": "cbb28df7.1359",
+    "x": 2021.358642578125,
+    "y": 1842.5848112106323,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "2ea2fe84.d1da82"
+        "4d6a36cc.899768"
       ]
     ]
   },
   {
-    "id": "30e7544d.83010c",
+    "id": "e55b495c.733518",
     "type": "returnFailure",
     "name": "return failure",
     "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",
     "comments": "",
-    "x": 2170.597255706787,
-    "y": 1795.5373249053955,
-    "z": "cbb28df7.1359",
+    "x": 2177.597255706787,
+    "y": 1808.5373249053955,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "2ea2fe84.d1da82",
+    "id": "4d6a36cc.899768",
     "type": "returnFailure",
     "name": "return failure",
     "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",
     "comments": "",
-    "x": 2168.1312866210938,
-    "y": 1829.023959159851,
-    "z": "cbb28df7.1359",
+    "x": 2175.1312866210938,
+    "y": 1842.023959159851,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "5347e72e.2bfef8",
+    "id": "7e1d241.12440dc",
     "type": "set",
     "name": "set tmp.thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 2207.5347290039062,
-    "y": 1757.6774616241455,
-    "z": "cbb28df7.1359",
+    "x": 2214.5347290039062,
+    "y": 1770.6774616241455,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "d0963e5.17cefc",
+    "id": "9df363c3.42e7",
     "type": "comment",
     "name": "get domain controller information",
     "info": "",
     "comments": "",
-    "x": 1891.0385971069336,
-    "y": 1780.6811847686768,
-    "z": "cbb28df7.1359",
+    "x": 1898.0385971069336,
+    "y": 1793.6811847686768,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "23370a9.5aed5f6",
+    "id": "2e8e574c.c64e68",
     "type": "set",
     "name": "set oof.vpn",
     "xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />",
     "comments": "",
-    "x": 1852.534683227539,
-    "y": 1734.7883129119873,
-    "z": "cbb28df7.1359",
+    "x": 1859.534683227539,
+    "y": 1747.7883129119873,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "bf4d6589.d6b308",
+    "id": "f4e8e4f3.f6e418",
     "type": "save",
     "name": "save VPN resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n<parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />",
     "comments": "",
     "outputs": 1,
-    "x": 1871.000099182129,
-    "y": 2151.7507152557373,
-    "z": "cbb28df7.1359",
+    "x": 1874.0001602172852,
+    "y": 2324.7506742477417,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "2c248924.320b46",
+    "id": "dea701ef.7abc9",
     "type": "set",
     "name": "set tmp.vpnName",
     "xml": "<set>\n<parameter name='tmp.vpnName' value=\"`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`\" />",
     "comments": "",
-    "x": 1847.500099182129,
-    "y": 2104.2504119873047,
-    "z": "cbb28df7.1359",
+    "x": 1850.5001602172852,
+    "y": 2277.250370979309,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "97ef93ae.8225c",
+    "id": "644c2300.fecafc",
     "type": "save",
     "name": "save connectivity relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$mdsal-psd.service-data.networks.network[0].network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1906.000099182129,
-    "y": 2196.7504711151123,
-    "z": "cbb28df7.1359",
+    "x": 1909.0001602172852,
+    "y": 2369.7504301071167,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "cc0d73cc.20adc",
+    "id": "ce418ee5.81a4e",
     "type": "comment",
     "name": "save vpn and its relation to AAI",
     "info": "",
     "comments": "",
-    "x": 1889.0002975463867,
-    "y": 2065.750680923462,
-    "z": "cbb28df7.1359",
+    "x": 1892.000358581543,
+    "y": 2238.7506399154663,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "25129de9.186342",
+    "id": "ca8a96be.c9e6a8",
     "type": "set",
     "name": "set src-ltpId dst-ltpId",
     "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
     "comments": "",
-    "x": 1858.000129699707,
-    "y": 2236.750591278076,
-    "z": "cbb28df7.1359",
+    "x": 1861.0001907348633,
+    "y": 2409.7505502700806,
+    "z": "f24fb736.66a428",
     "wires": []
   },
   {
-    "id": "71bec3b2.6b692c",
+    "id": "8bddc111.2e08f",
     "type": "save",
     "name": "save srcLTP relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1892.0003814697266,
-    "y": 2276.5008001327515,
-    "z": "cbb28df7.1359",
+    "x": 1895.0004425048828,
+    "y": 2449.500759124756,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "803aa791.a5b668",
+    "id": "981ad4ae.e983a8",
     "type": "save",
     "name": "save dstLTP relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1890.0002136230469,
-    "y": 2322.250638961792,
-    "z": "cbb28df7.1359",
+    "x": 1893.0002746582031,
+    "y": 2495.2505979537964,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "acc938bc.eae1d8",
+    "id": "b13bf095.cdea1",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 832.0039367675781,
-    "y": 587.0039119720459,
-    "z": "cbb28df7.1359",
+    "x": 839.0039367675781,
+    "y": 600.0039119720459,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "a1fbf2bd.6b2d9",
-        "97f58790.fbe988"
+        "fb3f3db1.2e857",
+        "549a2a73.774b74"
       ]
     ]
   },
   {
-    "id": "d519b726.ce9b88",
+    "id": "dcca5b8a.14d818",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 759.0040893554688,
-    "y": 814.004075050354,
-    "z": "cbb28df7.1359",
+    "x": 766.0040893554688,
+    "y": 827.004075050354,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "76dc332e.fe177c",
-        "cbf3f4e6.00aa98"
+        "e3a34e44.03f86",
+        "8447b050.f664b"
       ]
     ]
   },
   {
-    "id": "8ad08551.c43818",
+    "id": "5d5e7f8f.d3d28",
     "type": "execute",
     "name": "get parent-service-data url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 659.0039978027344,
-    "y": 777.0039081573486,
-    "z": "cbb28df7.1359",
+    "x": 666.0039978027344,
+    "y": 790.0039081573486,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "2fbf3350.d69d7c",
+    "id": "8c502b5e.ba0e48",
     "type": "execute",
     "name": "generate tmp.ar-other-url-connection",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-other-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.provided-ar.allotted-resource-id`\"/>\n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2073.0003509521484,
-    "y": 933.3334693908691,
-    "z": "cbb28df7.1359",
+    "x": 2080.0003509521484,
+    "y": 946.3334693908691,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "51067155.cb254",
+    "id": "b7c302f0.0eaa4",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-other-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-other-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2210.000991821289,
-    "y": 975.8333339691162,
-    "z": "cbb28df7.1359",
+    "x": 2217.000991821289,
+    "y": 988.8333339691162,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "7d7dc112.d678b",
-        "79425b66.b91424"
+        "642168d6.c96a08",
+        "d6797517.070b08"
       ]
     ]
   },
   {
-    "id": "6ae16eae.42967",
+    "id": "cafce3b5.74fb5",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1835.0002708435059,
-    "y": 1699.0001192092896,
-    "z": "cbb28df7.1359",
+    "x": 1842.0002708435059,
+    "y": 1712.0001192092896,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
   },
   {
-    "id": "d86d0f7e.bebac",
+    "id": "73f1353a.31fe0c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1211.9688835144043,
-    "y": 1724.0003032684326,
-    "z": "cbb28df7.1359",
+    "x": 1218.9688835144043,
+    "y": 1737.0003032684326,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "dfdb9aed.f71ce8",
-        "14017773.15ade9"
+        "73456eef.45eac",
+        "da1582e5.d9e86"
       ]
     ]
   },
   {
-    "id": "453143a6.32929c",
+    "id": "bd2b5022.a474e",
     "type": "outcome",
     "name": "outcome PendingDelete",
     "xml": "<outcome value='PendingDelete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2286.0313415527344,
-    "y": 539.0312976837158,
-    "z": "cbb28df7.1359",
+    "x": 2293.0313415527344,
+    "y": 552.0312976837158,
+    "z": "f24fb736.66a428",
     "wires": [
       [
-        "ea213aeb.c1a238"
+        "44575632.3edd28"
       ]
     ]
   },
   {
-    "id": "ea213aeb.c1a238",
+    "id": "44575632.3edd28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2470.031352996826,
-    "y": 535.0312976837158,
-    "z": "cbb28df7.1359",
+    "x": 2477.031352996826,
+    "y": 548.0312976837158,
+    "z": "f24fb736.66a428",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "b731c6a4.c3a218",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1922.5039367675781,
+    "y": 2044.003927230835,
+    "z": "f24fb736.66a428",
+    "wires": [
+      [
+        "ce234ab1.289298",
+        "b6c8858.bd95c78"
+      ]
+    ]
+  },
+  {
+    "id": "ce234ab1.289298",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2157.503936767578,
+    "y": 2022.003927230835,
+    "z": "f24fb736.66a428",
+    "wires": [
+      [
+        "98d09cc3.1216f"
+      ]
+    ]
+  },
+  {
+    "id": "b6c8858.bd95c78",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2149.753936767578,
+    "y": 2075.646810531616,
+    "z": "f24fb736.66a428",
+    "wires": [
+      [
+        "82c72a3.d7e47d8"
+      ]
+    ]
+  },
+  {
+    "id": "82c72a3.d7e47d8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 get token rest api\" />\n",
+    "comments": "",
+    "x": 2302.503936767578,
+    "y": 2075.3968715667725,
+    "z": "f24fb736.66a428",
+    "wires": []
+  },
+  {
+    "id": "98d09cc3.1216f",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+    "comments": "",
+    "x": 2311.503936767578,
+    "y": 2023.003927230835,
+    "z": "f24fb736.66a428",
+    "wires": []
   }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
index 185815d..d9c97e6 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "b2b2fc12.cf96d",
+    "id": "fd67dde.a66f82",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 96.50000190734863,
-    "y": 38.00000286102295,
-    "z": "f5fcb4a8.869698",
+    "x": 116,
+    "y": 35,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "6e50c528.de9a7c"
+        "1df77df2.bd25c2"
       ]
     ]
   },
   {
-    "id": "6e50c528.de9a7c",
+    "id": "1df77df2.bd25c2",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1311 +22,1326 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 237.50000381469727,
-    "y": 115.0000171661377,
-    "z": "f5fcb4a8.869698",
+    "x": 257.00000190734863,
+    "y": 112.00001430511475,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "f4bf8d69.ecd28"
+        "4ae5acd4.5be1a4"
       ]
     ]
   },
   {
-    "id": "f4bf8d69.ecd28",
+    "id": "4ae5acd4.5be1a4",
     "type": "method",
     "name": "sotn-attachment-topology-operation-create",
     "xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 225.5001220703125,
-    "y": 203,
-    "z": "f5fcb4a8.869698",
+    "x": 245.00012016296387,
+    "y": 199.99999713897705,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "3bd3ace.6bd7c54"
+        "b78625b7.40d198"
       ]
     ]
   },
   {
-    "id": "3bd3ace.6bd7c54",
+    "id": "b78625b7.40d198",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 145.50005340576172,
-    "y": 952.0002479553223,
-    "z": "f5fcb4a8.869698",
+    "x": 165.0000514984131,
+    "y": 949.0002450942993,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "e49d7cd0.24623",
-        "4a92eb0d.67e9c4",
-        "2dd15073.0da3b",
-        "5e1f3d4f.82c794",
-        "afc1bdf5.4b836",
-        "7d9ca6fb.249298",
-        "f5e2658.10ace98",
-        "3342f593.51121a",
-        "458e8426.a4810c",
-        "506bd024.3cd4a",
-        "ca1aa6f6.be5228",
-        "a07927be.544a08",
-        "2adeb8b.a94ce48",
-        "c51e932f.b0db6",
-        "16ace716.f64f39",
-        "91c11379.3848",
-        "c018ef66.ea6f",
-        "d7ef6ed3.36d06",
-        "9a473067.67045",
-        "91b59706.e4cdc8",
-        "cfbbadf0.d1c3a",
-        "e88d2834.1fdcf8",
-        "8fb59fb4.b6b0c",
-        "c224a6bb.b7b288",
-        "c765719e.98d15"
+        "13c3075f.a550d9",
+        "326099aa.e4b1f6",
+        "9e7243fc.98276",
+        "a773278f.c60928",
+        "79a41f6b.cf86f",
+        "afaa69e7.b4aba8",
+        "4a444e95.a33bb",
+        "77c3364e.f87538",
+        "9851c050.afe45",
+        "5f01282.a94d0d8",
+        "7e65d530.30d0fc",
+        "17bffa68.c6e1f6",
+        "b279212f.2876c",
+        "624c4802.103f08",
+        "15e63162.783f4f",
+        "4d0b157.d3d26ec",
+        "7b0dce99.088f9",
+        "47b622.5f78d9e",
+        "547adbe.09cf724",
+        "1c8354a6.82036b",
+        "908c2ae3.c4f938",
+        "323f6bf8.18f834",
+        "ef225a8b.70ebd8",
+        "16153237.cff69e",
+        "5054f74f.3fad08",
+        "9ff190ab.bed71"
       ]
     ]
   },
   {
-    "id": "bc77dabb.b8dfe8",
+    "id": "811ec7f1.394838",
     "type": "comment",
     "name": "Set allotted resource id if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 629.5767517089844,
-    "y": 112.4339189529419,
-    "z": "f5fcb4a8.869698",
+    "x": 664.0767593383789,
+    "y": 144.433913230896,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "e49d7cd0.24623",
+    "id": "13c3075f.a550d9",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 575.5000305175781,
-    "y": 167.99999237060547,
-    "z": "f5fcb4a8.869698",
+    "x": 610.0000381469727,
+    "y": 199.99998664855957,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "ede8227d.3da0a",
-        "871d8b04.92b798"
+        "1fd27893.31ab57",
+        "380f681d.6db258"
       ]
     ]
   },
   {
-    "id": "ede8227d.3da0a",
+    "id": "1fd27893.31ab57",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 773.5001182556152,
-    "y": 137.99998092651367,
-    "z": "f5fcb4a8.869698",
+    "x": 808.0001258850098,
+    "y": 169.99997520446777,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "8efccbca.23f2f8"
+        "f434bacd.73f0c8"
       ]
     ]
   },
   {
-    "id": "871d8b04.92b798",
+    "id": "380f681d.6db258",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 772.5000267028809,
-    "y": 174.99999141693115,
-    "z": "f5fcb4a8.869698",
+    "x": 807.0000343322754,
+    "y": 206.99998569488525,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "4fdaace7.615964"
+        "b52073bc.07c9f"
       ]
     ]
   },
   {
-    "id": "4fdaace7.615964",
+    "id": "b52073bc.07c9f",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n",
     "comments": "",
-    "x": 970.5000152587891,
-    "y": 172.00001049041748,
-    "z": "f5fcb4a8.869698",
+    "x": 1005.0000228881836,
+    "y": 204.00000476837158,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "4a92eb0d.67e9c4",
+    "id": "326099aa.e4b1f6",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 543.4999542236328,
-    "y": 389.0000991821289,
-    "z": "f5fcb4a8.869698",
+    "x": 562.9999523162842,
+    "y": 386.00009632110596,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "2dd15073.0da3b",
+    "id": "9e7243fc.98276",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 543.7618713378906,
-    "y": 470.66678047180176,
-    "z": "f5fcb4a8.869698",
+    "x": 563.2618942260742,
+    "y": 472.6668071746826,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e1f3d4f.82c794",
+    "id": "a773278f.c60928",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 596.7619323730469,
-    "y": 557.6666984558105,
-    "z": "f5fcb4a8.869698",
+    "x": 616.2619304656982,
+    "y": 554.6666955947876,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "8efccbca.23f2f8",
+    "id": "f434bacd.73f0c8",
     "type": "execute",
     "name": "execute tmp.ar.allotted-resource-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 988.5000953674316,
-    "y": 138.99998664855957,
-    "z": "f5fcb4a8.869698",
+    "x": 1023.0001029968262,
+    "y": 170.99998092651367,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "d4c15c7f.c9c6b"
+        "9ab0be9f.9431d"
       ]
     ]
   },
   {
-    "id": "d4c15c7f.c9c6b",
+    "id": "9ab0be9f.9431d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1206.5001373291016,
-    "y": 138.99995040893555,
-    "z": "f5fcb4a8.869698",
+    "x": 1241.000144958496,
+    "y": 170.99994468688965,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "4780ce03.07d49"
+        "aca58bfe.822378"
       ]
     ]
   },
   {
-    "id": "4780ce03.07d49",
+    "id": "aca58bfe.822378",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
     "comments": "",
-    "x": 1372.5000915527344,
-    "y": 138.9999647140503,
-    "z": "f5fcb4a8.869698",
+    "x": 1407.000099182129,
+    "y": 170.9999589920044,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "cd668aab.887ef8",
+    "id": "43d96423.28d03c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1102.5002307891846,
-    "y": 629.777871131897,
-    "z": "f5fcb4a8.869698",
+    "x": 1122.000228881836,
+    "y": 626.777868270874,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "43f948c5.8e3c48"
+        "1050cf03.802321"
       ]
     ]
   },
   {
-    "id": "fff5fcf9.b91b7",
+    "id": "b3c8cfd5.7bea1",
     "type": "returnFailure",
     "name": "return failure",
     "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: Existing connection attachment allotted resource\" />\n    \n",
     "comments": "",
-    "x": 1836.0186100006104,
-    "y": 630.8439426422119,
-    "z": "f5fcb4a8.869698",
+    "x": 1855.5186080932617,
+    "y": 627.843939781189,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "ae16b108.dde0f",
+    "id": "293dd257.14194e",
     "type": "comment",
     "name": "Check for non existence of allotted resource",
     "info": "",
     "comments": "",
-    "x": 958.5001525878906,
-    "y": 563.7779378890991,
-    "z": "f5fcb4a8.869698",
+    "x": 978.000150680542,
+    "y": 560.7779350280762,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "ada117fc.11b638",
+    "id": "c5387b68.c01b28",
     "type": "for",
     "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
     "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1479.1666984558105,
-    "y": 774.0000503063202,
-    "z": "f5fcb4a8.869698",
+    "x": 1498.666696548462,
+    "y": 771.0000474452972,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "e40e8409.36d7f8"
+        "c340ff54.e12d9"
       ]
     ]
   },
   {
-    "id": "7d9ca6fb.249298",
+    "id": "afaa69e7.b4aba8",
     "type": "switchNode",
     "name": "switch service-data.consumed-allotted-resources_length",
     "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 661.1660232543945,
-    "y": 750.7140827178955,
-    "z": "f5fcb4a8.869698",
+    "x": 680.6660213470459,
+    "y": 747.7140798568726,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "6fbc583.8ed6aa8",
-        "2f545e93.6ba8a2"
+        "7d136f12.04ec4",
+        "c30cd80f.81caf8"
       ]
     ]
   },
   {
-    "id": "6fbc583.8ed6aa8",
+    "id": "7d136f12.04ec4",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 965.3089218139648,
-    "y": 719.5715198516846,
-    "z": "f5fcb4a8.869698",
+    "x": 984.8089199066162,
+    "y": 716.5715169906616,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "a95f5b55.d6e9b8"
+        "58b68eae.81516"
       ]
     ]
   },
   {
-    "id": "2f545e93.6ba8a2",
+    "id": "c30cd80f.81caf8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 942.3089714050293,
-    "y": 780.5714750289917,
-    "z": "f5fcb4a8.869698",
+    "x": 961.8089694976807,
+    "y": 777.5714721679688,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "7d9f20d0.5505c"
+        "7a8ccc70.38dd84"
       ]
     ]
   },
   {
-    "id": "7d9f20d0.5505c",
+    "id": "7a8ccc70.38dd84",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1102.4360618591309,
-    "y": 778.6974515914917,
-    "z": "f5fcb4a8.869698",
+    "x": 1121.9360599517822,
+    "y": 775.6974487304688,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "ada117fc.11b638",
-        "67b14806.59d9a8",
-        "458ffc55.d5db04"
+        "c5387b68.c01b28",
+        "e1e02207.f540e",
+        "9846e0ee.d12b5"
       ]
     ]
   },
   {
-    "id": "a95f5b55.d6e9b8",
+    "id": "58b68eae.81516",
     "type": "set",
     "name": "set cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n",
     "comments": "",
-    "x": 1115.1659049987793,
-    "y": 717.2855701446533,
-    "z": "f5fcb4a8.869698",
+    "x": 1134.6659030914307,
+    "y": 714.2855672836304,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "f5e2658.10ace98",
+    "id": "4a444e95.a33bb",
     "type": "set",
     "name": "set consumed allotted resources",
     "xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n",
     "comments": "",
-    "x": 590.0233154296875,
-    "y": 854.285647392273,
-    "z": "f5fcb4a8.869698",
+    "x": 609.5233135223389,
+    "y": 851.28564453125,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "67b14806.59d9a8",
+    "id": "e1e02207.f540e",
     "type": "switchNode",
     "name": "switch tmp.found-cidx",
     "xml": "<switch test='`$tmp.found-cidx`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1291.5511093139648,
-    "y": 810.7089743614197,
-    "z": "f5fcb4a8.869698",
+    "x": 1311.0511074066162,
+    "y": 807.7089715003967,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "b4f07caa.1eece"
+        "d3531383.fcd03"
       ]
     ]
   },
   {
-    "id": "b4f07caa.1eece",
+    "id": "d3531383.fcd03",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1481.5510635375977,
-    "y": 810.7089114189148,
-    "z": "f5fcb4a8.869698",
+    "x": 1501.051061630249,
+    "y": 807.7089085578918,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "9b5a2a9b.791398"
+        "40bc6162.88ce4"
       ]
     ]
   },
   {
-    "id": "9b5a2a9b.791398",
+    "id": "40bc6162.88ce4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1647.5510635375977,
-    "y": 810.7089114189148,
-    "z": "f5fcb4a8.869698",
+    "x": 1667.051061630249,
+    "y": 807.7089085578918,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "82e04cf1.4917b"
+        "ae09ce54.6bf07"
       ]
     ]
   },
   {
-    "id": "e40e8409.36d7f8",
+    "id": "c340ff54.e12d9",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1896.2783279418945,
-    "y": 771.0000772476196,
-    "z": "f5fcb4a8.869698",
+    "x": 1915.778326034546,
+    "y": 768.0000743865967,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "f29e0cd9.704ae"
+        "1d1de9d1.83f6a6"
       ]
     ]
   },
   {
-    "id": "f29e0cd9.704ae",
+    "id": "1d1de9d1.83f6a6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2078.087902069092,
-    "y": 771.464524269104,
-    "z": "f5fcb4a8.869698",
+    "x": 2097.587900161743,
+    "y": 768.464521408081,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "60273371.090a2c"
+        "a46d34eb.cac738"
       ]
     ]
   },
   {
-    "id": "82e04cf1.4917b",
+    "id": "ae09ce54.6bf07",
     "type": "set",
     "name": "set tmp.cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n",
     "comments": "",
-    "x": 1809.424446105957,
-    "y": 810.2206125259399,
-    "z": "f5fcb4a8.869698",
+    "x": 1828.9244441986084,
+    "y": 807.220609664917,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "9b1a4b9d.344fd8",
+    "id": "896433e5.65cfe",
     "type": "comment",
     "name": "Add to consumed service consumed-allotted-resources in mdsal",
     "info": "Prepare data and add to service-data",
     "comments": "",
-    "x": 682.167236328125,
-    "y": 681.0000467300415,
-    "z": "f5fcb4a8.869698",
+    "x": 701.6672344207764,
+    "y": 678.0000438690186,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "57f62d80.43fe94",
+    "id": "f08c9e13.c44cf",
     "type": "comment",
     "name": "This set resource will be added to MDSAL by provider code",
     "info": "Below we add to service-data.consumed-allotted-resource at last index",
     "comments": "",
-    "x": 669.5001525878906,
-    "y": 819.7781391143799,
-    "z": "f5fcb4a8.869698",
+    "x": 689.000150680542,
+    "y": 816.7781362533569,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "8fb59fb4.b6b0c",
-    "type": "update",
-    "name": "save AAI allotted-resource",
-    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 556.1909332275391,
-    "y": 1876.5319156646729,
-    "z": "f5fcb4a8.869698",
-    "wires": [
-      [
-        "a1966a3.5032b98",
-        "3409a13c.09f89e"
-      ]
-    ]
-  },
-  {
-    "id": "a1966a3.5032b98",
+    "id": "c88c64b6.dfe1a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 769.9527854919434,
-    "y": 1860.4844913482666,
-    "z": "f5fcb4a8.869698",
+    "x": 789.4527835845947,
+    "y": 1857.4844884872437,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "9c3ee63e.5c5548"
+        "9e7b6d53.3088c"
       ]
     ]
   },
   {
-    "id": "9c3ee63e.5c5548",
+    "id": "9e7b6d53.3088c",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 936.4766654968262,
-    "y": 1872.1035623550415,
-    "z": "f5fcb4a8.869698",
+    "x": 955.9766635894775,
+    "y": 1869.1035594940186,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "3409a13c.09f89e",
+    "id": "d0e9a590.6f6418",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 777.0480728149414,
-    "y": 1893.2464590072632,
-    "z": "f5fcb4a8.869698",
+    "x": 796.5480709075928,
+    "y": 1890.2464561462402,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "9c3ee63e.5c5548"
+        "9e7b6d53.3088c"
       ]
     ]
   },
   {
-    "id": "72ae40d1.ad37d",
+    "id": "939b0538.009728",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 552.00048828125,
-    "y": 1812.8338623046875,
-    "z": "f5fcb4a8.869698",
+    "x": 571.5004863739014,
+    "y": 1809.8338594436646,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "a332d2fb.609ff",
+    "id": "452cb6fa.b17108",
     "type": "comment",
     "name": "Set allotted resource type if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 615.5,
-    "y": 221,
-    "z": "f5fcb4a8.869698",
+    "x": 650.0000076293945,
+    "y": 252.9999942779541,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "afc1bdf5.4b836",
+    "id": "79a41f6b.cf86f",
     "type": "switchNode",
     "name": "switch allotted-resource-type",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 577.4233093261719,
-    "y": 261.5660562515259,
-    "z": "f5fcb4a8.869698",
+    "x": 611.9233169555664,
+    "y": 293.56605052948,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "cf33bc7c.594b3",
-        "977436f5.c716c8"
+        "9df4ab55.c16cf8",
+        "31f43c4.20babc4"
       ]
     ]
   },
   {
-    "id": "cf33bc7c.594b3",
+    "id": "9df4ab55.c16cf8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 780.4234619140625,
-    "y": 246.56605911254883,
-    "z": "f5fcb4a8.869698",
+    "x": 814.923469543457,
+    "y": 278.56605339050293,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "382edb8d.38df44"
+        "e98a3f5.eded9c"
       ]
     ]
   },
   {
-    "id": "977436f5.c716c8",
+    "id": "31f43c4.20babc4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 773.4232902526855,
-    "y": 286.5660791397095,
-    "z": "f5fcb4a8.869698",
+    "x": 807.9232978820801,
+    "y": 318.5660734176636,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "2162049e.dcac4c"
+        "1fb5cc66.1487a4"
       ]
     ]
   },
   {
-    "id": "2162049e.dcac4c",
+    "id": "1fb5cc66.1487a4",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n",
     "comments": "",
-    "x": 1005.4232749938965,
-    "y": 286.56608390808105,
-    "z": "f5fcb4a8.869698",
+    "x": 1039.923282623291,
+    "y": 318.56607818603516,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "689a35d2.e3d7ac",
+    "id": "fd7e59b0.bdc4b8",
     "type": "comment",
     "name": "For storage in AAI connection-attachment-topology",
     "info": "",
     "comments": "",
-    "x": 640.4999618530273,
-    "y": 356,
-    "z": "f5fcb4a8.869698",
+    "x": 659.9999599456787,
+    "y": 352.99999713897705,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "adaba0c1.0cdca",
+    "id": "80a14ec4.93ba1",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 615.4999465942383,
-    "y": 437.8889093399048,
-    "z": "f5fcb4a8.869698",
+    "x": 634.9999446868896,
+    "y": 434.88890647888184,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "bdfc2cb5.718fd",
+    "id": "77a4ea23.6f89a4",
     "type": "comment",
     "name": "Used for Put AR by id to MDSAL",
     "info": "",
     "comments": "",
-    "x": 581.5000305175781,
-    "y": 526.8889265060425,
-    "z": "f5fcb4a8.869698",
+    "x": 601.0000286102295,
+    "y": 523.8889236450195,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "882372f2.e4c61",
+    "id": "9a5ebcbf.d7c64",
     "type": "comment",
     "name": "Obtain the last index in services",
     "info": "ServiceData is added by Provider code",
     "comments": "",
-    "x": 582.9444732666016,
-    "y": 712.8888711929321,
-    "z": "f5fcb4a8.869698",
+    "x": 602.4444713592529,
+    "y": 709.8888683319092,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "9a473067.67045",
+    "id": "547adbe.09cf724",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 560.7681350708008,
-    "y": 1776.3591890335083,
-    "z": "f5fcb4a8.869698",
+    "x": 580.2681331634521,
+    "y": 1773.3591861724854,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "91b59706.e4cdc8",
+    "id": "1c8354a6.82036b",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 510.18128967285156,
-    "y": 2026.9751167297363,
-    "z": "f5fcb4a8.869698",
+    "x": 525.6813278198242,
+    "y": 2062.9751262664795,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "382edb8d.38df44",
+    "id": "e98a3f5.eded9c",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n",
     "comments": "",
-    "x": 1019.5001487731934,
-    "y": 246.99998569488525,
-    "z": "f5fcb4a8.869698",
+    "x": 1054.000156402588,
+    "y": 278.99997997283936,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "7cc17548.dbfedc",
+    "id": "1a362e33.d91322",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 862.4941558837891,
-    "y": 1625.4937295913696,
-    "z": "f5fcb4a8.869698",
+    "x": 881.9941539764404,
+    "y": 1622.4937267303467,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "d7ef6ed3.36d06",
+    "id": "47b622.5f78d9e",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 611.5002670288086,
-    "y": 1710.0001182556152,
-    "z": "f5fcb4a8.869698",
+    "x": 631.00026512146,
+    "y": 1707.0001153945923,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "5ed47414.f6a9ec",
-        "9d623053.1780e",
-        "f8eb328d.71989"
+        "b728505b.0e0f4",
+        "c43ce215.10dc2",
+        "e9e15e53.ae354"
       ]
     ]
   },
   {
-    "id": "5ed47414.f6a9ec",
+    "id": "b728505b.0e0f4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 861.1416206359863,
-    "y": 1748.3314485549927,
-    "z": "f5fcb4a8.869698",
+    "x": 880.6416187286377,
+    "y": 1745.3314456939697,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "ee36b0d3.645c5"
+        "66f7d186.f5a07"
       ]
     ]
   },
   {
-    "id": "9d623053.1780e",
+    "id": "c43ce215.10dc2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 852.1416702270508,
-    "y": 1716.8314743041992,
-    "z": "f5fcb4a8.869698",
+    "x": 871.6416683197021,
+    "y": 1713.8314714431763,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "ee36b0d3.645c5"
+        "66f7d186.f5a07"
       ]
     ]
   },
   {
-    "id": "f8eb328d.71989",
+    "id": "e9e15e53.ae354",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 855.8917083740234,
-    "y": 1687.1885791793466,
-    "z": "f5fcb4a8.869698",
+    "x": 875.3917064666748,
+    "y": 1684.1885763183236,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "3e7a6f90.4daaf"
+        "7fa6f3ff.c75f4c"
       ]
     ]
   },
   {
-    "id": "ee36b0d3.645c5",
+    "id": "66f7d186.f5a07",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1021.8917083740234,
-    "y": 1717.5814981460571,
-    "z": "f5fcb4a8.869698",
+    "x": 1041.3917064666748,
+    "y": 1714.5814952850342,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "3e7a6f90.4daaf",
+    "id": "7fa6f3ff.c75f4c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 997.5476760864258,
-    "y": 1683.3807483687997,
-    "z": "f5fcb4a8.869698",
+    "x": 1017.0476741790771,
+    "y": 1680.3807455077767,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "ca1aa6f6.be5228",
+    "id": "7e65d530.30d0fc",
     "type": "execute",
     "name": "execute RestApiCallNode - Update parent provided service AR",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 681.4999542236328,
-    "y": 1136.0001649856567,
-    "z": "f5fcb4a8.869698",
+    "x": 700.9999523162842,
+    "y": 1133.0001621246338,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "10d6c8ff.30a7e7",
-        "fdb9bed8.ececf",
-        "d7a65ee0.6afc7"
+        "b6d4488a.291cc8",
+        "59f3d9b4.dd0088",
+        "20a7e6fe.74d03a"
       ]
     ]
   },
   {
-    "id": "10d6c8ff.30a7e7",
+    "id": "b6d4488a.291cc8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 989.8080139160156,
-    "y": 1167.9984407424927,
-    "z": "f5fcb4a8.869698",
+    "x": 1009.308012008667,
+    "y": 1164.9984378814697,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "c03cc053.bc771"
+        "2d8af8d.61d7808"
       ]
     ]
   },
   {
-    "id": "fdb9bed8.ececf",
+    "id": "59f3d9b4.dd0088",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 980.8080635070801,
-    "y": 1136.4984664916992,
-    "z": "f5fcb4a8.869698",
+    "x": 1000.3080615997314,
+    "y": 1133.4984636306763,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "c03cc053.bc771"
+        "2d8af8d.61d7808"
       ]
     ]
   },
   {
-    "id": "d7a65ee0.6afc7",
+    "id": "20a7e6fe.74d03a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 984.5581016540527,
-    "y": 1106.8555713668466,
-    "z": "f5fcb4a8.869698",
+    "x": 1004.0580997467041,
+    "y": 1103.8555685058236,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "c4688568.f7e6a8"
+        "3fdd6b37.b0dbe4"
       ]
     ]
   },
   {
-    "id": "c03cc053.bc771",
+    "id": "2d8af8d.61d7808",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1150.5581016540527,
-    "y": 1137.2484903335571,
-    "z": "f5fcb4a8.869698",
+    "x": 1170.058099746704,
+    "y": 1134.2484874725342,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "c4688568.f7e6a8",
+    "id": "3fdd6b37.b0dbe4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1126.214069366455,
-    "y": 1103.0477405562997,
-    "z": "f5fcb4a8.869698",
+    "x": 1145.7140674591064,
+    "y": 1100.0477376952767,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a0df30e.6ab87",
+    "id": "fef74984.54b2d8",
     "type": "comment",
     "name": "Put the parent allotted resource in mdsal",
     "info": "",
     "comments": "",
-    "x": 610.4999008178711,
-    "y": 1098.0000715255737,
-    "z": "f5fcb4a8.869698",
+    "x": 629.9998989105225,
+    "y": 1095.0000686645508,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "2adeb8b.a94ce48",
+    "id": "b279212f.2876c",
     "type": "set",
     "name": "set connection-attachment-ar-identifiers",
     "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
     "comments": "",
-    "x": 606.8570861816406,
-    "y": 1300.5716905593872,
-    "z": "f5fcb4a8.869698",
+    "x": 626.357084274292,
+    "y": 1297.5716876983643,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "a07927be.544a08",
+    "id": "17bffa68.c6e1f6",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />",
     "comments": "",
-    "x": 520.7138671875,
-    "y": 1268.3810472488403,
-    "z": "f5fcb4a8.869698",
+    "x": 540.2138652801514,
+    "y": 1265.3810443878174,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "c51e932f.b0db6",
+    "id": "624c4802.103f08",
     "type": "set",
     "name": "set identifiers in overall structure",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n",
     "comments": "",
-    "x": 585.6668853759766,
-    "y": 1334.6668758392334,
-    "z": "f5fcb4a8.869698",
+    "x": 605.1668834686279,
+    "y": 1331.6668729782104,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "16ace716.f64f39",
+    "id": "15e63162.783f4f",
     "type": "execute",
     "name": "execute getTime",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 537.9997253417969,
-    "y": 1408.0004034042358,
-    "z": "f5fcb4a8.869698",
+    "x": 557.4997234344482,
+    "y": 1405.000400543213,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "91c11379.3848",
+    "id": "4d0b157.d3d26ec",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 588.9867630004883,
-    "y": 1463.951636314392,
-    "z": "f5fcb4a8.869698",
+    "x": 608.4867610931396,
+    "y": 1460.9516334533691,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "c018ef66.ea6f",
+    "id": "7b0dce99.088f9",
     "type": "set",
     "name": "set model-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
     "comments": "",
-    "x": 533.5553817749023,
-    "y": 1369.5557613372803,
-    "z": "f5fcb4a8.869698",
+    "x": 553.0553798675537,
+    "y": 1366.5557584762573,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "34c8d9e7.5935d6",
+    "id": "3f9a586f.0ed898",
     "type": "comment",
     "name": "Prepare data for allotted-resource addition to MDSAL",
     "info": "This will add to allotted-resource which is present inside service.",
     "comments": "",
-    "x": 650.8888702392578,
-    "y": 1234.5556077957153,
-    "z": "f5fcb4a8.869698",
+    "x": 670.3888683319092,
+    "y": 1231.5556049346924,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "506bd024.3cd4a",
+    "id": "5f01282.a94d0d8",
     "type": "execute",
     "name": "generate parent-ar url - replace allotted-resource-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 646.0000152587891,
-    "y": 1062.0000104904175,
-    "z": "f5fcb4a8.869698",
+    "x": 665.5000133514404,
+    "y": 1059.0000076293945,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "458e8426.a4810c",
+    "id": "9851c050.afe45",
     "type": "execute",
     "name": "generate parent-ar url - replace service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 641.9999389648438,
-    "y": 1019.0001468658447,
-    "z": "f5fcb4a8.869698",
+    "x": 661.4999370574951,
+    "y": 1016.0001440048218,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "cd63ec4b.ff1cb",
+    "id": "e506fda2.8d2ea",
     "type": "comment",
     "name": "Prepare Parent AR URL",
     "info": "Preparation to set provided-allotted-resource in parent service instance",
     "comments": "",
-    "x": 560.0003967285156,
-    "y": 948.0001001358032,
-    "z": "f5fcb4a8.869698",
+    "x": 579.500394821167,
+    "y": 945.0000972747803,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "3342f593.51121a",
+    "id": "77c3364e.f87538",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 599.0001907348633,
-    "y": 981.5000395774841,
-    "z": "f5fcb4a8.869698",
+    "x": 618.5001888275146,
+    "y": 978.5000367164612,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "367a31a2.e26f2e",
+    "id": "92f0d3fa.a1c8f",
     "type": "comment",
     "name": "Required for filling template values",
     "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters",
     "comments": "",
-    "x": 788.500358581543,
-    "y": 1588.4998025894165,
-    "z": "f5fcb4a8.869698",
+    "x": 808.0003566741943,
+    "y": 1585.4997997283936,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "60273371.090a2c",
+    "id": "a46d34eb.cac738",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n",
     "comments": "",
-    "x": 2156.2569732666016,
-    "y": 819.6458292007446,
-    "z": "f5fcb4a8.869698",
+    "x": 2175.756971359253,
+    "y": 816.6458263397217,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "458ffc55.d5db04",
+    "id": "9846e0ee.d12b5",
     "type": "set",
     "name": "set tmp.found-cidx",
     "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
     "comments": "",
-    "x": 1282.1461448669434,
-    "y": 731.3125722408295,
-    "z": "f5fcb4a8.869698",
+    "x": 1301.6461429595947,
+    "y": 728.3125693798065,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "9861d990.de9418",
+    "id": "8a1a8721.8ed3e8",
     "type": "comment",
     "name": "Add to parent services provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 670.7015075683594,
-    "y": 915.9792566299438,
-    "z": "f5fcb4a8.869698",
+    "x": 690.2015056610107,
+    "y": 912.9792537689209,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "3b543dd4.ce0012",
+    "id": "1b0d53ce.9a266c",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 591.4686965942383,
-    "y": 1201.968936920166,
-    "z": "f5fcb4a8.869698",
+    "x": 610.9686946868896,
+    "y": 1198.968934059143,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "43f948c5.8e3c48",
+    "id": "1050cf03.802321",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1264.500051498413,
-    "y": 629.2777605056763,
-    "z": "f5fcb4a8.869698",
+    "x": 1284.0000495910645,
+    "y": 626.2777576446533,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "8dd70ad1.fb4fc8"
+        "e1fb702b.b9339"
       ]
     ]
   },
   {
-    "id": "8dd70ad1.fb4fc8",
+    "id": "e1fb702b.b9339",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1452.3574314117432,
-    "y": 629.8968958854675,
-    "z": "f5fcb4a8.869698",
+    "x": 1471.8574295043945,
+    "y": 626.8968930244446,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "fbc1bfeb.141c9"
+        "e440f3e0.a28bd"
       ]
     ]
   },
   {
-    "id": "fbc1bfeb.141c9",
+    "id": "e440f3e0.a28bd",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1651.6905536651611,
-    "y": 629.8969745635986,
-    "z": "f5fcb4a8.869698",
+    "x": 1671.1905517578125,
+    "y": 626.8969717025757,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "fff5fcf9.b91b7"
+        "b3c8cfd5.7bea1"
       ]
     ]
   },
   {
-    "id": "cfbbadf0.d1c3a",
+    "id": "908c2ae3.c4f938",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 736.5000534057617,
-    "y": 624.000036239624,
-    "z": "f5fcb4a8.869698",
+    "x": 756.0000514984131,
+    "y": 621.0000333786011,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "cd668aab.887ef8",
-        "bae083e9.e29fb"
+        "43d96423.28d03c",
+        "4feb08ba.5bc668"
       ]
     ]
   },
   {
-    "id": "bae083e9.e29fb",
+    "id": "4feb08ba.5bc668",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1104.5000839233398,
-    "y": 594.0000343322754,
-    "z": "f5fcb4a8.869698",
+    "x": 1124.0000820159912,
+    "y": 591.0000314712524,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "3e8fa261.9dd48e"
+        "83e21d77.f2154"
       ]
     ]
   },
   {
-    "id": "3e8fa261.9dd48e",
+    "id": "83e21d77.f2154",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1256.5000839233398,
-    "y": 593.0000343322754,
-    "z": "f5fcb4a8.869698",
+    "x": 1276.0000820159912,
+    "y": 590.0000314712524,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "e88d2834.1fdcf8",
+    "id": "323f6bf8.18f834",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 533.0556106567383,
-    "y": 1543.6666536331177,
-    "z": "f5fcb4a8.869698",
+    "x": 552.5556087493896,
+    "y": 1540.6666507720947,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "89eae9c8.150108",
-        "7cc17548.dbfedc"
+        "e3e339e2.fb2158",
+        "1a362e33.d91322"
       ]
     ]
   },
   {
-    "id": "89eae9c8.150108",
+    "id": "e3e339e2.fb2158",
     "type": "for",
     "name": "for each sotn-get-request-input-param",
     "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 803.0556755065918,
-    "y": 1543.6667013168335,
-    "z": "f5fcb4a8.869698",
+    "x": 822.5556735992432,
+    "y": 1540.6666984558105,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "a8e3f2e1.dc676"
+        "bbd24f47.537d9"
       ]
     ]
   },
   {
-    "id": "2789cf1d.918af",
+    "id": "efeae286.69244",
     "type": "comment",
     "name": "Take the parameter names by removing prefix",
     "info": "",
     "comments": "",
-    "x": 1343.0554580688477,
-    "y": 1499.6667346954346,
-    "z": "f5fcb4a8.869698",
+    "x": 1362.555456161499,
+    "y": 1496.6667318344116,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "b944f1f.576e11",
+    "id": "7418c4f0.7b725c",
     "type": "execute",
     "name": "execute split parameterName",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1301.0901260375977,
-    "y": 1534.6458778381348,
-    "z": "f5fcb4a8.869698",
+    "x": 1320.590124130249,
+    "y": 1531.6458749771118,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "ab8b4370.c5cdb",
+    "id": "91cb2a09.3ae8f8",
     "type": "set",
     "name": "set parameterName",
     "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
     "comments": "",
-    "x": 1271.534652709961,
-    "y": 1567.6458778381348,
-    "z": "f5fcb4a8.869698",
+    "x": 1291.0346508026123,
+    "y": 1564.6458749771118,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "426abdbb.ca9194",
+    "id": "6e625d6.e7e6ea4",
     "type": "comment",
     "name": "Remove VNFC prefix",
     "info": "",
     "comments": "",
-    "x": 744.0556030273438,
-    "y": 1511.1110153198242,
-    "z": "f5fcb4a8.869698",
+    "x": 763.5556011199951,
+    "y": 1508.1110124588013,
+    "z": "6ade2963.0875b8",
     "wires": []
   },
   {
-    "id": "a8e3f2e1.dc676",
+    "id": "bbd24f47.537d9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1050.0555114746094,
-    "y": 1542.1110458374023,
-    "z": "f5fcb4a8.869698",
+    "x": 1069.5555095672607,
+    "y": 1539.1110429763794,
+    "z": "6ade2963.0875b8",
     "wires": [
       [
-        "b944f1f.576e11",
-        "ab8b4370.c5cdb"
+        "7418c4f0.7b725c",
+        "91cb2a09.3ae8f8"
       ]
     ]
   },
   {
-    "id": "c224a6bb.b7b288",
-    "type": "save",
-    "name": "save srcLTP relationship in AAI",
-    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource:relationship-list\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
+    "id": "ef225a8b.70ebd8",
+    "type": "set",
+    "name": "set src-ltpId",
+    "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`\" />\n",
+    "comments": "",
+    "x": 529.0000972747803,
+    "y": 1930.0003395080566,
+    "z": "6ade2963.0875b8",
+    "wires": []
+  },
+  {
+    "id": "16153237.cff69e",
+    "type": "update",
+    "name": "save AAI allotted-resource",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='allotted-resource' \n      key='customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id' >        \n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 569.5040016174316,
-    "y": 1976.004249572754,
-    "z": "f5fcb4a8.869698",
+    "x": 579.0039520263672,
+    "y": 1870.5039854049683,
+    "z": "6ade2963.0875b8",
+    "wires": [
+      [
+        "c88c64b6.dfe1a8",
+        "d0e9a590.6f6418"
+      ]
+    ]
+  },
+  {
+    "id": "5054f74f.3fad08",
+    "type": "save",
+    "name": "save srcLTP relationship in AAI",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource:relationship-list\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 579.3170623779297,
+    "y": 1976.9767112731934,
+    "z": "6ade2963.0875b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "c765719e.98d15",
-    "type": "set",
-    "name": "set src-ltpId",
-    "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`\" />\n",
+    "id": "9ff190ab.bed71",
+    "type": "save",
+    "name": "save allotted relationship in AAI",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:relationship-list\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id\" \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"allotted-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/business/customers/customer/' + $connection-attachment-topology-operation-input.service-information.global-customer-id + '/service-subscriptions/service-subscription/' + $connection-attachment-topology-operation-input.service-information.subscription-service-type + '/service-instances/service-instance/' + $connection-attachment-topology-operation-input.service-information.service-instance-id + '/allotted-resources/allotted-resource/' + $tmp.ar.allotted-resource-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"allotted-resource.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\n\n\n",
     "comments": "",
-    "x": 509.5000991821289,
-    "y": 1933.0003423690796,
-    "z": "f5fcb4a8.869698",
-    "wires": []
+    "outputs": 1,
+    "x": 577.3130798339844,
+    "y": 2015.9724407196045,
+    "z": "6ade2963.0875b8",
+    "wires": [
+      []
+    ]
   }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
index be0e169..a0faa6a 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "4cfb64e6.6e881c",
+    "id": "b0d71f3f.58b13",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 94,
+    "x": 123,
     "y": 32,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "12c465a6.56166a"
+        "962f9112.e764e"
       ]
     ]
   },
   {
-    "id": "12c465a6.56166a",
+    "id": "962f9112.e764e",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1924 +22,1996 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 275.00000381469727,
+    "x": 304.00000381469727,
     "y": 92.0000171661377,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "2a9804fb.335a2c"
+        "87a8de44.934de"
       ]
     ]
   },
   {
-    "id": "2a9804fb.335a2c",
+    "id": "87a8de44.934de",
     "type": "method",
     "name": "sotn-attachment-topology-operation-deactivate",
     "xml": "<method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 263.0001220703125,
+    "x": 292.0001220703125,
     "y": 180,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "8ef7baf0.8ab7b8"
+        "b2d80288.ba823"
       ]
     ]
   },
   {
-    "id": "8ef7baf0.8ab7b8",
+    "id": "b2d80288.ba823",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 279.0001220703125,
+    "x": 308.0001220703125,
     "y": 735.0002446174622,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "7071662b.7233c8",
-        "3ad2f841.5f9c18",
-        "e4bfecd2.3089e",
-        "8d649aff.9610f8",
-        "76bb0e72.4c9e6",
-        "cfcc4cd.498b3b",
-        "d2afdfc8.3d49c",
-        "ff0d92e9.55c77",
-        "db753550.5e2778",
-        "6873bae7.8cf8e4",
-        "7a073085.0e81c",
-        "6fa8d61c.7e4378",
-        "39d4dd71.5f1112",
-        "d845a062.e24db",
-        "9b7849da.439398",
-        "5b4906aa.434008",
-        "485e569f.2b52d8",
-        "417e0490.1d34dc",
-        "d67f9f52.31c1f",
-        "2a0b728c.4f365e"
+        "6613ec86.694124",
+        "f6decbbf.dd5e18",
+        "1fbc45c.0ff5aba",
+        "bc709271.507d8",
+        "1c40b1f3.81976e",
+        "4f9b598.14771a8",
+        "8522b683.befcf8",
+        "62f18656.44cfe8",
+        "683cb14.3ce605",
+        "c2e56bca.b33d78",
+        "802f8ef7.b6731",
+        "5c1eba3c.5a3914",
+        "d3793c0a.e76dd",
+        "a3a48876.1d8a18",
+        "7ccf367e.a869f8",
+        "2c211a2d.e90676",
+        "693977cc.87d158",
+        "c0b8662.2083398",
+        "fada7ab3.d1d4e8",
+        "cfef8c40.7d401"
       ]
     ]
   },
   {
-    "id": "7071662b.7233c8",
+    "id": "6613ec86.694124",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id,etc",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 675.9935607910156,
+    "x": 704.9935607910156,
     "y": 133.9934868812561,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "f3d4b61.bd26248",
+    "id": "c64c0419.fa25b8",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 704.9538726806641,
+    "x": 733.9538726806641,
     "y": 98.02528285980225,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "3ad2f841.5f9c18",
+    "id": "f6decbbf.dd5e18",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 629.9934997558594,
+    "x": 658.9934997558594,
     "y": 226.99349212646484,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "76bb0e72.4c9e6",
+    "id": "1c40b1f3.81976e",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 636.2553901672363,
+    "x": 665.2553901672363,
     "y": 314.6602210998535,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "e4bfecd2.3089e",
+    "id": "1fbc45c.0ff5aba",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 686.2554931640625,
+    "x": 715.2554931640625,
     "y": 401.66022205352783,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "12a5d929.d1ab27",
+    "id": "61a9d102.2b159",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 729.8084869384766,
+    "x": 758.8084869384766,
     "y": 472.53876876831055,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "d0fe36b8.253ae8",
+    "id": "e3f68d6f.a262e",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 683.9935302734375,
+    "x": 712.9935302734375,
     "y": 193.993501663208,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "b80d794b.4e9278",
+    "id": "b492f1ea.34bc2",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 701.9934959411621,
+    "x": 730.9934959411621,
     "y": 279.8823823928833,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "cbbc01c9.a6bad",
+    "id": "d53312d8.be37d",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 727.9935150146484,
+    "x": 756.9935150146484,
     "y": 366.8823413848877,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "dd903f73.c503a",
+    "id": "e963cad3.e8d6c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1170.6668281555176,
+    "x": 1199.6668281555176,
     "y": 520.0000286102295,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "a2e7e6e6.009bb8"
+        "8ab48cf9.6862d"
       ]
     ]
   },
   {
-    "id": "a2e7e6e6.009bb8",
+    "id": "8ab48cf9.6862d",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1339.6668319702148,
+    "x": 1368.6668319702148,
     "y": 518.4999294281006,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "40901b07.2b8a34"
+        "46b50e5a.245ae"
       ]
     ]
   },
   {
-    "id": "40901b07.2b8a34",
+    "id": "46b50e5a.245ae",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1512.5241012573242,
+    "x": 1541.5241012573242,
     "y": 456.11909198760986,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "ff35eb42.56bb08",
-        "269f23f1.ccbfdc"
+        "13dfccaf.a022c3",
+        "30d435f0.aca96a"
       ]
     ]
   },
   {
-    "id": "ff35eb42.56bb08",
+    "id": "13dfccaf.a022c3",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1749.8573455810547,
+    "x": 1778.8573455810547,
     "y": 434.1190423965454,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "51f5ccd7.88acc4"
+        "2fbac1bd.15b6ee"
       ]
     ]
   },
   {
-    "id": "51f5ccd7.88acc4",
+    "id": "2fbac1bd.15b6ee",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1934.3812351226807,
+    "x": 1963.3812351226807,
     "y": 431.02387619018555,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "6cd3d1da.71f58",
-        "b9e7534b.5d3c7",
-        "69d088e.2321178"
+        "5bdbcf18.37ca8",
+        "cbe39501.d4aef8",
+        "a9187100.e70c6"
       ]
     ]
   },
   {
-    "id": "608eef9f.ff52c",
+    "id": "6cd8cd98.bbac14",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1858.5190773010254,
+    "x": 1887.5190773010254,
     "y": 556.0661172866821,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "5569926e.6ec77c",
+    "id": "489ff5d2.164b7c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1162.5186309814453,
+    "x": 1191.5186309814453,
     "y": 555.0661134719849,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "8fd3c2e7.8c13"
+        "6d0a26d5.df63e8"
       ]
     ]
   },
   {
-    "id": "8fd3c2e7.8c13",
+    "id": "6d0a26d5.df63e8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1342.5185813903809,
+    "x": 1371.5185813903809,
     "y": 555.7326641082764,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "608eef9f.ff52c"
+        "6cd8cd98.bbac14"
       ]
     ]
   },
   {
-    "id": "269f23f1.ccbfdc",
+    "id": "30d435f0.aca96a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1738.1852989196777,
+    "x": 1767.1852989196777,
     "y": 471.3994026184082,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "608eef9f.ff52c"
+        "6cd8cd98.bbac14"
       ]
     ]
   },
   {
-    "id": "6cd3d1da.71f58",
+    "id": "5bdbcf18.37ca8",
     "type": "set",
     "name": "set connection-attachment-ar from get",
     "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
     "comments": "",
-    "x": 2180.444793701172,
+    "x": 2209.444793701172,
     "y": 391.0001058578491,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "69d088e.2321178",
+    "id": "a9187100.e70c6",
     "type": "set",
     "name": "set oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
     "comments": "",
-    "x": 2113.4447898864746,
+    "x": 2142.4447898864746,
     "y": 481.42866039276123,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "b9e7534b.5d3c7",
+    "id": "cbe39501.d4aef8",
     "type": "switchNode",
     "name": "switch order-status",
     "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2124.444625854492,
+    "x": 2153.444625854492,
     "y": 435.0001096725464,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "e31f34a6.200f98",
-        "4be6cb8d.440694"
+        "1d7c3fd4.3573f",
+        "34a89ac4.b608e6"
       ]
     ]
   },
   {
-    "id": "e31f34a6.200f98",
+    "id": "1d7c3fd4.3573f",
     "type": "outcome",
     "name": "outcome Active",
     "xml": "<outcome value='Active'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2331.044574737549,
+    "x": 2360.044574737549,
     "y": 425.0001096725464,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "3c41da84.a11fe6"
+        "fffa8dec.2b92a"
       ]
     ]
   },
   {
-    "id": "4be6cb8d.440694",
+    "id": "34a89ac4.b608e6",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2330.7590942382812,
+    "x": 2359.7590942382812,
     "y": 467.4287004470825,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "4f30d53e.7d564c"
+        "31994932.765476"
       ]
     ]
   },
   {
-    "id": "3c41da84.a11fe6",
+    "id": "fffa8dec.2b92a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2483.5151290893555,
+    "x": 2512.5151290893555,
     "y": 423.3757600784302,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "4f30d53e.7d564c",
+    "id": "31994932.765476",
     "type": "returnFailure",
     "name": "return failure",
     "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
     "comments": "",
-    "x": 2503.6669845581055,
+    "x": 2532.6669845581055,
     "y": 464.000111579895,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "b70a2f75.befcc",
+    "id": "ade228e6.1238f8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 891.3031158447266,
+    "x": 920.3031158447266,
     "y": 616.4935908317566,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "cfcc4cd.498b3b",
+    "id": "4f9b598.14771a8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 588.3092803955078,
+    "x": 617.3092803955078,
     "y": 617.4999389648438,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "b70a2f75.befcc"
+        "ade228e6.1238f8"
       ]
     ]
   },
   {
-    "id": "11cd074.969d5f9",
+    "id": "2ee127b4.83e818",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 770.0004425048828,
+    "x": 799.0004425048828,
     "y": 678.5316982269287,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "9f5cf8a1.eb07d8",
+    "id": "ac0c0701.4d5818",
     "type": "for",
     "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1660.1849975585938,
+    "x": 1689.1849975585938,
     "y": 882.0040826797485,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "60ecfe73.436f5"
+        "6de65a21.ad20a4"
       ]
     ]
   },
   {
-    "id": "99b7fbfe.94a448",
+    "id": "cf2de8b0.5bcd28",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1066.3269691467285,
+    "x": 1095.3269691467285,
     "y": 1014.5755434036255,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "6439feba.07b8e"
+        "75a0a72c.5c3178"
       ]
     ]
   },
   {
-    "id": "bdbde57e.1f4d78",
+    "id": "2c958bf6.015ea4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1257.4543704986572,
+    "x": 1286.4543704986572,
     "y": 879.7015712037683,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "9f5cf8a1.eb07d8"
+        "ac0c0701.4d5818"
       ]
     ]
   },
   {
-    "id": "60ecfe73.436f5",
+    "id": "6de65a21.ad20a4",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2095.296398162842,
+    "x": 2124.296398162842,
     "y": 882.0039796829224,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "1a655308.b661fd",
-        "be68f27f.28bd6"
+        "9440a4ce.27b3b8",
+        "44e5c372.52cc1c"
       ]
     ]
   },
   {
-    "id": "1a655308.b661fd",
+    "id": "9440a4ce.27b3b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2304.106746673584,
+    "x": 2333.106746673584,
     "y": 862.4684362411499,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "9a95bbc4.4906f8"
+        "ce614dfc.389e4"
       ]
     ]
   },
   {
-    "id": "b3792237.47167",
+    "id": "5d89c62c.f1ebc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2452.867500305176,
+    "x": 2481.867500305176,
     "y": 898.3256177902222,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "5c963186.53d88"
+        "12052b78.fd51b5"
       ]
     ]
   },
   {
-    "id": "5c963186.53d88",
+    "id": "12052b78.fd51b5",
     "type": "set",
     "name": "set tmp.pidx and ptx.consumed-ar",
     "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
     "comments": "",
-    "x": 2687.724937438965,
+    "x": 2716.724937438965,
     "y": 896.8971490859985,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "bd64de18.15892",
+    "id": "2107b4e5.fcdf0c",
     "type": "comment",
     "name": "Check existence of other AR in parent service data",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 693.9628448486328,
+    "x": 722.9628448486328,
     "y": 848.8929204940796,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "7e8c22a4.61fc8c",
+    "id": "103b0ff7.ad1fb",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1076.9793167114258,
+    "x": 1105.9793167114258,
     "y": 949.677264213562,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "c4a79f00.128a8"
+        "61e7696e.e32818"
       ]
     ]
   },
   {
-    "id": "6439feba.07b8e",
+    "id": "75a0a72c.5c3178",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1238.9793128967285,
+    "x": 1267.9793128967285,
     "y": 1013.677285194397,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "2061f78c.10bc08",
+    "id": "4057b675.85b588",
     "type": "other",
     "name": "outcome 2",
     "xml": "<outcome value='2'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1082.9793910980225,
+    "x": 1111.9793910980225,
     "y": 880.6772715821862,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "bdbde57e.1f4d78"
+        "2c958bf6.015ea4"
       ]
     ]
   },
   {
-    "id": "9a95bbc4.4906f8",
+    "id": "ce614dfc.389e4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2433.090805053711,
+    "x": 2462.090805053711,
     "y": 857.6771764755249,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "be68f27f.28bd6",
+    "id": "44e5c372.52cc1c",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2304.0907974243164,
+    "x": 2333.0907974243164,
     "y": 896.6771802902222,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "b3792237.47167"
+        "5d89c62c.f1ebc8"
       ]
     ]
   },
   {
-    "id": "de57d171.2f008",
+    "id": "4960bf69.46744",
     "type": "switchNode",
     "name": "switch mdsal-psd.networks_length",
     "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1489.3129959106445,
+    "x": 1518.3129959106445,
     "y": 952.8997611999512,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "2dedf29c.7f1aee",
-        "754f989d.208718"
+        "21a6ff32.cc535",
+        "fd1b6df1.cb9a8"
       ]
     ]
   },
   {
-    "id": "754f989d.208718",
+    "id": "fd1b6df1.cb9a8",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1719.3130187988281,
+    "x": 1748.3130187988281,
     "y": 928.7885932922363,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "55c6b97a.4d77c8"
+        "bb9fff84.461e"
       ]
     ]
   },
   {
-    "id": "2dedf29c.7f1aee",
+    "id": "21a6ff32.cc535",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1713.3131408691406,
+    "x": 1742.3131408691406,
     "y": 988.7885932922363,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "f186a46c.9bf998"
+        "8d4e5f2f.b2054"
       ]
     ]
   },
   {
-    "id": "f186a46c.9bf998",
+    "id": "8d4e5f2f.b2054",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n    \n",
     "comments": "",
-    "x": 1885.9655265808105,
+    "x": 1914.9655265808105,
     "y": 988.8903999328613,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "30d37efb.acb512",
+    "id": "e3b0ecf2.4e878",
     "type": "set",
     "name": "set tmp.network.",
     "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n",
     "comments": "",
-    "x": 2087.757942199707,
+    "x": 2116.757942199707,
     "y": 918.7887525558472,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "c4a79f00.128a8",
+    "id": "61e7696e.e32818",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1249.423671722412,
+    "x": 1278.423671722412,
     "y": 950.7885122299194,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "de57d171.2f008"
+        "4960bf69.46744"
       ]
     ]
   },
   {
-    "id": "55c6b97a.4d77c8",
+    "id": "bb9fff84.461e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1887.090690612793,
+    "x": 1916.090690612793,
     "y": 947.7884273529053,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "30d37efb.acb512",
-        "71f1a549.c26fcc"
+        "e3b0ecf2.4e878",
+        "2162bd86.35e6f2"
       ]
     ]
   },
   {
-    "id": "71f1a549.c26fcc",
+    "id": "2162bd86.35e6f2",
     "type": "for",
     "name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
     "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 2263.09130859375,
+    "x": 2292.09130859375,
     "y": 990.7884349822998,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "7875ac99.845f44"
+        "15f15c9c.6120f3"
       ]
     ]
   },
   {
-    "id": "7875ac99.845f44",
+    "id": "15f15c9c.6120f3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2586.6469688415527,
+    "x": 2615.6469688415527,
     "y": 991.7885122299194,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "e81ff7c1.f7c6b8",
-        "bdffba6f.6b28d8"
+        "1f8bf049.48a41",
+        "24ef27d4.5acd08"
       ]
     ]
   },
   {
-    "id": "e81ff7c1.f7c6b8",
+    "id": "1f8bf049.48a41",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 2765.1570739746094,
+    "x": 2794.1570739746094,
     "y": 975.7989301681519,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "e7b692af.0dd02"
+        "8ecdc6ef.8a8ce8"
       ]
     ]
   },
   {
-    "id": "e7b692af.0dd02",
+    "id": "8ecdc6ef.8a8ce8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2952.1570739746094,
+    "x": 2981.1570739746094,
     "y": 976.7989301681519,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "bf146f7a.eb901"
+        "5c66b7eb.d5bf28"
       ]
     ]
   },
   {
-    "id": "bf146f7a.eb901",
+    "id": "5c66b7eb.d5bf28",
     "type": "set",
     "name": "set tmp.found-in-network tmp.ep-available",
     "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
     "comments": "",
-    "x": 3203.157081604004,
+    "x": 3232.157081604004,
     "y": 976.3988723754883,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "bdffba6f.6b28d8",
+    "id": "24ef27d4.5acd08",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 2748.14697265625,
+    "x": 2777.14697265625,
     "y": 1020.7885293960571,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "8d649aff.9610f8",
+    "id": "bc709271.507d8",
     "type": "switchNode",
     "name": "switch tmp.ep-available",
     "xml": "<switch test='`$tmp.ep-available`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 625.3128662109375,
+    "x": 654.3128662109375,
     "y": 1153.2327852249146,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "4f8ffbf3.76c804",
-        "5d810111.f89bf"
+        "18bdb942.c7be37",
+        "343945c7.6ea6fa"
       ]
     ]
   },
   {
-    "id": "5d810111.f89bf",
+    "id": "343945c7.6ea6fa",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 807.9797019958496,
+    "x": 836.9797019958496,
     "y": 1177.5661935806274,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "fc624863.8ed628"
+        "eb3e9e9.a810a6"
       ]
     ]
   },
   {
-    "id": "4f8ffbf3.76c804",
+    "id": "18bdb942.c7be37",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 810.8684730529785,
+    "x": 839.8684730529785,
     "y": 1116.566291809082,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "95d9e1c5.ffafd"
+        "33d109a0.0b3696"
       ]
     ]
   },
   {
-    "id": "95d9e1c5.ffafd",
+    "id": "33d109a0.0b3696",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 947.8685493469238,
+    "x": 976.8685493469238,
     "y": 1115.4551057815552,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc624863.8ed628",
+    "id": "eb3e9e9.a810a6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 978.0907897949219,
+    "x": 1007.0907897949219,
     "y": 1175.5661516189575,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "36542d01.f14212"
+        "d5bc9567.22f988"
       ]
     ]
   },
   {
-    "id": "1ad5d4a1.aaa1eb",
+    "id": "eba7f62b.bd7668",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2163.472946166992,
+    "x": 2192.472946166992,
     "y": 355.5039691925049,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "d24d901f.d9d76",
+    "id": "2d6b93ab.08655c",
     "type": "comment",
     "name": "Set source end point",
     "info": "",
     "comments": "",
-    "x": 601.9728393554688,
+    "x": 630.9728393554688,
     "y": 585.2540645599365,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "d2afdfc8.3d49c",
+    "id": "8522b683.befcf8",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 654.9689178466797,
+    "x": 683.9689178466797,
     "y": 710.0002088546753,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "7153ec61.6a9434",
+    "id": "773fbfc3.82918",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1032.9689140319824,
+    "x": 1061.9689140319824,
     "y": 759.000207901001,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "90308511.d0d098"
+        "e1e0569.afbf9a8"
       ]
     ]
   },
   {
-    "id": "f1d188a0.fe8058",
+    "id": "be2f70a0.4132d",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1024.8207168579102,
+    "x": 1053.8207168579102,
     "y": 794.0662927627563,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "f851790f.ede818"
+        "82d58d98.da526"
       ]
     ]
   },
   {
-    "id": "f851790f.ede818",
+    "id": "82d58d98.da526",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1199.9694023132324,
+    "x": 1228.9694023132324,
     "y": 790.3336429595947,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "90308511.d0d098",
+    "id": "e1e0569.afbf9a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1183.9689140319824,
+    "x": 1212.9689140319824,
     "y": 757.000207901001,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "ff0d92e9.55c77",
+    "id": "62f18656.44cfe8",
     "type": "set",
     "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
     "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
     "comments": "",
-    "x": 741.9689102172852,
+    "x": 770.9689102172852,
     "y": 884.0001821517944,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "717c1a02.c09b54",
+    "id": "ba6cedb4.1637d",
     "type": "comment",
     "name": "If other EP exists delete from domain controller",
     "info": "",
     "comments": "",
-    "x": 675.9688110351562,
+    "x": 704.9688110351562,
     "y": 1077.999997138977,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "b5225e87.1d6d6",
+    "id": "84d93cd2.2a2bf",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 2680.96964263916,
-    "y": 1375.0004262924194,
-    "z": "c671301.759d0d",
+    "x": 2702.969627380371,
+    "y": 1368.0005893707275,
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "a7698ae.d89d278",
+    "id": "3c2c4321.6e016c",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "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.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2244.469581604004,
-    "y": 1434.0004262924194,
-    "z": "c671301.759d0d",
+    "x": 2266.469566345215,
+    "y": 1427.0005893707275,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "f44dc730.296008",
-        "1e7b258.a67f1db",
-        "565f7f73.66ef7"
+        "b9c78202.065c4",
+        "b1e4c467.b20658",
+        "7cb01101.04dc1"
       ]
     ]
   },
   {
-    "id": "f44dc730.296008",
+    "id": "b9c78202.065c4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2483.469581604004,
-    "y": 1387.0004262924194,
-    "z": "c671301.759d0d",
+    "x": 2505.469566345215,
+    "y": 1380.0005893707275,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "b5225e87.1d6d6"
+        "84d93cd2.2a2bf"
       ]
     ]
   },
   {
-    "id": "1e7b258.a67f1db",
+    "id": "b1e4c467.b20658",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2486.960548400879,
-    "y": 1434.5744619369507,
-    "z": "c671301.759d0d",
+    "x": 2508.96053314209,
+    "y": 1427.5746250152588,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "b82d2ebf.1a1b3"
+        "912e3892.c38738"
       ]
     ]
   },
   {
-    "id": "565f7f73.66ef7",
+    "id": "7cb01101.04dc1",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2482.293556213379,
-    "y": 1475.907774925232,
-    "z": "c671301.759d0d",
+    "x": 2504.29354095459,
+    "y": 1468.90793800354,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "a1bb007f.4a95b"
+        "ba048e79.e103b"
       ]
     ]
   },
   {
-    "id": "b82d2ebf.1a1b3",
+    "id": "912e3892.c38738",
     "type": "returnFailure",
     "name": "return failure",
     "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 2663.5319595336914,
-    "y": 1422.860198020935,
-    "z": "c671301.759d0d",
+    "x": 2685.5319442749023,
+    "y": 1415.8603610992432,
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "a1bb007f.4a95b",
+    "id": "ba048e79.e103b",
     "type": "returnFailure",
     "name": "return failure",
     "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 2670.0661125183105,
-    "y": 1471.3469676971436,
-    "z": "c671301.759d0d",
+    "x": 2692.0660972595215,
+    "y": 1464.3471307754517,
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "41073eca.4f87f",
+    "id": "ac6b10fc.018ca",
     "type": "get-resource",
     "name": "get-resource pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.node-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2186.9697341918945,
+    "x": 2215.9697341918945,
     "y": 1319.000418663025,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "ea378f67.57494",
-        "868c9cb5.9db7b",
-        "3a1faec8.e90752"
+        "7d25011f.79dd3",
+        "abbaec43.33e1c",
+        "9bfad8e.2252b28"
       ]
     ]
   },
   {
-    "id": "ea378f67.57494",
+    "id": "7d25011f.79dd3",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2374.9697494506836,
+    "x": 2403.9697494506836,
     "y": 1265.0004110336304,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "1d2ccfbd.a8cd2"
+        "addfa25b.c3718"
       ]
     ]
   },
   {
-    "id": "868c9cb5.9db7b",
+    "id": "abbaec43.33e1c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2380.460796356201,
+    "x": 2409.460796356201,
     "y": 1307.5743074417114,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "9b840dcb.a56fd"
+        "6b2117db.4230f8"
       ]
     ]
   },
   {
-    "id": "3a1faec8.e90752",
+    "id": "9bfad8e.2252b28",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2366.793804168701,
+    "x": 2395.793804168701,
     "y": 1345.9076433181763,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "6444ae02.9da9b"
+        "c5a2b6cb.8de6a8"
       ]
     ]
   },
   {
-    "id": "9b840dcb.a56fd",
+    "id": "6b2117db.4230f8",
     "type": "returnFailure",
     "name": "return failure",
     "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",
     "comments": "",
-    "x": 2534.032096862793,
+    "x": 2563.032096862793,
     "y": 1297.8601140975952,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "6444ae02.9da9b",
+    "id": "c5a2b6cb.8de6a8",
     "type": "returnFailure",
     "name": "return failure",
     "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",
     "comments": "",
-    "x": 2530.566276550293,
+    "x": 2559.566276550293,
     "y": 1337.3469333648682,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "1d2ccfbd.a8cd2",
+    "id": "addfa25b.c3718",
     "type": "set",
     "name": "set tmp.thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 2574.9697647094727,
+    "x": 2603.9697647094727,
     "y": 1260.0004110336304,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "9df1ac2f.51afc",
+    "id": "44ef1c3d.800ab4",
     "type": "comment",
     "name": "get domain controller information",
     "info": "",
     "comments": "",
-    "x": 2230.4736404418945,
+    "x": 2259.4736404418945,
     "y": 1288.0043859481812,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "8e68e45a.813908",
+    "id": "7164fdca.4a0d84",
     "type": "execute",
     "name": "execute RestApiCallNode Delete ethernet Service",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`\" />\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=\"delete\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 2292.96964263916,
-    "y": 1539.0004262924194,
-    "z": "c671301.759d0d",
+    "x": 2308.969596862793,
+    "y": 1681.0005912780762,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "133da42a.747e7c",
-        "65e79690.a17a38"
+        "2b22380a.f1bc58",
+        "2dc816f1.66c67a"
       ]
     ]
   },
   {
-    "id": "133da42a.747e7c",
+    "id": "2b22380a.f1bc58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2579.969581604004,
-    "y": 1562.0004262924194,
-    "z": "c671301.759d0d",
+    "x": 2595.9695358276367,
+    "y": 1704.0005912780762,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "25b2c93d.e0d066"
+        "2a372b2.85f3bd4"
       ]
     ]
   },
   {
-    "id": "25b2c93d.e0d066",
+    "id": "2a372b2.85f3bd4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 2749.9695205688477,
-    "y": 1565.0004262924194,
-    "z": "c671301.759d0d",
+    "x": 2765.9694747924805,
+    "y": 1707.0005912780762,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "48ed3cb6.2c6ac4",
+    "id": "9ab48a6d.252ca8",
     "type": "returnFailure",
     "name": "return failure",
     "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 vpn rest api\" />\n",
     "comments": "",
-    "x": 2749.96964263916,
-    "y": 1521.0004262924194,
-    "z": "c671301.759d0d",
+    "x": 2765.969596862793,
+    "y": 1663.0005912780762,
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "65e79690.a17a38",
+    "id": "2dc816f1.66c67a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2582.9695205688477,
-    "y": 1521.0004262924194,
-    "z": "c671301.759d0d",
+    "x": 2598.9694747924805,
+    "y": 1663.0005912780762,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "48ed3cb6.2c6ac4"
+        "9ab48a6d.252ca8"
       ]
     ]
   },
   {
-    "id": "d8c8a336.34039",
+    "id": "b8fd2a49.d0b368",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 904.7307472229004,
+    "x": 933.7307472229004,
     "y": 1677.9527901411057,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "16163acd.838405"
+        "4d3bfe83.8ac38"
       ]
     ]
   },
   {
-    "id": "16163acd.838405",
+    "id": "4d3bfe83.8ac38",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 1071.2546272277832,
+    "x": 1100.2546272277832,
     "y": 1689.5718611478806,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "dfa99ab0.574428",
+    "id": "59f13b89.e4e7d4",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 911.8260345458984,
+    "x": 940.8260345458984,
     "y": 1710.7147578001022,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "16163acd.838405"
+        "4d3bfe83.8ac38"
       ]
     ]
   },
   {
-    "id": "60dc28ca.d224f8",
+    "id": "65a9cdb6.115924",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 623.7784614562988,
+    "x": 652.7784614562988,
     "y": 1660.3021783828735,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "d845a062.e24db",
+    "id": "a3a48876.1d8a18",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 638.5461578369141,
+    "x": 667.5461578369141,
     "y": 1581.8276596069336,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "9b7849da.439398",
+    "id": "7ccf367e.a869f8",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 606.9592399597168,
+    "x": 635.9592399597168,
     "y": 1742.4434118270874,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "39d4dd71.5f1112",
+    "id": "d3793c0a.e76dd",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 688.2782592773438,
+    "x": 717.2782592773438,
     "y": 1489.468433380127,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "f102f99f.ef15d8",
-        "c83c9026.cf22e",
-        "7e167ed3.568ff"
+        "c94958cd.0f7e08",
+        "5e263814.55f358",
+        "1ecab8f8.94f047"
       ]
     ]
   },
   {
-    "id": "f102f99f.ef15d8",
+    "id": "c94958cd.0f7e08",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 956.9196357727051,
+    "x": 985.9196357727051,
     "y": 1540.799845121801,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "5e6822ac.d3f74c"
+        "916b12ec.48653"
       ]
     ]
   },
   {
-    "id": "c83c9026.cf22e",
+    "id": "5e263814.55f358",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 947.9196853637695,
+    "x": 976.9196853637695,
     "y": 1509.2998708710074,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "5e6822ac.d3f74c"
+        "916b12ec.48653"
       ]
     ]
   },
   {
-    "id": "7e167ed3.568ff",
+    "id": "1ecab8f8.94f047",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 951.6697235107422,
+    "x": 980.6697235107422,
     "y": 1479.6569757461548,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "a5182b73.66b2a8"
+        "9a61150.9613ce8"
       ]
     ]
   },
   {
-    "id": "5e6822ac.d3f74c",
+    "id": "916b12ec.48653",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1117.6697235107422,
+    "x": 1146.6697235107422,
     "y": 1510.0498947128654,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "a5182b73.66b2a8",
+    "id": "9a61150.9613ce8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1093.3256912231445,
+    "x": 1122.3256912231445,
     "y": 1475.849144935608,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "db753550.5e2778",
+    "id": "683cb14.3ce605",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />",
     "comments": "",
-    "x": 588.4918785095215,
+    "x": 617.4918785095215,
     "y": 1339.8493564128876,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "7a073085.0e81c",
+    "id": "802f8ef7.b6731",
     "type": "execute",
     "name": "execute getTime",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 605.7777214050293,
+    "x": 634.7777214050293,
     "y": 1412.4689540863037,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "6fa8d61c.7e4378",
+    "id": "5c1eba3c.5a3914",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 660.764778137207,
+    "x": 689.764778137207,
     "y": 1450.4200916290283,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "6873bae7.8cf8e4",
+    "id": "c2e56bca.b33d78",
     "type": "set",
     "name": "set model-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
     "comments": "",
-    "x": 602.3334197998047,
+    "x": 631.3334197998047,
     "y": 1379.024006843567,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "9fb656d5.ef4218",
+    "id": "ae41f871.b43fa8",
     "type": "comment",
     "name": "Prepare data for allotted-resource addition to MDSAL",
     "info": "This will add to allotted-resource which is present inside service.",
     "comments": "",
-    "x": 715.6668815612793,
+    "x": 744.6668815612793,
     "y": 1300.0239589214325,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "ad67b90f.7f4058",
+    "id": "e752535c.aeb57",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 657.2467079162598,
+    "x": 686.2467079162598,
     "y": 1267.4372606277466,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "5b4906aa.434008",
+    "id": "2c211a2d.e90676",
     "type": "update",
     "name": "update AAI allotted-resource",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 650.2227401733398,
+    "x": 679.2227401733398,
     "y": 1697.7543210983276,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "d8c8a336.34039",
-        "dfa99ab0.574428"
+        "b8fd2a49.d0b368",
+        "59f13b89.e4e7d4"
       ]
     ]
   },
   {
-    "id": "36542d01.f14212",
+    "id": "d5bc9567.22f988",
     "type": "get-resource",
     "name": "get-resource connectivity",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"connectivity\" \n\t\tkey=\"connectivity.connectivity-id = $mdsal-psd.service-data.networks.network[0].network-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.connectivity' local-only='false' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1184.0005645751953,
+    "x": 1213.0005645751953,
     "y": 1175.5044269561768,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "ac511500.01c158",
-        "73ce6220.0aa3ac"
+        "7024d4cd.1a62bc",
+        "cf432033.112d9"
       ]
     ]
   },
   {
-    "id": "acaf1b93.77d2c8",
+    "id": "41a48915.ce4758",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1957.1178741455078,
+    "x": 1986.1178741455078,
     "y": 1372.3445596694946,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "49ef2c84.8031a4",
-        "240e11a5.31781e",
-        "41073eca.4f87f",
-        "a7698ae.d89d278",
-        "8e68e45a.813908",
-        "17a0b9d8.6d99a6"
+        "ae412232.e0411",
+        "3c342d96.9776c2",
+        "ac6b10fc.018ca",
+        "3c2c4321.6e016c",
+        "7164fdca.4a0d84",
+        "dda1ddc2.84784",
+        "f1f4e6ef.143a68"
       ]
     ]
   },
   {
-    "id": "bfb6dec9.6c932",
+    "id": "d567023b.2d9f",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783.286392211914,
+    "x": 1812.286392211914,
     "y": 1374.8260831832886,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "acaf1b93.77d2c8"
+        "41a48915.ce4758"
       ]
     ]
   },
   {
-    "id": "a4e854e4.e41328",
+    "id": "de835816.465b48",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1405.0003356933594,
+    "x": 1434.0003356933594,
     "y": 1373.0043096542358,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "998442eb.48b4"
+        "a2ccacd2.b0dbc"
       ]
     ]
   },
   {
-    "id": "998442eb.48b4",
+    "id": "a2ccacd2.b0dbc",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1617.0003471374512,
+    "x": 1646.0003471374512,
     "y": 1374.0043096542358,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "bfb6dec9.6c932"
+        "d567023b.2d9f"
       ]
     ]
   },
   {
-    "id": "240e11a5.31781e",
+    "id": "3c342d96.9776c2",
     "type": "set",
     "name": "set tmp.vpn-name",
     "xml": "<set>\n<parameter name='tmp.vpn-name' value=\"`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` \" />\n",
     "comments": "",
-    "x": 2190.0005416870117,
+    "x": 2219.0005416870117,
     "y": 1086.004626274109,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "49ef2c84.8031a4",
+    "id": "ae412232.e0411",
     "type": "execute",
     "name": "split vpnName to find nodeId",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.vpn-name`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2226.0004959106445,
+    "x": 2255.0004959106445,
     "y": 1187.0039930343628,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "29be775d.300d28",
-        "79e65a65.d62d64"
+        "ae670977.becbb8",
+        "60767ce2.3ab0a4"
       ]
     ]
   },
   {
-    "id": "79e65a65.d62d64",
+    "id": "60767ce2.3ab0a4",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2427.000686645508,
+    "x": 2456.000686645508,
     "y": 1164.0039854049683,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "2e37c245.6cda0e"
+        "bf10a60c.fdea98"
       ]
     ]
   },
   {
-    "id": "2e37c245.6cda0e",
+    "id": "bf10a60c.fdea98",
     "type": "set",
     "name": "set tmp.node-id",
     "xml": "<set>\n<parameter name='tmp.node-id' value='`$route1[0]`' />\n<parameter name='tmp.actual.vpn-name' value='`$route1[1]`' />\n",
     "comments": "",
-    "x": 2580.000846862793,
+    "x": 2609.000846862793,
     "y": 1162.0039863586426,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "3186476.c93d1b8",
+    "id": "a5afcc72.d877b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 2564.001012802124,
+    "x": 2593.001012802124,
     "y": 1211.0039882659912,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "29be775d.300d28",
+    "id": "ae670977.becbb8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2424.00066947937,
+    "x": 2453.00066947937,
     "y": 1212.0039901733398,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "3186476.c93d1b8"
+        "a5afcc72.d877b"
       ]
     ]
   },
   {
-    "id": "ac511500.01c158",
+    "id": "7024d4cd.1a62bc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1365.0001640319824,
+    "x": 1394.0001640319824,
     "y": 1210.0000715255737,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "35849f58.75b79"
+        "ea43f44.e748208"
       ]
     ]
   },
   {
-    "id": "73ce6220.0aa3ac",
+    "id": "cf432033.112d9",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1367.851894378662,
+    "x": 1396.851894378662,
     "y": 1137.0663166046143,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "3d1a3d62.7aa882"
+        "801260ca.47a9"
       ]
     ]
   },
   {
-    "id": "3d1a3d62.7aa882",
+    "id": "801260ca.47a9",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connectivity resource not found\" />\n    \n",
     "comments": "",
-    "x": 1510.0006637573242,
+    "x": 1539.0006637573242,
     "y": 1137.3337268829346,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": []
   },
   {
-    "id": "35849f58.75b79",
+    "id": "ea43f44.e748208",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1367.0001754760742,
+    "x": 1396.0001754760742,
     "y": 1288.0002374649048,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "a4e854e4.e41328"
+        "de835816.465b48"
       ]
     ]
   },
   {
-    "id": "485e569f.2b52d8",
+    "id": "693977cc.87d158",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 803.3339538574219,
+    "x": 832.3339538574219,
     "y": 536.4999494552612,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "dd903f73.c503a",
-        "5569926e.6ec77c"
+        "e963cad3.e8d6c8",
+        "489ff5d2.164b7c"
       ]
     ]
   },
   {
-    "id": "417e0490.1d34dc",
+    "id": "c0b8662.2083398",
     "type": "execute",
     "name": "get parent-service-data tmp.ar-url-psd",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 657.0001983642578,
+    "x": 686.0001983642578,
     "y": 745.0002107620239,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       []
     ]
   },
   {
-    "id": "d67f9f52.31c1f",
+    "id": "fada7ab3.d1d4e8",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 724.0001602172852,
+    "x": 753.0001602172852,
     "y": 780.0002946853638,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "7153ec61.6a9434",
-        "f1d188a0.fe8058"
+        "773fbfc3.82918",
+        "be2f70a0.4132d"
       ]
     ]
   },
   {
-    "id": "2a0b728c.4f365e",
+    "id": "cfef8c40.7d401",
     "type": "switchNode",
     "name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
     "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 740.1842803955078,
+    "x": 769.1842803955078,
     "y": 954.7181224822998,
-    "z": "c671301.759d0d",
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "99b7fbfe.94a448",
-        "7e8c22a4.61fc8c",
-        "2061f78c.10bc08"
+        "cf2de8b0.5bcd28",
+        "103b0ff7.ad1fb",
+        "4057b675.85b588"
       ]
     ]
   },
   {
-    "id": "17a0b9d8.6d99a6",
+    "id": "dda1ddc2.84784",
     "type": "update",
     "name": "delete AAI vpn-binding",
     "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.vpn-name' >",
     "comments": "",
     "outputs": 1,
-    "x": 2224,
-    "y": 1642,
-    "z": "c671301.759d0d",
+    "x": 2239.999954223633,
+    "y": 1784.0001649856567,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "496ebae3.0822d4",
-        "1b687bcc.3acb54"
+        "c726da18.1fa408",
+        "b99e2363.4f50b"
       ]
     ]
   },
   {
-    "id": "496ebae3.0822d4",
+    "id": "c726da18.1fa408",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2478.5080070495605,
-    "y": 1622.198469042778,
-    "z": "c671301.759d0d",
+    "x": 2494.5079612731934,
+    "y": 1764.1986340284348,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "9a00ded1.17f07"
+        "53701c4b.a688d4"
       ]
     ]
   },
   {
-    "id": "1b687bcc.3acb54",
+    "id": "b99e2363.4f50b",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2485.6032943725586,
-    "y": 1654.9604367017746,
-    "z": "c671301.759d0d",
+    "x": 2501.6032485961914,
+    "y": 1796.9606016874313,
+    "z": "ed10e8c7.d58f28",
     "wires": [
       [
-        "9a00ded1.17f07"
+        "53701c4b.a688d4"
       ]
     ]
   },
   {
-    "id": "9a00ded1.17f07",
+    "id": "53701c4b.a688d4",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 2645.0318870544434,
-    "y": 1633.817540049553,
-    "z": "c671301.759d0d",
+    "x": 2661.031841278076,
+    "y": 1775.8177050352097,
+    "z": "ed10e8c7.d58f28",
+    "wires": []
+  },
+  {
+    "id": "f1f4e6ef.143a68",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2279.7541580200195,
+    "y": 1564.254002571106,
+    "z": "ed10e8c7.d58f28",
+    "wires": [
+      [
+        "f8436b41.519d68",
+        "9d9f79f.4a7c888"
+      ]
+    ]
+  },
+  {
+    "id": "f8436b41.519d68",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2514.7541580200195,
+    "y": 1542.254002571106,
+    "z": "ed10e8c7.d58f28",
+    "wires": [
+      [
+        "1076a472.b53e4c"
+      ]
+    ]
+  },
+  {
+    "id": "9d9f79f.4a7c888",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2507.0041580200195,
+    "y": 1595.8968858718872,
+    "z": "ed10e8c7.d58f28",
+    "wires": [
+      [
+        "6534e8a7.2122d8"
+      ]
+    ]
+  },
+  {
+    "id": "6534e8a7.2122d8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 get token rest api\" />\n",
+    "comments": "",
+    "x": 2659.7541580200195,
+    "y": 1595.6469469070435,
+    "z": "ed10e8c7.d58f28",
+    "wires": []
+  },
+  {
+    "id": "1076a472.b53e4c",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+    "comments": "",
+    "x": 2668.7541580200195,
+    "y": 1543.254002571106,
+    "z": "ed10e8c7.d58f28",
     "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
index 453b782..8b1fd28 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "11e769e3.3811f6",
+    "id": "727269c5.c0c088",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 114,
-    "y": 40,
-    "z": "22c49458.dad37c",
+    "x": 107,
+    "y": 38,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "a911446f.df7748"
+        "476f18dc.439248"
       ]
     ]
   },
   {
-    "id": "a911446f.df7748",
+    "id": "476f18dc.439248",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,907 +22,907 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 288.00000381469727,
-    "y": 95.0000171661377,
-    "z": "22c49458.dad37c",
+    "x": 281.00000381469727,
+    "y": 93.0000171661377,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "7ff497ab.f66f98"
+        "e0fac416.80f518"
       ]
     ]
   },
   {
-    "id": "7ff497ab.f66f98",
+    "id": "e0fac416.80f518",
     "type": "method",
     "name": "sotn-attachment-topology-operation-delete",
     "xml": "<method rpc='sotn-attachment-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 276.0001220703125,
-    "y": 183,
-    "z": "22c49458.dad37c",
+    "x": 269.0001220703125,
+    "y": 181,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "5cbadab.7a99a24"
+        "231c9f70.d1a7d"
       ]
     ]
   },
   {
-    "id": "5cbadab.7a99a24",
+    "id": "231c9f70.d1a7d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 292.0001220703125,
-    "y": 738.0002446174622,
-    "z": "22c49458.dad37c",
+    "x": 285.0001220703125,
+    "y": 736.0002446174622,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "12de2d1a.68bba3",
-        "51b97e85.9070d",
-        "1fed4a5d.8e6a46",
-        "6484d39f.eed1bc",
-        "5b5b7d66.22fc34",
-        "e0c27564.dc6708",
-        "4516c95e.b99748",
-        "497a6009.1522c",
-        "79c8cfb5.a81b4",
-        "72f76f27.124fe",
-        "eb5610dc.278e7",
-        "8cb29231.a6eaa",
-        "322e0846.b44bc8",
-        "9ea8a95d.e39878",
-        "75c532eb.23cc8c"
+        "daf8cd41.f5737",
+        "a1a6aaf1.a46af8",
+        "90947482.aca148",
+        "b9944c13.63436",
+        "6eccbbd0.6de454",
+        "1a37f19e.b4ca8e",
+        "b769698c.40e9c8",
+        "a43d6d68.0f0c8",
+        "190ff216.cb59ee",
+        "4a2552b4.8267bc",
+        "471618ce.1aa6e8",
+        "afce32ae.04764",
+        "af833dcd.19d57",
+        "abce896b.ee5ab8",
+        "36034272.10e4ae"
       ]
     ]
   },
   {
-    "id": "12de2d1a.68bba3",
+    "id": "daf8cd41.f5737",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id,etc",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 688.9935607910156,
-    "y": 136.9934868812561,
-    "z": "22c49458.dad37c",
+    "x": 681.9935607910156,
+    "y": 134.9934868812561,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "a47c80d2.4bf0a",
+    "id": "f092463.fee0fb8",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 717.9538726806641,
-    "y": 101.02528285980225,
-    "z": "22c49458.dad37c",
+    "x": 710.9538726806641,
+    "y": 99.02528285980225,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "51b97e85.9070d",
+    "id": "a1a6aaf1.a46af8",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 642.9934997558594,
-    "y": 229.99349212646484,
-    "z": "22c49458.dad37c",
+    "x": 635.9934997558594,
+    "y": 227.99349212646484,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "5b5b7d66.22fc34",
+    "id": "6eccbbd0.6de454",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 649.2553901672363,
-    "y": 317.6602210998535,
-    "z": "22c49458.dad37c",
+    "x": 642.2553901672363,
+    "y": 315.6602210998535,
+    "z": "9a9db3db.b812b",
     "wires": [
       []
     ]
   },
   {
-    "id": "1fed4a5d.8e6a46",
+    "id": "90947482.aca148",
     "type": "execute",
     "name": "generate allotted-resource url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 681.2554168701172,
-    "y": 405.66020250320435,
-    "z": "22c49458.dad37c",
+    "x": 674.2554168701172,
+    "y": 403.66020250320435,
+    "z": "9a9db3db.b812b",
     "wires": [
       []
     ]
   },
   {
-    "id": "ab7e7ca9.bc19e",
+    "id": "a011c3.2eb3ce4",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 696.9935302734375,
-    "y": 196.993501663208,
-    "z": "22c49458.dad37c",
+    "x": 689.9935302734375,
+    "y": 194.993501663208,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "ba32781e.53a208",
+    "id": "d15c9938.74a878",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 714.9934959411621,
-    "y": 282.8823823928833,
-    "z": "22c49458.dad37c",
+    "x": 707.9934959411621,
+    "y": 280.8823823928833,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "b5885f7.9b7d5a",
+    "id": "a5405514.70c5b8",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 740.9935150146484,
-    "y": 369.8823413848877,
-    "z": "22c49458.dad37c",
+    "x": 733.9935150146484,
+    "y": 367.8823413848877,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "e2ab0cde.eabb7",
+    "id": "88c1d026.0cefd",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 808.0003280639648,
-    "y": 824.5316228866577,
-    "z": "22c49458.dad37c",
+    "x": 801.0003280639648,
+    "y": 822.5316228866577,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "9608d482.14feb8",
+    "id": "3c5cf576.01802a",
     "type": "for",
     "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1636.1849365234375,
-    "y": 1058.00425863266,
-    "z": "22c49458.dad37c",
+    "x": 1629.1849365234375,
+    "y": 1056.00425863266,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "9f0a169a.b7bf38"
+        "3496000b.b50ee"
       ]
     ]
   },
   {
-    "id": "6484d39f.eed1bc",
+    "id": "b9944c13.63436",
     "type": "switchNode",
     "name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
     "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 787.1842956542969,
-    "y": 1064.718041419983,
-    "z": "22c49458.dad37c",
+    "x": 780.1842956542969,
+    "y": 1062.718041419983,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "3cb5550a.e1379a",
-        "525dfe7f.9aace"
+        "af74ccd9.4a43f",
+        "86c1925.6123e7"
       ]
     ]
   },
   {
-    "id": "72d22ab8.9fbaf4",
+    "id": "e65e2eca.21548",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1237.4544582366943,
-    "y": 1104.7015271186829,
-    "z": "22c49458.dad37c",
+    "x": 1230.4544582366943,
+    "y": 1102.7015271186829,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "9608d482.14feb8",
-        "37cdb210.11699e"
+        "3c5cf576.01802a",
+        "fad43184.faa77"
       ]
     ]
   },
   {
-    "id": "9f0a169a.b7bf38",
+    "id": "3496000b.b50ee",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2086.296142578125,
-    "y": 1056.0041165351868,
-    "z": "22c49458.dad37c",
+    "x": 2079.296142578125,
+    "y": 1054.0041165351868,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "1c3b0551.8a3d7b"
+        "2b9e1b87.4d7be4"
       ]
     ]
   },
   {
-    "id": "e0c27564.dc6708",
+    "id": "1a37f19e.b4ca8e",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 698.9687118530273,
-    "y": 860.0000677108765,
-    "z": "22c49458.dad37c",
+    "x": 691.9687118530273,
+    "y": 858.0000677108765,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "df350c49.f450e",
+    "id": "f65db35d.ec076",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1078.968994140625,
-    "y": 938.0001826286316,
-    "z": "22c49458.dad37c",
+    "x": 1071.968994140625,
+    "y": 936.0001826286316,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "f5ff5552.dcef18"
+        "c80198f0.eabc78"
       ]
     ]
   },
   {
-    "id": "a707d837.6f7a08",
+    "id": "733108ec.4b0c18",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1070.8207969665527,
-    "y": 973.066267490387,
-    "z": "22c49458.dad37c",
+    "x": 1063.8207969665527,
+    "y": 971.066267490387,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "72020d23.f0ba44"
+        "d0615553.03e2f8"
       ]
     ]
   },
   {
-    "id": "72020d23.f0ba44",
+    "id": "d0615553.03e2f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1245.969482421875,
-    "y": 969.3336176872253,
-    "z": "22c49458.dad37c",
+    "x": 1238.969482421875,
+    "y": 967.3336176872253,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "f5ff5552.dcef18",
+    "id": "c80198f0.eabc78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1229.968994140625,
-    "y": 936.0001826286316,
-    "z": "22c49458.dad37c",
+    "x": 1222.968994140625,
+    "y": 934.0001826286316,
+    "z": "9a9db3db.b812b",
     "wires": [
       []
     ]
   },
   {
-    "id": "b9f57970.85bbb8",
+    "id": "5239fca8.d17b94",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 932.7307624816895,
-    "y": 1253.952815413475,
-    "z": "22c49458.dad37c",
+    "x": 925.7307624816895,
+    "y": 1251.952815413475,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "7794b76c.3bcdd8"
+        "d9416e9b.67f3a"
       ]
     ]
   },
   {
-    "id": "7794b76c.3bcdd8",
+    "id": "d9416e9b.67f3a",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 1099.2546424865723,
-    "y": 1265.57188642025,
-    "z": "22c49458.dad37c",
+    "x": 1092.2546424865723,
+    "y": 1263.57188642025,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "2e04eae7.d58896",
+    "id": "c631f277.5fd19",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 939.8260498046875,
-    "y": 1286.7147830724716,
-    "z": "22c49458.dad37c",
+    "x": 932.8260498046875,
+    "y": 1284.7147830724716,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "7794b76c.3bcdd8"
+        "d9416e9b.67f3a"
       ]
     ]
   },
   {
-    "id": "4516c95e.b99748",
+    "id": "b769698c.40e9c8",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 665.5461502075195,
-    "y": 1217.8276824951172,
-    "z": "22c49458.dad37c",
+    "x": 658.5461502075195,
+    "y": 1215.8276824951172,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "497a6009.1522c",
+    "id": "a43d6d68.0f0c8",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 634.9592552185059,
-    "y": 1318.4434370994568,
-    "z": "22c49458.dad37c",
+    "x": 627.9592552185059,
+    "y": 1316.4434370994568,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "75c532eb.23cc8c",
+    "id": "36034272.10e4ae",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='Delete' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 714.6666641235352,
-    "y": 494.3333625793457,
-    "z": "22c49458.dad37c",
+    "x": 707.6666641235352,
+    "y": 492.3333625793457,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "62855576.29e8bc",
-        "943e1cd3.5570d",
-        "d016523b.d696c"
+        "b9a614f.423c0e8",
+        "1fe78f55.993961",
+        "2453145c.fe210c"
       ]
     ]
   },
   {
-    "id": "62855576.29e8bc",
+    "id": "b9a614f.423c0e8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 954.3081665039062,
-    "y": 534.6649107933044,
-    "z": "22c49458.dad37c",
+    "x": 947.3081665039062,
+    "y": 532.6649107933044,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "1a54db3b.e65b75"
+        "ceacff91.78296"
       ]
     ]
   },
   {
-    "id": "943e1cd3.5570d",
+    "id": "1fe78f55.993961",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 951.3081665039062,
-    "y": 491.16490840911865,
-    "z": "22c49458.dad37c",
+    "x": 944.3081665039062,
+    "y": 489.16490840911865,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "1a54db3b.e65b75"
+        "ceacff91.78296"
       ]
     ]
   },
   {
-    "id": "d016523b.d696c",
+    "id": "2453145c.fe210c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 958.0582466125488,
-    "y": 450.5220036506653,
-    "z": "22c49458.dad37c",
+    "x": 951.0582466125488,
+    "y": 448.5220036506653,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "4e5c2e12.2b4c5"
+        "cc515c42.f40e8"
       ]
     ]
   },
   {
-    "id": "1a54db3b.e65b75",
+    "id": "ceacff91.78296",
     "type": "returnFailure",
     "name": "return failure",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1110.058334350586,
-    "y": 512.9149088859558,
-    "z": "22c49458.dad37c",
+    "x": 1103.058334350586,
+    "y": 510.9149088859558,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "4e5c2e12.2b4c5",
+    "id": "cc515c42.f40e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1095.7141780853271,
-    "y": 450.7141833305359,
-    "z": "22c49458.dad37c",
+    "x": 1088.7141780853271,
+    "y": 448.7141833305359,
+    "z": "9a9db3db.b812b",
     "wires": [
       []
     ]
   },
   {
-    "id": "568d92cc.719a5c",
+    "id": "afc0a167.60e96",
     "type": "comment",
     "name": "Delete Allotted Resource",
     "info": "",
     "comments": "",
-    "x": 662.0000457763672,
-    "y": 463.0000286102295,
-    "z": "22c49458.dad37c",
+    "x": 655.0000457763672,
+    "y": 461.0000286102295,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "34b11a52.976836",
+    "id": "930f6554.7ad0e8",
     "type": "for",
     "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
     "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1612.00390625,
-    "y": 700.00390625,
-    "z": "22c49458.dad37c",
+    "x": 1605.00390625,
+    "y": 698.00390625,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "905bba1a.0e8108"
+        "ab2d612c.e624d"
       ]
     ]
   },
   {
-    "id": "79c8cfb5.a81b4",
+    "id": "190ff216.cb59ee",
     "type": "switchNode",
     "name": "switch service-data.consumed-allotted-resources_length",
     "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 765.0032920837402,
-    "y": 660.71790766716,
-    "z": "22c49458.dad37c",
+    "x": 758.0032920837402,
+    "y": 658.71790766716,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "a04a8128.1b845",
-        "9bf1251d.a97d08"
+        "22a6f73e.83f758",
+        "59a890e7.9e391"
       ]
     ]
   },
   {
-    "id": "a04a8128.1b845",
+    "id": "22a6f73e.83f758",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1089.1461563110352,
-    "y": 643.5753421783447,
-    "z": "22c49458.dad37c",
+    "x": 1082.1461563110352,
+    "y": 641.5753421783447,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "673a72bf.8ebb9c"
+        "d98f9bea.dbb4e8"
       ]
     ]
   },
   {
-    "id": "9bf1251d.a97d08",
+    "id": "59a890e7.9e391",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1075.1461791992188,
-    "y": 706.5753309726715,
-    "z": "22c49458.dad37c",
+    "x": 1068.1461791992188,
+    "y": 704.5753309726715,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "db5549c4.4372e8"
+        "741d09f.ef4e8f8"
       ]
     ]
   },
   {
-    "id": "db5549c4.4372e8",
+    "id": "741d09f.ef4e8f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1235.2732696533203,
-    "y": 704.7013075351715,
-    "z": "22c49458.dad37c",
+    "x": 1228.2732696533203,
+    "y": 702.7013075351715,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "34b11a52.976836",
-        "f5274780.cdc8d8"
+        "930f6554.7ad0e8",
+        "a2d1d665.9bea78"
       ]
     ]
   },
   {
-    "id": "72f76f27.124fe",
+    "id": "4a2552b4.8267bc",
     "type": "set",
     "name": "set consumed allotted resources for deletion",
     "xml": "<set>\n<parameter name=\"service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].\" value=\"\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n",
     "comments": "",
-    "x": 721.8606262207031,
-    "y": 731.28955078125,
-    "z": "22c49458.dad37c",
+    "x": 714.8606262207031,
+    "y": 729.28955078125,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "905bba1a.0e8108",
+    "id": "ab2d612c.e624d",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2050.1155166625977,
-    "y": 696.0040283203125,
-    "z": "22c49458.dad37c",
+    "x": 2043.1155166625977,
+    "y": 694.0040283203125,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "a9176335.8c5a3"
+        "d09e4ce4.cdbe3"
       ]
     ]
   },
   {
-    "id": "a9176335.8c5a3",
+    "id": "d09e4ce4.cdbe3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2245.925338745117,
-    "y": 695.4683527946472,
-    "z": "22c49458.dad37c",
+    "x": 2238.925338745117,
+    "y": 693.4683527946472,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "c3d97090.70bae"
+        "c313761f.950178"
       ]
     ]
   },
   {
-    "id": "cc5aea61.28e048",
+    "id": "92647963.e38708",
     "type": "set",
     "name": "set tmp.cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n",
     "comments": "",
-    "x": 2561.2618713378906,
-    "y": 696.2246108055115,
-    "z": "22c49458.dad37c",
+    "x": 2554.2618713378906,
+    "y": 694.2246108055115,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "ad0e4910.5dc848",
+    "id": "8d54089c.d1a698",
     "type": "comment",
     "name": "Delete consumed service consumed-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 776.0045623779297,
-    "y": 593.0038724095793,
-    "z": "22c49458.dad37c",
+    "x": 769.0045623779297,
+    "y": 591.0038724095793,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "5b6b08ee.203c48",
+    "id": "66e1c966.841508",
     "type": "comment",
     "name": "This set resource will be deleted in MDSAL by provider code",
     "info": "",
     "comments": "",
-    "x": 766.337345123291,
-    "y": 697.781964302063,
-    "z": "22c49458.dad37c",
+    "x": 759.337345123291,
+    "y": 695.781964302063,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "5c1ad210.960a1c",
+    "id": "491e50db.34949",
     "type": "comment",
     "name": "Obtain the index of conusumed AR",
     "info": "",
     "comments": "",
-    "x": 688.7817535400391,
-    "y": 624.8927326202393,
-    "z": "22c49458.dad37c",
+    "x": 681.7817535400391,
+    "y": 622.8927326202393,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "673a72bf.8ebb9c",
+    "id": "d98f9bea.dbb4e8",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n",
     "comments": "",
-    "x": 1251.00390625,
-    "y": 644.00390625,
-    "z": "22c49458.dad37c",
+    "x": 1244.00390625,
+    "y": 642.00390625,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "c3d97090.70bae",
+    "id": "c313761f.950178",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2395.003936767578,
-    "y": 696.2539558410645,
-    "z": "22c49458.dad37c",
+    "x": 2388.003936767578,
+    "y": 694.2539558410645,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "cc5aea61.28e048"
+        "92647963.e38708"
       ]
     ]
   },
   {
-    "id": "b29df060.eb56c",
+    "id": "6aa48d02.a58084",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"resource to be deleted is not available in mdsal\" />\n",
     "comments": "",
-    "x": 1705.25390625,
-    "y": 753.25390625,
-    "z": "22c49458.dad37c",
+    "x": 1698.25390625,
+    "y": 751.25390625,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "b8b02536.9fab38",
+    "id": "bf5c462c.da5e08",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1567.75390625,
-    "y": 753.25390625,
-    "z": "22c49458.dad37c",
+    "x": 1560.75390625,
+    "y": 751.25390625,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "b29df060.eb56c"
+        "6aa48d02.a58084"
       ]
     ]
   },
   {
-    "id": "f5274780.cdc8d8",
+    "id": "a2d1d665.9bea78",
     "type": "switchNode",
     "name": "switch tmp.cidx ",
     "xml": "<switch test=\"`$tmp.cidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1413.75390625,
-    "y": 753.25390625,
-    "z": "22c49458.dad37c",
+    "x": 1406.75390625,
+    "y": 751.25390625,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "b8b02536.9fab38"
+        "bf5c462c.da5e08"
       ]
     ]
   },
   {
-    "id": "88b79953.981898",
+    "id": "e3078c06.7be5",
     "type": "comment",
     "name": "Delete provided service provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 762.5039215087891,
-    "y": 789.00390625,
-    "z": "22c49458.dad37c",
+    "x": 755.5039215087891,
+    "y": 787.00390625,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "525dfe7f.9aace",
+    "id": "86c1925.6123e7",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1090.5041770935059,
-    "y": 1103.7540984153748,
-    "z": "22c49458.dad37c",
+    "x": 1083.5041770935059,
+    "y": 1101.7540984153748,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "72d22ab8.9fbaf4"
+        "e65e2eca.21548"
       ]
     ]
   },
   {
-    "id": "3cb5550a.e1379a",
+    "id": "af74ccd9.4a43f",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1107.5040969848633,
-    "y": 1015.7539324760437,
-    "z": "22c49458.dad37c",
+    "x": 1100.5040969848633,
+    "y": 1013.7539324760437,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "b0f98381.70f7"
+        "fea3dc81.4b3fa"
       ]
     ]
   },
   {
-    "id": "b0f98381.70f7",
+    "id": "fea3dc81.4b3fa",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n",
     "comments": "",
-    "x": 1271.3616943359375,
-    "y": 1016.1824774742126,
-    "z": "22c49458.dad37c",
+    "x": 1264.3616943359375,
+    "y": 1014.1824774742126,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "1af61fb0.016",
+    "id": "39762013.3aeda",
     "type": "returnFailure",
     "name": "return failure",
     "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=\"resource to be deleted is not available in mdsal\" />\n",
     "comments": "",
-    "x": 1702.7539501190186,
-    "y": 1133.753936290741,
-    "z": "22c49458.dad37c",
+    "x": 1695.7539501190186,
+    "y": 1131.753936290741,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "457e37be.33a0e8",
+    "id": "f41a3391.116cf",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1565.2539501190186,
-    "y": 1133.753936290741,
-    "z": "22c49458.dad37c",
+    "x": 1558.2539501190186,
+    "y": 1131.753936290741,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "1af61fb0.016"
+        "39762013.3aeda"
       ]
     ]
   },
   {
-    "id": "37cdb210.11699e",
+    "id": "fad43184.faa77",
     "type": "switchNode",
     "name": "switch tmp.pidx ",
     "xml": "<switch test=\"`$tmp.pidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1411.2539501190186,
-    "y": 1133.753936290741,
-    "z": "22c49458.dad37c",
+    "x": 1404.2539501190186,
+    "y": 1131.753936290741,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "457e37be.33a0e8"
+        "f41a3391.116cf"
       ]
     ]
   },
   {
-    "id": "1c3b0551.8a3d7b",
+    "id": "2b9e1b87.4d7be4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2275.504367828369,
-    "y": 1053.7540946006775,
-    "z": "22c49458.dad37c",
+    "x": 2268.504367828369,
+    "y": 1051.7540946006775,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "f8a04da0.ae331"
+        "3e54d0ca.68119"
       ]
     ]
   },
   {
-    "id": "26796192.02fd4e",
+    "id": "124aec38.7e75f4",
     "type": "set",
     "name": "set tmp.pidx",
     "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n\n",
     "comments": "",
-    "x": 2343.8404846191406,
-    "y": 1188.5101914405823,
-    "z": "22c49458.dad37c",
+    "x": 2336.8404846191406,
+    "y": 1186.5101914405823,
+    "z": "9a9db3db.b812b",
     "wires": []
   },
   {
-    "id": "f8a04da0.ae331",
+    "id": "3e54d0ca.68119",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2335.582820892334,
-    "y": 1124.539580821991,
-    "z": "22c49458.dad37c",
+    "x": 2328.582820892334,
+    "y": 1122.539580821991,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "26796192.02fd4e"
+        "124aec38.7e75f4"
       ]
     ]
   },
   {
-    "id": "eb5610dc.278e7",
+    "id": "471618ce.1aa6e8",
     "type": "update",
     "name": "update AAI allotted-resource",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='allotted-resource'  \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\">\n",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='allotted-resource'  \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 678.2227554321289,
-    "y": 1273.754346370697,
-    "z": "22c49458.dad37c",
+    "x": 671.2227554321289,
+    "y": 1271.754346370697,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "b9f57970.85bbb8",
-        "2e04eae7.d58896"
+        "5239fca8.d17b94",
+        "c631f277.5fd19"
       ]
     ]
   },
   {
-    "id": "322e0846.b44bc8",
+    "id": "af833dcd.19d57",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 768.3334197998047,
-    "y": 959.333366394043,
-    "z": "22c49458.dad37c",
+    "x": 761.3334197998047,
+    "y": 957.333366394043,
+    "z": "9a9db3db.b812b",
     "wires": [
       [
-        "df350c49.f450e",
-        "a707d837.6f7a08"
+        "f65db35d.ec076",
+        "733108ec.4b0c18"
       ]
     ]
   },
   {
-    "id": "8cb29231.a6eaa",
+    "id": "afce32ae.04764",
     "type": "execute",
     "name": "get parent-service-data tmp.ar-url-psd",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 702.3333587646484,
-    "y": 917.3332056999207,
-    "z": "22c49458.dad37c",
+    "x": 695.3333587646484,
+    "y": 915.3332056999207,
+    "z": "9a9db3db.b812b",
     "wires": [
       []
     ]
   },
   {
-    "id": "9ea8a95d.e39878",
+    "id": "abce896b.ee5ab8",
     "type": "execute",
     "name": "execute RestApiCallNode - delete-resource parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.controller.url + $tmp.ar-url-psd + '/provided-allotted-resources/provided-allotted-resource/' + $tmp.ar.allotted-resource-id`\" />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd-delete\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 773,
-    "y": 1168,
-    "z": "22c49458.dad37c",
+    "x": 766,
+    "y": 1166,
+    "z": "9a9db3db.b812b",
     "wires": [
       []
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json
index 2fc5b3e..6bdf1de 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "ba830c79.783fc",
+    "id": "75921ba5.e84f04",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 112,
-    "y": 60,
-    "z": "e5bf33cc.860bc",
+    "x": 127,
+    "y": 31,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "4ae6deec.cd3f3"
+        "67179bf.f30bb64"
       ]
     ]
   },
   {
-    "id": "4ae6deec.cd3f3",
+    "id": "67179bf.f30bb64",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,356 +22,356 @@
     "comments": "",
     "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}'>",
     "outputs": 1,
-    "x": 330.49999237060547,
-    "y": 140.9999928767793,
-    "z": "e5bf33cc.860bc",
+    "x": 345.49999237060547,
+    "y": 111.99999287677929,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "d2d46081.2fceb"
+        "df585947.1b0688"
       ]
     ]
   },
   {
-    "id": "d2d46081.2fceb",
+    "id": "df585947.1b0688",
     "type": "method",
     "name": "sotn-network-topology-operation-reoptimize",
     "xml": "<method rpc='sotn-network-topology-operation-reoptimize' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 331.5,
-    "y": 194,
-    "z": "e5bf33cc.860bc",
+    "x": 346.5,
+    "y": 165,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "36051f70.beb8c"
+        "970cf081.0efd5"
       ]
     ]
   },
   {
-    "id": "36051f70.beb8c",
+    "id": "970cf081.0efd5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 409.50000762939453,
-    "y": 252.000009059906,
-    "z": "e5bf33cc.860bc",
+    "x": 424.50000762939453,
+    "y": 223.000009059906,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "7af3f162.64be",
-        "def5a09c.a5553",
-        "ecfb074a.096988",
-        "17f9a997.150a06",
-        "a8c6638b.cba29",
-        "59b44687.021ed8"
+        "32a56503.ce58fa",
+        "b0b6546.423eca8",
+        "103fcffc.47e2d",
+        "77dde683.c05af8",
+        "c64a9e95.de368",
+        "f4c6a746.18c888"
       ]
     ]
   },
   {
-    "id": "7af3f162.64be",
+    "id": "32a56503.ce58fa",
     "type": "set",
     "name": "set tmp.network.parent-network-id,etc",
     "xml": "<set>\n<parameter name='tmp.network.network-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='tmp.network.service-instance-id' value='`$network-topology-operation-input.service-information.service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 757.0000152587891,
-    "y": 147.00000476837158,
-    "z": "e5bf33cc.860bc",
+    "x": 772.0000152587891,
+    "y": 118.00000476837158,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "e6874582.0b2958",
+    "id": "21fcd909.4488b6",
     "type": "comment",
     "name": "set tmp connectivity-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 826.9603424072266,
-    "y": 112.03180408477783,
-    "z": "e5bf33cc.860bc",
+    "x": 841.9603424072266,
+    "y": 83.03180408477783,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "def5a09c.a5553",
+    "id": "b0b6546.423eca8",
     "type": "execute",
     "name": "execute Properties",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 700.9999542236328,
-    "y": 230.00000476837158,
-    "z": "e5bf33cc.860bc",
+    "x": 715.9999542236328,
+    "y": 201.00000476837158,
+    "z": "4c77a098.14bed",
     "wires": [
       []
     ]
   },
   {
-    "id": "5022e1ba.bc98c",
+    "id": "deead92.2e05028",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 796.7380523681641,
-    "y": 195.22217273712158,
-    "z": "e5bf33cc.860bc",
+    "x": 811.7380523681641,
+    "y": 166.22217273712158,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "ecfb074a.096988",
+    "id": "103fcffc.47e2d",
     "type": "for",
     "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
-    "xml": "<for index='pidx' start='0' end='`$service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
+    "xml": "<for index='pidx' start='0' end='1' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 911.0000991821289,
-    "y": 312.0000705718994,
-    "z": "e5bf33cc.860bc",
+    "x": 926.0000991821289,
+    "y": 283.0000705718994,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "d7a2d973.f454d8"
+        "4ff3cba6.0577e4"
       ]
     ]
   },
   {
-    "id": "d7a2d973.f454d8",
+    "id": "4ff3cba6.0577e4",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 882.8459091186523,
-    "y": 368.224645614624,
-    "z": "e5bf33cc.860bc",
+    "x": 897.8459091186523,
+    "y": 339.224645614624,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "23cb526c.80076e",
-        "39defcd5.3339e4",
-        "165dda1d.49d8c6",
-        "6d05051.63437fc",
-        "2355af77.170bb",
-        "c3991295.942e1",
-        "5cbe5e79.5b38f",
-        "5573aa15.2f76f4",
-        "92a8c0e.7e8084",
-        "53bd8f16.8bed2"
+        "efb008da.002a38",
+        "56cd0f49.c1db2",
+        "1e3aa974.204b57",
+        "c0e08604.031d68",
+        "b2b348e8.930c38",
+        "ea908538.cdcb68",
+        "63bd98b8.1ea0d8",
+        "9da5cea0.60ef2",
+        "a382c856.52c0b8",
+        "4d332c82.ad3af4"
       ]
     ]
   },
   {
-    "id": "23cb526c.80076e",
+    "id": "efb008da.002a38",
     "type": "set",
     "name": "set prop.ar.provided-allotted-resource-id",
     "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />\n\n",
     "comments": "",
-    "x": 1152.8153915405273,
-    "y": 351.02744245529175,
-    "z": "e5bf33cc.860bc",
+    "x": 1167.8153915405273,
+    "y": 322.02744245529175,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "39defcd5.3339e4",
+    "id": "56cd0f49.c1db2",
     "type": "execute",
     "name": "generate tmp.ar-url-connection url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value='`$prop.ar.provided-allotted-resource-id`'/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1141.815284729004,
-    "y": 403.5724229812622,
-    "z": "e5bf33cc.860bc",
+    "x": 1156.815284729004,
+    "y": 374.5724229812622,
+    "z": "4c77a098.14bed",
     "wires": [
       []
     ]
   },
   {
-    "id": "165dda1d.49d8c6",
+    "id": "1e3aa974.204b57",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1282.8151321411133,
-    "y": 459.2390090227127,
-    "z": "e5bf33cc.860bc",
+    "x": 1297.8151321411133,
+    "y": 430.2390090227127,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "cd095866.b31848",
-        "1215888c.ee51e7"
+        "4145e899.11bf48",
+        "75032056.67182"
       ]
     ]
   },
   {
-    "id": "cd095866.b31848",
+    "id": "4145e899.11bf48",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1658.185203552246,
-    "y": 459.7611274719238,
-    "z": "e5bf33cc.860bc",
+    "x": 1673.185203552246,
+    "y": 430.7611274719238,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "7c49cfc5.d8cce"
+        "a6a898ea.1345e8"
       ]
     ]
   },
   {
-    "id": "1215888c.ee51e7",
+    "id": "75032056.67182",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1650.0370063781738,
-    "y": 494.8272123336792,
-    "z": "e5bf33cc.860bc",
+    "x": 1665.0370063781738,
+    "y": 465.8272123336792,
+    "z": "4c77a098.14bed",
     "wires": [
       [
-        "77edea1f.976304"
+        "b38b08ff.bf1c28"
       ]
     ]
   },
   {
-    "id": "7c49cfc5.d8cce",
+    "id": "a6a898ea.1345e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1789.1852989196777,
-    "y": 459.7611885070801,
-    "z": "e5bf33cc.860bc",
+    "x": 1804.1852989196777,
+    "y": 430.7611885070801,
+    "z": "4c77a098.14bed",
     "wires": [
       []
     ]
   },
   {
-    "id": "77edea1f.976304",
+    "id": "b38b08ff.bf1c28",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n    \n",
     "comments": "",
-    "x": 1796.1857872009277,
-    "y": 494.0946235656738,
-    "z": "e5bf33cc.860bc",
+    "x": 1811.1857872009277,
+    "y": 465.0946235656738,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "c3991295.942e1",
+    "id": "ea908538.cdcb68",
     "type": "set",
     "name": "set model-data to input",
     "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.onap-model-information.` \" />",
     "comments": "",
-    "x": 1123.0001907348633,
-    "y": 594.0000371932983,
-    "z": "e5bf33cc.860bc",
+    "x": 1138.0001907348633,
+    "y": 565.0000371932983,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "2355af77.170bb",
+    "id": "b2b348e8.930c38",
     "type": "set",
     "name": "set connection-attachment-ar-identifiers to input",
     "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.service-information.service-instance-id' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id` \" />\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.parent-service-instance-id` \" />\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-type` \" />\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-id` \" />\n",
     "comments": "",
-    "x": 1198.301872253418,
-    "y": 556.0159864425659,
-    "z": "e5bf33cc.860bc",
+    "x": 1213.301872253418,
+    "y": 527.0159864425659,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "6d05051.63437fc",
+    "id": "c0e08604.031d68",
     "type": "set",
     "name": "set ar-data to input",
     "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.request-information.request-action' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-status.action` \" />\n<parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-status.rpc-action` \" />\n<parameter name='connection-attachment-topology-operation-input.request-information.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.request-information.` \" />\n<parameter name='connection-attachment-topology-operation-input.sdnc-request-header.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.` \" />\n<parameter name='connection-attachment-topology-operation-input.service-information.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.service-information.` \" />\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.` \" />\n<parameter name='connection-attachment-topology-operation-input.connection-attachment-request-input.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.` \" />\n",
     "comments": "",
-    "x": 1105.1586456298828,
-    "y": 514.8253927230835,
-    "z": "e5bf33cc.860bc",
+    "x": 1120.1586456298828,
+    "y": 485.8253927230835,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "53bd8f16.8bed2",
+    "id": "4d332c82.ad3af4",
     "type": "call",
     "name": "call sotn-attachment-topology-operation-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-activate' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1199.0001945495605,
-    "y": 769.0000486373901,
-    "z": "e5bf33cc.860bc",
+    "x": 1214.0001945495605,
+    "y": 740.0000486373901,
+    "z": "4c77a098.14bed",
     "wires": [
       []
     ]
   },
   {
-    "id": "5573aa15.2f76f4",
+    "id": "9da5cea0.60ef2",
     "type": "call",
     "name": "call sotn-attachment-topology-operation-deactivate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-deactivate' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1208.0002746582031,
-    "y": 678.0000429153442,
-    "z": "e5bf33cc.860bc",
+    "x": 1223.0002746582031,
+    "y": 649.0000429153442,
+    "z": "4c77a098.14bed",
     "wires": [
       []
     ]
   },
   {
-    "id": "92a8c0e.7e8084",
+    "id": "a382c856.52c0b8",
     "type": "set",
     "name": "set request-action and svc-action",
     "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value=\"activate\" />\n<parameter name='connection-attachment-topology-operation-input.request-information.request-action' value=\"ActivateSOTNAttachmentInstance\" />\n\n\n",
     "comments": "",
-    "x": 1154.0002746582031,
-    "y": 723.0000457763672,
-    "z": "e5bf33cc.860bc",
+    "x": 1169.0002746582031,
+    "y": 694.0000457763672,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "5cbe5e79.5b38f",
+    "id": "63bd98b8.1ea0d8",
     "type": "set",
     "name": "set request-action and svc-action",
     "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value=\"deactivate\" />\n<parameter name='connection-attachment-topology-operation-input.request-information.request-action' value=\"DeactivateSOTNAttachmentInstance\" />\n<parameter name='connection-attachment-topology-operation-input.service-information.global-customer-id' value=\"`$service-data.service-information.global-customer-id` \" />\n<parameter name='connection-attachment-topology-operation-input.service-information.subscription-service-type' value=\"`$service-data.service-information.subscription-service-type` \" />\n<parameter name='connection-attachment-topology-operation-input.service-information.subscriber-name' value=\"`$service-data.service-information.subscriber-name` \" />",
     "comments": "",
-    "x": 1154.000114440918,
-    "y": 637.0000410079956,
-    "z": "e5bf33cc.860bc",
+    "x": 1169.000114440918,
+    "y": 608.0000410079956,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "17f9a997.150a06",
+    "id": "77dde683.c05af8",
     "type": "set",
     "name": "set service-data in tmp var",
     "xml": "<set>\n<parameter name = 'tmp.service-data.' value=\"`$service-data.`\"/>\n",
     "comments": "",
-    "x": 719.0001983642578,
-    "y": 266.0000944137573,
-    "z": "e5bf33cc.860bc",
+    "x": 734.0001983642578,
+    "y": 237.00009441375732,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "a8c6638b.cba29",
+    "id": "c64a9e95.de368",
     "type": "set",
     "name": "set tmp.service-data to service-data",
     "xml": "<set>\n<parameter name = 'service-data. '  value = \"`$tmp.service-data.`\"/>\n",
     "comments": "",
-    "x": 822.0003814697266,
-    "y": 845.0001068115234,
-    "z": "e5bf33cc.860bc",
+    "x": 837.0003814697266,
+    "y": 816.0001068115234,
+    "z": "4c77a098.14bed",
     "wires": []
   },
   {
-    "id": "59b44687.021ed8",
+    "id": "f4c6a746.18c888",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 743.0001831054688,
-    "y": 889.0000267028809,
-    "z": "e5bf33cc.860bc",
+    "x": 758.0001831054688,
+    "y": 860.0000267028809,
+    "z": "4c77a098.14bed",
     "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml
index df80e2d..01db650 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml
@@ -468,12 +468,13 @@
 		resource="allotted-resource" 
 		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
         pfx='pfx' local-only='false' force='false'>
                 <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
                 <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
                 <parameter name="operational-status" value="Active" />
                 <outcome value='failure'>
                     <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
index f86a75f..4ce82b1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
@@ -240,7 +240,7 @@
 		resource="allotted-resource" 
 		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
         pfx='pfx' local-only='false' force='false'>
                 <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml
index 180d317..6d67936 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml
@@ -509,11 +509,12 @@
 		resource="allotted-resource" 
 		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
         pfx='pfx' local-only='false' force='false'>
                 <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
                 <parameter name="operational-status" value="PendingDelete" />
                 <outcome value='failure'>
                     <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml
index 28f6442..9f9121c 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml
@@ -162,7 +162,7 @@
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'  
 		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id">
                 <outcome value='failure'>
                     <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index 28f3b75..ef9278b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -1,600 +1,624 @@
-<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}'>
-    <method rpc='sotn-attachment-topology-operation-activate' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='GET' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-                            <outcome value='1'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
-                                    </set>
-                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-                                        <outcome value='Created'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='PendingDelete'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" 
-    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-                                            </return>
-                                        </outcome>
-                                    </switch>
-                                    <set>
-                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
-                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="404" />
-                                    <parameter name="error-message" value="Error: Connection attachment resource not exist" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="404" />
-                            <parameter name="error-message" value="Error: Connection attachment resource not exist" />
-                        </return>
-                    </block>
-                </outcome>
-            </execute>
-            <block atomic="true">
-                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
-            </block>
-            <set>
-                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
-                <parameter name="outputPath" value="tmp.ar-url-psd"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='GET' />
-                <parameter name="responsePrefix" value="mdsal-psd" />
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="Error: Parent service data not available" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='tmp.found-in-ar' value='false' />
-                <parameter name='tmp.found-in-network' value='false' />
-                <parameter name='tmp.ep-available' value='false' />
-            </set>
-            <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>
-                <outcome value='2'>
-                    <block atomic="true">
-                        <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >
-                            <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                <outcome value='true'>
-                                    <block></block>
-                                </outcome>
-                                <outcome value='false'>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='tmp.pidx' value='`$pidx`' />
-                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
-                                            <parameter name='tmp.found-in-ar' value='true' />
-                                            <parameter name='tmp.ep-available' value='true' />
-                                        </set>
-                                    </block>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.found-in-ar`'>
-                            <outcome value='true'>
-                                <block atomic="true">
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                        <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-                                        <parameter name="outputPath" value="tmp.ar-other-url-connection"/>
-                                        <parameter name="target" value="{allotted-resource-id}"/>
-                                        <parameter name="replacement" value="`$tmp.provided-ar.allotted-resource-id`"/>
-                                    </execute>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-other-url-connection`' />
-                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
-                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                                        <parameter name='format' value='json' />
-                                        <parameter name='httpMethod' value='GET' />
-                                        <parameter name="responsePrefix" value="mdsal-other-ar" />
-                                        <outcome value='success'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="404" />
-                                                <parameter name="error-message" value="Error: SOTN provided attachment resource not found" />
-                                            </return>
-                                        </outcome>
-                                    </execute>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='1'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-psd.service-data.networks.network_length`'>
-                            <outcome value='1'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />
-                                    </set>
-                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
-                                        <block>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='tmp.found-in-network' value='true' />
-                                                        <parameter name='tmp.ep-available' value='true' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                        <parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <return status='success'>
-                                                <parameter name="ack-final-indicator" value="Y" />
-                                                <parameter name="error-code" value="200" />
-                                                <parameter name="error-message" value="`$error-message`" />
-                                            </return>
-                                        </block>
-                                    </for>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="404" />
-                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="Error: End points not available" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$tmp.ep-available`'>
-                <outcome value='false'>
-                    <block></block>
-                </outcome>
-                <outcome value='true'>
-                    <block atomic="true">
-                        <switch test='`$tmp.found-in-ar`'>
-                            <outcome value='true'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.ep.parameters.' value='`$mdsal-other-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                            <outcome value='false'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                        </switch>
-                        <for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>
-                            <block>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <return status='success'>
-                                    <parameter name="ack-final-indicator" value="Y" />
-                                    <parameter name="error-code" value="200" />
-                                    <parameter name="error-message" value="`$error-message`" />
-                                </return>
-                            </block>
-                        </for>
-                        <block atomic="true">
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
-                                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
-                                <parameter name="restapiUser" value="`$prop.oof.user`" />
-                                <parameter name="restapiPassword" value="`$prop.oof.password`" />
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="post"/>
-                                <parameter name="responsePrefix" value="oof"/>
-                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                <parameter name="trustStorePassword" value="adminadmin"/>
-                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                <parameter name="keyStorePassword" value="adminadmin"/>
-                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                <outcome value='failure'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error executing OOF api" />
-                                    </return>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block></block>
-                                </outcome>
-                            </execute>
-                            <for index='vidx' start='0' end='`$oof.vpns_length`' >
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />
-                                    </set>
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="pnf" 
-		key="pnf.pnf-name = $oof.vpn.access-node-id 
-		AND depth = '0'"
-        pfx='tmp.aai.pnf' local-only='false' >
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                            </set>
-                                        </outcome>
-                                        <outcome value='not-found'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                            </return>
-                                        </outcome>
-                                    </get-resource>
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
-		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                            </set>
-                                        </outcome>
-                                        <outcome value='not-found'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                            </return>
-                                        </outcome>
-                                    </get-resource>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
-                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                        <parameter name="format" value="json"/>
-                                        <parameter name="httpMethod" value="patch"/>
-                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                        <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='success'>
-                                            <block atomic="true"></block>
-                                        </outcome>
-                                    </execute>
-                                    <set>
-                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`" />
-                                    </set>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' >
-                                        <parameter name='vpn-id' value='`$tmp.vpnName`' />
-                                        <parameter name='vpn-name' value='`$tmp.vpnName`' />
-                                        <parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                        <parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />
-                                        <parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                        <parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />
-                                        <parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                        <parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />
-                                        <parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                        <parameter name='operational-status' value='Created' />
-                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                    </save>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' 
-      force="true" pfx="tmp.AnAI-data">
-                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$mdsal-psd.service-data.networks.network[0].network-id`" />
-                                    </save>
-                                    <set>
-                                        <parameter name='src-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`" />
-                                        <parameter name='dst-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`" />
-                                    </set>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' 
-      force="true" pfx="tmp.AnAI-data">
-                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
-                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
-                                    </save>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' 
-      force="true" pfx="tmp.AnAI-data">
-                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
-                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" />
-                                    </save>
-                                </block>
-                            </for>
-                        </block>
-                    </block>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-                <parameter name="outputPath" value="tmp.current-time" />
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-            </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="allotted-resource" 
-		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
-			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id"
-        pfx='pfx' local-only='false' force='false'>
-                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-                <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
-                <parameter name="operational-status" value="Active" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-            </update>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
+<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}'>
+    <method rpc='sotn-attachment-topology-operation-activate' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
+                                    </set>
+                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+                                        <outcome value='Created'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='PendingDelete'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" 
+    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Connection attachment resource not exist" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="404" />
+                            <parameter name="error-message" value="Error: Connection attachment resource not exist" />
+                        </return>
+                    </block>
+                </outcome>
+            </execute>
+            <block atomic="true">
+                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+            </block>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+                <parameter name="outputPath" value="tmp.ar-url-psd"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-psd" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: Parent service data not available" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='tmp.found-in-ar' value='false' />
+                <parameter name='tmp.found-in-network' value='false' />
+                <parameter name='tmp.ep-available' value='false' />
+            </set>
+            <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value='2'>
+                    <block atomic="true">
+                        <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >
+                            <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block></block>
+                                </outcome>
+                                <outcome value='false'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
+                                            <parameter name='tmp.found-in-ar' value='true' />
+                                            <parameter name='tmp.ep-available' value='true' />
+                                        </set>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-in-ar`'>
+                            <outcome value='true'>
+                                <block atomic="true">
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                        <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                                        <parameter name="outputPath" value="tmp.ar-other-url-connection"/>
+                                        <parameter name="target" value="{allotted-resource-id}"/>
+                                        <parameter name="replacement" value="`$tmp.provided-ar.allotted-resource-id`"/>
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-other-url-connection`' />
+                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='httpMethod' value='GET' />
+                                        <parameter name="responsePrefix" value="mdsal-other-ar" />
+                                        <outcome value='success'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="404" />
+                                                <parameter name="error-message" value="Error: SOTN provided attachment resource not found" />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='1'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-psd.service-data.networks.network_length`'>
+                            <outcome value='1'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />
+                                    </set>
+                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+                                        <block>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='tmp.found-in-network' value='true' />
+                                                        <parameter name='tmp.ep-available' value='true' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <return status='success'>
+                                                <parameter name="ack-final-indicator" value="Y" />
+                                                <parameter name="error-code" value="200" />
+                                                <parameter name="error-message" value="`$error-message`" />
+                                            </return>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: End points not available" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$tmp.ep-available`'>
+                <outcome value='false'>
+                    <block></block>
+                </outcome>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <switch test='`$tmp.found-in-ar`'>
+                            <outcome value='true'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.ep.parameters.' value='`$mdsal-other-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                        <for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>
+                            <block>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                    <parameter name="error-message" value="`$error-message`" />
+                                </return>
+                            </block>
+                        </for>
+                        <block atomic="true">
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
+                                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
+                                <parameter name="restapiUser" value="`$prop.oof.user`" />
+                                <parameter name="restapiPassword" value="`$prop.oof.password`" />
+                                <parameter name="format" value="json"/>
+                                <parameter name="httpMethod" value="post"/>
+                                <parameter name="responsePrefix" value="oof"/>
+                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error executing OOF api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block></block>
+                                </outcome>
+                            </execute>
+                            <for index='vidx' start='0' end='`$oof.vpns_length`' >
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />
+                                    </set>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="pnf.pnf-name = $oof.vpn.access-node-id 
+		AND depth = '0'"
+        pfx='tmp.aai.pnf' local-only='false' >
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
+		     depth = '1'"
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
+                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
+                                        <parameter name="format" value="json"/>
+                                        <parameter name="httpMethod" value="post"/>
+                                        <parameter name="responsePrefix" value="token-result"/>
+                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error executing get token rest api" />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
+                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                        <parameter name="format" value="json"/>
+                                        <parameter name="httpMethod" value="patch"/>
+                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block atomic="true"></block>
+                                        </outcome>
+                                    </execute>
+                                    <set>
+                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`" />
+                                    </set>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' >
+                                        <parameter name='vpn-id' value='`$tmp.vpnName`' />
+                                        <parameter name='vpn-name' value='`$tmp.vpnName`' />
+                                        <parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />
+                                        <parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />
+                                        <parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />
+                                        <parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />
+                                        <parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
+                                        <parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />
+                                        <parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
+                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                        <parameter name='operational-status' value='Created' />
+                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                    </save>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$mdsal-psd.service-data.networks.network[0].network-id`" />
+                                    </save>
+                                    <set>
+                                        <parameter name='src-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`" />
+                                        <parameter name='dst-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`" />
+                                    </set>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
+                                    </save>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" />
+                                    </save>
+                                </block>
+                            </for>
+                        </block>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id"
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Active" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
index 819c02b..ff7640d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
@@ -1,296 +1,304 @@
-<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}'>
-    <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
-        <block atomic="true">
-            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
-                <outcome value=''>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                        <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='error-code' value='' />
-                                <parameter name='error-message' value="An error occured while generation allotted resource ID" />
-                            </return>
-                        </outcome>
-                    </execute>
-                </outcome>
-                <outcome value='Other'>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                    </set>
-                </outcome>
-            </switch>
-            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
-                <outcome value=''>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
-                    </set>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='GET' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='failure'>
-                    <block></block>
-                </outcome>
-                <outcome value='success'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-                            <outcome value='1'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </execute>
-            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
-                <outcome value=''>
-                    <set>
-                        <parameter name='tmp.cidx' value="`0`" />
-                        <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='tmp.found-cidx' value="`false`" />
-                        </set>
-                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
-                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                <outcome value='true'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.found-cidx`'>
-                            <outcome value='false'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
-                <parameter name="outputPath" value="tmp.parent-ar-url"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.parent-ar-url`"/>
-                <parameter name="outputPath" value="tmp.parent-ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="parent" />
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
-                <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-                <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-                <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' 
-value="`$connection-attachment-ar-identifiers.`" />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-                <parameter name="outputPath" value="tmp.current-time" />
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-            </set>
-            <block atomic="true">
-                <for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >
-                    <block atomic="true">
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                            <parameter name="original_string" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>
-                            <parameter name="regex" value="_"/>
-                            <parameter name="ctx_memory_result_key" value="param-prefix"/>
-                        </execute>
-                        <set>
-                            <parameter name="`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
-                        </set>
-                    </block>
-                </for>
-                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
-            </block>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-            </set>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="allotted-resource" 
-		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
-			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id"
-        pfx='pfx' local-only='false' force='false'>
-                <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
-                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
-                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
-                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
-                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
-                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
-                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
-                <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
-                <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
-                <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-                <parameter name="operational-status" value="Created" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-            </save>
-            <set>
-                <parameter name='src-ltpId' value="`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`" />
-            </set>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="allotted-resource:relationship-list" 
-		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
-			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id" 
-      force="true" pfx="tmp.AnAI-data">
-                <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
-            </save>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
+<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}'>
+    <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
+        <block atomic="true">
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+                <outcome value=''>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                        <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
+                        <outcome value='failure'>
+                            <return status='failure'>
+                                <parameter name='error-code' value='' />
+                                <parameter name='error-message' value="An error occured while generation allotted resource ID" />
+                            </return>
+                        </outcome>
+                    </execute>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                    </set>
+                </outcome>
+            </switch>
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
+                    </set>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='failure'>
+                    <block></block>
+                </outcome>
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </execute>
+            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.cidx' value="`0`" />
+                        <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <set>
+                            <parameter name='tmp.found-cidx' value="`false`" />
+                        </set>
+                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-cidx`'>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.parent-ar-url`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="parent" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' 
+value="`$connection-attachment-ar-identifiers.`" />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <block atomic="true">
+                <for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >
+                    <block atomic="true">
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                            <parameter name="original_string" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>
+                            <parameter name="regex" value="_"/>
+                            <parameter name="ctx_memory_result_key" value="param-prefix"/>
+                        </execute>
+                        <set>
+                            <parameter name="`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
+                        </set>
+                    </block>
+                </for>
+                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+            </block>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+            </set>
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='allotted-resource' 
+      key='customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id' >
+                <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
+                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
+                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
+                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
+                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
+                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
+                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
+                <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
+                <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Created" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </save>
+            <set>
+                <parameter name='src-ltpId' value="`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`" />
+            </set>
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource:relationship-list" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id" 
+      force="true" pfx="tmp.AnAI-data">
+                <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
+            </save>
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id" 
+      force="true" pfx="tmp.AnAI-data">
+                <parameter name="relationship-list.relationship[0].related-to" value="allotted-resource" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/business/customers/customer/' + $connection-attachment-topology-operation-input.service-information.global-customer-id + '/service-subscriptions/service-subscription/' + $connection-attachment-topology-operation-input.service-information.subscription-service-type + '/service-instances/service-instance/' + $connection-attachment-topology-operation-input.service-information.service-instance-id + '/allotted-resources/allotted-resource/' + $tmp.ar.allotted-resource-id`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="allotted-resource.id" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.ar.allotted-resource-id`" />
+            </save>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
index 9fc30e6..4626b3c 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
@@ -276,6 +276,29 @@
                                                         </outcome>
                                                     </get-resource>
                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
+                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
+                                                        <parameter name="format" value="json"/>
+                                                        <parameter name="httpMethod" value="post"/>
+                                                        <parameter name="responsePrefix" value="token-result"/>
+                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                        <outcome value='success'>
+                                                            <set>
+                                                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error executing get token rest api" />
+                                                            </return>
+                                                        </outcome>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`" />
                                                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -384,12 +407,13 @@
 		resource="allotted-resource" 
 		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
         pfx='pfx' local-only='false' force='false'>
                 <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
                 <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
                 <parameter name="operational-status" value="PendingDelete" />
                 <outcome value='failure'>
                     <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
index 2d723a7..3104c68 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
@@ -162,7 +162,7 @@
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'  
 		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id">
                 <outcome value='failure'>
                     <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml
index 9a257eb..b49cb89 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml
@@ -14,7 +14,7 @@
             <set>
                 <parameter name = 'tmp.service-data.' value="`$service-data.`"/>
             </set>
-            <for index='pidx' start='0' end='`$service-data.provided-allotted-resources.provided-allotted-resource_length`' >
+            <for index='pidx' start='0' end='1' >
                 <block atomic="true">
                     <set>
                         <parameter name='prop.ar.provided-allotted-resource-id' value='`$service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />