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

SDWAN DGs and restapi templates issue fixes

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

Former-commit-id: b1da373ad0e08400b4c1f2a8cfbb69524df745a2
---
 ...E-API_site-vnf-topology-operation-activate.json | 954 ++++++++-------------
 1 file changed, 370 insertions(+), 584 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
index b750acf2..4f087f58 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "c9dff872.319c28",
+    "id": "365b721f.7a253e",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 182.03125,
-    "y": 193.0103907585144,
-    "z": "8546294e.bbf628",
+    "x": 142.00390625,
+    "y": 164.01038789749146,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "f599176a.0162d8"
+        "4883cd2c.e8add4"
       ]
     ]
   },
   {
-    "id": "f599176a.0162d8",
+    "id": "4883cd2c.e8add4",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1218 +22,1004 @@
     "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": 257.31695556640625,
-    "y": 233.24850225448608,
-    "z": "8546294e.bbf628",
+    "x": 217.28961181640625,
+    "y": 204.24849939346313,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "6ef8717d.0a89a"
+        "3fd0f9a0.bfb166"
       ]
     ]
   },
   {
-    "id": "6ef8717d.0a89a",
+    "id": "3fd0f9a0.bfb166",
     "type": "method",
     "name": "method site-vnf-topology-operation-activate",
     "xml": "<method rpc='site-vnf-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 278.4598693847656,
-    "y": 323.0103907585144,
-    "z": "8546294e.bbf628",
+    "x": 238.43252563476562,
+    "y": 294.01038789749146,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "e4c81f6e.49ef7"
+        "a41ebaac.ea0658"
       ]
     ]
   },
   {
-    "id": "e4c81f6e.49ef7",
+    "id": "a41ebaac.ea0658",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 266.69798278808594,
-    "y": 512.6771693229675,
-    "z": "8546294e.bbf628",
+    "x": 226.67063903808594,
+    "y": 483.6771664619446,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "cd35c02d.85245",
-        "cbc96af.e7a6b98",
-        "f380f867.7d6998",
-        "be9b1521.3244d8",
-        "8699a911.00b498",
-        "640f5d20.cfa064",
-        "e28c053e.d4c358",
-        "c2b356f7.cb66f8",
-        "cfdaefb3.97c88",
-        "de98d30f.d2fa5"
+        "d76422f.52b80e",
+        "221a8fd1.b8b2f",
+        "faa004c7.5a25c8",
+        "5f14f4d2.549ccc",
+        "3c340ff6.924a4",
+        "3edd9e9f.d604f2",
+        "dd9550a6.ba9af",
+        "ead8f54d.0eecc8",
+        "90854244.d2678",
+        "78b0ee0f.0865f"
       ]
     ]
   },
   {
-    "id": "cd35c02d.85245",
+    "id": "d76422f.52b80e",
     "type": "switchNode",
     "name": "switch service-data.vnfs.vnf_length",
     "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 706.0209121704102,
-    "y": 141.99998569488525,
-    "z": "8546294e.bbf628",
+    "x": 665.9935684204102,
+    "y": 112.9999828338623,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "e72f24a3.7e9cf8",
-        "56a6c4e8.1f860c",
-        "7ce3d5f2.723dec"
+        "3851ce61.8f91c2",
+        "a2f9a6ea.ae2718",
+        "c137a07.e2f1f6"
       ]
     ]
   },
   {
-    "id": "e72f24a3.7e9cf8",
+    "id": "3851ce61.8f91c2",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 937.0208892822266,
-    "y": 144.0000491142273,
-    "z": "8546294e.bbf628",
+    "x": 896.9935455322266,
+    "y": 115.00004625320435,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "edb6abe2.7bba78"
+        "4f151038.9977"
       ]
     ]
   },
   {
-    "id": "edb6abe2.7bba78",
+    "id": "4f151038.9977",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1094.7984046936035,
-    "y": 124.88899755477905,
-    "z": "8546294e.bbf628",
+    "x": 1054.7710609436035,
+    "y": 95.8889946937561,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "56a6c4e8.1f860c",
+    "id": "a2f9a6ea.ae2718",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 929.0213165283203,
-    "y": 179.00007104873657,
-    "z": "8546294e.bbf628",
+    "x": 888.9939727783203,
+    "y": 150.00006818771362,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "28abc688.86ccda"
+        "f0eea43d.80c008"
       ]
     ]
   },
   {
-    "id": "28abc688.86ccda",
+    "id": "f0eea43d.80c008",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1095.290786743164,
-    "y": 170.55460453033447,
-    "z": "8546294e.bbf628",
+    "x": 1055.263442993164,
+    "y": 141.55460166931152,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "13d47e80.4e6022",
-        "5d523d19.4e3534",
-        "63f3d384.29d3ac"
+        "5514a22c.cabcac",
+        "c241356.b2ab4c8",
+        "18332af4.bcb575"
       ]
     ]
   },
   {
-    "id": "13d47e80.4e6022",
+    "id": "5514a22c.cabcac",
     "type": "for",
     "name": "for vidx..service-data.vnfs.vnf_length[]",
     "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1365.3068771362305,
-    "y": 114.42860555648804,
-    "z": "8546294e.bbf628",
+    "x": 1306.2795715332031,
+    "y": 86.42860507965088,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "9845da61.98a1c8"
+        "5665ac79.9c7064"
       ]
     ]
   },
   {
-    "id": "5d523d19.4e3534",
+    "id": "c241356.b2ab4c8",
     "type": "switchNode",
     "name": "switch tmp.vidx ",
     "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1301.6082305908203,
-    "y": 165.41179418563843,
-    "z": "8546294e.bbf628",
+    "x": 1261.5808868408203,
+    "y": 136.41179132461548,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "26cec9c2.9bd426"
+        "19a218fc.ad6fe7"
       ]
     ]
   },
   {
-    "id": "26cec9c2.9bd426",
+    "id": "19a218fc.ad6fe7",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1453.0370330810547,
-    "y": 165.98322439193726,
-    "z": "8546294e.bbf628",
+    "x": 1413.0096893310547,
+    "y": 136.9832215309143,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "a0a7bb4c.608bd8"
+        "87ce1b6f.ea04b8"
       ]
     ]
   },
   {
-    "id": "90e8fa4e.9e0b88",
+    "id": "3d3bb0a2.e8367",
     "type": "switchNode",
     "name": "switch vnfid found",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1762.7356185913086,
-    "y": 74.67872762680054,
-    "z": "8546294e.bbf628",
+    "x": 1722.7082748413086,
+    "y": 45.67872476577759,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "b847bf38.a4e72"
+        "90ad7f4f.37ad5"
       ]
     ]
   },
   {
-    "id": "a0a7bb4c.608bd8",
+    "id": "87ce1b6f.ea04b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1591.465431213379,
-    "y": 167.12604665756226,
-    "z": "8546294e.bbf628",
+    "x": 1551.438087463379,
+    "y": 138.1260437965393,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "b847bf38.a4e72",
+    "id": "90ad7f4f.37ad5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1936.6880989074707,
-    "y": 74.57144784927368,
-    "z": "8546294e.bbf628",
+    "x": 1896.6607551574707,
+    "y": 45.57144498825073,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "fe37a50e.9b06e8"
+        "edd58360.fef7"
       ]
     ]
   },
   {
-    "id": "7ce3d5f2.723dec",
+    "id": "c137a07.e2f1f6",
     "type": "outcome",
     "name": "0",
     "xml": "<outcome value='0'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 934.9897003173828,
-    "y": 106.96873807907104,
-    "z": "8546294e.bbf628",
+    "x": 894.9623565673828,
+    "y": 77.9687352180481,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "edb6abe2.7bba78"
+        "4f151038.9977"
       ]
     ]
   },
   {
-    "id": "be9b1521.3244d8",
+    "id": "5f14f4d2.549ccc",
     "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": 650.3649482727051,
-    "y": 695.344174861908,
-    "z": "8546294e.bbf628",
+    "x": 610.3376045227051,
+    "y": 666.344172000885,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "c2b356f7.cb66f8",
+    "id": "ead8f54d.0eecc8",
     "type": "set",
     "name": "set vnf-level-oper-status to Active",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
     "comments": "",
-    "x": 712.8451385498047,
-    "y": 529.6816143989563,
-    "z": "8546294e.bbf628",
+    "x": 672.8177947998047,
+    "y": 500.68161153793335,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "e28c053e.d4c358",
+    "id": "dd9550a6.ba9af",
     "type": "set",
     "name": "set vnf-index and vnf-object-path",
-    "xml": "<set>\n<parameter name='vnfId' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$tmp.vidx].vnf-id  + '/vnf-data/'` \" />",
+    "xml": "<set>\n<parameter name='vnfId' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",
     "comments": "",
-    "x": 712.53173828125,
-    "y": 486.3441491127014,
-    "z": "8546294e.bbf628",
+    "x": 672.50439453125,
+    "y": 457.34414625167847,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "5369a88f.c265a8",
+    "id": "1689d83b.0f3d48",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1570.531826019287,
-    "y": 431.00039863586426,
-    "z": "8546294e.bbf628",
+    "x": 1530.504482269287,
+    "y": 402.0003957748413,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "e11a3e97.9a4cf"
+        "877e79a4.de6e08"
       ]
     ]
   },
   {
-    "id": "e11a3e97.9a4cf",
+    "id": "877e79a4.de6e08",
     "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": 1759.0319213867188,
-    "y": 425.0004082918167,
-    "z": "8546294e.bbf628",
+    "x": 1719.0045776367188,
+    "y": 396.00040543079376,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "a5222a28.6f55b8",
+    "id": "e9a64136.0f3a4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1574.022792816162,
-    "y": 478.5744342803955,
-    "z": "8546294e.bbf628",
+    "x": 1533.995449066162,
+    "y": 449.57443141937256,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "ea233a49.a94538"
+        "1ecf5c87.8a1883"
       ]
     ]
   },
   {
-    "id": "ea233a49.a94538",
+    "id": "1ecf5c87.8a1883",
     "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": 1747.5942039489746,
-    "y": 466.8601703643799,
-    "z": "8546294e.bbf628",
+    "x": 1707.5668601989746,
+    "y": 437.86016750335693,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "42b5e401.e14b8c",
+    "id": "46f84de2.5c2c94",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1566.355800628662,
-    "y": 519.9077472686768,
-    "z": "8546294e.bbf628",
+    "x": 1526.328456878662,
+    "y": 490.9077444076538,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "28e9f15e.a3f2ce"
+        "87e2e13c.489f3"
       ]
     ]
   },
   {
-    "id": "28e9f15e.a3f2ce",
+    "id": "87e2e13c.489f3",
     "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": 1754.1283569335938,
-    "y": 515.3469400405884,
-    "z": "8546294e.bbf628",
+    "x": 1714.1010131835938,
+    "y": 486.34693717956543,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "e43f8602.8d7af8",
+    "id": "e15f72bc.d37ff",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWAN-Controller AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1303.53173828125,
-    "y": 479.00040447711945,
-    "z": "8546294e.bbf628",
+    "x": 1263.50439453125,
+    "y": 450.0004016160965,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "5369a88f.c265a8",
-        "a5222a28.6f55b8",
-        "42b5e401.e14b8c"
+        "1689d83b.0f3d48",
+        "e9a64136.0f3a4",
+        "46f84de2.5c2c94"
       ]
     ]
   },
   {
-    "id": "d2ea4d7a.0f7bc",
+    "id": "8c66a623.b3e238",
     "type": "execute",
     "name": "execute RestApiCallNode Create  SDWAN site",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"site-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": 1326.031852722168,
-    "y": 636.0003986358643,
-    "z": "8546294e.bbf628",
+    "x": 1286.004508972168,
+    "y": 607.0003957748413,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "f57bd183.9204c"
+        "9cc77bf6.9a9d78",
+        "2cdd5eb4.cdc7e2"
       ]
     ]
   },
   {
-    "id": "b5c8e88e.b71a98",
+    "id": "45d1f2b.f3e000c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1746.6983757019043,
-    "y": 637.8892993927002,
-    "z": "8546294e.bbf628",
+    "x": 1706.6710319519043,
+    "y": 608.8892965316772,
+    "z": "d540a7b.861cb58",
     "wires": [
       []
     ]
   },
   {
-    "id": "db67aff2.ce7ea",
+    "id": "7a151bff.37aaa4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
     "comments": "",
-    "x": 1732.1429595947266,
-    "y": 697.4446468353271,
-    "z": "8546294e.bbf628",
+    "x": 1692.1156158447266,
+    "y": 668.4446439743042,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "8e3552db.71c4c",
+    "id": "2cdd5eb4.cdc7e2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1587.1429500579834,
-    "y": 694.4446449279785,
-    "z": "8546294e.bbf628",
+    "x": 1547.1156063079834,
+    "y": 665.4446420669556,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "db67aff2.ce7ea"
+        "7a151bff.37aaa4"
       ]
     ]
   },
   {
-    "id": "f57bd183.9204c",
+    "id": "9cc77bf6.9a9d78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1587.587287902832,
-    "y": 638.1114530563354,
-    "z": "8546294e.bbf628",
+    "x": 1547.559944152832,
+    "y": 609.1114501953125,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "b5c8e88e.b71a98"
+        "45d1f2b.f3e000c"
       ]
     ]
   },
   {
-    "id": "cfdaefb3.97c88",
+    "id": "90854244.d2678",
     "type": "set",
     "name": "copy input data to service data",
-    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
+    "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
     "comments": "",
-    "x": 701.0316848754883,
-    "y": 572.0005831718445,
-    "z": "8546294e.bbf628",
+    "x": 664.0043487548828,
+    "y": 544.0006427764893,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "b24b0990.f29818",
+    "id": "dc8a36b0.c3b358",
     "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": 1304.7858352661133,
-    "y": 572.0044652223587,
-    "z": "8546294e.bbf628",
+    "x": 1264.7584915161133,
+    "y": 543.0044623613358,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "289de783.f62c58",
-        "794b6e1c.8d635"
+        "b5fd26d4.434e58",
+        "35ebfe16.180562"
       ]
     ]
   },
   {
-    "id": "289de783.f62c58",
+    "id": "b5fd26d4.434e58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1569.785717010498,
-    "y": 557.0043603181839,
-    "z": "8546294e.bbf628",
+    "x": 1529.758373260498,
+    "y": 528.004357457161,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "9a259234.042bd"
+        "545e872c.836968"
       ]
     ]
   },
   {
-    "id": "794b6e1c.8d635",
+    "id": "35ebfe16.180562",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1562.035717010498,
-    "y": 598.6472436189651,
-    "z": "8546294e.bbf628",
+    "x": 1522.008373260498,
+    "y": 569.6472407579422,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "abdc5f44.099"
+        "ec823836.0a8798"
       ]
     ]
   },
   {
-    "id": "abdc5f44.099",
+    "id": "ec823836.0a8798",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1688.119213104248,
-    "y": 598.8932763338089,
-    "z": "8546294e.bbf628",
+    "x": 1648.091869354248,
+    "y": 569.893273472786,
+    "z": "d540a7b.861cb58",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a259234.042bd",
+    "id": "545e872c.836968",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1706.785717010498,
-    "y": 557.0043603181839,
-    "z": "8546294e.bbf628",
+    "x": 1666.758373260498,
+    "y": 528.004357457161,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "6db7dcff.bc7ce4",
+    "id": "48a7bd41.b0ef94",
     "type": "comment",
     "name": "tmp.thirdparty-sdnc-id is hardcoded value?",
     "info": "",
     "comments": "",
-    "x": 1352.0356369018555,
-    "y": 433.004376411438,
-    "z": "8546294e.bbf628",
+    "x": 1312.0082931518555,
+    "y": 404.00437355041504,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "640f5d20.cfa064",
+    "id": "3edd9e9f.d604f2",
     "type": "set",
-    "name": "set vnf-index to service data",
-    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='siteId' />\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$site-result[0].id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n",
+    "name": "set siteId to service data",
+    "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='siteId' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$site-result.success[0].id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n",
     "comments": "",
-    "x": 702.0354537963867,
-    "y": 448.00424432754517,
-    "z": "8546294e.bbf628",
+    "x": 654.0081787109375,
+    "y": 419.0042562484741,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "3d75d87b.d2ff28",
+    "id": "5c9c6749.a75a58",
     "type": "switchNode",
     "name": "switch ActivateSDWANDeviceInstance",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1830.2855911254883,
-    "y": 144.00390481948853,
-    "z": "8546294e.bbf628",
+    "x": 1790.2582473754883,
+    "y": 115.00390195846558,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "628cbd2.1a1aa44"
+        "4e8a745e.fc595c"
       ]
     ]
   },
   {
-    "id": "628cbd2.1a1aa44",
+    "id": "4e8a745e.fc595c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2057.285446166992,
-    "y": 143.0039038658142,
-    "z": "8546294e.bbf628",
+    "x": 2017.2581024169922,
+    "y": 114.00390100479126,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "b1822ffa.bc97b"
+        "80899e02.b6a68"
       ]
     ]
   },
   {
-    "id": "9845da61.98a1c8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1600.285415649414,
-    "y": 115.00389051437378,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "3d75d87b.d2ff28",
-        "90e8fa4e.9e0b88"
-      ]
-    ]
-  },
-  {
-    "id": "fab4e8d5.eaaa38",
+    "id": "f39513a2.e7f31",
     "type": "comment",
     "name": "Get devices",
     "info": "",
     "comments": "",
-    "x": 1864.0356063842773,
-    "y": 164.7539200782776,
-    "z": "8546294e.bbf628",
+    "x": 1824.0082626342773,
+    "y": 135.75391721725464,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "cbc96af.e7a6b98",
+    "id": "221a8fd1.b8b2f",
     "type": "set",
     "name": "set prop.site.sdwan false",
     "xml": "<set>\n<parameter name='prop.site.sdwan' value=\"false\" />\n\n",
     "comments": "",
-    "x": 685.0312652587891,
-    "y": 83.0000352859497,
-    "z": "8546294e.bbf628",
+    "x": 645.0039215087891,
+    "y": 54.00003242492676,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "8699a911.00b498",
+    "id": "3c340ff6.924a4",
     "type": "switchNode",
     "name": "switch prop.site.sdwan",
     "xml": "<switch test=\"`$prop.site.sdwan`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 681.0313720703125,
-    "y": 390.666624546051,
-    "z": "8546294e.bbf628",
+    "x": 641.0040283203125,
+    "y": 361.6666216850281,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "ace66bf6.fc6f18"
+        "3529dc36.6091c4"
       ]
     ]
   },
   {
-    "id": "ace66bf6.fc6f18",
+    "id": "3529dc36.6091c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 860.031421661377,
-    "y": 387.666624546051,
-    "z": "8546294e.bbf628",
+    "x": 820.004077911377,
+    "y": 358.6666216850281,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "70ebd8ae.1dd798"
+        "b0a30d5b.6002c"
       ]
     ]
   },
   {
-    "id": "70ebd8ae.1dd798",
+    "id": "b0a30d5b.6002c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1016.0316467285156,
-    "y": 384.6669464111328,
-    "z": "8546294e.bbf628",
+    "x": 976.0043029785156,
+    "y": 355.66694355010986,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "2f462de2.0453e2",
-        "2f8e9052.03ea2",
-        "d2ea4d7a.0f7bc",
-        "e43f8602.8d7af8",
-        "b24b0990.f29818"
+        "8c7ebff5.e351e",
+        "1aa5ae21.057332",
+        "8c66a623.b3e238",
+        "e15f72bc.d37ff",
+        "dc8a36b0.c3b358"
       ]
     ]
   },
   {
-    "id": "b1822ffa.bc97b",
+    "id": "80899e02.b6a68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2010.6982822418213,
-    "y": 212.00003480911255,
-    "z": "8546294e.bbf628",
+    "x": 1972.6710166931152,
+    "y": 176.00004196166992,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "f8a73d95.16c95"
+        "744280bc.85fef"
       ]
     ]
   },
   {
-    "id": "f8a73d95.16c95",
+    "id": "744280bc.85fef",
     "type": "for",
     "name": "for loop deviceidx - Get deviceId from servicedata",
     "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">",
     "comments": "",
     "outputs": 1,
-    "x": 2294.0321140289307,
-    "y": 215.00006532669067,
-    "z": "8546294e.bbf628",
+    "x": 2254.0047702789307,
+    "y": 186.00006246566772,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "f4aaaa9b.0e63e8"
+        "e3f03864.75b5b8"
       ]
     ]
   },
   {
-    "id": "f4aaaa9b.0e63e8",
+    "id": "e3f03864.75b5b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2410.031898498535,
-    "y": 266.0002508163452,
-    "z": "8546294e.bbf628",
+    "x": 2370.004554748535,
+    "y": 237.00024795532227,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "560efc8.407e904"
+        "271bfd98.e39bf2"
       ]
     ]
   },
   {
-    "id": "560efc8.407e904",
+    "id": "271bfd98.e39bf2",
     "type": "switchNode",
     "name": "switch deviceId",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2570.032154083252,
-    "y": 268.0001039505005,
-    "z": "8546294e.bbf628",
+    "x": 2530.004810333252,
+    "y": 239.00010108947754,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "364ea14b.4737ce"
+        "d2e3890.db58f78"
       ]
     ]
   },
   {
-    "id": "364ea14b.4737ce",
+    "id": "d2e3890.db58f78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2722.032325744629,
-    "y": 267.0001039505005,
-    "z": "8546294e.bbf628",
+    "x": 2682.004981994629,
+    "y": 238.00010108947754,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "57bae08d.5682f"
+        "a5559674.8a50e8"
       ]
     ]
   },
   {
-    "id": "57bae08d.5682f",
+    "id": "a5559674.8a50e8",
     "type": "set",
     "name": "set deviceId",
-    "xml": "<set>\n<parameter name='prop.site.deviceId[$prop.site.deviceId_length]' value='`$service-data.vnfs.vnf[$tmp.deviceVidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n<parameter name='prop.site.deviceId_length' value='`$prop.site.deviceId_length + 1`' />\n",
+    "xml": "<set>\n<parameter name='prop.site.deviceId[$prop.site.deviceId_length]' value='`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n<parameter name='prop.site.deviceId_length' value='`$prop.site.deviceId_length + 1`' />\n",
     "comments": "",
-    "x": 2862.032329559326,
-    "y": 266.600058555603,
-    "z": "8546294e.bbf628",
+    "x": 2822.004985809326,
+    "y": 237.60005569458008,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "63f3d384.29d3ac",
+    "id": "18332af4.bcb575",
     "type": "set",
     "name": "set prop.site.deviceId_length",
     "xml": "<set>\n<parameter name='prop.site.deviceId_length' value='0' />\n",
     "comments": "",
-    "x": 1338.031322479248,
-    "y": 69.99999761581421,
-    "z": "8546294e.bbf628",
+    "x": 1298.003978729248,
+    "y": 40.99999475479126,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "de98d30f.d2fa5",
+    "id": "78b0ee0f.0865f",
     "type": "save",
     "name": "update siteInstance configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.id = $service-data.vnfs.vnf[$tmp.vidx].vnf-id' >\n<parameter name='id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />      \n<parameter name='generated-site-id' value='`$site-result[0].site-id`' /> \n<parameter name='operational-status' value='Active' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />      \n<parameter name='generated-site-id' value='`$site-result.success[0].id`' /> \n<parameter name='operational-status' value='Active' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 731.0313720703125,
-    "y": 633.0000977516174,
-    "z": "8546294e.bbf628",
+    "x": 694.0040740966797,
+    "y": 605.0001573562622,
+    "z": "d540a7b.861cb58",
     "wires": [
       []
     ]
   },
   {
-    "id": "f380f867.7d6998",
+    "id": "faa004c7.5a25c8",
     "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": 677.0312881469727,
-    "y": 279.99999952316284,
-    "z": "8546294e.bbf628",
+    "x": 637.0039443969727,
+    "y": 250.9999966621399,
+    "z": "d540a7b.861cb58",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f462de2.0453e2",
+    "id": "8c7ebff5.e351e",
     "type": "set",
     "name": "set siteId",
     "xml": "<set>\n<parameter name='prop.site.siteId' value=\"\" />\n\n",
     "comments": "",
-    "x": 1225.0315856933594,
-    "y": 375.0001050233841,
-    "z": "8546294e.bbf628",
+    "x": 1185.0042419433594,
+    "y": 346.00010216236115,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "e43a0564.6e85b8",
+    "id": "f5d9902.f200f7",
     "type": "comment",
     "name": "should be null in request",
     "info": "",
     "comments": "",
-    "x": 1234.031509399414,
-    "y": 346.0000592470169,
-    "z": "8546294e.bbf628",
+    "x": 1194.004165649414,
+    "y": 317.00005638599396,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "fe37a50e.9b06e8",
+    "id": "edd58360.fef7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2107.031394958496,
-    "y": 78.65758323669434,
-    "z": "8546294e.bbf628",
+    "x": 2067.004051208496,
+    "y": 49.65758037567139,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "4bd89f7e.9676d",
-        "9ff83ab.3d923c8",
-        "523d9c1d.3e7a14",
-        "471b0999.b03818"
+        "e434b261.8d553",
+        "2f0be2c.5dcd11e",
+        "eee333df.5a9b6"
       ]
     ]
   },
   {
-    "id": "9ff83ab.3d923c8",
+    "id": "2f0be2c.5dcd11e",
     "type": "set",
     "name": "set vnf-request-input.",
     "xml": "<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n",
     "comments": "",
-    "x": 2359.364402770996,
-    "y": 95.65763854980469,
-    "z": "8546294e.bbf628",
+    "x": 2319.337059020996,
+    "y": 66.65763568878174,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "4bd89f7e.9676d",
+    "id": "e434b261.8d553",
     "type": "set",
     "name": "set tmp.vidx and ctx.vnf-data",
     "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
     "comments": "",
-    "x": 2386.918113708496,
-    "y": 49.00000286102295,
-    "z": "8546294e.bbf628",
+    "x": 2346.890769958496,
+    "y": 20,
+    "z": "d540a7b.861cb58",
     "wires": []
   },
   {
-    "id": "523d9c1d.3e7a14",
+    "id": "eee333df.5a9b6",
     "type": "call",
     "name": "call sdwan-get-site-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-site-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2358.005081176758,
-    "y": 131.10712242126465,
-    "z": "8546294e.bbf628",
+    "x": 2317.977737426758,
+    "y": 102.1071195602417,
+    "z": "d540a7b.861cb58",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f8e9052.03ea2",
+    "id": "1aa5ae21.057332",
     "type": "for",
     "name": "for cpidx..prop.site.controlpoints",
     "xml": "<for index='cpidx' start='0' end='`$prop.site.controlpoints_length`' >\n\t\t\t\t\t\t\t\t\t\n",
     "comments": "",
     "outputs": 1,
-    "x": 1285.0318603515625,
-    "y": 276.0313186645508,
-    "z": "8546294e.bbf628",
+    "x": 1245.0045166015625,
+    "y": 247.03131580352783,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "5d6d521c.a38a7c"
+        "78afb961.5c44f8"
       ]
     ]
   },
   {
-    "id": "5d6d521c.a38a7c",
+    "id": "78afb961.5c44f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1528.0313720703125,
-    "y": 274.03125762939453,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "a5905cec.9f577"
-      ]
-    ]
-  },
-  {
-    "id": "a5905cec.9f577",
-    "type": "for",
-    "name": "for cpvidx..service-data.vnfs.vnf_length[]",
-    "xml": "<for index='cpvidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1777.0313720703125,
-    "y": 272.031289100647,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "c5914904.7dd248"
-      ]
-    ]
-  },
-  {
-    "id": "c5914904.7dd248",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1630.531322479248,
-    "y": 338.03128933906555,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "81562a69.669098"
-      ]
-    ]
-  },
-  {
-    "id": "81562a69.669098",
-    "type": "switchNode",
-    "name": "switch ActivateSiteInstance",
-    "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n\n    \n    \n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1826.5317573547363,
-    "y": 337.0312900543213,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "4dd0f132.ac22d"
-      ]
-    ]
-  },
-  {
-    "id": "4dd0f132.ac22d",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2015.5316467285156,
-    "y": 336.031259059906,
-    "z": "8546294e.bbf628",
+    "x": 1488.0040283203125,
+    "y": 245.03125476837158,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "c19716c9.bf16e8"
+        "6cfee007.a751c",
+        "9f90e330.d491e"
       ]
     ]
   },
   {
-    "id": "c19716c9.bf16e8",
+    "id": "5665ac79.9c7064",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2169.874858856201,
-    "y": 352.1174783706665,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "b380d74e.7f6938"
-      ]
-    ]
-  },
-  {
-    "id": "b380d74e.7f6938",
-    "type": "for",
-    "name": "for loop sidx - Get siteId from servicedata",
-    "xml": "<for index=\"sidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 2415.5315895080566,
-    "y": 354.0313606262207,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "586aef3f.c2594"
-      ]
-    ]
-  },
-  {
-    "id": "586aef3f.c2594",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2141.531894683838,
-    "y": 451.0313949584961,
-    "z": "8546294e.bbf628",
+    "x": 1545.2540493011475,
+    "y": 86.00390911102295,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "6ca3ced4.b496f"
+        "3d3bb0a2.e8367",
+        "5c9c6749.a75a58"
       ]
     ]
   },
   {
-    "id": "6ca3ced4.b496f",
-    "type": "switchNode",
-    "name": "switch name",
-    "xml": "<switch test=\"`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'name'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2301.5321502685547,
-    "y": 453.03124809265137,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "e4e196a3.719d08"
-      ]
-    ]
-  },
-  {
-    "id": "e4e196a3.719d08",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
+    "id": "6cfee007.a751c",
+    "type": "get-resource",
+    "name": "get-resource control pts for sideId",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"site-resource\" \n\t\tkey=\"site-resource.name = $prop.controlPtId AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.controlPoints' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2453.5323219299316,
-    "y": 452.03124809265137,
-    "z": "8546294e.bbf628",
+    "x": 1711.333595275879,
+    "y": 270.0000762939453,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "79a83f73.ae9af"
+        "80cbc7ba.096f98",
+        "e060fcc5.cef25"
       ]
     ]
   },
   {
-    "id": "9f3ec9f2.b22258",
-    "type": "switchNode",
-    "name": "switch name match with controlPoint",
-    "xml": "<switch test=\"`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value == $prop.site.controlpoints[$cpidx]`\">\n",
+    "id": "44fab179.6e6d3",
+    "type": "set",
+    "name": "set siteId in control point",
+    "xml": "<set>\n<parameter name='prop.site.controlpoints[$cpidx]' value='`$tmp.aai.controlPoints.generated-site-id`' />\n\n",
     "comments": "",
-    "outputs": 1,
-    "x": 2690.0319023132324,
-    "y": 462.031436920166,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "2d878bd7.4ff264"
-      ]
-    ]
+    "x": 2108.666790008545,
+    "y": 240.00019645690918,
+    "z": "d540a7b.861cb58",
+    "wires": []
   },
   {
-    "id": "2d878bd7.4ff264",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
+    "id": "80cbc7ba.096f98",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2899.031665802002,
-    "y": 455.03130531311035,
-    "z": "8546294e.bbf628",
+    "x": 1930.0004386901855,
+    "y": 239.00007438659668,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "3590859d.52442a"
+        "44fab179.6e6d3"
       ]
     ]
   },
   {
-    "id": "95b453fd.ee43a",
-    "type": "for",
-    "name": "for loop lidx - Get siteId from servicedata",
-    "xml": "<for index=\"lidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">",
+    "id": "e060fcc5.cef25",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2483.0317192077637,
-    "y": 566.0313177108765,
-    "z": "8546294e.bbf628",
+    "x": 1932.2502822875977,
+    "y": 277.6429605484009,
+    "z": "d540a7b.861cb58",
     "wires": [
       [
-        "29fb7e8d.917742"
+        "a065dfd4.9970f"
       ]
     ]
   },
   {
-    "id": "29fb7e8d.917742",
+    "id": "a065dfd4.9970f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2273.0313606262207,
-    "y": 640.0315551757812,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "43fe6c1f.7a83e4"
-      ]
-    ]
-  },
-  {
-    "id": "43fe6c1f.7a83e4",
-    "type": "switchNode",
-    "name": "switch siteId",
-    "xml": "<switch test=\"`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$lidx].name == 'siteId'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2419.0316047668457,
-    "y": 643.0313415527344,
-    "z": "8546294e.bbf628",
+    "x": 2072.6666297912598,
+    "y": 276.0000171661377,
+    "z": "d540a7b.861cb58",
     "wires": [
-      [
-        "48abb19b.d8fe"
-      ]
-    ]
-  },
-  {
-    "id": "48abb19b.d8fe",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2566.031913757324,
-    "y": 641.0313110351562,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "2780c7bb.98f1c8"
-      ]
+      []
     ]
   },
   {
-    "id": "2780c7bb.98f1c8",
+    "id": "9f90e330.d491e",
     "type": "set",
-    "name": "set siteId in control point",
-    "xml": "<set>\n<parameter name='prop.site.controlpoints[$cpidx]' value='`$service-data.vnfs.vnf[$cpvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$lidx].value`' />\n\n",
+    "name": "set prop.controlPtId",
+    "xml": "<set>\n<parameter name='prop.controlPtId' value='`$prop.site.controlpoints[$cpidx]`' />\n\n",
     "comments": "",
-    "x": 2745.0322227478027,
-    "y": 643.631411075592,
-    "z": "8546294e.bbf628",
+    "x": 1673.000099182129,
+    "y": 210.0000114440918,
+    "z": "d540a7b.861cb58",
     "wires": []
-  },
-  {
-    "id": "3590859d.52442a",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 2227.0316123962402,
-    "y": 566.0313024520874,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "95b453fd.ee43a"
-      ]
-    ]
-  },
-  {
-    "id": "471b0999.b03818",
-    "type": "record",
-    "name": "record",
-    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-site-activateeeee-delete\"/>\n<parameter name=\"field3\" value='`$prop.site.sdwan`'/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2300.0313873291016,
-    "y": 177.03126049041748,
-    "z": "8546294e.bbf628",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "79a83f73.ae9af",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 2720.5314903259277,
-    "y": 401.031286239624,
-    "z": "8546294e.bbf628",
-    "wires": [
-      [
-        "9f3ec9f2.b22258"
-      ]
-    ]
   }
 ]
-- 
cgit 1.2.3-korg