X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2FGENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json;h=448098c16e5b3ac5520d8e90daaa9f81b1b4bf4c;hb=07d173c059f15fe9959deec9650246b173a3b50c;hp=eb1c854dfe6dd4eab8186a67eb3de0e8f64a8f94;hpb=cc49cb7753ff820dada996ab1d56263243630395;p=sdnc%2Foam.git

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 eb1c854d..448098c1 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": "2bdb51b9.ffb50e",
+    "id": "7430f04a.1774",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 113,
-    "y": 44,
-    "z": "e055a121.e69f6",
+    "x": 85.00390625,
+    "y": 36.999999046325684,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d26984ef.8ad798"
+        "7176568b.6d7dc8"
       ]
     ]
   },
   {
-    "id": "d26984ef.8ad798",
+    "id": "7176568b.6d7dc8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2107 +22,2120 @@
     "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": 325.00000381469727,
-    "y": 116.0000171661377,
-    "z": "e055a121.e69f6",
+    "x": 297.00391006469727,
+    "y": 109.00001621246338,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "a82211ff.bcbea"
+        "1281a61c.40d4ba"
       ]
     ]
   },
   {
-    "id": "a82211ff.bcbea",
+    "id": "1281a61c.40d4ba",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-deactivate",
     "xml": "<method rpc='sdwan-attachment-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 313.0001220703125,
-    "y": 204,
-    "z": "e055a121.e69f6",
+    "x": 285.0040283203125,
+    "y": 196.99999904632568,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "17e8ca87.b6b645"
+        "cb789dee.7e0ea"
       ]
     ]
   },
   {
-    "id": "17e8ca87.b6b645",
+    "id": "cb789dee.7e0ea",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 329.0001220703125,
-    "y": 759.0002446174622,
-    "z": "e055a121.e69f6",
+    "x": 301.0040283203125,
+    "y": 752.0002436637878,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "7ace4d9e.58fcf4",
-        "bea2d27c.d685a",
-        "be682c34.83d48",
-        "693dc7ad.b4be18",
-        "eca332.2df45cd",
-        "e0348bfe.6da088",
-        "fa3b1cd4.6bac8",
-        "666c2133.53672",
-        "41482a99.a59c34",
-        "15783ea7.8d4171",
-        "bde1b214.c3f7b",
-        "96128287.8c319",
-        "6a5b6014.c0c27",
-        "e1363ac.79d3bc8",
-        "47bcadbc.4f3554",
-        "5c4aaa91.ee5904",
-        "adeb4876.0f5318",
-        "2ec20a50.f21ce6",
-        "5ceee25e.e4656c",
-        "e3162e1d.557c8",
-        "10dfad38.ba80e3",
-        "8825a27f.2ee76"
+        "b3e4fdfd.73c98",
+        "6160e5eb.eabd7c",
+        "36f03095.f7624",
+        "8b80d6.bfb8df28",
+        "c3c64d17.8399b",
+        "79aaa9c4.4c7368",
+        "f2ac7b6a.645e98",
+        "17808c6d.fbcb64",
+        "d8dcd45a.fcb0f8",
+        "bbb611b3.fa639",
+        "3e42552f.cc2b3a",
+        "dcc926d7.4a3488",
+        "4623075d.b08748",
+        "c6cd0b89.3b6988",
+        "d4cf70d6.63ae5",
+        "96741252.7528f",
+        "b30219b.8f8bde8",
+        "7dea7f5b.a3b81",
+        "5b38ce7d.8512a",
+        "4ed101e7.e4ff7",
+        "2a2d01cd.5646fe",
+        "4b5b6f95.ae82b",
+        "63f14ad3.bfd8e4"
       ]
     ]
   },
   {
-    "id": "7ace4d9e.58fcf4",
+    "id": "b3e4fdfd.73c98",
     "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": 725.9935607910156,
-    "y": 157.9934868812561,
-    "z": "e055a121.e69f6",
+    "x": 697.9974670410156,
+    "y": 150.9934859275818,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "3dae2c9.5fd3cd4",
+    "id": "e79f6bf1.e760c8",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 754.9538726806641,
-    "y": 122.02528285980225,
-    "z": "e055a121.e69f6",
+    "x": 726.9577789306641,
+    "y": 115.02528190612793,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "bea2d27c.d685a",
+    "id": "6160e5eb.eabd7c",
     "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": 679.9934997558594,
-    "y": 250.99349212646484,
-    "z": "e055a121.e69f6",
+    "x": 651.9974060058594,
+    "y": 243.99349117279053,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "693dc7ad.b4be18",
+    "id": "8b80d6.bfb8df28",
     "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": 686.2553901672363,
-    "y": 338.6602210998535,
-    "z": "e055a121.e69f6",
+    "x": 658.2592964172363,
+    "y": 331.6602201461792,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "be682c34.83d48",
+    "id": "36f03095.f7624",
     "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": 736.2554931640625,
-    "y": 425.66022205352783,
-    "z": "e055a121.e69f6",
+    "x": 708.2593994140625,
+    "y": 418.6602210998535,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e6fef6dc.2d5ab8",
+    "id": "a79814d4.cdbed8",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 779.8085174560547,
-    "y": 517.5387678146362,
-    "z": "e055a121.e69f6",
+    "x": 751.8124237060547,
+    "y": 510.5387668609619,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "43378634.47ada8",
+    "id": "ad19a624.c947b8",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 733.9935302734375,
-    "y": 217.993501663208,
-    "z": "e055a121.e69f6",
+    "x": 705.9974365234375,
+    "y": 210.9935007095337,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "2638e15d.85e40e",
+    "id": "543e0d5a.474aa4",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 751.9934959411621,
-    "y": 303.8823823928833,
-    "z": "e055a121.e69f6",
+    "x": 723.9974021911621,
+    "y": 296.882381439209,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "9a84fa70.2209a8",
+    "id": "512154aa.b3fb3c",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 777.9935150146484,
-    "y": 390.8823413848877,
-    "z": "e055a121.e69f6",
+    "x": 749.9974212646484,
+    "y": 383.8823404312134,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "d74c07cb.d7c4f8",
+    "id": "515ee298.e46b6c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1220.6668281555176,
-    "y": 544.0000286102295,
-    "z": "e055a121.e69f6",
+    "x": 1192.6707344055176,
+    "y": 537.0000276565552,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "34940fae.b43b1"
+        "abb973f1.c78ab"
       ]
     ]
   },
   {
-    "id": "34940fae.b43b1",
+    "id": "abb973f1.c78ab",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1389.6668319702148,
-    "y": 542.4999294281006,
-    "z": "e055a121.e69f6",
+    "x": 1361.6707382202148,
+    "y": 535.4999284744263,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d6a9a70b.860c78"
+        "e8fcf921.210ef8"
       ]
     ]
   },
   {
-    "id": "d6a9a70b.860c78",
+    "id": "e8fcf921.210ef8",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1562.5241012573242,
-    "y": 480.11909198760986,
-    "z": "e055a121.e69f6",
+    "x": 1534.5280075073242,
+    "y": 473.11909103393555,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "99f7b40f.a33748",
-        "e196788b.7f6f48"
+        "386d63ec.fd330c",
+        "7e042bd8.776d24"
       ]
     ]
   },
   {
-    "id": "99f7b40f.a33748",
+    "id": "386d63ec.fd330c",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1799.8573455810547,
-    "y": 458.1190423965454,
-    "z": "e055a121.e69f6",
+    "x": 1771.8612518310547,
+    "y": 451.1190414428711,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "4d65a30c.1bb46c"
+        "d200a0fb.28d9a"
       ]
     ]
   },
   {
-    "id": "4d65a30c.1bb46c",
+    "id": "d200a0fb.28d9a",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1984.3812351226807,
-    "y": 455.02387619018555,
-    "z": "e055a121.e69f6",
+    "x": 1956.3851413726807,
+    "y": 448.02387523651123,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "c007de9b.1a8ea",
-        "5a0d997d.5410d8",
-        "58ae2d07.a93234"
+        "e41bac9c.61118",
+        "88329a50.a105f8",
+        "89950442.815df8"
       ]
     ]
   },
   {
-    "id": "89d000a2.16646",
+    "id": "d190b08a.d3505",
     "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": 1908.5190773010254,
-    "y": 580.0661172866821,
-    "z": "e055a121.e69f6",
+    "x": 1880.5229835510254,
+    "y": 573.0661163330078,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "c9d998e2.a81b38",
+    "id": "24c1e070.0695f",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1212.5186309814453,
-    "y": 579.0661134719849,
-    "z": "e055a121.e69f6",
+    "x": 1184.5225372314453,
+    "y": 572.0661125183105,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d2ec7fde.451d7"
+        "4c6403f2.3fe66c"
       ]
     ]
   },
   {
-    "id": "d2ec7fde.451d7",
+    "id": "4c6403f2.3fe66c",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1392.5185813903809,
-    "y": 579.7326641082764,
-    "z": "e055a121.e69f6",
+    "x": 1364.5224876403809,
+    "y": 572.732663154602,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "89d000a2.16646"
+        "d190b08a.d3505"
       ]
     ]
   },
   {
-    "id": "e196788b.7f6f48",
+    "id": "7e042bd8.776d24",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1788.1852989196777,
-    "y": 495.3994026184082,
-    "z": "e055a121.e69f6",
+    "x": 1760.1892051696777,
+    "y": 488.3994016647339,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "89d000a2.16646"
+        "d190b08a.d3505"
       ]
     ]
   },
   {
-    "id": "c007de9b.1a8ea",
+    "id": "e41bac9c.61118",
     "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": 2230.444793701172,
-    "y": 415.0001058578491,
-    "z": "e055a121.e69f6",
+    "x": 2202.448699951172,
+    "y": 408.0001049041748,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "58ae2d07.a93234",
+    "id": "89950442.815df8",
     "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": 2163.4447898864746,
-    "y": 505.42866039276123,
-    "z": "e055a121.e69f6",
+    "x": 2135.4486961364746,
+    "y": 498.4286594390869,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "5a0d997d.5410d8",
+    "id": "88329a50.a105f8",
     "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": 2174.444625854492,
-    "y": 459.0001096725464,
-    "z": "e055a121.e69f6",
+    "x": 2146.448532104492,
+    "y": 452.00010871887207,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d61247de.876858",
-        "8beb5612.c27698"
+        "ca3f78a2.5bc238",
+        "968020a5.6806a"
       ]
     ]
   },
   {
-    "id": "d61247de.876858",
+    "id": "ca3f78a2.5bc238",
     "type": "outcome",
     "name": "outcome Active",
     "xml": "<outcome value='Active'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2381.044574737549,
-    "y": 449.0001096725464,
-    "z": "e055a121.e69f6",
+    "x": 2353.048480987549,
+    "y": 442.00010871887207,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "17b6e937.06f8f7"
+        "58491b2c.42f3c4"
       ]
     ]
   },
   {
-    "id": "8beb5612.c27698",
+    "id": "968020a5.6806a",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2380.7590942382812,
-    "y": 491.4287004470825,
-    "z": "e055a121.e69f6",
+    "x": 2352.7630004882812,
+    "y": 484.4286994934082,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d4116f87.4108f"
+        "4c9f7920.4c2598"
       ]
     ]
   },
   {
-    "id": "17b6e937.06f8f7",
+    "id": "58491b2c.42f3c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2533.5151290893555,
-    "y": 447.3757600784302,
-    "z": "e055a121.e69f6",
+    "x": 2505.5190353393555,
+    "y": 440.37575912475586,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d4116f87.4108f",
+    "id": "4c9f7920.4c2598",
     "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": 2553.6669845581055,
-    "y": 488.000111579895,
-    "z": "e055a121.e69f6",
+    "x": 2525.6708908081055,
+    "y": 481.0001106262207,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "30756753.5fa938",
+    "id": "60f55e27.f2b8e",
     "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": 941.3031158447266,
-    "y": 640.4935908317566,
-    "z": "e055a121.e69f6",
+    "x": 913.3070220947266,
+    "y": 633.4935898780823,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "eca332.2df45cd",
+    "id": "c3c64d17.8399b",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 638.3092803955078,
-    "y": 641.4999389648438,
-    "z": "e055a121.e69f6",
+    "x": 610.3131866455078,
+    "y": 634.4999380111694,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "30756753.5fa938"
+        "60f55e27.f2b8e"
       ]
     ]
   },
   {
-    "id": "804022a6.3de27",
+    "id": "4352df33.d9426",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 820.0004425048828,
-    "y": 702.5316982269287,
-    "z": "e055a121.e69f6",
+    "x": 792.0043487548828,
+    "y": 695.5316972732544,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "de0fff38.b1af5",
+    "id": "536fbd5d.ad4c74",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2213.472946166992,
-    "y": 379.5039691925049,
-    "z": "e055a121.e69f6",
+    "x": 2185.476852416992,
+    "y": 372.50396823883057,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "4c932022.44bb4",
+    "id": "d407857f.3d4ed8",
     "type": "comment",
     "name": "Set source end point",
     "info": "",
     "comments": "",
-    "x": 651.9728393554688,
-    "y": 609.2540645599365,
-    "z": "e055a121.e69f6",
+    "x": 623.9767456054688,
+    "y": 602.2540636062622,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "e0348bfe.6da088",
+    "id": "79aaa9c4.4c7368",
     "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": 704.9689178466797,
-    "y": 734.0002088546753,
-    "z": "e055a121.e69f6",
+    "x": 676.9728240966797,
+    "y": 727.000207901001,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "9796ef03.4b4b1",
+    "id": "a093fbeb.16ad58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1082.9689140319824,
-    "y": 783.000207901001,
-    "z": "e055a121.e69f6",
+    "x": 1054.9728202819824,
+    "y": 776.0002069473267,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "b45d9050.17bcb"
+        "c54cab5a.e88d98"
       ]
     ]
   },
   {
-    "id": "bd6c8a09.7c4c38",
+    "id": "46b4b052.24e9d",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1074.8207168579102,
-    "y": 818.0662927627563,
-    "z": "e055a121.e69f6",
+    "x": 1046.8246231079102,
+    "y": 811.066291809082,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "69c73a80.242c64"
+        "b51504e3.dadba8"
       ]
     ]
   },
   {
-    "id": "69c73a80.242c64",
+    "id": "b51504e3.dadba8",
     "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": 1249.9694023132324,
-    "y": 814.3336429595947,
-    "z": "e055a121.e69f6",
+    "x": 1221.9733085632324,
+    "y": 807.3336420059204,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "b45d9050.17bcb",
+    "id": "c54cab5a.e88d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1233.9689140319824,
-    "y": 781.000207901001,
-    "z": "e055a121.e69f6",
+    "x": 1205.9728202819824,
+    "y": 774.0002069473267,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a4e20887.0b85d8",
+    "id": "bdec135a.84aa6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 948.7308311462402,
-    "y": 1757.9527840614319,
-    "z": "e055a121.e69f6",
+    "x": 920.7347373962402,
+    "y": 1750.9527831077576,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "8d059d44.8e7a7"
+        "323e9893.b0b728"
       ]
     ]
   },
   {
-    "id": "8d059d44.8e7a7",
+    "id": "323e9893.b0b728",
     "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": 1110.2546653747559,
-    "y": 1802.5718301534653,
-    "z": "e055a121.e69f6",
+    "x": 1082.2585716247559,
+    "y": 1795.571829199791,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "e2a5ade9.56c27",
+    "id": "f668942a.019a38",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 950.8260726928711,
-    "y": 1823.714726805687,
-    "z": "e055a121.e69f6",
+    "x": 922.8299789428711,
+    "y": 1816.7147258520126,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "8d059d44.8e7a7"
+        "323e9893.b0b728"
       ]
     ]
   },
   {
-    "id": "3cae81ad.c7916e",
+    "id": "24abbd36.f847b2",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 662.7784996032715,
-    "y": 1773.3021473884583,
-    "z": "e055a121.e69f6",
+    "x": 634.7824058532715,
+    "y": 1766.302146434784,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "96128287.8c319",
+    "id": "dcc926d7.4a3488",
     "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": 677.5461959838867,
-    "y": 1694.8276286125183,
-    "z": "e055a121.e69f6",
+    "x": 649.5501022338867,
+    "y": 1687.827627658844,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "6a5b6014.c0c27",
+    "id": "4623075d.b08748",
     "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": 624.9593353271484,
-    "y": 1889.4434475898743,
-    "z": "e055a121.e69f6",
+    "x": 596.9632415771484,
+    "y": 1882.4434466362,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "bde1b214.c3f7b",
+    "id": "3e42552f.cc2b3a",
     "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": 727.2782974243164,
-    "y": 1602.4684023857117,
-    "z": "e055a121.e69f6",
+    "x": 699.2822036743164,
+    "y": 1595.4684014320374,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "7e9cd2ab.0312bc",
-        "85c2a287.db093",
-        "b89f709c.ac27e"
+        "5966123b.c0928c",
+        "28e0d860.c64a68",
+        "4d9dd2fd.a02e7c"
       ]
     ]
   },
   {
-    "id": "7e9cd2ab.0312bc",
+    "id": "5966123b.c0928c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 995.9196739196777,
-    "y": 1653.7998141273856,
-    "z": "e055a121.e69f6",
+    "x": 967.9235801696777,
+    "y": 1646.7998131737113,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "c16778e0.4835a8"
+        "1d15a206.04371e"
       ]
     ]
   },
   {
-    "id": "85c2a287.db093",
+    "id": "28e0d860.c64a68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 986.9197235107422,
-    "y": 1622.2998398765922,
-    "z": "e055a121.e69f6",
+    "x": 958.9236297607422,
+    "y": 1615.2998389229178,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "c16778e0.4835a8"
+        "1d15a206.04371e"
       ]
     ]
   },
   {
-    "id": "b89f709c.ac27e",
+    "id": "4d9dd2fd.a02e7c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 990.6697616577148,
-    "y": 1592.6569447517395,
-    "z": "e055a121.e69f6",
+    "x": 962.6736679077148,
+    "y": 1585.6569437980652,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "69a0963d.493b78"
+        "e1b7a04e.aa4f3"
       ]
     ]
   },
   {
-    "id": "c16778e0.4835a8",
+    "id": "1d15a206.04371e",
     "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": 1156.6697616577148,
-    "y": 1623.04986371845,
-    "z": "e055a121.e69f6",
+    "x": 1128.6736679077148,
+    "y": 1616.0498627647758,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "69a0963d.493b78",
+    "id": "e1b7a04e.aa4f3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1132.3257293701172,
-    "y": 1588.8491139411926,
-    "z": "e055a121.e69f6",
+    "x": 1104.3296356201172,
+    "y": 1581.8491129875183,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "fa3b1cd4.6bac8",
+    "id": "f2ac7b6a.645e98",
     "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": 627.4919166564941,
-    "y": 1452.8493254184723,
-    "z": "e055a121.e69f6",
+    "x": 599.4958229064941,
+    "y": 1445.849324464798,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "41482a99.a59c34",
+    "id": "d8dcd45a.fcb0f8",
     "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": 644.777759552002,
-    "y": 1525.4689230918884,
-    "z": "e055a121.e69f6",
+    "x": 616.781665802002,
+    "y": 1518.468922138214,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "15783ea7.8d4171",
+    "id": "bbb611b3.fa639",
     "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": 699.7648162841797,
-    "y": 1563.420060634613,
-    "z": "e055a121.e69f6",
+    "x": 671.7687225341797,
+    "y": 1556.4200596809387,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "666c2133.53672",
+    "id": "17808c6d.fbcb64",
     "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": 641.3334579467773,
-    "y": 1492.0239758491516,
-    "z": "e055a121.e69f6",
+    "x": 613.3373641967773,
+    "y": 1485.0239748954773,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "6edf8947.4ad548",
+    "id": "83fab007.e00bd",
     "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": 750.6668891906738,
-    "y": 1408.0238506793976,
-    "z": "e055a121.e69f6",
+    "x": 722.6707954406738,
+    "y": 1401.0238497257233,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "2f4fb378.be435c",
+    "id": "ce9eef3f.571d2",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 692.2467155456543,
-    "y": 1375.4371523857117,
-    "z": "e055a121.e69f6",
+    "x": 664.2506217956543,
+    "y": 1368.4371514320374,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "e440d873.f4a568",
+    "id": "63f14ad3.bfd8e4",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 689.2227783203125,
-    "y": 1810.7542901039124,
-    "z": "e055a121.e69f6",
+    "x": 661.2266845703125,
+    "y": 1803.754289150238,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "a4e20887.0b85d8",
-        "e2a5ade9.56c27"
+        "bdec135a.84aa6",
+        "f668942a.019a38"
       ]
     ]
   },
   {
-    "id": "e1363ac.79d3bc8",
+    "id": "c6cd0b89.3b6988",
     "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": 853.3339538574219,
-    "y": 560.4999494552612,
-    "z": "e055a121.e69f6",
+    "x": 825.3378601074219,
+    "y": 553.4999485015869,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d74c07cb.d7c4f8",
-        "c9d998e2.a81b38"
+        "515ee298.e46b6c",
+        "24c1e070.0695f"
       ]
     ]
   },
   {
-    "id": "47bcadbc.4f3554",
+    "id": "d4cf70d6.63ae5",
     "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": 707.0001983642578,
-    "y": 769.0002107620239,
-    "z": "e055a121.e69f6",
+    "x": 679.0041046142578,
+    "y": 762.0002098083496,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c4aaa91.ee5904",
+    "id": "96741252.7528f",
     "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": 774.0001602172852,
-    "y": 804.0002946853638,
-    "z": "e055a121.e69f6",
+    "x": 746.0040664672852,
+    "y": 797.0002937316895,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "9796ef03.4b4b1",
-        "bd6c8a09.7c4c38"
+        "a093fbeb.16ad58",
+        "46b4b052.24e9d"
       ]
     ]
   },
   {
-    "id": "adaeb2d3.7f8c4",
+    "id": "490fd156.3cc2e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2594.812660217285,
-    "y": 821.329451084137,
-    "z": "e055a121.e69f6",
+    "x": 2566.816566467285,
+    "y": 814.3294501304626,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "a3d10a9a.3a1df8"
+        "88745fb7.28e43"
       ]
     ]
   },
   {
-    "id": "cddd16fb.abe6b8",
+    "id": "edb86366.daca5",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2628.66414642334,
-    "y": 767.3954176902771,
-    "z": "e055a121.e69f6",
+    "x": 2600.66805267334,
+    "y": 760.3954167366028,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "af15096f.71acd8"
+        "ae1d17f2.d02858"
       ]
     ]
   },
   {
-    "id": "fee7243c.735b08",
+    "id": "92d891d3.4ab0e",
     "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": 2113.81356048584,
-    "y": 1648.9966716766357,
-    "z": "e055a121.e69f6",
+    "x": 2085.81746673584,
+    "y": 1641.9966707229614,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "6c84c38f.13baec"
+        "71080db2.ebc5d4"
       ]
     ]
   },
   {
-    "id": "6c84c38f.13baec",
+    "id": "71080db2.ebc5d4",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2389.4801330566406,
-    "y": 1649.9967045783997,
-    "z": "e055a121.e69f6",
+    "x": 2361.4840393066406,
+    "y": 1642.9967036247253,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "fc4d2ad5.d7c638"
+        "a5010038.a8cca"
       ]
     ]
   },
   {
-    "id": "fc4d2ad5.d7c638",
+    "id": "a5010038.a8cca",
     "type": "switchNode",
     "name": "switch ActivateSiteInstance",
-    "xml": "<switch test=\"`$mdsal-parentsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == ActivateSiteInstance`\">\n    \n    \n\n",
+    "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": 2626.34383392334,
-    "y": 1654.1946682929993,
-    "z": "e055a121.e69f6",
+    "x": 2598.34774017334,
+    "y": 1647.194667339325,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "3d2b3845.2b40b8"
+        "78d61896.379bb8"
       ]
     ]
   },
   {
-    "id": "3d2b3845.2b40b8",
+    "id": "78d61896.379bb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2835.343349456787,
-    "y": 1654.194821357727,
-    "z": "e055a121.e69f6",
+    "x": 2807.347255706787,
+    "y": 1647.1948204040527,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "1ec9b1bd.90608e"
+        "bfec68b.915a698"
       ]
     ]
   },
   {
-    "id": "c0ef9502.2ffda8",
+    "id": "9280788a.1a5978",
     "type": "set",
     "name": "set tmp.sitevidx ",
     "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 2232.3442993164062,
-    "y": 1758.1952500343323,
-    "z": "e055a121.e69f6",
+    "x": 2204.3482055664062,
+    "y": 1751.195249080658,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "faa3fd1c.58594",
+    "id": "a8aa86a8.764d68",
     "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": 2148.8124618530273,
-    "y": 1071.9961004257202,
-    "z": "e055a121.e69f6",
+    "x": 2120.8163681030273,
+    "y": 1064.996099472046,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "798afd86.2541c4",
+    "id": "9f1816e2.642ea8",
     "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": 2174.812255859375,
-    "y": 1020.4959716796875,
-    "z": "e055a121.e69f6",
+    "x": 2146.816162109375,
+    "y": 1013.4959707260132,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "20bb02be.0259ee"
+        "9c8b4e3c.7c8c5"
       ]
     ]
   },
   {
-    "id": "20bb02be.0259ee",
+    "id": "9c8b4e3c.7c8c5",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2429.81258392334,
-    "y": 1017.496431350708,
-    "z": "e055a121.e69f6",
+    "x": 2401.81649017334,
+    "y": 1010.4964303970337,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "245bf6ff.3e669a",
-        "c47b810c.d3dc3"
+        "30449575.75463a",
+        "92ec0f10.dba05"
       ]
     ]
   },
   {
-    "id": "245bf6ff.3e669a",
+    "id": "30449575.75463a",
     "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": 2559.8124046325684,
-    "y": 989.4963684082031,
-    "z": "e055a121.e69f6",
+    "x": 2531.8163108825684,
+    "y": 982.4963674545288,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "2a2eadb0.1dbad2"
+        "b4910f3d.0db62"
       ]
     ]
   },
   {
-    "id": "2a2eadb0.1dbad2",
+    "id": "b4910f3d.0db62",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2700.8127365112305,
-    "y": 988.4963674545288,
-    "z": "e055a121.e69f6",
+    "x": 2672.8166427612305,
+    "y": 981.4963665008545,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "991f431c.722fb"
+        "367dfe9f.4b0012"
       ]
     ]
   },
   {
-    "id": "991f431c.722fb",
+    "id": "367dfe9f.4b0012",
     "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": 2866.8134002685547,
-    "y": 983.0962705612183,
-    "z": "e055a121.e69f6",
+    "x": 2838.8173065185547,
+    "y": 976.096269607544,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "f74ee755.f16cf8",
+    "id": "1009f0e9.e8787f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2446.8130836486816,
-    "y": 1166.9963779449463,
-    "z": "e055a121.e69f6",
+    "x": 2418.8169898986816,
+    "y": 1159.996376991272,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "cbc38822.1755a8"
+        "38660dd.8ae9ef2"
       ]
     ]
   },
   {
-    "id": "32c3c46f.3bc2bc",
+    "id": "c9a9abe5.0b0758",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2440.664825439453,
-    "y": 1123.0624151229858,
-    "z": "e055a121.e69f6",
+    "x": 2412.668731689453,
+    "y": 1116.0624141693115,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "7c65d2f6.31dcec"
+        "faec6a4d.0cfc28"
       ]
     ]
   },
   {
-    "id": "af15096f.71acd8",
+    "id": "ae1d17f2.d02858",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2754.812271118164,
-    "y": 764.4958510398865,
-    "z": "e055a121.e69f6",
+    "x": 2726.816177368164,
+    "y": 757.4958500862122,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3d10a9a.3a1df8",
+    "id": "88745fb7.28e43",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1884.3121337890625,
-    "y": 1038.4959716796875,
-    "z": "e055a121.e69f6",
+    "x": 1856.3160400390625,
+    "y": 1031.4959707260132,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "798afd86.2541c4",
-        "faa3fd1c.58594",
-        "e9b06c97.acbe5",
-        "6b58bb8e.b3cd84"
+        "9f1816e2.642ea8",
+        "a8aa86a8.764d68",
+        "56d62d96.7f8ce4",
+        "b96757af.5cca38"
       ]
     ]
   },
   {
-    "id": "7c65d2f6.31dcec",
+    "id": "faec6a4d.0cfc28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2570.3129444122314,
-    "y": 1116.496335029602,
-    "z": "e055a121.e69f6",
+    "x": 2542.3168506622314,
+    "y": 1109.4963340759277,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "cbc38822.1755a8",
+    "id": "38660dd.8ae9ef2",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1960.3124237060547,
-    "y": 1243.495985031128,
-    "z": "e055a121.e69f6",
+    "x": 1932.3163299560547,
+    "y": 1236.4959840774536,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d2493073.c1028"
+        "c768cf9a.62862"
       ]
     ]
   },
   {
-    "id": "2180b01e.7e4f6",
+    "id": "4edc1d8f.0a1944",
     "type": "for",
     "name": "for loop siteidx - Get site ID from servicedata",
-    "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-parentsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "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": 2324.3151473999023,
-    "y": 1799.4970078468323,
-    "z": "e055a121.e69f6",
+    "x": 2296.3190536499023,
+    "y": 1792.497006893158,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "af63b1cd.e76ae"
+        "3d77f67c.b5ecea"
       ]
     ]
   },
   {
-    "id": "e04f34e4.013728",
+    "id": "ead36ab7.282438",
     "type": "switchNode",
     "name": "switch siteId",
-    "xml": "<switch test=\"`$mdsal-parentsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n",
+    "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": 2396.3171310424805,
-    "y": 1867.4979872703552,
-    "z": "e055a121.e69f6",
+    "x": 2368.3210372924805,
+    "y": 1860.497986316681,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "f8f1f3f8.78972"
+        "d924a586.673c18"
       ]
     ]
   },
   {
-    "id": "b95ce81a.c946a8",
+    "id": "321bf129.18913e",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2250.8154067993164,
-    "y": 1940.99702501297,
-    "z": "e055a121.e69f6",
+    "x": 2222.8193130493164,
+    "y": 1933.9970240592957,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "fb38a029.7518f",
-        "4ede6e05.800f6"
+        "875c4bea.660358",
+        "ecb79aa0.650108",
+        "f8b5c142.e5e42"
       ]
     ]
   },
   {
-    "id": "e3162e1d.557c8",
+    "id": "4ed101e7.e4ff7",
     "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-tolopogy.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.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`\" />",
+    "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.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": 725.8129196166992,
-    "y": 1200.4966821670532,
-    "z": "e055a121.e69f6",
+    "x": 697.8168258666992,
+    "y": 1193.496681213379,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "512bde3d.9ae1f",
-        "b1a2ea7d.7f7bd8"
+        "79fecdbb.444414",
+        "8f4a1544.240ce8"
       ]
     ]
   },
   {
-    "id": "512bde3d.9ae1f",
+    "id": "79fecdbb.444414",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 980.812686920166,
-    "y": 1216.4966821670532,
-    "z": "e055a121.e69f6",
+    "x": 952.816593170166,
+    "y": 1209.496681213379,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "94f6bfc2.443d3"
+        "1ef5ce22.99b2f2"
       ]
     ]
   },
   {
-    "id": "94f6bfc2.443d3",
+    "id": "1ef5ce22.99b2f2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1150.8126258850098,
-    "y": 1219.4966821670532,
-    "z": "e055a121.e69f6",
+    "x": 1122.8165321350098,
+    "y": 1212.496681213379,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "8511117c.800f2",
+    "id": "13d95323.743e4d",
     "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": 1150.8127479553223,
-    "y": 1175.4966821670532,
-    "z": "e055a121.e69f6",
+    "x": 1122.8166542053223,
+    "y": 1168.496681213379,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "b1a2ea7d.7f7bd8",
+    "id": "8f4a1544.240ce8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 983.8126258850098,
-    "y": 1175.4966821670532,
-    "z": "e055a121.e69f6",
+    "x": 955.8165321350098,
+    "y": 1168.496681213379,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "8511117c.800f2"
+        "13d95323.743e4d"
       ]
     ]
   },
   {
-    "id": "7731dc6f.5a7d24",
+    "id": "9f45ce4d.1731c",
     "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": 1131.3796367645264,
-    "y": 972.1728582382202,
-    "z": "e055a121.e69f6",
+    "x": 1103.3835430145264,
+    "y": 965.1728572845459,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "8825a27f.2ee76",
+    "id": "4b5b6f95.ae82b",
     "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 = SDWAN-Controller AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "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": 700.8793792724609,
-    "y": 1023.1732087135315,
-    "z": "e055a121.e69f6",
+    "x": 672.8832855224609,
+    "y": 1016.1732077598572,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "2e6a47b6.7b6de8",
-        "9dc29fcc.585cf",
-        "49b46c59.711bd4"
+        "9379b94d.ebf738",
+        "85618b89.4df498",
+        "d4faaa3e.0874d8"
       ]
     ]
   },
   {
-    "id": "2e6a47b6.7b6de8",
+    "id": "9379b94d.ebf738",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 959.8796710968018,
-    "y": 978.1728420257568,
-    "z": "e055a121.e69f6",
+    "x": 931.8835773468018,
+    "y": 971.1728410720825,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "7731dc6f.5a7d24"
+        "9f45ce4d.1731c"
       ]
     ]
   },
   {
-    "id": "9dc29fcc.585cf",
+    "id": "85618b89.4df498",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 956.3703880310059,
-    "y": 1016.7469387054443,
-    "z": "e055a121.e69f6",
+    "x": 928.3742942810059,
+    "y": 1009.74693775177,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "8fde510d.f3ff3"
+        "ef8f714d.57ad1"
       ]
     ]
   },
   {
-    "id": "49b46c59.711bd4",
+    "id": "d4faaa3e.0874d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 951.7033958435059,
-    "y": 1058.0802516937256,
-    "z": "e055a121.e69f6",
+    "x": 923.7073020935059,
+    "y": 1051.0802507400513,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "9ea97502.11aad8"
+        "7ed2ad4f.8bf614"
       ]
     ]
   },
   {
-    "id": "8fde510d.f3ff3",
+    "id": "ef8f714d.57ad1",
     "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": 1106.9417037963867,
-    "y": 1011.0326910018921,
-    "z": "e055a121.e69f6",
+    "x": 1078.9456100463867,
+    "y": 1004.0326900482178,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "9ea97502.11aad8",
+    "id": "7ed2ad4f.8bf614",
     "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": 1113.4758567810059,
-    "y": 1059.5194606781006,
-    "z": "e055a121.e69f6",
+    "x": 1085.4797630310059,
+    "y": 1052.5194597244263,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "d2493073.c1028",
+    "id": "c768cf9a.62862",
     "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": 2285.311996459961,
-    "y": 1242.9957127571106,
-    "z": "e055a121.e69f6",
+    "x": 2257.315902709961,
+    "y": 1235.9957118034363,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "220869b3.8ab4c6"
+        "e252e8ae.c32088"
       ]
     ]
   },
   {
-    "id": "220869b3.8ab4c6",
+    "id": "e252e8ae.c32088",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1963.9790878295898,
-    "y": 1333.995548248291,
-    "z": "e055a121.e69f6",
+    "x": 1935.9829940795898,
+    "y": 1326.9955472946167,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "542e96e2.bce748"
+        "14486987.b85df6"
       ]
     ]
   },
   {
-    "id": "542e96e2.bce748",
+    "id": "14486987.b85df6",
     "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": 2208.979820251465,
-    "y": 1335.9959144592285,
-    "z": "e055a121.e69f6",
+    "x": 2180.983726501465,
+    "y": 1328.9959135055542,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "6a416d6d.a241f4"
+        "1a69042b.c0872c"
       ]
     ]
   },
   {
-    "id": "6a416d6d.a241f4",
+    "id": "1a69042b.c0872c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2465.9793128967285,
-    "y": 1334.9960446357727,
-    "z": "e055a121.e69f6",
+    "x": 2437.9832191467285,
+    "y": 1327.9960436820984,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "fe572e69.46e77"
+        "ecc75ce5.52a22"
       ]
     ]
   },
   {
-    "id": "fd8cdc4f.58f91",
+    "id": "693abfa.fed9d4",
     "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": 2267.9799995422363,
-    "y": 1424.995632648468,
-    "z": "e055a121.e69f6",
+    "x": 2239.9839057922363,
+    "y": 1417.9956316947937,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "21109ad6.0bc416"
+        "3b22a756.98c7f8"
       ]
     ]
   },
   {
-    "id": "21109ad6.0bc416",
+    "id": "3b22a756.98c7f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2533.979688644409,
-    "y": 1421.9959559440613,
-    "z": "e055a121.e69f6",
+    "x": 2505.983594894409,
+    "y": 1414.995954990387,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "c6ab4f3c.02f18",
-        "dd125781.58e528"
+        "dccdc0aa.2bb7b",
+        "b18f2a38.d85ae8"
       ]
     ]
   },
   {
-    "id": "c6ab4f3c.02f18",
+    "id": "dccdc0aa.2bb7b",
     "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": 2704.98002243042,
-    "y": 1390.9954657554626,
-    "z": "e055a121.e69f6",
+    "x": 2676.98392868042,
+    "y": 1383.9954648017883,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "ec8b6683.dafbe8"
+        "e0213c77.0f4ca"
       ]
     ]
   },
   {
-    "id": "ec8b6683.dafbe8",
+    "id": "e0213c77.0f4ca",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2856.9800128936768,
-    "y": 1392.9954962730408,
-    "z": "e055a121.e69f6",
+    "x": 2828.9839191436768,
+    "y": 1385.9954953193665,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "8651aac5.31b1a8"
+        "71cd0898.67eff8"
       ]
     ]
   },
   {
-    "id": "8651aac5.31b1a8",
+    "id": "71cd0898.67eff8",
     "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": 3000.9800243377686,
-    "y": 1392.5954308509827,
-    "z": "e055a121.e69f6",
+    "x": 2972.9839305877686,
+    "y": 1385.5954298973083,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "dd125781.58e528",
+    "id": "b18f2a38.d85ae8",
     "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 == 'vpnId'`\">\n",
+    "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": 2696.645746231079,
-    "y": 1433.328447818756,
-    "z": "e055a121.e69f6",
+    "x": 2668.649652481079,
+    "y": 1426.3284468650818,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d2a6c128.0e306"
+        "5ef41a40.56fe94"
       ]
     ]
   },
   {
-    "id": "d2a6c128.0e306",
+    "id": "5ef41a40.56fe94",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2848.645736694336,
-    "y": 1435.3284783363342,
-    "z": "e055a121.e69f6",
+    "x": 2820.649642944336,
+    "y": 1428.32847738266,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "88095b1a.e451a8"
+        "25d7449c.78b97c"
       ]
     ]
   },
   {
-    "id": "88095b1a.e451a8",
+    "id": "25d7449c.78b97c",
     "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": 2992.6457481384277,
-    "y": 1434.9284129142761,
-    "z": "e055a121.e69f6",
+    "x": 2964.6496543884277,
+    "y": 1427.9284119606018,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "10dfad38.ba80e3",
+    "id": "2a2d01cd.5646fe",
     "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.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": 698.8125915527344,
-    "y": 1311.9966473579407,
-    "z": "e055a121.e69f6",
+    "x": 670.8164978027344,
+    "y": 1304.9966464042664,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "dbba5b2e.06b178",
-        "92b8b7a2.551998"
+        "c4c9f687.9e7588",
+        "802fa182.99b1f"
       ]
     ]
   },
   {
-    "id": "dbba5b2e.06b178",
+    "id": "c4c9f687.9e7588",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 931.8126697540283,
-    "y": 1336.9966464042664,
-    "z": "e055a121.e69f6",
+    "x": 903.8165760040283,
+    "y": 1329.996645450592,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "647fdeef.e91dd"
+        "1b0d22fd.e671fd"
       ]
     ]
   },
   {
-    "id": "647fdeef.e91dd",
+    "id": "1b0d22fd.e671fd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1101.812608718872,
-    "y": 1339.9966464042664,
-    "z": "e055a121.e69f6",
+    "x": 1073.816514968872,
+    "y": 1332.996645450592,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "487a6881.62d628",
+    "id": "588dc5fe.3853dc",
     "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": 1101.8127307891846,
-    "y": 1295.9966464042664,
-    "z": "e055a121.e69f6",
+    "x": 1073.8166370391846,
+    "y": 1288.996645450592,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "92b8b7a2.551998",
+    "id": "802fa182.99b1f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 934.8126087188721,
-    "y": 1295.9966464042664,
-    "z": "e055a121.e69f6",
+    "x": 906.8165149688721,
+    "y": 1288.996645450592,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "487a6881.62d628"
+        "588dc5fe.3853dc"
       ]
     ]
   },
   {
-    "id": "d0aa490b.36da18",
+    "id": "67ff2f7e.84dea",
     "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": 2914.8124046325684,
-    "y": 1035.9959411621094,
-    "z": "e055a121.e69f6",
+    "x": 2886.8163108825684,
+    "y": 1028.995940208435,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "c47b810c.d3dc3",
+    "id": "92ec0f10.dba05",
     "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": 2595.312244415283,
-    "y": 1038.9959335327148,
-    "z": "e055a121.e69f6",
+    "x": 2567.316150665283,
+    "y": 1031.9959325790405,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "947974c8.04d658"
+        "da5b9464.fd80d8"
       ]
     ]
   },
   {
-    "id": "947974c8.04d658",
+    "id": "da5b9464.fd80d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2766.3124046325684,
-    "y": 1037.9960021972656,
-    "z": "e055a121.e69f6",
+    "x": 2738.3163108825684,
+    "y": 1030.9960012435913,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "d0aa490b.36da18"
+        "67ff2f7e.84dea"
       ]
     ]
   },
   {
-    "id": "ddcd4395.ffc5",
+    "id": "1f17ba6f.07fd86",
     "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": 2080.81201171875,
-    "y": 779.9960656166077,
-    "z": "e055a121.e69f6",
+    "x": 2052.81591796875,
+    "y": 772.9960646629333,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "de8fd68.62a4428",
+    "id": "5609c5e0.866b1c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1258.8424682617188,
-    "y": 887.1932353973389,
-    "z": "e055a121.e69f6",
+    "x": 1230.8463745117188,
+    "y": 880.1932344436646,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "1e72ef49.46e8b1"
+        "b59d7969.b1f2f8"
       ]
     ]
   },
   {
-    "id": "25ee3acf.45d7b6",
+    "id": "cd36d7b2.2df868",
     "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": 2065.32967376709,
-    "y": 813.329541683197,
-    "z": "e055a121.e69f6",
+    "x": 2037.3335800170898,
+    "y": 806.3295407295227,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e392cace.793438",
+    "id": "f53ba2f7.ad562",
     "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": 2205.329303741455,
-    "y": 848.9958329200745,
-    "z": "e055a121.e69f6",
+    "x": 2177.333209991455,
+    "y": 841.9958319664001,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "cddd16fb.abe6b8",
-        "adaeb2d3.7f8c4"
+        "edb86366.daca5",
+        "490fd156.3cc2e"
       ]
     ]
   },
   {
-    "id": "e9b06c97.acbe5",
+    "id": "56d62d96.7f8ce4",
     "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": 2180.9965438842773,
-    "y": 1141.9958896636963,
-    "z": "e055a121.e69f6",
+    "x": 2153.0004501342773,
+    "y": 1134.995888710022,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "f74ee755.f16cf8",
-        "32c3c46f.3bc2bc"
+        "1009f0e9.e8787f",
+        "c9a9abe5.0b0758"
       ]
     ]
   },
   {
-    "id": "fe572e69.46e77",
+    "id": "ecc75ce5.52a22",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1925.329963684082,
-    "y": 1431.6630954742432,
-    "z": "e055a121.e69f6",
+    "x": 1897.333869934082,
+    "y": 1424.6630945205688,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "fd8cdc4f.58f91",
-        "1d60ce05.e0ad92",
-        "11102f6.31d23d1",
-        "a4fa1e7f.2461f"
+        "693abfa.fed9d4",
+        "90dd080.179f4f8",
+        "74e88748.645e58",
+        "a1a950eb.a0193"
       ]
     ]
   },
   {
-    "id": "fb38a029.7518f",
+    "id": "875c4bea.660358",
     "type": "set",
     "name": "set prop.attach.siteId",
-    "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$mdsal-parentsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n\n",
+    "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": 2516.998279571533,
-    "y": 1922.663851261139,
-    "z": "e055a121.e69f6",
+    "x": 2489.002185821533,
+    "y": 1915.6638503074646,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "f8f1f3f8.78972",
+    "id": "d924a586.673c18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2536.99853515625,
-    "y": 1867.6636776924133,
-    "z": "e055a121.e69f6",
+    "x": 2509.00244140625,
+    "y": 1860.663676738739,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "b95ce81a.c946a8"
+        "321bf129.18913e"
       ]
     ]
   },
   {
-    "id": "1ec9b1bd.90608e",
+    "id": "bfec68b.915a698",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2029.664421081543,
-    "y": 1753.3301882743835,
-    "z": "e055a121.e69f6",
+    "x": 2001.668327331543,
+    "y": 1746.3301873207092,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "2180b01e.7e4f6",
-        "c0ef9502.2ffda8"
+        "4edc1d8f.0a1944",
+        "9280788a.1a5978"
       ]
     ]
   },
   {
-    "id": "adeb4876.0f5318",
+    "id": "b30219b.8f8bde8",
     "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": 866.181224822998,
-    "y": 922.635835647583,
-    "z": "e055a121.e69f6",
+    "x": 838.185131072998,
+    "y": 915.6358346939087,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "de8fd68.62a4428"
+        "5609c5e0.866b1c"
       ]
     ]
   },
   {
-    "id": "af63b1cd.e76ae",
+    "id": "3d77f67c.b5ecea",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2241.664779663086,
-    "y": 1864.0008358955383,
-    "z": "e055a121.e69f6",
+    "x": 2213.668685913086,
+    "y": 1857.000834941864,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "e04f34e4.013728"
+        "ead36ab7.282438"
       ]
     ]
   },
   {
-    "id": "2ec20a50.f21ce6",
+    "id": "7dea7f5b.a3b81",
     "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": 712,
-    "y": 865.5311913490295,
-    "z": "e055a121.e69f6",
+    "x": 684.00390625,
+    "y": 858.5311903953552,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "4ede6e05.800f6",
+    "id": "ecb79aa0.650108",
     "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<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",
+    "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": 2544.502113342285,
-    "y": 1967.5316562652588,
-    "z": "e055a121.e69f6",
+    "x": 2516.506019592285,
+    "y": 1960.5316553115845,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "6b58bb8e.b3cd84",
+    "id": "b96757af.5cca38",
     "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": 2165.500144958496,
-    "y": 1104.5314102172852,
-    "z": "e055a121.e69f6",
+    "x": 2137.504051208496,
+    "y": 1097.5314092636108,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d60ce05.e0ad92",
+    "id": "90dd080.179f4f8",
     "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.allotted-resource-operation-information.service-information.service-instance-id`' />\n",
+    "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": 2198.5005645751953,
-    "y": 1493.531328201294,
-    "z": "e055a121.e69f6",
+    "x": 2170.5044708251953,
+    "y": 1486.5313272476196,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "11102f6.31d23d1",
+    "id": "74e88748.645e58",
     "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": 2223.833023071289,
-    "y": 1526.4096240997314,
-    "z": "e055a121.e69f6",
+    "x": 2195.836929321289,
+    "y": 1519.4096231460571,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a4fa1e7f.2461f",
+    "id": "a1a950eb.a0193",
     "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": 2274.8331451416016,
-    "y": 1563.4094429016113,
-    "z": "e055a121.e69f6",
+    "x": 2246.8370513916016,
+    "y": 1556.409441947937,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "6e57063a.0010c8",
-        "6eeded55.346254"
+        "d085c605.a64ce8",
+        "872e1cc1.fb142"
       ]
     ]
   },
   {
-    "id": "6eeded55.346254",
+    "id": "872e1cc1.fb142",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2553.5002098083496,
-    "y": 1559.5311546325684,
-    "z": "e055a121.e69f6",
+    "x": 2525.5041160583496,
+    "y": 1552.531153678894,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "4470f1a5.f3f5a"
+        "eb1435b3.407188"
       ]
     ]
   },
   {
-    "id": "6e57063a.0010c8",
+    "id": "d085c605.a64ce8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2551.3525390625,
-    "y": 1520.597282409668,
-    "z": "e055a121.e69f6",
+    "x": 2523.3564453125,
+    "y": 1513.5972814559937,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "85643aef.3b34a8"
+        "6579eeb9.4ad43"
       ]
     ]
   },
   {
-    "id": "85643aef.3b34a8",
+    "id": "6579eeb9.4ad43",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2681.000732421875,
-    "y": 1514.0312423706055,
-    "z": "e055a121.e69f6",
+    "x": 2653.004638671875,
+    "y": 1507.0312414169312,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4470f1a5.f3f5a",
+    "id": "eb1435b3.407188",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2702.501106262207,
-    "y": 1560.5313396453857,
-    "z": "e055a121.e69f6",
+    "x": 2674.505012512207,
+    "y": 1553.5313386917114,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "fee7243c.735b08"
+        "92d891d3.4ab0e"
       ]
     ]
   },
   {
-    "id": "1e72ef49.46e8b1",
+    "id": "b59d7969.b1f2f8",
     "type": "switchNode",
     "name": "switch allotted resource ID match",
     "xml": "<switch test=\"`$prop.ar.provided-allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1482.500114440918,
-    "y": 884.0312638282776,
-    "z": "e055a121.e69f6",
+    "x": 1454.504020690918,
+    "y": 877.0312628746033,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "e324a45a.91d0f8"
+        "d35d9e14.f135e"
       ]
     ]
   },
   {
-    "id": "e324a45a.91d0f8",
+    "id": "d35d9e14.f135e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1696.5001792907715,
-    "y": 815.0312943458557,
-    "z": "e055a121.e69f6",
+    "x": 1668.5040855407715,
+    "y": 808.0312933921814,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "80651cf1.36d15"
+        "72234e91.d5575"
       ]
     ]
   },
   {
-    "id": "80651cf1.36d15",
+    "id": "72234e91.d5575",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1838.5004272460938,
-    "y": 814.0312352180481,
-    "z": "e055a121.e69f6",
+    "x": 1810.5043334960938,
+    "y": 807.0312342643738,
+    "z": "5c37638f.99fd6c",
     "wires": [
       [
-        "ddcd4395.ffc5",
-        "25ee3acf.45d7b6",
-        "e392cace.793438"
+        "1f17ba6f.07fd86",
+        "cd36d7b2.2df868",
+        "f53ba2f7.ad562"
       ]
     ]
   },
   {
-    "id": "c2710bbf.7f5e98",
+    "id": "d4480c4c.ab7f1",
     "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": 1791.5000305175781,
-    "y": 747.0312962532043,
-    "z": "e055a121.e69f6",
+    "x": 1763.5039367675781,
+    "y": 740.03129529953,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "4c2f69ef.f668e8",
+    "id": "44d17735.c18b38",
     "type": "comment",
     "name": "loop for provided allotted rsource Id",
     "info": "",
     "comments": "",
-    "x": 978.5,
-    "y": 886.5312523841858,
-    "z": "e055a121.e69f6",
+    "x": 950.50390625,
+    "y": 879.5312514305115,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "ce1eca8a.5fa098",
+    "id": "e435a42b.3afe08",
     "type": "comment",
     "name": "get allotted resource for the allotted resource ID",
     "info": "",
     "comments": "",
-    "x": 2352.500328063965,
-    "y": 748.5311741828918,
-    "z": "e055a121.e69f6",
+    "x": 2324.504234313965,
+    "y": 741.5311732292175,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "c6139ab0.680cf8",
+    "id": "1438e6b6.ccead9",
     "type": "comment",
     "name": "get parent service data to get connectivity which has connectivity and vpn ID",
     "info": "",
     "comments": "",
-    "x": 2135.499855041504,
-    "y": 975.5312519073486,
-    "z": "e055a121.e69f6",
+    "x": 2107.503761291504,
+    "y": 968.5312509536743,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "1497e243.92bc1e",
+    "id": "32a9e203.7d629e",
     "type": "comment",
     "name": "get service data from service instance id from allotted reosurce Id to get sites vnf",
     "info": "",
     "comments": "",
-    "x": 2324.499855041504,
-    "y": 1457.5310516357422,
-    "z": "e055a121.e69f6",
+    "x": 2296.503761291504,
+    "y": 1450.5310506820679,
+    "z": "5c37638f.99fd6c",
     "wires": []
   },
   {
-    "id": "5ceee25e.e4656c",
+    "id": "5b38ce7d.8512a",
     "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": 759.5001220703125,
-    "y": 1116.5312991142273,
-    "z": "e055a121.e69f6",
+    "x": 731.5040283203125,
+    "y": 1109.531298160553,
+    "z": "5c37638f.99fd6c",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "f8b5c142.e5e42",
+    "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": 2546.2539978027344,
+    "y": 2001.2539825439453,
+    "z": "5c37638f.99fd6c",
+    "wires": []
   }
 ]