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

1 files changed, 248 insertions, 248 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
index 26456855..76e0f703 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "c9ac4983.326288",
+    "id": "c38bd7d5.df77b8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 259.03125,
-    "y": 199.03125,
-    "z": "33fa79d5.e5dbd6",
+    "x": 220.00390625,
+    "y": 142.00390625,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "a919b1fb.cf167"
+        "9db33c19.af792"
       ]
     ]
   },
   {
-    "id": "a919b1fb.cf167",
+    "id": "9db33c19.af792",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,712 +22,712 @@
     "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": 471.03125381469727,
-    "y": 271.0312671661377,
-    "z": "33fa79d5.e5dbd6",
+    "x": 432.00391006469727,
+    "y": 214.0039234161377,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "20189583.354efa"
+        "d521798b.eb0348"
       ]
     ]
   },
   {
-    "id": "20189583.354efa",
+    "id": "d521798b.eb0348",
     "type": "method",
     "name": "sdwan-get-site-param",
     "xml": "<method rpc='sdwan-get-site-param' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 459.0313720703125,
-    "y": 359.03125,
-    "z": "33fa79d5.e5dbd6",
+    "x": 420.0040283203125,
+    "y": 302.00390625,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "c2456569.00bd88"
+        "71ba9c6d.9a9864"
       ]
     ]
   },
   {
-    "id": "c2456569.00bd88",
+    "id": "71ba9c6d.9a9864",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 466.03126525878906,
-    "y": 445.0313081741333,
-    "z": "33fa79d5.e5dbd6",
+    "x": 427.00392150878906,
+    "y": 388.0039644241333,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "4e2d26a4.4c1808"
+        "b3f4200f.57507"
       ]
     ]
   },
   {
-    "id": "4e2d26a4.4c1808",
+    "id": "b3f4200f.57507",
     "type": "for",
     "name": "for each sdwan-get-request-input-param",
     "xml": "<for index='idx' start='0' end='`$vnf-request-input.vnf-input-parameters.param_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 502.6980285644531,
-    "y": 527.697904586792,
-    "z": "33fa79d5.e5dbd6",
+    "x": 463.6706848144531,
+    "y": 470.670560836792,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "e3603253.51629"
+        "6800f034.117f8"
       ]
     ]
   },
   {
-    "id": "e3603253.51629",
+    "id": "6800f034.117f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 789.5315780639648,
-    "y": 445.03135204315186,
-    "z": "33fa79d5.e5dbd6",
+    "x": 750.5042343139648,
+    "y": 388.00400829315186,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "4fbcc568.ce097c",
-        "9e4fbe84.7d2fb",
-        "ed14265a.99d948",
-        "773d0e91.45e91",
-        "a690711f.67d26",
-        "f96e2736.deb9e8",
-        "5bc913df.9a308c",
-        "8619f18f.0dd93",
-        "1ee73b7b.ea9285",
-        "5cd558f4.7f3258",
-        "dbf73ee2.461c2",
-        "bbcb741c.0eb968",
-        "cd952f17.46c77"
+        "a6377b98.e830f8",
+        "517edbd2.91b704",
+        "a701284f.455118",
+        "ca16c569.719ab8",
+        "86e64461.d62ec8",
+        "c6f06bc6.074328",
+        "24b313e.2bb53ec",
+        "3a793fa2.7f94e",
+        "fee596dc.022e48",
+        "2bb40b1d.ca77f4",
+        "663914f5.d948fc",
+        "9a6d9a43.210478",
+        "d3c58875.e0f958"
       ]
     ]
   },
   {
-    "id": "4fbcc568.ce097c",
+    "id": "a6377b98.e830f8",
     "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": 993.0323181152344,
-    "y": 814.032012462616,
-    "z": "33fa79d5.e5dbd6",
+    "x": 954.0049743652344,
+    "y": 757.004668712616,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "9e4fbe84.7d2fb",
+    "id": "517edbd2.91b704",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1009.0312881469727,
-    "y": 241.031325340271,
-    "z": "33fa79d5.e5dbd6",
+    "x": 970.0039443969727,
+    "y": 184.003981590271,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "3261cfb2.83caf"
+        "7a153116.0d4e7"
       ]
     ]
   },
   {
-    "id": "3261cfb2.83caf",
+    "id": "7a153116.0d4e7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1151.0312881469727,
-    "y": 242.031325340271,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1112.0039443969727,
+    "y": 185.003981590271,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "e4e6bc65.0ec81"
+        "d8a2309b.8475f"
       ]
     ]
   },
   {
-    "id": "e4e6bc65.0ec81",
+    "id": "d8a2309b.8475f",
     "type": "set",
     "name": "set name",
-    "xml": "<set>\n<parameter name='prop.device.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+    "xml": "<set>\n<parameter name='prop.site.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1285.0312881469727,
-    "y": 242.63133144378662,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1246.0039443969727,
+    "y": 185.60398769378662,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "ed14265a.99d948",
+    "id": "a701284f.455118",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1005.0313949584961,
-    "y": 332.0312833786011,
-    "z": "33fa79d5.e5dbd6",
+    "x": 966.0040512084961,
+    "y": 275.0039396286011,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "81ce8f79.a82a1"
+        "de455822.f8ce78"
       ]
     ]
   },
   {
-    "id": "81ce8f79.a82a1",
+    "id": "de455822.f8ce78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1183.0314083099365,
-    "y": 335.0312833786011,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1144.0040645599365,
+    "y": 278.0039396286011,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "6599a894.64adf8"
+        "78b4f47e.c7bfcc"
       ]
     ]
   },
   {
-    "id": "6599a894.64adf8",
+    "id": "78b4f47e.c7bfcc",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.site.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1330.0314178466797,
-    "y": 334.6312789916992,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1291.0040740966797,
+    "y": 277.6039352416992,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "5cd558f4.7f3258",
+    "id": "2bb40b1d.ca77f4",
     "type": "switchNode",
     "name": "switch type",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 983.9270668029785,
-    "y": 630.0047330856323,
-    "z": "33fa79d5.e5dbd6",
+    "x": 944.8997230529785,
+    "y": 572.9773893356323,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "48783360.87fe7c"
+        "8bb0abec.ed7288"
       ]
     ]
   },
   {
-    "id": "48783360.87fe7c",
+    "id": "8bb0abec.ed7288",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1162.9269104003906,
-    "y": 631.0046529769897,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1123.8995666503906,
+    "y": 573.9773092269897,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "b59fb35a.098b9"
+        "bb6bcb71.b39508"
       ]
     ]
   },
   {
-    "id": "b59fb35a.098b9",
+    "id": "bb6bcb71.b39508",
     "type": "set",
     "name": "set type",
     "xml": "<set>\n<parameter name='prop.site.type' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n<parameter name='prop.site.sdwan' value='true' />",
     "comments": "",
-    "x": 1312.9269218444824,
-    "y": 632.6046676635742,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1273.8995780944824,
+    "y": 575.5773239135742,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "dbf73ee2.461c2",
+    "id": "663914f5.d948fc",
     "type": "switchNode",
     "name": "switch role",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'role'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 984.9267425537109,
-    "y": 674.0047731399536,
-    "z": "33fa79d5.e5dbd6",
+    "x": 945.8993988037109,
+    "y": 616.9774293899536,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "8ceba6c3.5c88c8"
+        "a0fc9634.928638"
       ]
     ]
   },
   {
-    "id": "8ceba6c3.5c88c8",
+    "id": "a0fc9634.928638",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1154.9267501831055,
-    "y": 684.0047359466553,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1115.8994064331055,
+    "y": 626.9773921966553,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "832f2789.d30da8"
+        "55d77248.d68a9c"
       ]
     ]
   },
   {
-    "id": "773d0e91.45e91",
+    "id": "ca16c569.719ab8",
     "type": "switchNode",
     "name": "switch location-name",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'location-name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1027.9265823364258,
-    "y": 374.0045919418335,
-    "z": "33fa79d5.e5dbd6",
+    "x": 988.8992385864258,
+    "y": 316.9772481918335,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "85468ea4.c68d2"
+        "4c784934.a87448"
       ]
     ]
   },
   {
-    "id": "85468ea4.c68d2",
+    "id": "4c784934.a87448",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1191.9267539978027,
-    "y": 374.0045928955078,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1152.8994102478027,
+    "y": 316.9772491455078,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "bc94b24c.9dce8"
+        "3e756eb.d90f392"
       ]
     ]
   },
   {
-    "id": "bc94b24c.9dce8",
+    "id": "3e756eb.d90f392",
     "type": "set",
     "name": "set location-name",
     "xml": "<set>\n<parameter name='prop.site.location-name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1353.9267654418945,
-    "y": 373.6046495437622,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1314.8994216918945,
+    "y": 316.5773057937622,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "a690711f.67d26",
+    "id": "86e64461.d62ec8",
     "type": "switchNode",
     "name": "switch address",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'address'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1010.9265823364258,
-    "y": 410.00459575653076,
-    "z": "33fa79d5.e5dbd6",
+    "x": 971.8992385864258,
+    "y": 352.97725200653076,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "5c1e569f.3488e8"
+        "4b7d0893.6d1a98"
       ]
     ]
   },
   {
-    "id": "5c1e569f.3488e8",
+    "id": "4b7d0893.6d1a98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1180.9264297485352,
-    "y": 418.00459480285645,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1141.8990859985352,
+    "y": 360.97725105285645,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "b976d806.368f48"
+        "2c26a847.9d4008"
       ]
     ]
   },
   {
-    "id": "b976d806.368f48",
+    "id": "2c26a847.9d4008",
     "type": "set",
     "name": "set location-address",
     "xml": "<set>\n<parameter name='prop.site.location-address' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1368.9266052246094,
-    "y": 413.60457038879395,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1329.8992614746094,
+    "y": 356.57722663879395,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "f96e2736.deb9e8",
+    "id": "c6f06bc6.074328",
     "type": "switchNode",
     "name": "switch postcode",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'postcode'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1011.9265823364258,
-    "y": 452.0045566558838,
-    "z": "33fa79d5.e5dbd6",
+    "x": 972.8992385864258,
+    "y": 394.9772129058838,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "e2c2334c.42179"
+        "af6ba3e1.07f47"
       ]
     ]
   },
   {
-    "id": "e2c2334c.42179",
+    "id": "af6ba3e1.07f47",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1176.9267539978027,
-    "y": 451.0045566558838,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1137.8994102478027,
+    "y": 393.9772129058838,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "8da40933.edfaf8"
+        "2e6a288b.539db8"
       ]
     ]
   },
   {
-    "id": "8da40933.edfaf8",
+    "id": "2e6a288b.539db8",
     "type": "set",
     "name": "set location-postcode",
     "xml": "<set>\n<parameter name='prop.site.location-postcode' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1363.9266052246094,
-    "y": 452.6045732498169,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1324.8992614746094,
+    "y": 395.5772294998169,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "bbcb741c.0eb968",
+    "id": "9a6d9a43.210478",
     "type": "switchNode",
     "name": "switch controlPoint",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'controlPoint'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1003.8099670410156,
-    "y": 734.0315742492676,
-    "z": "33fa79d5.e5dbd6",
+    "x": 964.7826232910156,
+    "y": 677.0042304992676,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "6a2baa92.dd77f4"
+        "610c92a.a595c6c"
       ]
     ]
   },
   {
-    "id": "6a2baa92.dd77f4",
+    "id": "610c92a.a595c6c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1165.8098907470703,
-    "y": 730.0315971374512,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1126.7825469970703,
+    "y": 673.0042533874512,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "fd4f1adb.5ec4b8"
+        "be722424.9e5438"
       ]
     ]
   },
   {
-    "id": "9ab3bfdb.b8822",
+    "id": "64aa63f1.8e581c",
     "type": "set",
     "name": "set role",
     "xml": "<set>\n<parameter name='prop.site.role' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n\n",
     "comments": "",
-    "x": 1526.8100395202637,
-    "y": 660.0315113067627,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1487.7826957702637,
+    "y": 603.0041675567627,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "44d73030.0da8d",
+    "id": "79665fbb.1aeb5",
     "type": "set",
     "name": "set controlPoint",
     "xml": "<set>\n<parameter name='prop.site.controlPoint' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n\n",
     "comments": "",
-    "x": 1550.8099174499512,
-    "y": 750.0315952301025,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1511.7825736999512,
+    "y": 693.0042514801025,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "a9190ca.3c93df",
+    "id": "adfd7aba.7276f8",
     "type": "execute",
     "name": "execute split roles",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.site.role`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.site.roles\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1565.4762649536133,
-    "y": 707.0314292907715,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1526.4489212036133,
+    "y": 650.0040855407715,
+    "z": "152c5971.7ac927",
     "wires": [
       []
     ]
   },
   {
-    "id": "832f2789.d30da8",
+    "id": "55d77248.d68a9c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1312.4764022827148,
-    "y": 687.0314292907715,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1273.4490585327148,
+    "y": 630.0040855407715,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "9ab3bfdb.b8822",
-        "a9190ca.3c93df"
+        "64aa63f1.8e581c",
+        "adfd7aba.7276f8"
       ]
     ]
   },
   {
-    "id": "fd4f1adb.5ec4b8",
+    "id": "be722424.9e5438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1324.4762382507324,
-    "y": 734.0313529968262,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1285.4488945007324,
+    "y": 677.0040092468262,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "44d73030.0da8d",
-        "2ecea48f.cefbcc"
+        "79665fbb.1aeb5",
+        "db6408de.efe4c8"
       ]
     ]
   },
   {
-    "id": "2ecea48f.cefbcc",
+    "id": "db6408de.efe4c8",
     "type": "execute",
     "name": "execute split control points",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.site.controlPoint`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.site.controlpoints\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1575.4763946533203,
-    "y": 802.031455039978,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1536.4490509033203,
+    "y": 745.004111289978,
+    "z": "152c5971.7ac927",
     "wires": [
       []
     ]
   },
   {
-    "id": "5bc913df.9a308c",
+    "id": "24b313e.2bb53ec",
     "type": "switchNode",
     "name": "switch latitude",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'latitude'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1002.1428909301758,
-    "y": 496.03133392333984,
-    "z": "33fa79d5.e5dbd6",
+    "x": 963.1155471801758,
+    "y": 439.00399017333984,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "408fca65.ceeb84"
+        "13e09627.b199da"
       ]
     ]
   },
   {
-    "id": "408fca65.ceeb84",
+    "id": "13e09627.b199da",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1178.1427383422852,
-    "y": 491.03129291534424,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1139.1153945922852,
+    "y": 434.00394916534424,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "fff4ca4.988db38"
+        "3ac65d27.a38462"
       ]
     ]
   },
   {
-    "id": "fff4ca4.988db38",
+    "id": "3ac65d27.a38462",
     "type": "set",
     "name": "set location-latitude",
     "xml": "<set>\n<parameter name='prop.site.location-latitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1352.1427459716797,
-    "y": 489.63130950927734,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1313.1154022216797,
+    "y": 432.60396575927734,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "8619f18f.0dd93",
+    "id": "3a793fa2.7f94e",
     "type": "switchNode",
     "name": "switch longitude",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'longitude'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1005.1428909301758,
-    "y": 536.0313768386841,
-    "z": "33fa79d5.e5dbd6",
+    "x": 966.1155471801758,
+    "y": 479.0040330886841,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "f2c6dced.9082e"
+        "55ab0e28.8342d"
       ]
     ]
   },
   {
-    "id": "f2c6dced.9082e",
+    "id": "55ab0e28.8342d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1177.1428985595703,
-    "y": 531.031418800354,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1138.1155548095703,
+    "y": 474.004075050354,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "dc9fd2db.e7bb7"
+        "de42d185.f22c5"
       ]
     ]
   },
   {
-    "id": "dc9fd2db.e7bb7",
+    "id": "de42d185.f22c5",
     "type": "set",
-    "name": "set location-latitude",
-    "xml": "<set>\n<parameter name='prop.site.location-latitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+    "name": "set location-longitude",
+    "xml": "<set>\n<parameter name='prop.site.location-longitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1359.1427536010742,
-    "y": 534.6312704086304,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1320.1154098510742,
+    "y": 477.60392665863037,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "95b5a3d.f7b926",
+    "id": "954fde0c.db00e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1168.1428985595703,
-    "y": 581.031421661377,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1129.1155548095703,
+    "y": 524.004077911377,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "9b797058.27cec"
+        "ec738ea.7ff107"
       ]
     ]
   },
   {
-    "id": "e75918af.752508",
+    "id": "ddfdabba.c44028",
     "type": "set",
     "name": "set emails",
     "xml": "<set>\n<parameter name='prop.site.emails' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1526.142593383789,
-    "y": 549.6312737464905,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1487.115249633789,
+    "y": 492.6039299964905,
+    "z": "152c5971.7ac927",
     "wires": []
   },
   {
-    "id": "1ee73b7b.ea9285",
+    "id": "fee596dc.022e48",
     "type": "switchNode",
     "name": "switch emails",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'emails'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 995.1429672241211,
-    "y": 581.031421661377,
-    "z": "33fa79d5.e5dbd6",
+    "x": 956.1156234741211,
+    "y": 524.004077911377,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "95b5a3d.f7b926"
+        "954fde0c.db00e"
       ]
     ]
   },
   {
-    "id": "931cb5f.e240e48",
+    "id": "803294bd.b33768",
     "type": "execute",
     "name": "execute split emails",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.site.emails`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.site.email\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1551.808937072754,
-    "y": 596.0311765670776,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1512.781593322754,
+    "y": 539.0038328170776,
+    "z": "152c5971.7ac927",
     "wires": [
       []
     ]
   },
   {
-    "id": "9b797058.27cec",
+    "id": "ec738ea.7ff107",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1330.1429061889648,
-    "y": 582.0313391685486,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1291.1155624389648,
+    "y": 525.0039954185486,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "e75918af.752508",
-        "931cb5f.e240e48"
+        "ddfdabba.c44028",
+        "803294bd.b33768"
       ]
     ]
   },
   {
-    "id": "cd952f17.46c77",
+    "id": "d3c58875.e0f958",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1010.03125,
-    "y": 286.03125,
-    "z": "33fa79d5.e5dbd6",
+    "x": 971.00390625,
+    "y": 229.00390625,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "e92216b6.4260b8"
+        "8aebe9ab.cbad88"
       ]
     ]
   },
   {
-    "id": "e92216b6.4260b8",
+    "id": "8aebe9ab.cbad88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1152.03125,
-    "y": 287.03125,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1113.00390625,
+    "y": 230.00390625,
+    "z": "152c5971.7ac927",
     "wires": [
       [
-        "adffc0ee.7e0ff"
+        "d7605ed6.36544"
       ]
     ]
   },
   {
-    "id": "adffc0ee.7e0ff",
+    "id": "d7605ed6.36544",
     "type": "set",
     "name": "set description",
-    "xml": "<set>\n<parameter name='prop.device.description' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+    "xml": "<set>\n<parameter name='prop.site.description' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1286.03125,
-    "y": 287.6312561035156,
-    "z": "33fa79d5.e5dbd6",
+    "x": 1259.0039825439453,
+    "y": 230.60393619537354,
+    "z": "152c5971.7ac927",
     "wires": []
   }
 ]