From 55b429cfc73802e3e52fa2f3864ecc4cdd552728 Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Fri, 7 Sep 2018 14:38:22 +0530
Subject: integration test issues fix for sdwan and sotn

Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682
---
 ...wan-attachment-topology-operation-activate.json | 1603 +++++++++++---------
 1 file changed, 911 insertions(+), 692 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 684b6b02..4d15309c 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": "8656b138.5dcef",
+    "id": "4eb3c760.0f4e78",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 87.00390625,
-    "y": 63.999998569488525,
-    "z": "4842829a.c92f5c",
+    "x": 91,
+    "y": 47,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "434423eb.200dcc"
+        "6dada1.f2c9326"
       ]
     ]
   },
   {
-    "id": "434423eb.200dcc",
+    "id": "6dada1.f2c9326",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2027 +22,2246 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 278.0039119720459,
-    "y": 134.00001668930054,
-    "z": "4842829a.c92f5c",
+    "x": 282.0000057220459,
+    "y": 117.00001811981201,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "e6e0d8a8.8bfcf8"
+        "280e7b0d.e2eef4"
       ]
     ]
   },
   {
-    "id": "e6e0d8a8.8bfcf8",
+    "id": "280e7b0d.e2eef4",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-activate",
     "xml": "<method rpc='sdwan-attachment-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 266.00403022766113,
-    "y": 221.99999952316284,
-    "z": "4842829a.c92f5c",
+    "x": 270.00012397766113,
+    "y": 205.00000095367432,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "5cdb946c.3b710c"
+        "3b8ff9db.6736b6"
       ]
     ]
   },
   {
-    "id": "5cdb946c.3b710c",
+    "id": "3b8ff9db.6736b6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 168.00404357910156,
-    "y": 908.0002876520157,
-    "z": "4842829a.c92f5c",
-    "wires": [
-      [
-        "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": "4b9de3d9.03091c",
+    "x": 172.00013732910156,
+    "y": 891.0002890825272,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "91ee02fa.b186a",
+        "ba42cb5a.846d08",
+        "b40f6fde.18743",
+        "8171db6d.f63858",
+        "e6936fb4.46122",
+        "a02dc728.884b28",
+        "210482d7.10d8ee",
+        "b09356ce.de3e78",
+        "b70e72ac.ac27d",
+        "720d11d0.f67bc",
+        "671de4e7.c5daec",
+        "22826455.9296ec",
+        "f959c075.1e7e6",
+        "69260ab2.333c94",
+        "1ebdd52f.25cc2b",
+        "5f71dd6c.97cd84",
+        "69e18ab9.627484",
+        "bcfeb911.f55008",
+        "19a39c5d.bf96f4",
+        "c4f38bc0.54d238",
+        "6a97289d.80a568",
+        "f3ac87c7.5588f8",
+        "c88d609e.257e3",
+        "86fafd91.f4f2f",
+        "df3f5d3a.29e2c",
+        "55f46b97.799ce4"
+      ]
+    ]
+  },
+  {
+    "id": "91ee02fa.b186a",
     "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": 678.9974689483643,
-    "y": 175.99348640441895,
-    "z": "4842829a.c92f5c",
+    "x": 682.9935626983643,
+    "y": 158.99348783493042,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "246c798e.5e7076",
+    "id": "fc6cccab.f6373",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 707.9577808380127,
-    "y": 140.0252823829651,
-    "z": "4842829a.c92f5c",
+    "x": 711.9538745880127,
+    "y": 123.02528381347656,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "4127df46.08ca1",
+    "id": "ba42cb5a.846d08",
     "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": 632.997407913208,
-    "y": 268.9934916496277,
-    "z": "4842829a.c92f5c",
+    "x": 636.993501663208,
+    "y": 251.99349308013916,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "72064d52.212b94",
+    "id": "8171db6d.f63858",
     "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": 639.259298324585,
-    "y": 356.66022062301636,
-    "z": "4842829a.c92f5c",
+    "x": 643.255392074585,
+    "y": 339.66022205352783,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "aae6c90e.119798",
+    "id": "b40f6fde.18743",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 686.259355545044,
-    "y": 444.6602244377136,
-    "z": "4842829a.c92f5c",
+    "x": 690.255449295044,
+    "y": 427.6602258682251,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "ca8f4f1a.61b38",
+    "id": "8f7c2f3a.39068",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 740.8123168945312,
-    "y": 513.5386500358582,
-    "z": "4842829a.c92f5c",
+    "x": 744.8084106445312,
+    "y": 496.53865146636963,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "9f182507.e3c608",
+    "id": "6a9edb15.0372c4",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 686.9974384307861,
-    "y": 235.99350118637085,
-    "z": "4842829a.c92f5c",
+    "x": 690.9935321807861,
+    "y": 218.99350261688232,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "2aa7816a.d5fa1e",
+    "id": "5d0ffaf8.eea164",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 704.9974040985107,
-    "y": 321.88238191604614,
-    "z": "4842829a.c92f5c",
+    "x": 708.9934978485107,
+    "y": 304.8823833465576,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "7187d295.0c7a1c",
+    "id": "4c6a252e.949a4c",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 730.9974231719971,
-    "y": 408.88234090805054,
-    "z": "4842829a.c92f5c",
+    "x": 734.9935169219971,
+    "y": 391.882342338562,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "b2104ab0.d42038",
+    "id": "1df58ece.22a6f1",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1194.6707286834717,
-    "y": 526.9999775886536,
-    "z": "4842829a.c92f5c",
+    "x": 1198.6668224334717,
+    "y": 509.99997901916504,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "736e1064.726c"
+        "beb58fcf.0e694"
       ]
     ]
   },
   {
-    "id": "736e1064.726c",
+    "id": "beb58fcf.0e694",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1338.6708068847656,
-    "y": 484.49989557266235,
-    "z": "4842829a.c92f5c",
+    "x": 1342.6669006347656,
+    "y": 467.4998970031738,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "a5f06ff2.e93e4"
+        "b372be99.b158c"
       ]
     ]
   },
   {
-    "id": "a5f06ff2.e93e4",
+    "id": "b372be99.b158c",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1507.5282306671143,
-    "y": 482.1190667152405,
-    "z": "4842829a.c92f5c",
+    "x": 1511.5243244171143,
+    "y": 465.11906814575195,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "69d17a58.9c2324",
-        "1cf05230.c0296e"
+        "553cf33f.abe66c",
+        "efe7a59a.897c58"
       ]
     ]
   },
   {
-    "id": "69d17a58.9c2324",
+    "id": "553cf33f.abe66c",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1662.8613662719727,
-    "y": 454.1189818382263,
-    "z": "4842829a.c92f5c",
+    "x": 1666.8574600219727,
+    "y": 437.1189832687378,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "a2e5f5bf.161fe8"
+        "bb79446e.fd2a98"
       ]
     ]
   },
   {
-    "id": "a2e5f5bf.161fe8",
+    "id": "bb79446e.fd2a98",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1821.3851699829102,
-    "y": 452.0238289833069,
-    "z": "4842829a.c92f5c",
+    "x": 1825.3812637329102,
+    "y": 435.02383041381836,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "2e9b819d.3363ee",
-        "edfeb643.5889d8",
-        "76036750.d4da68"
+        "c3367ce.c8b6f8",
+        "6e235bab.f44c74",
+        "fca0cf3f.e6c1c"
       ]
     ]
   },
   {
-    "id": "8107bf70.6729c",
+    "id": "cad70d2f.866d6",
     "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": 1761.5231018066406,
-    "y": 559.0660634040833,
-    "z": "4842829a.c92f5c",
+    "x": 1765.5191955566406,
+    "y": 542.0660648345947,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "a6741673.5edd48",
+    "id": "60f581d.8121d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1186.5225315093994,
-    "y": 562.0660624504089,
-    "z": "4842829a.c92f5c",
+    "x": 1190.5186252593994,
+    "y": 545.0660638809204,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "9ba85af5.f74448"
+        "4541101a.4fcaa"
       ]
     ]
   },
   {
-    "id": "9ba85af5.f74448",
+    "id": "4541101a.4fcaa",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1366.522481918335,
-    "y": 562.7326130867004,
-    "z": "4842829a.c92f5c",
+    "x": 1370.518575668335,
+    "y": 545.7326145172119,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "8107bf70.6729c"
+        "cad70d2f.866d6"
       ]
     ]
   },
   {
-    "id": "1cf05230.c0296e",
+    "id": "efe7a59a.897c58",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1654.1893692016602,
-    "y": 513.3993563652039,
-    "z": "4842829a.c92f5c",
+    "x": 1658.1854629516602,
+    "y": 496.39935779571533,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "8107bf70.6729c"
+        "cad70d2f.866d6"
       ]
     ]
   },
   {
-    "id": "2e9b819d.3363ee",
+    "id": "c3367ce.c8b6f8",
     "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": 2068.4486236572266,
-    "y": 425.0000810623169,
-    "z": "4842829a.c92f5c",
+    "x": 2072.4447174072266,
+    "y": 408.00008249282837,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "edfeb643.5889d8",
+    "id": "6e235bab.f44c74",
     "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": 2017.4488925933838,
-    "y": 527.4286171197891,
-    "z": "4842829a.c92f5c",
+    "x": 2021.4449863433838,
+    "y": 510.4286185503006,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "76036750.d4da68",
+    "id": "fca0cf3f.e6c1c",
     "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": 2019.448709487915,
-    "y": 467.0000420808792,
-    "z": "4842829a.c92f5c",
+    "x": 2023.444803237915,
+    "y": 450.0000435113907,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "e87ff105.14d1b",
-        "d97dfa9c.e30428"
+        "3fdfd73c.bfa0f8",
+        "a02243dc.27d9"
       ]
     ]
   },
   {
-    "id": "d97dfa9c.e30428",
+    "id": "a02243dc.27d9",
     "type": "outcome",
     "name": "outcome Created",
     "xml": "<outcome value='Created'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2247.0490589141846,
-    "y": 458.0000993013382,
-    "z": "4842829a.c92f5c",
+    "x": 2251.0451526641846,
+    "y": 441.00010073184967,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "987bc713.b486f8"
+        "efd48355.63c2"
       ]
     ]
   },
   {
-    "id": "e87ff105.14d1b",
+    "id": "3fdfd73c.bfa0f8",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2241.762954711914,
-    "y": 497.42865657806396,
-    "z": "4842829a.c92f5c",
+    "x": 2245.759048461914,
+    "y": 480.42865800857544,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "b58f7e1e.c3478"
+        "e7841384.7d2f"
       ]
     ]
   },
   {
-    "id": "987bc713.b486f8",
+    "id": "efd48355.63c2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2406.519187927246,
-    "y": 458.37570428848267,
-    "z": "4842829a.c92f5c",
+    "x": 2410.515281677246,
+    "y": 441.37570571899414,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "b58f7e1e.c3478",
+    "id": "e7841384.7d2f",
     "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": 2417.670768737793,
-    "y": 496.0000557899475,
-    "z": "4842829a.c92f5c",
+    "x": 2421.666862487793,
+    "y": 479.000057220459,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "e130ad96.c9e09",
+    "id": "28e25554.5dcffa",
     "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": 911.3069496154785,
-    "y": 633.4936280250549,
-    "z": "4842829a.c92f5c",
+    "x": 915.3030433654785,
+    "y": 616.4936294555664,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "21e8ba33.483c86",
+    "id": "e6936fb4.46122",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 605.3130493164062,
-    "y": 634.4999985694885,
-    "z": "4842829a.c92f5c",
+    "x": 609.3091430664062,
+    "y": 617.5,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "e130ad96.c9e09"
+        "28e25554.5dcffa"
       ]
     ]
   },
   {
-    "id": "336e8236.5ec30e",
+    "id": "912e86c8.6df528",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 783.00439453125,
-    "y": 705.5317368507385,
-    "z": "4842829a.c92f5c",
+    "x": 787.00048828125,
+    "y": 688.53173828125,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "2b31d5c5.87577a",
+    "id": "bb953da4.20a6",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2130.4766845703125,
-    "y": 385.50393533706665,
-    "z": "4842829a.c92f5c",
+    "x": 2134.4727783203125,
+    "y": 368.5039367675781,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "7d9870f2.8c169",
+    "id": "a02dc728.884b28",
     "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": 668.9727172851562,
-    "y": 735.000120639801,
-    "z": "4842829a.c92f5c",
+    "x": 672.9688110351562,
+    "y": 718.0001220703125,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "b757ef37.0ce2d",
+    "id": "237a4084.caa97",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1028.972885131836,
-    "y": 792.0000901222229,
-    "z": "4842829a.c92f5c",
+    "x": 1032.968978881836,
+    "y": 775.0000915527344,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "8876c1bb.25741"
+        "cb935d16.398af"
       ]
     ]
   },
   {
-    "id": "f706c388.1aebc",
+    "id": "b92e648c.4237d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1020.8246879577637,
-    "y": 827.0661749839783,
-    "z": "4842829a.c92f5c",
+    "x": 1024.8207817077637,
+    "y": 810.0661764144897,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "cb9cbf16.bef44"
+        "3472a1b6.dd0c3e"
       ]
     ]
   },
   {
-    "id": "cb9cbf16.bef44",
+    "id": "3472a1b6.dd0c3e",
     "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": 1166.9734687805176,
-    "y": 826.3335862159729,
-    "z": "4842829a.c92f5c",
+    "x": 1170.9695625305176,
+    "y": 809.3335876464844,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "8876c1bb.25741",
+    "id": "cb935d16.398af",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1159.9729804992676,
-    "y": 792.0001511573792,
-    "z": "4842829a.c92f5c",
+    "x": 1163.9690742492676,
+    "y": 775.0001525878906,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "2c9b5f28.48e9e",
+    "id": "a9379012.e6c67",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 842.7351894378662,
-    "y": 1824.9538197517395,
-    "z": "4842829a.c92f5c",
+    "x": 846.7313137054443,
+    "y": 2135.9540371894836,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "6b8dfb7d.64cd94"
+        "be6d4648.608728"
       ]
     ]
   },
   {
-    "id": "6b8dfb7d.64cd94",
+    "id": "be6d4648.608728",
     "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": 1009.2590103149414,
-    "y": 1851.5728268623352,
-    "z": "4842829a.c92f5c",
+    "x": 1013.2551345825195,
+    "y": 2162.5730443000793,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "ed67a862.2bd1f8",
+    "id": "c2820f2f.b28f6",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 844.8304176330566,
-    "y": 1872.7156624794006,
-    "z": "4842829a.c92f5c",
+    "x": 848.8265419006348,
+    "y": 2183.715879917145,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "6b8dfb7d.64cd94"
+        "be6d4648.608728"
       ]
     ]
   },
   {
-    "id": "97cf9734.788978",
+    "id": "4982ee04.1cd2f",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 616.7828330993652,
-    "y": 1813.3029828071594,
-    "z": "4842829a.c92f5c",
+    "x": 620.7789573669434,
+    "y": 2124.3032002449036,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "38c9c0d2.63a2d",
+    "id": "1ebdd52f.25cc2b",
     "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": 631.5505294799805,
-    "y": 1734.8284640312195,
-    "z": "4842829a.c92f5c",
+    "x": 635.5466537475586,
+    "y": 2045.8286814689636,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "9192f41d.1c9e78",
+    "id": "5f71dd6c.97cd84",
     "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": 591.963701248169,
-    "y": 1920.4442524909973,
-    "z": "4842829a.c92f5c",
+    "x": 595.9598255157471,
+    "y": 2231.4444699287415,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "43fe29d3.28d4b8",
+    "id": "69260ab2.333c94",
     "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": 684.2826118469238,
-    "y": 1659.469316959381,
-    "z": "4842829a.c92f5c",
+    "x": 688.278736114502,
+    "y": 1970.4695343971252,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "d5f8f1b8.84781",
-        "d21a6279.bc9d6",
-        "9617473f.000048"
+        "61914fb2.5848f",
+        "913cab50.d379e8",
+        "247de1a.a91111e"
       ]
     ]
   },
   {
-    "id": "d5f8f1b8.84781",
+    "id": "61914fb2.5848f",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 938.9240341186523,
-    "y": 1703.8007111549377,
-    "z": "4842829a.c92f5c",
+    "x": 942.9201583862305,
+    "y": 2014.8009285926819,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "ce2b1814.f0bc28"
+        "63853616.80d768"
       ]
     ]
   },
   {
-    "id": "d21a6279.bc9d6",
+    "id": "913cab50.d379e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 940.9240570068359,
-    "y": 1662.3006752952933,
-    "z": "4842829a.c92f5c",
+    "x": 944.9201812744141,
+    "y": 1973.3008927330375,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "ce2b1814.f0bc28"
+        "63853616.80d768"
       ]
     ]
   },
   {
-    "id": "9617473f.000048",
+    "id": "247de1a.a91111e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 944.6741409301758,
-    "y": 1613.6578278541565,
-    "z": "4842829a.c92f5c",
+    "x": 948.6702651977539,
+    "y": 1924.6580452919006,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "c002bab4.10b818"
+        "e8b97cec.a52d7"
       ]
     ]
   },
   {
-    "id": "ce2b1814.f0bc28",
+    "id": "63853616.80d768",
     "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": 1099.674160003662,
-    "y": 1682.0507416725159,
-    "z": "4842829a.c92f5c",
+    "x": 1103.6702842712402,
+    "y": 1993.05095911026,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "c002bab4.10b818",
+    "id": "e8b97cec.a52d7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1072.3300857543945,
-    "y": 1615.8499960899353,
-    "z": "4842829a.c92f5c",
+    "x": 1076.3262100219727,
+    "y": 1926.8502135276794,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "4fc8c244.1177ac",
+    "id": "720d11d0.f67bc",
     "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": 586.4962272644043,
-    "y": 1493.8502180576324,
-    "z": "4842829a.c92f5c",
+    "x": 590.4923515319824,
+    "y": 1804.8504354953766,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "daadac76.292c6",
+    "id": "22826455.9296ec",
     "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": 603.7820701599121,
-    "y": 1566.4698157310486,
-    "z": "4842829a.c92f5c",
+    "x": 607.7781944274902,
+    "y": 1877.4700331687927,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "c4a41078.ea3c4",
+    "id": "f959c075.1e7e6",
     "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": 653.7691497802734,
-    "y": 1603.4208960533142,
-    "z": "4842829a.c92f5c",
+    "x": 657.7652740478516,
+    "y": 1914.4211134910583,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "d4d40535.00b288",
+    "id": "671de4e7.c5daec",
     "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": 600.3377685546875,
-    "y": 1533.0248684883118,
-    "z": "4842829a.c92f5c",
+    "x": 604.3338928222656,
+    "y": 1844.025085926056,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "45fc3466.cbd9ac",
+    "id": "33b4dd9d.575162",
     "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": 711.6712646484375,
-    "y": 1455.0248260498047,
-    "z": "4842829a.c92f5c",
+    "x": 715.6673889160156,
+    "y": 1766.0250434875488,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "4c6b5051.361fc",
+    "id": "ad8abb41.f27f98",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 655.2510566711426,
-    "y": 1421.4381222724915,
-    "z": "4842829a.c92f5c",
+    "x": 659.2471809387207,
+    "y": 1732.4383397102356,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "390c3a59.81dbe6",
+    "id": "c88d609e.257e3",
     "type": "update",
     "name": "update AAI allotted-resource",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.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": 643.2271118164062,
-    "y": 1850.7551255226135,
-    "z": "4842829a.c92f5c",
+    "x": 647.2232360839844,
+    "y": 2161.7553429603577,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "2c9b5f28.48e9e",
-        "ed67a862.2bd1f8"
+        "a9379012.e6c67",
+        "c2820f2f.b28f6"
       ]
     ]
   },
   {
-    "id": "f1c987fe.e262e8",
+    "id": "210482d7.10d8ee",
     "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": 815.0078735351562,
-    "y": 545.0039048194885,
-    "z": "4842829a.c92f5c",
+    "x": 819.0039672851562,
+    "y": 528.00390625,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "b2104ab0.d42038",
-        "a6741673.5edd48"
+        "1df58ece.22a6f1",
+        "60f581d.8121d8"
       ]
     ]
   },
   {
-    "id": "4c06f720.016118",
+    "id": "b09356ce.de3e78",
     "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": 738.0079956054688,
-    "y": 808.0040879249573,
-    "z": "4842829a.c92f5c",
+    "x": 742.0040893554688,
+    "y": 791.0040893554688,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "b757ef37.0ce2d",
-        "f706c388.1aebc"
+        "237a4084.caa97",
+        "b92e648c.4237d8"
       ]
     ]
   },
   {
-    "id": "1379096d.d52197",
+    "id": "b70e72ac.ac27d",
     "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": 638.0079040527344,
-    "y": 771.0039210319519,
-    "z": "4842829a.c92f5c",
+    "x": 642.0039978027344,
+    "y": 754.0039224624634,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "5177b2ec.7304dc",
+    "id": "32321857.9b87a8",
     "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": 1496.0003814697266,
-    "y": 860.1218543052673,
-    "z": "4842829a.c92f5c",
+    "x": 1499.9964752197266,
+    "y": 843.1218557357788,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "a4de5ab0.2e8518",
+    "id": "b156e259.c2b83",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2002.0009765625,
-    "y": 954.4551377296448,
-    "z": "4842829a.c92f5c",
+    "x": 2005.9970703125,
+    "y": 937.4551391601562,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "b07d3158.ec06e"
+        "7bcfda30.e9f8d4"
       ]
     ]
   },
   {
-    "id": "e77eab64.b80238",
+    "id": "9ffe3ec9.11aa8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2005.852352142334,
-    "y": 916.5212178230286,
-    "z": "4842829a.c92f5c",
+    "x": 2009.848445892334,
+    "y": 899.52121925354,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "67d985d1.99c82c"
+        "66958c0e.e9ae64"
       ]
     ]
   },
   {
-    "id": "a9f31ecc.485fc",
+    "id": "edc31606.488c38",
     "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": 1898.0015487670898,
-    "y": 1682.1222678422928,
-    "z": "4842829a.c92f5c",
+    "x": 1901.9976425170898,
+    "y": 1665.1222692728043,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "3f28b2ff.c5261e"
+        "4a985c04.ef4f84"
       ]
     ]
   },
   {
-    "id": "3f28b2ff.c5261e",
+    "id": "4a985c04.ef4f84",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1657.6680450439453,
-    "y": 1754.1224604845047,
-    "z": "4842829a.c92f5c",
+    "x": 1661.6641387939453,
+    "y": 1737.1224619150162,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "7390d84f.4b2318"
+        "f49161ce.7951e"
       ]
     ]
   },
   {
-    "id": "7390d84f.4b2318",
+    "id": "f49161ce.7951e",
     "type": "switchNode",
     "name": "switch ActivateSiteInstance",
     "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1870.5332794189453,
-    "y": 1755.3203288316727,
-    "z": "4842829a.c92f5c",
+    "x": 1874.5293731689453,
+    "y": 1738.3203302621841,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "f67dfe78.781af"
+        "ba99c3de.16d52"
       ]
     ]
   },
   {
-    "id": "f67dfe78.781af",
+    "id": "ba99c3de.16d52",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2075.53263092041,
-    "y": 1758.3203250169754,
-    "z": "4842829a.c92f5c",
+    "x": 2079.52872467041,
+    "y": 1741.3203264474869,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "24aa0f5e.31356"
+        "81072e73.36a9b"
       ]
     ]
   },
   {
-    "id": "e2678b6.a3e2078",
+    "id": "fe54ca75.073228",
     "type": "set",
     "name": "set tmp.sitevidx ",
     "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 2419.532802581787,
-    "y": 1738.3206726312637,
-    "z": "4842829a.c92f5c",
+    "x": 2423.528896331787,
+    "y": 1721.3206740617752,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "9f2a331c.6de8",
+    "id": "fca98070.131e",
     "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": 1647.0009765625,
-    "y": 1101.1221171617508,
-    "z": "4842829a.c92f5c",
+    "x": 1650.9970703125,
+    "y": 1084.1221185922623,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "d2ac9580.cea3a8",
+    "id": "3615b198.912bde",
     "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": 1674.0004901885986,
-    "y": 1058.621705532074,
-    "z": "4842829a.c92f5c",
+    "x": 1677.9965839385986,
+    "y": 1041.6217069625854,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "ab4a3566.1d4448"
+        "ff4ce46e.aa5008"
       ]
     ]
   },
   {
-    "id": "9e31b20.ec7145",
+    "id": "17a801cc.ffa25e",
     "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": 2105.0007343292236,
-    "y": 1024.6218276023865,
-    "z": "4842829a.c92f5c",
+    "x": 2108.9968280792236,
+    "y": 1007.621829032898,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "8e1f2970.68a218"
+        "4be35b76.6b2a54"
       ]
     ]
   },
   {
-    "id": "8e1f2970.68a218",
+    "id": "4be35b76.6b2a54",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2245.0009784698486,
-    "y": 1022.621949672699,
-    "z": "4842829a.c92f5c",
+    "x": 2248.9970722198486,
+    "y": 1005.6219511032104,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "ef163b1b.5ea0c8"
+        "7e234298.9ccc3c"
       ]
     ]
   },
   {
-    "id": "ef163b1b.5ea0c8",
+    "id": "7e234298.9ccc3c",
     "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": 2389.0017108917236,
-    "y": 1022.221803188324,
-    "z": "4842829a.c92f5c",
+    "x": 2392.9978046417236,
+    "y": 1005.2218046188354,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "8f7eca2d.7a5ac8",
+    "id": "c26e60ea.9b07b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1953.0007934570312,
-    "y": 1201.1219245195389,
-    "z": "4842829a.c92f5c",
+    "x": 1956.9968872070312,
+    "y": 1184.1219259500504,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "2acc8e1c.c1a132"
+        "dcf01c19.ab4ec"
       ]
     ]
   },
   {
-    "id": "224b80f9.f7e8e",
+    "id": "21194342.fd75ac",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1950.8531227111816,
-    "y": 1162.1880522966385,
-    "z": "4842829a.c92f5c",
+    "x": 1954.8492164611816,
+    "y": 1145.18805372715,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "d6b1d2aa.02b42"
+        "26a61e2a.3b4ee2"
       ]
     ]
   },
   {
-    "id": "67d985d1.99c82c",
+    "id": "66958c0e.e9ae64",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2132.000476837158,
-    "y": 913.6216511726379,
-    "z": "4842829a.c92f5c",
+    "x": 2135.996570587158,
+    "y": 896.6216526031494,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "b07d3158.ec06e",
+    "id": "7bcfda30.e9f8d4",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1297.500431060791,
-    "y": 1093.621780872345,
-    "z": "4842829a.c92f5c",
+    "x": 1301.496524810791,
+    "y": 1076.6217823028564,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "d2ac9580.cea3a8",
-        "9f2a331c.6de8",
-        "13a1cc8b.f27593",
-        "8c1064b8.0837a8"
+        "3615b198.912bde",
+        "fca98070.131e",
+        "d8ea80f8.53dca",
+        "f11b05ac.5891b8"
       ]
     ]
   },
   {
-    "id": "d6b1d2aa.02b42",
+    "id": "26a61e2a.3b4ee2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2080.5013160705566,
-    "y": 1155.622012257576,
-    "z": "4842829a.c92f5c",
+    "x": 2084.4974098205566,
+    "y": 1138.6220136880875,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "2acc8e1c.c1a132",
+    "id": "dcf01c19.ab4ec",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1679.5010528564453,
-    "y": 1280.6221534013748,
-    "z": "4842829a.c92f5c",
+    "x": 1683.4971466064453,
+    "y": 1263.6221548318863,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "2eef69ed.8c4646"
+        "6973f8af.870f38"
       ]
     ]
   },
   {
-    "id": "322f0f47.8e765",
+    "id": "452db2df.70966c",
     "type": "for",
     "name": "for loop siteidx - Get site ID from servicedata",
     "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2498.5025024414062,
-    "y": 1788.6224652528763,
-    "z": "4842829a.c92f5c",
+    "x": 2502.4985961914062,
+    "y": 1771.6224666833878,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "f041a5c4.8e5ff8"
+        "5784939.f29e76c"
       ]
     ]
   },
   {
-    "id": "3ce210b6.91582",
+    "id": "200a6173.10b10e",
     "type": "switchNode",
     "name": "switch siteId",
     "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1969.505865097046,
-    "y": 1902.6239272356033,
-    "z": "4842829a.c92f5c",
+    "x": 1973.501958847046,
+    "y": 1885.6239286661148,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "57ac6f64.1286d"
+        "91222197.1f508"
       ]
     ]
   },
   {
-    "id": "57ac6f64.1286d",
+    "id": "91222197.1f508",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2124.5062351226807,
-    "y": 1904.624293923378,
-    "z": "4842829a.c92f5c",
+    "x": 2128.5023288726807,
+    "y": 1887.6242953538895,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "b1ee9c99.2aacf"
+        "ea7d1279.422d1"
       ]
     ]
   },
   {
-    "id": "cbb60b59.d98d48",
+    "id": "62f62c1c.d1f314",
     "type": "set",
     "name": "Add sites to list and update length",
     "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
     "comments": "",
-    "x": 2102.0048294067383,
-    "y": 2037.122889637947,
-    "z": "4842829a.c92f5c",
+    "x": 2106.0009231567383,
+    "y": 2020.1228910684586,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "5723dd.5302dc24",
+    "id": "f3ac87c7.5588f8",
     "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": 695.0036029815674,
-    "y": 1242.6233216524124,
-    "z": "4842829a.c92f5c",
+    "x": 698.9997272491455,
+    "y": 1553.6235390901566,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "dbb9cf9c.1b8a",
-        "fefb45a2.751f18"
+        "b3354b35.0339d8",
+        "83e6dff5.c0823"
       ]
     ]
   },
   {
-    "id": "fefb45a2.751f18",
+    "id": "83e6dff5.c0823",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 939.0035572052002,
-    "y": 1263.6231385469437,
-    "z": "4842829a.c92f5c",
+    "x": 942.9996814727783,
+    "y": 1574.6233559846878,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "96dbc97.ce15e38"
+        "5884381c.754b78"
       ]
     ]
   },
   {
-    "id": "96dbc97.ce15e38",
+    "id": "5884381c.754b78",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1109.003496170044,
-    "y": 1266.6231385469437,
-    "z": "4842829a.c92f5c",
+    "x": 1112.999620437622,
+    "y": 1577.6233559846878,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "95ee12f3.671c4",
+    "id": "3a834e9e.d6b4c2",
     "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": 1109.0036182403564,
-    "y": 1222.6231385469437,
-    "z": "4842829a.c92f5c",
+    "x": 1112.9997425079346,
+    "y": 1533.6233559846878,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "dbb9cf9c.1b8a",
+    "id": "b3354b35.0339d8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 942.003496170044,
-    "y": 1222.6231385469437,
-    "z": "4842829a.c92f5c",
+    "x": 945.9996204376221,
+    "y": 1533.6233559846878,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "95ee12f3.671c4"
+        "3a834e9e.d6b4c2"
       ]
     ]
   },
   {
-    "id": "722c21e0.94316",
+    "id": "97a06baa.a4df68",
     "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": 1113.569179534912,
-    "y": 955.2990155220032,
-    "z": "4842829a.c92f5c",
+    "x": 1061.5652923583984,
+    "y": 928.2990293502808,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "db5d0d5.71c66f",
+    "id": "c4f38bc0.54d238",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 650.0689697265625,
-    "y": 1004.2993149757385,
-    "z": "4842829a.c92f5c",
+    "x": 658.0650634765625,
+    "y": 954.2993497848511,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "9f61640b.56f5e8",
-        "fcbf7eb7.5e0e6",
-        "b9617b3d.71b3f8"
+        "b1ed8af2.ff9cc8",
+        "64af3109.c43ba",
+        "b545c5fe.0aa818"
       ]
     ]
   },
   {
-    "id": "9f61640b.56f5e8",
+    "id": "b1ed8af2.ff9cc8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 916.0691184997559,
-    "y": 967.2990155220032,
-    "z": "4842829a.c92f5c",
+    "x": 896.0651664733887,
+    "y": 928.2989978790283,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "722c21e0.94316"
+        "97a06baa.a4df68"
       ]
     ]
   },
   {
-    "id": "fcbf7eb7.5e0e6",
+    "id": "64af3109.c43ba",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 912.55983543396,
-    "y": 1005.8731122016907,
-    "z": "4842829a.c92f5c",
+    "x": 892.5559043884277,
+    "y": 964.8731408119202,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "ae421a1b.b35b38"
+        "84eeaaa5.5de4f8"
       ]
     ]
   },
   {
-    "id": "b9617b3d.71b3f8",
+    "id": "b545c5fe.0aa818",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 907.89284324646,
-    "y": 1047.206425189972,
-    "z": "4842829a.c92f5c",
+    "x": 886.8889579772949,
+    "y": 1001.2064542770386,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "e4bd895d.631da8"
+        "4396ff0e.50b9e"
       ]
     ]
   },
   {
-    "id": "ae421a1b.b35b38",
+    "id": "84eeaaa5.5de4f8",
     "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": 1089.1312465667725,
-    "y": 994.158848285675,
-    "z": "4842829a.c92f5c",
+    "x": 1049.1273345947266,
+    "y": 964.1588926315308,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "e4bd895d.631da8",
+    "id": "4396ff0e.50b9e",
     "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": 1095.6653995513916,
-    "y": 1042.6456179618835,
-    "z": "4842829a.c92f5c",
+    "x": 1048.6615295410156,
+    "y": 996.6456785202026,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "2eef69ed.8c4646",
+    "id": "6973f8af.870f38",
     "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": 1987.5011825561523,
-    "y": 1280.1222764253616,
-    "z": "4842829a.c92f5c",
+    "x": 1991.4972763061523,
+    "y": 1263.122277855873,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "19a68b02.3eedc5"
+        "86298d2a.4e81d"
       ]
     ]
   },
   {
-    "id": "532b87f6.cba248",
+    "id": "9e5424eb.2e5b98",
     "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": 1834.169578552246,
-    "y": 1369.122292637825,
-    "z": "4842829a.c92f5c",
+    "x": 1838.165672302246,
+    "y": 1352.1222940683365,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "f7df899d.2cdaa8"
+        "7568a55.272e35c"
       ]
     ]
   },
   {
-    "id": "f7df899d.2cdaa8",
+    "id": "7568a55.272e35c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2090.1690311431885,
-    "y": 1367.1222316026688,
-    "z": "4842829a.c92f5c",
+    "x": 2094.1651248931885,
+    "y": 1350.1222330331802,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "4ad4efb2.b5354"
+        "e1df3461.3efed8"
       ]
     ]
   },
   {
-    "id": "f89715ac.25dc68",
+    "id": "34f69c4e.e0acb4",
     "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": 1877.1676940917969,
-    "y": 1460.1214705705643,
-    "z": "4842829a.c92f5c",
+    "x": 1881.1637878417969,
+    "y": 1443.1214720010757,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "c531c63.7b95a38"
+        "1b29b6f3.84c7e9"
       ]
     ]
   },
   {
-    "id": "bd704489.7274d8",
+    "id": "9dd144dd.7929d8",
     "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": 2331.1680545806885,
-    "y": 1447.1217604875565,
-    "z": "4842829a.c92f5c",
+    "x": 2335.1641483306885,
+    "y": 1430.121761918068,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "76f653aa.77e0bc"
+        "e3be96aa.c2c8a8"
       ]
     ]
   },
   {
-    "id": "76f653aa.77e0bc",
+    "id": "e3be96aa.c2c8a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2480.1678104400635,
-    "y": 1442.121882557869,
-    "z": "4842829a.c92f5c",
+    "x": 2484.1639041900635,
+    "y": 1425.1218839883804,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "e332cfdd.3a325"
+        "23ce8dd3.49fc12"
       ]
     ]
   },
   {
-    "id": "e332cfdd.3a325",
+    "id": "23ce8dd3.49fc12",
     "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": 2620.1679973602295,
-    "y": 1439.7217980623245,
-    "z": "4842829a.c92f5c",
+    "x": 2624.1640911102295,
+    "y": 1422.721799492836,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "95926f9f.7a56d",
+    "id": "ecf33c6a.0e252",
     "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": 2318.8340015411377,
-    "y": 1485.4549852609634,
-    "z": "4842829a.c92f5c",
+    "x": 2322.8300952911377,
+    "y": 1468.454986691475,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "915a39b2.608e28"
+        "3bf645ac.c4019a"
       ]
     ]
   },
   {
-    "id": "915a39b2.608e28",
+    "id": "3bf645ac.c4019a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2458.8339443206787,
-    "y": 1485.4548016786575,
-    "z": "4842829a.c92f5c",
+    "x": 2462.8300380706787,
+    "y": 1468.454803109169,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "56e124a4.ba815c"
+        "f947fdb0.d1a3c"
       ]
     ]
   },
   {
-    "id": "56e124a4.ba815c",
+    "id": "f947fdb0.d1a3c",
     "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": 2606.833948135376,
-    "y": 1485.0548692941666,
-    "z": "4842829a.c92f5c",
+    "x": 2610.830041885376,
+    "y": 1468.054870724678,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "537ad820.346958",
+    "id": "6a97289d.80a568",
     "type": "execute",
     "name": "execute RestApiCallNode create vpn ",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.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": 664.0019989013672,
-    "y": 1151.122742652893,
-    "z": "4842829a.c92f5c",
+    "x": 667.9981231689453,
+    "y": 1462.1229600906372,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "3ba3cba0.b1b5b4",
-        "14233b12.99c415"
+        "5ffc81bd.b86cd",
+        "2fd24486.c6bc7c"
       ]
     ]
   },
   {
-    "id": "14233b12.99c415",
+    "id": "2fd24486.c6bc7c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 884.0019016265869,
-    "y": 1147.1227074861526,
-    "z": "4842829a.c92f5c",
+    "x": 887.998025894165,
+    "y": 1458.1229249238968,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "e9e1022d.54d97"
+        "10a20cb7.762a63"
       ]
     ]
   },
   {
-    "id": "e9e1022d.54d97",
+    "id": "10a20cb7.762a63",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1054.0018405914307,
-    "y": 1150.1227074861526,
-    "z": "4842829a.c92f5c",
+    "x": 1057.9979648590088,
+    "y": 1461.1229249238968,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "12277977.d003a7",
+    "id": "bb44545a.967818",
     "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": 1054.0019626617432,
-    "y": 1106.1227074861526,
-    "z": "4842829a.c92f5c",
+    "x": 1057.9980869293213,
+    "y": 1417.1229249238968,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "3ba3cba0.b1b5b4",
+    "id": "5ffc81bd.b86cd",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 887.0018405914307,
-    "y": 1106.1227074861526,
-    "z": "4842829a.c92f5c",
+    "x": 890.9979648590088,
+    "y": 1417.1229249238968,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "12277977.d003a7"
+        "bb44545a.967818"
       ]
     ]
   },
   {
-    "id": "4ac994c1.39bcbc",
+    "id": "c6900049.d4f2a",
     "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": 2464.0007343292236,
-    "y": 1074.121461391449,
-    "z": "4842829a.c92f5c",
+    "x": 2467.9968280792236,
+    "y": 1057.1214628219604,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "24b71c25.bdf914",
+    "id": "6d71d4d6.b3bfec",
     "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": 2143.5004901885986,
-    "y": 1079.121461391449,
-    "z": "4842829a.c92f5c",
+    "x": 2147.4965839385986,
+    "y": 1062.1214628219604,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "4b8a8916.d5df08"
+        "95235e68.5208b"
       ]
     ]
   },
   {
-    "id": "4b8a8916.d5df08",
+    "id": "95235e68.5208b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2320.5007343292236,
-    "y": 1076.121461391449,
-    "z": "4842829a.c92f5c",
+    "x": 2324.4968280792236,
+    "y": 1059.1214628219604,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "4ac994c1.39bcbc"
+        "c6900049.d4f2a"
       ]
     ]
   },
   {
-    "id": "35fb02d9.bc983e",
+    "id": "5dc928bc.725628",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1233.0308837890625,
-    "y": 897.3190293312073,
-    "z": "4842829a.c92f5c",
+    "x": 1237.0269775390625,
+    "y": 880.3190307617188,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "5177b2ec.7304dc",
-        "72795760.cf2f58",
-        "48fba41e.5e07cc"
+        "32321857.9b87a8",
+        "8e15f4fa.e90f28",
+        "9fc5f700.68a778"
       ]
     ]
   },
   {
-    "id": "19eae0e7.50657f",
+    "id": "69e18ab9.627484",
     "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": 826.18505859375,
-    "y": 906.0944199562073,
-    "z": "4842829a.c92f5c",
+    "x": 830.18115234375,
+    "y": 889.0944213867188,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "35fb02d9.bc983e"
+        "5dc928bc.725628"
       ]
     ]
   },
   {
-    "id": "72795760.cf2f58",
+    "id": "8e15f4fa.e90f28",
     "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": 1482.0002059936523,
-    "y": 895.6668076515198,
-    "z": "4842829a.c92f5c",
+    "x": 1485.9962997436523,
+    "y": 878.6668090820312,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "48fba41e.5e07cc",
+    "id": "9fc5f700.68a778",
     "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": 1631,
-    "y": 934.333372592926,
-    "z": "4842829a.c92f5c",
+    "x": 1634.99609375,
+    "y": 917.3333740234375,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "e77eab64.b80238",
-        "a4de5ab0.2e8518"
+        "9ffe3ec9.11aa8",
+        "b156e259.c2b83"
       ]
     ]
   },
   {
-    "id": "13a1cc8b.f27593",
+    "id": "d8ea80f8.53dca",
     "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": 1661.3334655761719,
-    "y": 1143.0003348588943,
-    "z": "4842829a.c92f5c",
+    "x": 1665.3295593261719,
+    "y": 1126.0003362894058,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "8c1064b8.0837a8",
+    "id": "f11b05ac.5891b8",
     "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": 1680.3334350585938,
-    "y": 1177.0004206895828,
-    "z": "4842829a.c92f5c",
+    "x": 1684.3295288085938,
+    "y": 1160.0004221200943,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "224b80f9.f7e8e",
-        "8f7eca2d.7a5ac8"
+        "21194342.fd75ac",
+        "c26e60ea.9b07b"
       ]
     ]
   },
   {
-    "id": "ab4a3566.1d4448",
+    "id": "ff4ce46e.aa5008",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1940.0311298370361,
-    "y": 1053.531129360199,
-    "z": "4842829a.c92f5c",
+    "x": 1944.0272235870361,
+    "y": 1036.5311307907104,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "9e31b20.ec7145",
-        "24b71c25.bdf914"
+        "17a801cc.ffa25e",
+        "6d71d4d6.b3bfec"
       ]
     ]
   },
   {
-    "id": "4ad4efb2.b5354",
+    "id": "e1df3461.3efed8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1466.0316848754883,
-    "y": 1500.5313200950623,
-    "z": "4842829a.c92f5c",
+    "x": 1470.0277786254883,
+    "y": 1483.5313215255737,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "f89715ac.25dc68",
-        "6e129b4e.95cc44",
-        "5de3f774.9f5298",
-        "153d05d.db3defa"
+        "34f69c4e.e0acb4",
+        "f53c2301.9407e",
+        "c3f7512e.84f81",
+        "334c603e.da8c8"
       ]
     ]
   },
   {
-    "id": "19a68b02.3eedc5",
+    "id": "86298d2a.4e81d",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1576.6673126220703,
-    "y": 1367.6670924425125,
-    "z": "4842829a.c92f5c",
+    "x": 1580.6634063720703,
+    "y": 1350.667093873024,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "532b87f6.cba248"
+        "9e5424eb.2e5b98"
       ]
     ]
   },
   {
-    "id": "f041a5c4.8e5ff8",
+    "id": "5784939.f29e76c",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1802.0023765563965,
-    "y": 1904.6676589250565,
-    "z": "4842829a.c92f5c",
+    "x": 1805.9984703063965,
+    "y": 1887.667660355568,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "3ce210b6.91582"
+        "200a6173.10b10e"
       ]
     ]
   },
   {
-    "id": "c531c63.7b95a38",
+    "id": "1b29b6f3.84c7e9",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2163.031629562378,
-    "y": 1460.531430363655,
-    "z": "4842829a.c92f5c",
+    "x": 2167.027723312378,
+    "y": 1443.5314317941666,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "bd704489.7274d8",
-        "95926f9f.7a56d"
+        "9dd144dd.7929d8",
+        "ecf33c6a.0e252"
       ]
     ]
   },
   {
-    "id": "61033198.2b1b8",
+    "id": "5c15538f.0d810c",
     "type": "set",
     "name": "set prop.attach.siteId",
     "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n\n",
     "comments": "",
-    "x": 2054.668918609619,
-    "y": 1978.333869099617,
-    "z": "4842829a.c92f5c",
+    "x": 2058.665012359619,
+    "y": 1961.3338705301285,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "24aa0f5e.31356",
+    "id": "81072e73.36a9b",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2234.259433746338,
-    "y": 1759.0044165849686,
-    "z": "4842829a.c92f5c",
+    "x": 2238.255527496338,
+    "y": 1742.00441801548,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "e2678b6.a3e2078",
-        "322f0f47.8e765"
+        "fe54ca75.073228",
+        "452db2df.70966c"
       ]
     ]
   },
   {
-    "id": "b1ee9c99.2aacf",
+    "id": "ea7d1279.422d1",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1857.759853363037,
-    "y": 2004.7543412446976,
-    "z": "4842829a.c92f5c",
+    "x": 1861.755947113037,
+    "y": 1987.754342675209,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "61033198.2b1b8",
-        "cbb60b59.d98d48",
-        "96db890b.9cff38"
+        "5c15538f.0d810c",
+        "62f62c1c.d1f314",
+        "9f8585c2.03c528"
       ]
     ]
   },
   {
-    "id": "4041fa5f.8f6984",
+    "id": "19a39c5d.bf96f4",
     "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": 713.757890701294,
-    "y": 1359.2539811134338,
-    "z": "4842829a.c92f5c",
+    "x": 717.7540149688721,
+    "y": 1670.254198551178,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "1587faed.a593f5",
+    "id": "497d8e2c.0cabf",
     "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": 621.7268695831299,
-    "y": 1324.2229199409485,
-    "z": "4842829a.c92f5c",
+    "x": 625.722993850708,
+    "y": 1635.2231373786926,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "585348e6.e28c68",
+    "id": "bcfeb911.f55008",
     "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": 663.0038757324219,
-    "y": 871.5311719179153,
-    "z": "4842829a.c92f5c",
+    "x": 666.9999694824219,
+    "y": 854.5311733484268,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "6e129b4e.95cc44",
+    "id": "f53c2301.9407e",
     "type": "set",
     "name": "set prop.ar-service-instance-id",
     "xml": "<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
     "comments": "",
-    "x": 1826.0043029785156,
-    "y": 1498.5312304496765,
-    "z": "4842829a.c92f5c",
+    "x": 1830.0003967285156,
+    "y": 1481.531231880188,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "5de3f774.9f5298",
+    "id": "c3f7512e.84f81",
     "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": 1836.3365745544434,
-    "y": 1539.409375667572,
-    "z": "4842829a.c92f5c",
+    "x": 1840.3326683044434,
+    "y": 1522.4093770980835,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "153d05d.db3defa",
+    "id": "334c603e.da8c8",
     "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": 1865.3366394042969,
-    "y": 1580.409375667572,
-    "z": "4842829a.c92f5c",
+    "x": 1869.3327331542969,
+    "y": 1563.4093770980835,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "9f007bfc.0c1338",
-        "c288c029.05ff1"
+        "c3928a9a.4b87b8",
+        "3258f9bd.5d9236"
       ]
     ]
   },
   {
-    "id": "9f007bfc.0c1338",
+    "id": "c3928a9a.4b87b8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2121.8563232421875,
-    "y": 1589.597209095955,
-    "z": "4842829a.c92f5c",
+    "x": 2125.8524169921875,
+    "y": 1572.5972105264664,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "690363c.d28ea9c"
+        "8e2c2a42.ebc3b8"
       ]
     ]
   },
   {
-    "id": "c288c029.05ff1",
+    "id": "3258f9bd.5d9236",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2124.003993988037,
-    "y": 1628.5310813188553,
-    "z": "4842829a.c92f5c",
+    "x": 2128.000087738037,
+    "y": 1611.5310827493668,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "d23e72e1.4c912"
+        "db1a6308.98167"
       ]
     ]
   },
   {
-    "id": "690363c.d28ea9c",
+    "id": "8e2c2a42.ebc3b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2251.5045166015625,
-    "y": 1583.0311690568924,
-    "z": "4842829a.c92f5c",
+    "x": 2255.5006103515625,
+    "y": 1566.0311704874039,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       []
     ]
   },
   {
-    "id": "d23e72e1.4c912",
+    "id": "db1a6308.98167",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1600.0037841796875,
-    "y": 1679.531129002571,
-    "z": "4842829a.c92f5c",
+    "x": 1603.9998779296875,
+    "y": 1662.5311304330826,
+    "z": "5b3e3707.3aa6c8",
     "wires": [
       [
-        "a9f31ecc.485fc"
+        "edc31606.488c38"
       ]
     ]
   },
   {
-    "id": "54f08af3.c933d4",
+    "id": "1a500d64.c038a3",
     "type": "comment",
     "name": "TODO send Email",
     "info": "",
     "comments": "",
-    "x": 963.0038928985596,
-    "y": 1404.0313096046448,
-    "z": "4842829a.c92f5c",
+    "x": 967.0000171661377,
+    "y": 1715.031527042389,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   },
   {
-    "id": "96db890b.9cff38",
+    "id": "9f8585c2.03c528",
     "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",
+    "x": 2141.250045776367,
+    "y": 2074.753987789154,
+    "z": "5b3e3707.3aa6c8",
+    "wires": []
+  },
+  {
+    "id": "86fafd91.f4f2f",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 655.0038986206055,
+    "y": 1072.0041399002075,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "6e49d8b7.8b66c8",
+        "d4d84dda.9a08b"
+      ]
+    ]
+  },
+  {
+    "id": "6e49d8b7.8b66c8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 907.0040245056152,
+    "y": 1053.003957748413,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "2d072571.88985a"
+      ]
+    ]
+  },
+  {
+    "id": "d4d84dda.9a08b",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 899.2540588378906,
+    "y": 1088.6470804214478,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "e6862503.c2ac28"
+      ]
+    ]
+  },
+  {
+    "id": "e6862503.c2ac28",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
+    "comments": "",
+    "x": 1047.004051208496,
+    "y": 1086.3972024917603,
+    "z": "5b3e3707.3aa6c8",
+    "wires": []
+  },
+  {
+    "id": "2d072571.88985a",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+    "comments": "",
+    "x": 1056.0040245056152,
+    "y": 1052.003927230835,
+    "z": "5b3e3707.3aa6c8",
+    "wires": []
+  },
+  {
+    "id": "df3f5d3a.29e2c",
+    "type": "get-resource",
+    "name": "get-resource service-subscription",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type \n        AND customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data-tenant\">           ",
+    "comments": "",
+    "outputs": 1,
+    "x": 645.8993682861328,
+    "y": 1184.5660381317139,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "a39bcd10.58925",
+        "2937722a.892cce"
+      ]
+    ]
+  },
+  {
+    "id": "601b10b0.92d6e",
+    "type": "switchNode",
+    "name": "switch temp-ub-sub-account-id",
+    "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1057.8994598388672,
+    "y": 1149.3161191940308,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "9400efe1.833e2",
+        "af14c507.1fb9e8"
+      ]
+    ]
+  },
+  {
+    "id": "9400efe1.833e2",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1250.6139106750488,
+    "y": 1123.3161602020264,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "97ca3fa8.80b92"
+      ]
+    ]
+  },
+  {
+    "id": "af14c507.1fb9e8",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1203.8994903564453,
+    "y": 1217.3162384033203,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "98cbe213.a0ab5"
+      ]
+    ]
+  },
+  {
+    "id": "a39bcd10.58925",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 856.3992309570312,
+    "y": 1157.3120965957642,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "601b10b0.92d6e"
+      ]
+    ]
+  },
+  {
+    "id": "2937722a.892cce",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 850.0778198242188,
+    "y": 1209.5264081954956,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      [
+        "b04b740c.a6ef58"
+      ]
+    ]
+  },
+  {
+    "id": "b04b740c.a6ef58",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
+    "comments": "",
+    "x": 1002.8278198242188,
+    "y": 1209.2764692306519,
+    "z": "5b3e3707.3aa6c8",
+    "wires": []
+  },
+  {
+    "id": "98cbe213.a0ab5",
+    "type": "set",
+    "name": "set prop.tenant-id",
+    "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n",
+    "comments": "",
+    "x": 1372.7566719055176,
+    "y": 1215.423252105713,
+    "z": "5b3e3707.3aa6c8",
+    "wires": []
+  },
+  {
+    "id": "55f46b97.799ce4",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create tenant auth",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 683.3994293212891,
+    "y": 1251.4588842391968,
+    "z": "5b3e3707.3aa6c8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "97ca3fa8.80b92",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
+    "comments": "",
+    "x": 1363.042236328125,
+    "y": 1168.1375246047974,
+    "z": "5b3e3707.3aa6c8",
     "wires": []
   }
 ]
-- 
cgit 1.2.3-korg