From 07d173c059f15fe9959deec9650246b173a3b50c Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Fri, 24 Aug 2018 19:21:33 +0530
Subject: SDWAN flow based end-end test and issue fix

SDWAN DGs and restapi templates issue fixes

Change-Id: I5d1d4e6cb17e9b187ea4f0942ca837472738fe62
Issue-ID: SDNC-357
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: b1da373ad0e08400b4c1f2a8cfbb69524df745a2
---
 ...wan-attachment-topology-operation-activate.json | 1390 ++++++++++----------
 1 file changed, 701 insertions(+), 689 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json')

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
index 58b8c3eb..684b6b02 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "80dd667e.b96f28",
+    "id": "8656b138.5dcef",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 113,
-    "y": 41,
-    "z": "dffc6494.bbb2d8",
+    "x": 87.00390625,
+    "y": 63.999998569488525,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "7472205c.aef1a"
+        "434423eb.200dcc"
       ]
     ]
   },
   {
-    "id": "7472205c.aef1a",
+    "id": "434423eb.200dcc",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2015 +22,2027 @@
     "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": 304.0000057220459,
-    "y": 111.00001811981201,
-    "z": "dffc6494.bbb2d8",
+    "x": 278.0039119720459,
+    "y": 134.00001668930054,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "37ba3eae.275d42"
+        "e6e0d8a8.8bfcf8"
       ]
     ]
   },
   {
-    "id": "37ba3eae.275d42",
+    "id": "e6e0d8a8.8bfcf8",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-activate",
     "xml": "<method rpc='sdwan-attachment-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 292.00012397766113,
-    "y": 199.00000095367432,
-    "z": "dffc6494.bbb2d8",
+    "x": 266.00403022766113,
+    "y": 221.99999952316284,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "ee5288e.f42de78"
+        "5cdb946c.3b710c"
       ]
     ]
   },
   {
-    "id": "ee5288e.f42de78",
+    "id": "5cdb946c.3b710c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 194.00013732910156,
-    "y": 885.0002890825272,
-    "z": "dffc6494.bbb2d8",
+    "x": 168.00404357910156,
+    "y": 908.0002876520157,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "b85a45bf.0bc7a8",
-        "1151bd20.7a3e23",
-        "9037088f.df5478",
-        "dae5e077.3dcd8",
-        "5bfd91ae.4a06",
-        "4bcdea66.6625d4",
-        "3d8eaf9a.38bd9",
-        "1c9f2051.6c4ec",
-        "5bbd58f7.5f7198",
-        "40c05ce.b6f2ba4",
-        "c934c812.741518",
-        "cfd66b10.01cc08",
-        "5daf20a3.56c58",
-        "235295.bc1afd6c",
-        "9bb2f2c0.a869e",
-        "78a5dd87.45acf4",
-        "12273108.2aad0f",
-        "989cf904.9df618",
-        "38de1063.b6c52",
-        "1b86e032.9e8d5",
-        "27476583.31719a",
-        "6f11d9b9.d9b5a8",
-        "d462299e.954ef8"
+        "4b9de3d9.03091c",
+        "4127df46.08ca1",
+        "aae6c90e.119798",
+        "72064d52.212b94",
+        "21e8ba33.483c86",
+        "7d9870f2.8c169",
+        "f1c987fe.e262e8",
+        "4c06f720.016118",
+        "1379096d.d52197",
+        "4fc8c244.1177ac",
+        "d4d40535.00b288",
+        "daadac76.292c6",
+        "c4a41078.ea3c4",
+        "43fe29d3.28d4b8",
+        "38c9c0d2.63a2d",
+        "9192f41d.1c9e78",
+        "19eae0e7.50657f",
+        "585348e6.e28c68",
+        "4041fa5f.8f6984",
+        "db5d0d5.71c66f",
+        "537ad820.346958",
+        "5723dd.5302dc24",
+        "390c3a59.81dbe6"
       ]
     ]
   },
   {
-    "id": "b85a45bf.0bc7a8",
+    "id": "4b9de3d9.03091c",
     "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": 704.9935626983643,
-    "y": 152.99348783493042,
-    "z": "dffc6494.bbb2d8",
+    "x": 678.9974689483643,
+    "y": 175.99348640441895,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "7b859e23.ef0a6",
+    "id": "246c798e.5e7076",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 733.9538745880127,
-    "y": 117.02528381347656,
-    "z": "dffc6494.bbb2d8",
+    "x": 707.9577808380127,
+    "y": 140.0252823829651,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "1151bd20.7a3e23",
+    "id": "4127df46.08ca1",
     "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": 658.993501663208,
-    "y": 245.99349308013916,
-    "z": "dffc6494.bbb2d8",
+    "x": 632.997407913208,
+    "y": 268.9934916496277,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "dae5e077.3dcd8",
+    "id": "72064d52.212b94",
     "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": 665.255392074585,
-    "y": 333.66022205352783,
-    "z": "dffc6494.bbb2d8",
+    "x": 639.259298324585,
+    "y": 356.66022062301636,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9037088f.df5478",
+    "id": "aae6c90e.119798",
     "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": 712.255449295044,
-    "y": 421.6602258682251,
-    "z": "dffc6494.bbb2d8",
+    "x": 686.259355545044,
+    "y": 444.6602244377136,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "8334555.85225a8",
+    "id": "ca8f4f1a.61b38",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 766.8084106445312,
-    "y": 490.53865146636963,
-    "z": "dffc6494.bbb2d8",
+    "x": 740.8123168945312,
+    "y": 513.5386500358582,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "3f9851c.f3967ae",
+    "id": "9f182507.e3c608",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 712.9935321807861,
-    "y": 212.99350261688232,
-    "z": "dffc6494.bbb2d8",
+    "x": 686.9974384307861,
+    "y": 235.99350118637085,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "1e81abbc.616b14",
+    "id": "2aa7816a.d5fa1e",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 730.9934978485107,
-    "y": 298.8823833465576,
-    "z": "dffc6494.bbb2d8",
+    "x": 704.9974040985107,
+    "y": 321.88238191604614,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "72dc7ecf.95a62",
+    "id": "7187d295.0c7a1c",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 756.9935169219971,
-    "y": 385.882342338562,
-    "z": "dffc6494.bbb2d8",
+    "x": 730.9974231719971,
+    "y": 408.88234090805054,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "e6ee5327.c0d68",
+    "id": "b2104ab0.d42038",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1220.6668224334717,
-    "y": 503.99997901916504,
-    "z": "dffc6494.bbb2d8",
+    "x": 1194.6707286834717,
+    "y": 526.9999775886536,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "8c680853.310ea8"
+        "736e1064.726c"
       ]
     ]
   },
   {
-    "id": "8c680853.310ea8",
+    "id": "736e1064.726c",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1364.6669006347656,
-    "y": 461.4998970031738,
-    "z": "dffc6494.bbb2d8",
+    "x": 1338.6708068847656,
+    "y": 484.49989557266235,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "925fb80e.34f158"
+        "a5f06ff2.e93e4"
       ]
     ]
   },
   {
-    "id": "925fb80e.34f158",
+    "id": "a5f06ff2.e93e4",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1533.5243244171143,
-    "y": 459.11906814575195,
-    "z": "dffc6494.bbb2d8",
+    "x": 1507.5282306671143,
+    "y": 482.1190667152405,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "26b8d340.46df1c",
-        "7a829be2.af0124"
+        "69d17a58.9c2324",
+        "1cf05230.c0296e"
       ]
     ]
   },
   {
-    "id": "26b8d340.46df1c",
+    "id": "69d17a58.9c2324",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1688.8574600219727,
-    "y": 431.1189832687378,
-    "z": "dffc6494.bbb2d8",
+    "x": 1662.8613662719727,
+    "y": 454.1189818382263,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "1395b904.dff867"
+        "a2e5f5bf.161fe8"
       ]
     ]
   },
   {
-    "id": "1395b904.dff867",
+    "id": "a2e5f5bf.161fe8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1847.3812637329102,
-    "y": 429.02383041381836,
-    "z": "dffc6494.bbb2d8",
+    "x": 1821.3851699829102,
+    "y": 452.0238289833069,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "bca835dc.03acf8",
-        "60209a3f.8f2c74",
-        "20e59893.8ce128"
+        "2e9b819d.3363ee",
+        "edfeb643.5889d8",
+        "76036750.d4da68"
       ]
     ]
   },
   {
-    "id": "a8ed7d7b.3441",
+    "id": "8107bf70.6729c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachment resource not exist\" />\n    \n",
     "comments": "",
-    "x": 1787.5191955566406,
-    "y": 536.0660648345947,
-    "z": "dffc6494.bbb2d8",
+    "x": 1761.5231018066406,
+    "y": 559.0660634040833,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "2e147334.04188c",
+    "id": "a6741673.5edd48",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1212.5186252593994,
-    "y": 539.0660638809204,
-    "z": "dffc6494.bbb2d8",
+    "x": 1186.5225315093994,
+    "y": 562.0660624504089,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "b263ea5d.751198"
+        "9ba85af5.f74448"
       ]
     ]
   },
   {
-    "id": "b263ea5d.751198",
+    "id": "9ba85af5.f74448",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1392.518575668335,
-    "y": 539.7326145172119,
-    "z": "dffc6494.bbb2d8",
+    "x": 1366.522481918335,
+    "y": 562.7326130867004,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "a8ed7d7b.3441"
+        "8107bf70.6729c"
       ]
     ]
   },
   {
-    "id": "7a829be2.af0124",
+    "id": "1cf05230.c0296e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1680.1854629516602,
-    "y": 490.39935779571533,
-    "z": "dffc6494.bbb2d8",
+    "x": 1654.1893692016602,
+    "y": 513.3993563652039,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "a8ed7d7b.3441"
+        "8107bf70.6729c"
       ]
     ]
   },
   {
-    "id": "bca835dc.03acf8",
+    "id": "2e9b819d.3363ee",
     "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": 2094.4447174072266,
-    "y": 402.00008249282837,
-    "z": "dffc6494.bbb2d8",
+    "x": 2068.4486236572266,
+    "y": 425.0000810623169,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "60209a3f.8f2c74",
+    "id": "edfeb643.5889d8",
     "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": 2043.4449863433838,
-    "y": 504.4286185503006,
-    "z": "dffc6494.bbb2d8",
+    "x": 2017.4488925933838,
+    "y": 527.4286171197891,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "20e59893.8ce128",
+    "id": "76036750.d4da68",
     "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": 2045.444803237915,
-    "y": 444.0000435113907,
-    "z": "dffc6494.bbb2d8",
+    "x": 2019.448709487915,
+    "y": 467.0000420808792,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "c22325f7.252dc8",
-        "892b7c23.01481"
+        "e87ff105.14d1b",
+        "d97dfa9c.e30428"
       ]
     ]
   },
   {
-    "id": "c22325f7.252dc8",
+    "id": "d97dfa9c.e30428",
     "type": "outcome",
     "name": "outcome Created",
     "xml": "<outcome value='Created'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2273.0451526641846,
-    "y": 435.00010073184967,
-    "z": "dffc6494.bbb2d8",
+    "x": 2247.0490589141846,
+    "y": 458.0000993013382,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "8f64788b.479f58"
+        "987bc713.b486f8"
       ]
     ]
   },
   {
-    "id": "892b7c23.01481",
+    "id": "e87ff105.14d1b",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2267.759048461914,
-    "y": 474.42865800857544,
-    "z": "dffc6494.bbb2d8",
+    "x": 2241.762954711914,
+    "y": 497.42865657806396,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "7e065517.d9cffc"
+        "b58f7e1e.c3478"
       ]
     ]
   },
   {
-    "id": "8f64788b.479f58",
+    "id": "987bc713.b486f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2432.515281677246,
-    "y": 435.37570571899414,
-    "z": "dffc6494.bbb2d8",
+    "x": 2406.519187927246,
+    "y": 458.37570428848267,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "7e065517.d9cffc",
+    "id": "b58f7e1e.c3478",
     "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": 2443.666862487793,
-    "y": 473.000057220459,
-    "z": "dffc6494.bbb2d8",
+    "x": 2417.670768737793,
+    "y": 496.0000557899475,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "6f92ad01.bceb24",
+    "id": "e130ad96.c9e09",
     "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": 937.3030433654785,
-    "y": 610.4936294555664,
-    "z": "dffc6494.bbb2d8",
+    "x": 911.3069496154785,
+    "y": 633.4936280250549,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5bfd91ae.4a06",
+    "id": "21e8ba33.483c86",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 631.3091430664062,
-    "y": 611.5,
-    "z": "dffc6494.bbb2d8",
+    "x": 605.3130493164062,
+    "y": 634.4999985694885,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "6f92ad01.bceb24"
+        "e130ad96.c9e09"
       ]
     ]
   },
   {
-    "id": "ab12c387.518e3",
+    "id": "336e8236.5ec30e",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 809.00048828125,
-    "y": 682.53173828125,
-    "z": "dffc6494.bbb2d8",
+    "x": 783.00439453125,
+    "y": 705.5317368507385,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "20314e6c.dff2b2",
+    "id": "2b31d5c5.87577a",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2156.4727783203125,
-    "y": 362.5039367675781,
-    "z": "dffc6494.bbb2d8",
+    "x": 2130.4766845703125,
+    "y": 385.50393533706665,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "4bcdea66.6625d4",
+    "id": "7d9870f2.8c169",
     "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": 694.9688110351562,
-    "y": 712.0001220703125,
-    "z": "dffc6494.bbb2d8",
+    "x": 668.9727172851562,
+    "y": 735.000120639801,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "15984952.556e87",
+    "id": "b757ef37.0ce2d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1054.968978881836,
-    "y": 769.0000915527344,
-    "z": "dffc6494.bbb2d8",
+    "x": 1028.972885131836,
+    "y": 792.0000901222229,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "de6674d7.fb4908"
+        "8876c1bb.25741"
       ]
     ]
   },
   {
-    "id": "6badb4c9.fd121c",
+    "id": "f706c388.1aebc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1046.8207817077637,
-    "y": 804.0661764144897,
-    "z": "dffc6494.bbb2d8",
+    "x": 1020.8246879577637,
+    "y": 827.0661749839783,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "d2de38fb.c9bd98"
+        "cb9cbf16.bef44"
       ]
     ]
   },
   {
-    "id": "d2de38fb.c9bd98",
+    "id": "cb9cbf16.bef44",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n    \n",
     "comments": "",
-    "x": 1192.9695625305176,
-    "y": 803.3335876464844,
-    "z": "dffc6494.bbb2d8",
+    "x": 1166.9734687805176,
+    "y": 826.3335862159729,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "de6674d7.fb4908",
+    "id": "8876c1bb.25741",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1185.9690742492676,
-    "y": 769.0001525878906,
-    "z": "dffc6494.bbb2d8",
+    "x": 1159.9729804992676,
+    "y": 792.0001511573792,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3fee618.47cf19e",
+    "id": "2c9b5f28.48e9e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 868.7312831878662,
-    "y": 1801.953821182251,
-    "z": "dffc6494.bbb2d8",
+    "x": 842.7351894378662,
+    "y": 1824.9538197517395,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "ce560694.4e0568"
+        "6b8dfb7d.64cd94"
       ]
     ]
   },
   {
-    "id": "ce560694.4e0568",
+    "id": "6b8dfb7d.64cd94",
     "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": 1035.2551040649414,
-    "y": 1828.5728282928467,
-    "z": "dffc6494.bbb2d8",
+    "x": 1009.2590103149414,
+    "y": 1851.5728268623352,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "c68d8601.616f38",
+    "id": "ed67a862.2bd1f8",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 870.8265113830566,
-    "y": 1849.715663909912,
-    "z": "dffc6494.bbb2d8",
+    "x": 844.8304176330566,
+    "y": 1872.7156624794006,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "ce560694.4e0568"
+        "6b8dfb7d.64cd94"
       ]
     ]
   },
   {
-    "id": "4f78f27.2aadb0c",
+    "id": "97cf9734.788978",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 642.7789268493652,
-    "y": 1790.302984237671,
-    "z": "dffc6494.bbb2d8",
+    "x": 616.7828330993652,
+    "y": 1813.3029828071594,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "9bb2f2c0.a869e",
+    "id": "38c9c0d2.63a2d",
     "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": 657.5466232299805,
-    "y": 1711.828465461731,
-    "z": "dffc6494.bbb2d8",
+    "x": 631.5505294799805,
+    "y": 1734.8284640312195,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "12273108.2aad0f",
+    "id": "9192f41d.1c9e78",
     "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": 617.959794998169,
-    "y": 1897.4442539215088,
-    "z": "dffc6494.bbb2d8",
+    "x": 591.963701248169,
+    "y": 1920.4442524909973,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "235295.bc1afd6c",
+    "id": "43fe29d3.28d4b8",
     "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": 710.2787055969238,
-    "y": 1636.4693183898926,
-    "z": "dffc6494.bbb2d8",
+    "x": 684.2826118469238,
+    "y": 1659.469316959381,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "fbd9f3da.ac92e",
-        "d531264d.6e9598",
-        "ceab622e.44add"
+        "d5f8f1b8.84781",
+        "d21a6279.bc9d6",
+        "9617473f.000048"
       ]
     ]
   },
   {
-    "id": "fbd9f3da.ac92e",
+    "id": "d5f8f1b8.84781",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 964.9201278686523,
-    "y": 1680.8007125854492,
-    "z": "dffc6494.bbb2d8",
+    "x": 938.9240341186523,
+    "y": 1703.8007111549377,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "6996a4e1.52814c"
+        "ce2b1814.f0bc28"
       ]
     ]
   },
   {
-    "id": "d531264d.6e9598",
+    "id": "d21a6279.bc9d6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 966.9201507568359,
-    "y": 1639.3006767258048,
-    "z": "dffc6494.bbb2d8",
+    "x": 940.9240570068359,
+    "y": 1662.3006752952933,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "6996a4e1.52814c"
+        "ce2b1814.f0bc28"
       ]
     ]
   },
   {
-    "id": "ceab622e.44add",
+    "id": "9617473f.000048",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 970.6702346801758,
-    "y": 1590.657829284668,
-    "z": "dffc6494.bbb2d8",
+    "x": 944.6741409301758,
+    "y": 1613.6578278541565,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "a90a3596.a63828"
+        "c002bab4.10b818"
       ]
     ]
   },
   {
-    "id": "6996a4e1.52814c",
+    "id": "ce2b1814.f0bc28",
     "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": 1125.670253753662,
-    "y": 1659.0507431030273,
-    "z": "dffc6494.bbb2d8",
+    "x": 1099.674160003662,
+    "y": 1682.0507416725159,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "a90a3596.a63828",
+    "id": "c002bab4.10b818",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1098.3261795043945,
-    "y": 1592.8499975204468,
-    "z": "dffc6494.bbb2d8",
+    "x": 1072.3300857543945,
+    "y": 1615.8499960899353,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "40c05ce.b6f2ba4",
+    "id": "4fc8c244.1177ac",
     "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": 612.4923210144043,
-    "y": 1470.850219488144,
-    "z": "dffc6494.bbb2d8",
+    "x": 586.4962272644043,
+    "y": 1493.8502180576324,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "cfd66b10.01cc08",
+    "id": "daadac76.292c6",
     "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": 629.7781639099121,
-    "y": 1543.46981716156,
-    "z": "dffc6494.bbb2d8",
+    "x": 603.7820701599121,
+    "y": 1566.4698157310486,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5daf20a3.56c58",
+    "id": "c4a41078.ea3c4",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 679.7652435302734,
-    "y": 1580.4208974838257,
-    "z": "dffc6494.bbb2d8",
+    "x": 653.7691497802734,
+    "y": 1603.4208960533142,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "c934c812.741518",
+    "id": "d4d40535.00b288",
     "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": 626.3338623046875,
-    "y": 1510.0248699188232,
-    "z": "dffc6494.bbb2d8",
+    "x": 600.3377685546875,
+    "y": 1533.0248684883118,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "39e69165.d7e96e",
+    "id": "45fc3466.cbd9ac",
     "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": 739.6673240661621,
-    "y": 1431.0248219966888,
-    "z": "dffc6494.bbb2d8",
+    "x": 711.6712646484375,
+    "y": 1455.0248260498047,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "76218215.a6538c",
+    "id": "4c6b5051.361fc",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 681.2471504211426,
-    "y": 1398.438123703003,
-    "z": "dffc6494.bbb2d8",
+    "x": 655.2510566711426,
+    "y": 1421.4381222724915,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "78a5dd87.45acf4",
+    "id": "390c3a59.81dbe6",
     "type": "update",
     "name": "update AAI allotted-resource",
     "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 669.2232055664062,
-    "y": 1827.755126953125,
-    "z": "dffc6494.bbb2d8",
+    "x": 643.2271118164062,
+    "y": 1850.7551255226135,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "3fee618.47cf19e",
-        "c68d8601.616f38"
+        "2c9b5f28.48e9e",
+        "ed67a862.2bd1f8"
       ]
     ]
   },
   {
-    "id": "3d8eaf9a.38bd9",
+    "id": "f1c987fe.e262e8",
     "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": 841.0039672851562,
-    "y": 522.00390625,
-    "z": "dffc6494.bbb2d8",
+    "x": 815.0078735351562,
+    "y": 545.0039048194885,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "e6ee5327.c0d68",
-        "2e147334.04188c"
+        "b2104ab0.d42038",
+        "a6741673.5edd48"
       ]
     ]
   },
   {
-    "id": "1c9f2051.6c4ec",
+    "id": "4c06f720.016118",
     "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": 764.0040893554688,
-    "y": 785.0040893554688,
-    "z": "dffc6494.bbb2d8",
+    "x": 738.0079956054688,
+    "y": 808.0040879249573,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "15984952.556e87",
-        "6badb4c9.fd121c"
+        "b757ef37.0ce2d",
+        "f706c388.1aebc"
       ]
     ]
   },
   {
-    "id": "5bbd58f7.5f7198",
+    "id": "1379096d.d52197",
     "type": "execute",
     "name": "get parent-service-data url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 664.0039978027344,
-    "y": 748.0039224624634,
-    "z": "dffc6494.bbb2d8",
+    "x": 638.0079040527344,
+    "y": 771.0039210319519,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f4b4f93.ed2c608",
+    "id": "5177b2ec.7304dc",
     "type": "set",
     "name": "set prop.ar.provided-allotted-resource-id",
     "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />\n\n",
     "comments": "",
-    "x": 1521.9964752197266,
-    "y": 837.1218557357788,
-    "z": "dffc6494.bbb2d8",
+    "x": 1496.0003814697266,
+    "y": 860.1218543052673,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "a15a79a.36a3388",
+    "id": "a4de5ab0.2e8518",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2027.9970703125,
-    "y": 931.4551391601562,
-    "z": "dffc6494.bbb2d8",
+    "x": 2002.0009765625,
+    "y": 954.4551377296448,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "a3fba491.823078"
+        "b07d3158.ec06e"
       ]
     ]
   },
   {
-    "id": "9877a25.829156",
+    "id": "e77eab64.b80238",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2031.848445892334,
-    "y": 893.52121925354,
-    "z": "dffc6494.bbb2d8",
+    "x": 2005.852352142334,
+    "y": 916.5212178230286,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "7dae3a54.790c34"
+        "67d985d1.99c82c"
       ]
     ]
   },
   {
-    "id": "70d2ed6a.c33784",
+    "id": "a9f31ecc.485fc",
     "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": 1923.9976425170898,
-    "y": 1659.1222692728043,
-    "z": "dffc6494.bbb2d8",
+    "x": 1898.0015487670898,
+    "y": 1682.1222678422928,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "3299d5bb.c8fffa"
+        "3f28b2ff.c5261e"
       ]
     ]
   },
   {
-    "id": "3299d5bb.c8fffa",
+    "id": "3f28b2ff.c5261e",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1683.6641387939453,
-    "y": 1731.1224619150162,
-    "z": "dffc6494.bbb2d8",
+    "x": 1657.6680450439453,
+    "y": 1754.1224604845047,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "9c72dcbf.2f4d8"
+        "7390d84f.4b2318"
       ]
     ]
   },
   {
-    "id": "9c72dcbf.2f4d8",
+    "id": "7390d84f.4b2318",
     "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\n",
     "comments": "",
     "outputs": 1,
-    "x": 1896.5293731689453,
-    "y": 1732.3203302621841,
-    "z": "dffc6494.bbb2d8",
+    "x": 1870.5332794189453,
+    "y": 1755.3203288316727,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "d6c2e1ad.856bf"
+        "f67dfe78.781af"
       ]
     ]
   },
   {
-    "id": "d6c2e1ad.856bf",
+    "id": "f67dfe78.781af",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2101.52872467041,
-    "y": 1735.3203264474869,
-    "z": "dffc6494.bbb2d8",
+    "x": 2075.53263092041,
+    "y": 1758.3203250169754,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "1deec432.31ab3c"
+        "24aa0f5e.31356"
       ]
     ]
   },
   {
-    "id": "6d2e1c61.8e7884",
+    "id": "e2678b6.a3e2078",
     "type": "set",
     "name": "set tmp.sitevidx ",
     "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 2445.528896331787,
-    "y": 1715.3206740617752,
-    "z": "dffc6494.bbb2d8",
+    "x": 2419.532802581787,
+    "y": 1738.3206726312637,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "eb1ab4ec.5e2dc8",
+    "id": "9f2a331c.6de8",
     "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",
+    "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": 1672.9970703125,
-    "y": 1078.1221185922623,
-    "z": "dffc6494.bbb2d8",
+    "x": 1647.0009765625,
+    "y": 1101.1221171617508,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "57da3fea.264e9",
+    "id": "d2ac9580.cea3a8",
     "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": 1699.9965839385986,
-    "y": 1035.6217069625854,
-    "z": "dffc6494.bbb2d8",
+    "x": 1674.0004901885986,
+    "y": 1058.621705532074,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "cee99943.fb3588"
+        "ab4a3566.1d4448"
       ]
     ]
   },
   {
-    "id": "509849b3.d30508",
+    "id": "9e31b20.ec7145",
     "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": 2130.9968280792236,
-    "y": 1001.621829032898,
-    "z": "dffc6494.bbb2d8",
+    "x": 2105.0007343292236,
+    "y": 1024.6218276023865,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "934da16.2ecff6"
+        "8e1f2970.68a218"
       ]
     ]
   },
   {
-    "id": "934da16.2ecff6",
+    "id": "8e1f2970.68a218",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2270.9970722198486,
-    "y": 999.6219511032104,
-    "z": "dffc6494.bbb2d8",
+    "x": 2245.0009784698486,
+    "y": 1022.621949672699,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "e881355e.f5e048"
+        "ef163b1b.5ea0c8"
       ]
     ]
   },
   {
-    "id": "e881355e.f5e048",
+    "id": "ef163b1b.5ea0c8",
     "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": 2414.9978046417236,
-    "y": 999.2218046188354,
-    "z": "dffc6494.bbb2d8",
+    "x": 2389.0017108917236,
+    "y": 1022.221803188324,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "c3c5524a.3faea",
+    "id": "8f7eca2d.7a5ac8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1978.9968872070312,
-    "y": 1178.1219259500504,
-    "z": "dffc6494.bbb2d8",
+    "x": 1953.0007934570312,
+    "y": 1201.1219245195389,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "694081b0.40c87"
+        "2acc8e1c.c1a132"
       ]
     ]
   },
   {
-    "id": "a5b86b7b.af84c8",
+    "id": "224b80f9.f7e8e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1976.8492164611816,
-    "y": 1139.18805372715,
-    "z": "dffc6494.bbb2d8",
+    "x": 1950.8531227111816,
+    "y": 1162.1880522966385,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "2179a00d.ce49"
+        "d6b1d2aa.02b42"
       ]
     ]
   },
   {
-    "id": "7dae3a54.790c34",
+    "id": "67d985d1.99c82c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2157.996570587158,
-    "y": 890.6216526031494,
-    "z": "dffc6494.bbb2d8",
+    "x": 2132.000476837158,
+    "y": 913.6216511726379,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3fba491.823078",
+    "id": "b07d3158.ec06e",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1323.496524810791,
-    "y": 1070.6217823028564,
-    "z": "dffc6494.bbb2d8",
+    "x": 1297.500431060791,
+    "y": 1093.621780872345,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "57da3fea.264e9",
-        "eb1ab4ec.5e2dc8",
-        "e782e2ca.8bf82",
-        "1cdc5d42.9a95b3"
+        "d2ac9580.cea3a8",
+        "9f2a331c.6de8",
+        "13a1cc8b.f27593",
+        "8c1064b8.0837a8"
       ]
     ]
   },
   {
-    "id": "2179a00d.ce49",
+    "id": "d6b1d2aa.02b42",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2106.4974098205566,
-    "y": 1132.6220136880875,
-    "z": "dffc6494.bbb2d8",
+    "x": 2080.5013160705566,
+    "y": 1155.622012257576,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "694081b0.40c87",
+    "id": "2acc8e1c.c1a132",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1705.4971466064453,
-    "y": 1257.6221548318863,
-    "z": "dffc6494.bbb2d8",
+    "x": 1679.5010528564453,
+    "y": 1280.6221534013748,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "96cc2adb.55b7e8"
+        "2eef69ed.8c4646"
       ]
     ]
   },
   {
-    "id": "ac9bfac3.fa8558",
+    "id": "322f0f47.8e765",
     "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": 2524.4985961914062,
-    "y": 1765.6224666833878,
-    "z": "dffc6494.bbb2d8",
+    "x": 2498.5025024414062,
+    "y": 1788.6224652528763,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "a2ba66c.8ff5498"
+        "f041a5c4.8e5ff8"
       ]
     ]
   },
   {
-    "id": "8bbd7692.ac8cd8",
+    "id": "3ce210b6.91582",
     "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\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\n",
     "comments": "",
     "outputs": 1,
-    "x": 1995.501958847046,
-    "y": 1879.6239286661148,
-    "z": "dffc6494.bbb2d8",
+    "x": 1969.505865097046,
+    "y": 1902.6239272356033,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "4610475a.073248"
+        "57ac6f64.1286d"
       ]
     ]
   },
   {
-    "id": "4610475a.073248",
+    "id": "57ac6f64.1286d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2150.5023288726807,
-    "y": 1881.6242953538895,
-    "z": "dffc6494.bbb2d8",
+    "x": 2124.5062351226807,
+    "y": 1904.624293923378,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "feeed51.dea6e28"
+        "b1ee9c99.2aacf"
       ]
     ]
   },
   {
-    "id": "4e949727.dc9598",
+    "id": "cbb60b59.d98d48",
     "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\n\n\n",
     "comments": "",
-    "x": 2128.0009231567383,
-    "y": 2014.1228910684586,
-    "z": "dffc6494.bbb2d8",
+    "x": 2102.0048294067383,
+    "y": 2037.122889637947,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "d462299e.954ef8",
+    "id": "5723dd.5302dc24",
     "type": "execute",
     "name": "execute RestApiCallNode create vpn topology",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.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": 720.9996967315674,
-    "y": 1219.623323082924,
-    "z": "dffc6494.bbb2d8",
+    "x": 695.0036029815674,
+    "y": 1242.6233216524124,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "eedd5dfa.0c3ec",
-        "8a2fbc0b.ebcbf"
+        "dbb9cf9c.1b8a",
+        "fefb45a2.751f18"
       ]
     ]
   },
   {
-    "id": "8a2fbc0b.ebcbf",
+    "id": "fefb45a2.751f18",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 964.9996509552002,
-    "y": 1240.6231399774551,
-    "z": "dffc6494.bbb2d8",
+    "x": 939.0035572052002,
+    "y": 1263.6231385469437,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "d213fa13.f05e78"
+        "96dbc97.ce15e38"
       ]
     ]
   },
   {
-    "id": "d213fa13.f05e78",
+    "id": "96dbc97.ce15e38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1134.999589920044,
-    "y": 1243.6231399774551,
-    "z": "dffc6494.bbb2d8",
+    "x": 1109.003496170044,
+    "y": 1266.6231385469437,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c3f37303.c62e9",
+    "id": "95ee12f3.671c4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn topology failed\" />\n",
     "comments": "",
-    "x": 1134.9997119903564,
-    "y": 1199.6231399774551,
-    "z": "dffc6494.bbb2d8",
+    "x": 1109.0036182403564,
+    "y": 1222.6231385469437,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "eedd5dfa.0c3ec",
+    "id": "dbb9cf9c.1b8a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 967.999589920044,
-    "y": 1199.6231399774551,
-    "z": "dffc6494.bbb2d8",
+    "x": 942.003496170044,
+    "y": 1222.6231385469437,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "c3f37303.c62e9"
+        "95ee12f3.671c4"
       ]
     ]
   },
   {
-    "id": "d4efb2ad.bacb3",
+    "id": "722c21e0.94316",
     "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": 1139.565273284912,
-    "y": 932.2990169525146,
-    "z": "dffc6494.bbb2d8",
+    "x": 1113.569179534912,
+    "y": 955.2990155220032,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "27476583.31719a",
+    "id": "db5d0d5.71c66f",
     "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": 676.0650634765625,
-    "y": 981.29931640625,
-    "z": "dffc6494.bbb2d8",
+    "x": 650.0689697265625,
+    "y": 1004.2993149757385,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "62080e5d.ec8ce",
-        "dfaa962c.3e1378",
-        "bbba9586.9afb98"
+        "9f61640b.56f5e8",
+        "fcbf7eb7.5e0e6",
+        "b9617b3d.71b3f8"
       ]
     ]
   },
   {
-    "id": "62080e5d.ec8ce",
+    "id": "9f61640b.56f5e8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 942.0652122497559,
-    "y": 944.2990169525146,
-    "z": "dffc6494.bbb2d8",
+    "x": 916.0691184997559,
+    "y": 967.2990155220032,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "d4efb2ad.bacb3"
+        "722c21e0.94316"
       ]
     ]
   },
   {
-    "id": "dfaa962c.3e1378",
+    "id": "fcbf7eb7.5e0e6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 938.55592918396,
-    "y": 982.8731136322021,
-    "z": "dffc6494.bbb2d8",
+    "x": 912.55983543396,
+    "y": 1005.8731122016907,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "663ca3f0.5f815c"
+        "ae421a1b.b35b38"
       ]
     ]
   },
   {
-    "id": "bbba9586.9afb98",
+    "id": "b9617b3d.71b3f8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 933.88893699646,
-    "y": 1024.2064266204834,
-    "z": "dffc6494.bbb2d8",
+    "x": 907.89284324646,
+    "y": 1047.206425189972,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "936e384d.44b2d8"
+        "e4bd895d.631da8"
       ]
     ]
   },
   {
-    "id": "663ca3f0.5f815c",
+    "id": "ae421a1b.b35b38",
     "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": 1115.1273403167725,
-    "y": 971.1588497161865,
-    "z": "dffc6494.bbb2d8",
+    "x": 1089.1312465667725,
+    "y": 994.158848285675,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "936e384d.44b2d8",
+    "id": "e4bd895d.631da8",
     "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": 1121.6614933013916,
-    "y": 1019.645619392395,
-    "z": "dffc6494.bbb2d8",
+    "x": 1095.6653995513916,
+    "y": 1042.6456179618835,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "96cc2adb.55b7e8",
+    "id": "2eef69ed.8c4646",
     "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": 2013.4972763061523,
-    "y": 1257.122277855873,
-    "z": "dffc6494.bbb2d8",
+    "x": 1987.5011825561523,
+    "y": 1280.1222764253616,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "b7189ec7.b6673"
+        "19a68b02.3eedc5"
       ]
     ]
   },
   {
-    "id": "86cf34ff.454008",
+    "id": "532b87f6.cba248",
     "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": 1860.165672302246,
-    "y": 1346.1222940683365,
-    "z": "dffc6494.bbb2d8",
+    "x": 1834.169578552246,
+    "y": 1369.122292637825,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "9f2ef89f.648238"
+        "f7df899d.2cdaa8"
       ]
     ]
   },
   {
-    "id": "9f2ef89f.648238",
+    "id": "f7df899d.2cdaa8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2116.1651248931885,
-    "y": 1344.1222330331802,
-    "z": "dffc6494.bbb2d8",
+    "x": 2090.1690311431885,
+    "y": 1367.1222316026688,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "e8091f90.d8758"
+        "4ad4efb2.b5354"
       ]
     ]
   },
   {
-    "id": "ea7febcc.253688",
+    "id": "f89715ac.25dc68",
     "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": 1903.1637878417969,
-    "y": 1437.1214720010757,
-    "z": "dffc6494.bbb2d8",
+    "x": 1877.1676940917969,
+    "y": 1460.1214705705643,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "a261c913.e49f08"
+        "c531c63.7b95a38"
       ]
     ]
   },
   {
-    "id": "c9c5e103.2dba",
+    "id": "bd704489.7274d8",
     "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": 2357.1641483306885,
-    "y": 1424.121761918068,
-    "z": "dffc6494.bbb2d8",
+    "x": 2331.1680545806885,
+    "y": 1447.1217604875565,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "d03c47e7.2291b8"
+        "76f653aa.77e0bc"
       ]
     ]
   },
   {
-    "id": "d03c47e7.2291b8",
+    "id": "76f653aa.77e0bc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2506.1639041900635,
-    "y": 1419.1218839883804,
-    "z": "dffc6494.bbb2d8",
+    "x": 2480.1678104400635,
+    "y": 1442.121882557869,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "6f44a2b9.64d87c"
+        "e332cfdd.3a325"
       ]
     ]
   },
   {
-    "id": "6f44a2b9.64d87c",
+    "id": "e332cfdd.3a325",
     "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": 2646.1640911102295,
-    "y": 1416.721799492836,
-    "z": "dffc6494.bbb2d8",
+    "x": 2620.1679973602295,
+    "y": 1439.7217980623245,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "2f06a667.74729a",
+    "id": "95926f9f.7a56d",
     "type": "switchNode",
     "name": "switch vpnId",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2344.8300952911377,
-    "y": 1462.454986691475,
-    "z": "dffc6494.bbb2d8",
+    "x": 2318.8340015411377,
+    "y": 1485.4549852609634,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "26cdcacc.68bc96"
+        "915a39b2.608e28"
       ]
     ]
   },
   {
-    "id": "26cdcacc.68bc96",
+    "id": "915a39b2.608e28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2484.8300380706787,
-    "y": 1462.454803109169,
-    "z": "dffc6494.bbb2d8",
+    "x": 2458.8339443206787,
+    "y": 1485.4548016786575,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "b29eb112.7e5e6"
+        "56e124a4.ba815c"
       ]
     ]
   },
   {
-    "id": "b29eb112.7e5e6",
+    "id": "56e124a4.ba815c",
     "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": 2632.830041885376,
-    "y": 1462.054870724678,
-    "z": "dffc6494.bbb2d8",
+    "x": 2606.833948135376,
+    "y": 1485.0548692941666,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "6f11d9b9.d9b5a8",
+    "id": "537ad820.346958",
     "type": "execute",
     "name": "execute RestApiCallNode create vpn ",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/vpn-services'`\" />\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.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": 689.9980926513672,
-    "y": 1128.1227440834045,
-    "z": "dffc6494.bbb2d8",
+    "x": 664.0019989013672,
+    "y": 1151.122742652893,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "65b6f0f3.2d5de",
-        "76008493.6f9b6c"
+        "3ba3cba0.b1b5b4",
+        "14233b12.99c415"
       ]
     ]
   },
   {
-    "id": "76008493.6f9b6c",
+    "id": "14233b12.99c415",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 909.9979953765869,
-    "y": 1124.1227089166641,
-    "z": "dffc6494.bbb2d8",
+    "x": 884.0019016265869,
+    "y": 1147.1227074861526,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "3a95c7bc.96e9b8"
+        "e9e1022d.54d97"
       ]
     ]
   },
   {
-    "id": "3a95c7bc.96e9b8",
+    "id": "e9e1022d.54d97",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1079.9979343414307,
-    "y": 1127.1227089166641,
-    "z": "dffc6494.bbb2d8",
+    "x": 1054.0018405914307,
+    "y": 1150.1227074861526,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "daf3ded5.68f9c",
+    "id": "12277977.d003a7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn failed\" />\n",
     "comments": "",
-    "x": 1079.9980564117432,
-    "y": 1083.1227089166641,
-    "z": "dffc6494.bbb2d8",
+    "x": 1054.0019626617432,
+    "y": 1106.1227074861526,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "65b6f0f3.2d5de",
+    "id": "3ba3cba0.b1b5b4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 912.9979343414307,
-    "y": 1083.1227089166641,
-    "z": "dffc6494.bbb2d8",
+    "x": 887.0018405914307,
+    "y": 1106.1227074861526,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "daf3ded5.68f9c"
+        "12277977.d003a7"
       ]
     ]
   },
   {
-    "id": "643b6a4a.e81654",
+    "id": "4ac994c1.39bcbc",
     "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": 2489.9968280792236,
-    "y": 1051.1214628219604,
-    "z": "dffc6494.bbb2d8",
+    "x": 2464.0007343292236,
+    "y": 1074.121461391449,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "607a7459.cb7aac",
+    "id": "24b71c25.bdf914",
     "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": 2169.4965839385986,
-    "y": 1056.1214628219604,
-    "z": "dffc6494.bbb2d8",
+    "x": 2143.5004901885986,
+    "y": 1079.121461391449,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "5340c76b.84ae08"
+        "4b8a8916.d5df08"
       ]
     ]
   },
   {
-    "id": "5340c76b.84ae08",
+    "id": "4b8a8916.d5df08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2346.4968280792236,
-    "y": 1053.1214628219604,
-    "z": "dffc6494.bbb2d8",
+    "x": 2320.5007343292236,
+    "y": 1076.121461391449,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "643b6a4a.e81654"
+        "4ac994c1.39bcbc"
       ]
     ]
   },
   {
-    "id": "6b6508e8.a91ff8",
+    "id": "35fb02d9.bc983e",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1259.0269775390625,
-    "y": 874.3190307617188,
-    "z": "dffc6494.bbb2d8",
+    "x": 1233.0308837890625,
+    "y": 897.3190293312073,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "f4b4f93.ed2c608",
-        "62278433.5ef6cc",
-        "f022812b.da229"
+        "5177b2ec.7304dc",
+        "72795760.cf2f58",
+        "48fba41e.5e07cc"
       ]
     ]
   },
   {
-    "id": "989cf904.9df618",
+    "id": "19eae0e7.50657f",
     "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": 852.18115234375,
-    "y": 883.0944213867188,
-    "z": "dffc6494.bbb2d8",
+    "x": 826.18505859375,
+    "y": 906.0944199562073,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "6b6508e8.a91ff8"
+        "35fb02d9.bc983e"
       ]
     ]
   },
   {
-    "id": "62278433.5ef6cc",
+    "id": "72795760.cf2f58",
     "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": 1507.9962997436523,
-    "y": 872.6668090820312,
-    "z": "dffc6494.bbb2d8",
+    "x": 1482.0002059936523,
+    "y": 895.6668076515198,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f022812b.da229",
+    "id": "48fba41e.5e07cc",
     "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": 1656.99609375,
-    "y": 911.3333740234375,
-    "z": "dffc6494.bbb2d8",
+    "x": 1631,
+    "y": 934.333372592926,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "9877a25.829156",
-        "a15a79a.36a3388"
+        "e77eab64.b80238",
+        "a4de5ab0.2e8518"
       ]
     ]
   },
   {
-    "id": "e782e2ca.8bf82",
+    "id": "13a1cc8b.f27593",
     "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": 1687.3295593261719,
-    "y": 1120.0003362894058,
-    "z": "dffc6494.bbb2d8",
+    "x": 1661.3334655761719,
+    "y": 1143.0003348588943,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1cdc5d42.9a95b3",
+    "id": "8c1064b8.0837a8",
     "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": 1706.3295288085938,
-    "y": 1154.0004221200943,
-    "z": "dffc6494.bbb2d8",
+    "x": 1680.3334350585938,
+    "y": 1177.0004206895828,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "a5b86b7b.af84c8",
-        "c3c5524a.3faea"
+        "224b80f9.f7e8e",
+        "8f7eca2d.7a5ac8"
       ]
     ]
   },
   {
-    "id": "cee99943.fb3588",
+    "id": "ab4a3566.1d4448",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1966.0272235870361,
-    "y": 1030.5311307907104,
-    "z": "dffc6494.bbb2d8",
+    "x": 1940.0311298370361,
+    "y": 1053.531129360199,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "509849b3.d30508",
-        "607a7459.cb7aac"
+        "9e31b20.ec7145",
+        "24b71c25.bdf914"
       ]
     ]
   },
   {
-    "id": "e8091f90.d8758",
+    "id": "4ad4efb2.b5354",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1492.0277786254883,
-    "y": 1477.5313215255737,
-    "z": "dffc6494.bbb2d8",
+    "x": 1466.0316848754883,
+    "y": 1500.5313200950623,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "ea7febcc.253688",
-        "2c101b23.e11c54",
-        "390e0e98.c0e052",
-        "64a3b63d.2b1de8"
+        "f89715ac.25dc68",
+        "6e129b4e.95cc44",
+        "5de3f774.9f5298",
+        "153d05d.db3defa"
       ]
     ]
   },
   {
-    "id": "b7189ec7.b6673",
+    "id": "19a68b02.3eedc5",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1602.6634063720703,
-    "y": 1344.667093873024,
-    "z": "dffc6494.bbb2d8",
+    "x": 1576.6673126220703,
+    "y": 1367.6670924425125,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "86cf34ff.454008"
+        "532b87f6.cba248"
       ]
     ]
   },
   {
-    "id": "a2ba66c.8ff5498",
+    "id": "f041a5c4.8e5ff8",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1827.9984703063965,
-    "y": 1881.667660355568,
-    "z": "dffc6494.bbb2d8",
+    "x": 1802.0023765563965,
+    "y": 1904.6676589250565,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "8bbd7692.ac8cd8"
+        "3ce210b6.91582"
       ]
     ]
   },
   {
-    "id": "a261c913.e49f08",
+    "id": "c531c63.7b95a38",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2189.027723312378,
-    "y": 1437.5314317941666,
-    "z": "dffc6494.bbb2d8",
+    "x": 2163.031629562378,
+    "y": 1460.531430363655,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "c9c5e103.2dba",
-        "2f06a667.74729a"
+        "bd704489.7274d8",
+        "95926f9f.7a56d"
       ]
     ]
   },
   {
-    "id": "aa76b9db.55ac58",
+    "id": "61033198.2b1b8",
     "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": 2080.665012359619,
-    "y": 1955.3338705301285,
-    "z": "dffc6494.bbb2d8",
+    "x": 2054.668918609619,
+    "y": 1978.333869099617,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "1deec432.31ab3c",
+    "id": "24aa0f5e.31356",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2260.255527496338,
-    "y": 1736.00441801548,
-    "z": "dffc6494.bbb2d8",
+    "x": 2234.259433746338,
+    "y": 1759.0044165849686,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "6d2e1c61.8e7884",
-        "ac9bfac3.fa8558"
+        "e2678b6.a3e2078",
+        "322f0f47.8e765"
       ]
     ]
   },
   {
-    "id": "feeed51.dea6e28",
+    "id": "b1ee9c99.2aacf",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1883.755947113037,
-    "y": 1981.754342675209,
-    "z": "dffc6494.bbb2d8",
+    "x": 1857.759853363037,
+    "y": 2004.7543412446976,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "aa76b9db.55ac58",
-        "4e949727.dc9598"
+        "61033198.2b1b8",
+        "cbb60b59.d98d48",
+        "96db890b.9cff38"
       ]
     ]
   },
   {
-    "id": "1b86e032.9e8d5",
+    "id": "4041fa5f.8f6984",
     "type": "call",
     "name": "call sdwan-wanport-vnf-topology-operation-underlay",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 739.753984451294,
-    "y": 1336.2539825439453,
-    "z": "dffc6494.bbb2d8",
+    "x": 713.757890701294,
+    "y": 1359.2539811134338,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "7f6d52f3.6e394c",
+    "id": "1587faed.a593f5",
     "type": "comment",
     "name": "underlay",
     "info": "1. Get consumed AR from service data\n2. for all the AR id's get the respective AR from MDSAL\n3. From MDSAL AR get parent service instance ID\n4. Get service data based in parent service instance ID to get parent service. i.e, SDWAN Infra service\n5. Get SDWAN connectivity from looping network and check for topology\n6. from parent service data get siteAttachInstance vnf and check the role\n7. from parent service data get wanportINstance vnf and check the transportNetworkName\n8. Get provided AR from the parent service data\n9. for each of the provided ARid get the AR from MDSAL\n10.in the AR check for hub\n\n",
     "comments": "",
-    "x": 647.7229633331299,
-    "y": 1301.22292137146,
-    "z": "dffc6494.bbb2d8",
+    "x": 621.7268695831299,
+    "y": 1324.2229199409485,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "38de1063.b6c52",
+    "id": "585348e6.e28c68",
     "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": 688.9999694824219,
-    "y": 848.5311733484268,
-    "z": "dffc6494.bbb2d8",
+    "x": 663.0038757324219,
+    "y": 871.5311719179153,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "2c101b23.e11c54",
+    "id": "6e129b4e.95cc44",
     "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": 1852.0003967285156,
-    "y": 1475.531231880188,
-    "z": "dffc6494.bbb2d8",
+    "x": 1826.0043029785156,
+    "y": 1498.5312304496765,
+    "z": "4842829a.c92f5c",
     "wires": []
   },
   {
-    "id": "390e0e98.c0e052",
+    "id": "5de3f774.9f5298",
     "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": 1862.3326683044434,
-    "y": 1516.4093770980835,
-    "z": "dffc6494.bbb2d8",
+    "x": 1836.3365745544434,
+    "y": 1539.409375667572,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "64a3b63d.2b1de8",
+    "id": "153d05d.db3defa",
     "type": "execute",
     "name": "execute RestApiCallNode - get service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-sd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1891.3327331542969,
-    "y": 1557.4093770980835,
-    "z": "dffc6494.bbb2d8",
+    "x": 1865.3366394042969,
+    "y": 1580.409375667572,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "989a92da.0b198",
-        "30bf8c06.3702c4"
+        "9f007bfc.0c1338",
+        "c288c029.05ff1"
       ]
     ]
   },
   {
-    "id": "989a92da.0b198",
+    "id": "9f007bfc.0c1338",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2147.8524169921875,
-    "y": 1566.5972105264664,
-    "z": "dffc6494.bbb2d8",
+    "x": 2121.8563232421875,
+    "y": 1589.597209095955,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "337ed6c3.e36fba"
+        "690363c.d28ea9c"
       ]
     ]
   },
   {
-    "id": "30bf8c06.3702c4",
+    "id": "c288c029.05ff1",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2150.000087738037,
-    "y": 1605.5310827493668,
-    "z": "dffc6494.bbb2d8",
+    "x": 2124.003993988037,
+    "y": 1628.5310813188553,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "8b4ff7.5f205008"
+        "d23e72e1.4c912"
       ]
     ]
   },
   {
-    "id": "337ed6c3.e36fba",
+    "id": "690363c.d28ea9c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2277.5006103515625,
-    "y": 1560.0311704874039,
-    "z": "dffc6494.bbb2d8",
+    "x": 2251.5045166015625,
+    "y": 1583.0311690568924,
+    "z": "4842829a.c92f5c",
     "wires": [
       []
     ]
   },
   {
-    "id": "8b4ff7.5f205008",
+    "id": "d23e72e1.4c912",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1625.9998779296875,
-    "y": 1656.5311304330826,
-    "z": "dffc6494.bbb2d8",
+    "x": 1600.0037841796875,
+    "y": 1679.531129002571,
+    "z": "4842829a.c92f5c",
     "wires": [
       [
-        "70d2ed6a.c33784"
+        "a9f31ecc.485fc"
       ]
     ]
   },
   {
-    "id": "94e25478.dfdfd8",
+    "id": "54f08af3.c933d4",
     "type": "comment",
     "name": "TODO send Email",
     "info": "",
     "comments": "",
-    "x": 988.9999866485596,
-    "y": 1381.0313110351562,
-    "z": "dffc6494.bbb2d8",
+    "x": 963.0038928985596,
+    "y": 1404.0313096046448,
+    "z": "4842829a.c92f5c",
+    "wires": []
+  },
+  {
+    "id": "96db890b.9cff38",
+    "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": 2137.253952026367,
+    "y": 2091.7539863586426,
+    "z": "4842829a.c92f5c",
     "wires": []
   }
 ]
-- 
cgit 1.2.3-korg