integration test issues fix for sdwan and sotn
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
index ad15140..d90a5cc 100644 (file)
@@ -1,20 +1,20 @@
 [
   {
-    "id": "acaf9f12.dd321",
+    "id": "8722df6b.da333",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 119.00390625,
-    "y": 52.00390625,
-    "z": "816d5e60.eba45",
+    "x": 118,
+    "y": 57,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "9e7830e2.084e3"
+        "5f0a72e7.8810fc"
       ]
     ]
   },
   {
-    "id": "9e7830e2.084e3",
+    "id": "5f0a72e7.8810fc",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
     "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": 235.2895965576172,
-    "y": 103.24201393127441,
-    "z": "816d5e60.eba45",
+    "x": 234.2856903076172,
+    "y": 108.23810768127441,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b00ec17b.44975"
+        "a6501208.be07a"
       ]
     ]
   },
   {
-    "id": "b00ec17b.44975",
+    "id": "a6501208.be07a",
     "type": "method",
     "name": "method sdwan-wanport-vnf-topology-operation-underlay",
     "xml": "<method rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 238.43252563476562,
-    "y": 188.00393772125244,
-    "z": "816d5e60.eba45",
+    "x": 237.42861938476562,
+    "y": 193.00003147125244,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2452d404.5dd7bc"
+        "fbe9ed1f.31b14"
       ]
     ]
   },
   {
-    "id": "2452d404.5dd7bc",
+    "id": "fbe9ed1f.31b14",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 170.67059326171875,
-    "y": 296.67063903808594,
-    "z": "816d5e60.eba45",
+    "x": 169.66668701171875,
+    "y": 301.66673278808594,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "74620ff1.b94be",
-        "e68f1fae.052f",
-        "18ea4160.5b97af",
-        "84666856.592818",
-        "f80aa612.1d1cd8"
+        "ba308345.6a0be",
+        "723ddf07.218d1",
+        "431fc2f2.17609c",
+        "38f6b67d.380b9a",
+        "32bd7569.5de31a"
       ]
     ]
   },
   {
-    "id": "74620ff1.b94be",
+    "id": "ba308345.6a0be",
     "type": "for",
     "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
     "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 605.004337310791,
-    "y": 435.6707601547241,
-    "z": "816d5e60.eba45",
+    "x": 604.000431060791,
+    "y": 440.6668539047241,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "89904125.f9c2d"
+        "88f8bb94.113e88"
       ]
     ]
   },
   {
-    "id": "f587f945.9668c8",
+    "id": "2cdd7d19.2083a2",
     "type": "set",
     "name": "set prop.ar.allotted-resource-id",
     "xml": "<set>\n<parameter name='prop.ar.allotted-resource-id' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id`' />\n",
     "comments": "",
-    "x": 1395.0052490234375,
-    "y": 124.97268486022949,
-    "z": "816d5e60.eba45",
+    "x": 1394.0013427734375,
+    "y": 129.9687786102295,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "7103c5d5.4c730c",
+    "id": "f2739d06.3f82a",
     "type": "comment",
     "name": "Query MDSAL for AR",
     "info": "",
     "comments": "",
-    "x": 1720.3379211425781,
-    "y": 148.97255420684814,
-    "z": "816d5e60.eba45",
+    "x": 1719.3340148925781,
+    "y": 153.96864795684814,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "95a2de04.a237b",
+    "id": "4600defb.d9dc1",
     "type": "comment",
     "name": "Query MDSAL to get parent service based on service instance id from AR",
     "info": "",
     "comments": "",
-    "x": 2190.338779449463,
-    "y": 167.97253322601318,
-    "z": "816d5e60.eba45",
+    "x": 2189.334873199463,
+    "y": 172.96862697601318,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "4d085fb4.7bdbe",
+    "id": "2398fd5d.dbac12",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1969.67232131958,
-    "y": 203.63917350769043,
-    "z": "816d5e60.eba45",
+    "x": 1968.66841506958,
+    "y": 208.63526725769043,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6619fa96.9e1c44"
+        "179e1db5.4a8f02"
       ]
     ]
   },
   {
-    "id": "6619fa96.9e1c44",
+    "id": "179e1db5.4a8f02",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2124.672161102295,
-    "y": 203.13900661468506,
-    "z": "816d5e60.eba45",
+    "x": 2123.668254852295,
+    "y": 208.13510036468506,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "65302594.0054ec"
+        "35d0f2e8.ed82ae"
       ]
     ]
   },
   {
-    "id": "33787bc7.0b4834",
+    "id": "f8dd83a.151c88",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2448.3626976013184,
-    "y": 199.75814723968506,
-    "z": "816d5e60.eba45",
+    "x": 2447.3587913513184,
+    "y": 204.75424098968506,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "545b3871.7610f8"
+        "2218a177.4e456e"
       ]
     ]
   },
   {
-    "id": "17a34962.7bafd7",
+    "id": "7900e8ec.0ba228",
     "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 attachement resource not found\" />\n    \n",
     "comments": "",
-    "x": 2594.1314735412598,
-    "y": 239.20513534545898,
-    "z": "816d5e60.eba45",
+    "x": 2593.1275672912598,
+    "y": 244.20122909545898,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "60f770e5.3c645",
+    "id": "7edde1df.f81a4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1962.5240478515625,
-    "y": 250.70518016815186,
-    "z": "816d5e60.eba45",
+    "x": 1961.5201416015625,
+    "y": 255.70127391815186,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a69f2107.3bfff"
+        "ae127aa8.bf8958"
       ]
     ]
   },
   {
-    "id": "a69f2107.3bfff",
+    "id": "ae127aa8.bf8958",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2112.5238914489746,
-    "y": 251.37173557281494,
-    "z": "816d5e60.eba45",
+    "x": 2111.5199851989746,
+    "y": 256.36782932281494,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "48f1dbd9.82eaf4"
+        "c86b6674.f9da58"
       ]
     ]
   },
   {
-    "id": "3677d240.46bcee",
+    "id": "735fee8b.f10fd",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2436.6906509399414,
-    "y": 237.03850746154785,
-    "z": "816d5e60.eba45",
+    "x": 2435.6867446899414,
+    "y": 242.03460121154785,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "17a34962.7bafd7"
+        "7900e8ec.0ba228"
       ]
     ]
   },
   {
-    "id": "65302594.0054ec",
+    "id": "35d0f2e8.ed82ae",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2288.672336578369,
-    "y": 203.6391897201538,
-    "z": "816d5e60.eba45",
+    "x": 2287.668430328369,
+    "y": 208.6352834701538,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "33787bc7.0b4834",
-        "3677d240.46bcee"
+        "f8dd83a.151c88",
+        "735fee8b.f10fd"
       ]
     ]
   },
   {
-    "id": "f2c93863.974c98",
+    "id": "99f51e24.95bbd",
     "type": "set",
     "name": "set parent-service-instance-id",
     "xml": "<set>\n<parameter name='prop.parent-service-instance-id' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />\n\n",
     "comments": "",
-    "x": 2844.0059356689453,
-    "y": 200.63917064666748,
-    "z": "816d5e60.eba45",
+    "x": 2843.0020294189453,
+    "y": 205.63526439666748,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "545b3871.7610f8",
+    "id": "2218a177.4e456e",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2598.4817276000977,
-    "y": 199.80570697784424,
-    "z": "816d5e60.eba45",
+    "x": 2597.4778213500977,
+    "y": 204.80180072784424,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f2c93863.974c98",
-        "c4ef0618.a01ef8"
+        "99f51e24.95bbd",
+        "87284033.76d89"
       ]
     ]
   },
   {
-    "id": "48f1dbd9.82eaf4",
+    "id": "c86b6674.f9da58",
     "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 attachement resource not found\" />\n    \n",
     "comments": "",
-    "x": 2280.005344390869,
-    "y": 249.63911151885986,
-    "z": "816d5e60.eba45",
+    "x": 2279.001438140869,
+    "y": 254.63520526885986,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "3af4c28.a27653e",
+    "id": "3ba72ba0.13a9f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2067.307460784912,
-    "y": 521.7748374938965,
-    "z": "816d5e60.eba45",
+    "x": 2066.303554534912,
+    "y": 526.7709312438965,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "29090a88.41c1f6"
+        "3c18f953.7698e6"
       ]
     ]
   },
   {
-    "id": "b8d8640d.13eac8",
+    "id": "b947c854.e35438",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2059.15926361084,
-    "y": 556.8409223556519,
-    "z": "816d5e60.eba45",
+    "x": 2058.15535736084,
+    "y": 561.8370161056519,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bda3efcf.89dfe"
+        "5f7ffb48.00ef54"
       ]
     ]
   },
   {
-    "id": "bda3efcf.89dfe",
+    "id": "5f7ffb48.00ef54",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 2205.308036804199,
-    "y": 557.1084184646606,
-    "z": "816d5e60.eba45",
+    "x": 2204.304130554199,
+    "y": 562.1045122146606,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "29090a88.41c1f6",
+    "id": "3c18f953.7698e6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2187.3077087402344,
-    "y": 521.774920463562,
-    "z": "816d5e60.eba45",
+    "x": 2186.3038024902344,
+    "y": 526.771014213562,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "c548252d.342ee8",
+    "id": "9ef76182.7b173",
     "type": "for",
     "name": "for pnidx.. mdsal-psd.networks.network_length[]",
     "xml": "<for index='pnidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1750.6722564697266,
-    "y": 621.3067955970764,
-    "z": "816d5e60.eba45",
+    "x": 1749.6683502197266,
+    "y": 626.3028893470764,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e621a712.c02488"
+        "e38b67ea.4c8758"
       ]
     ]
   },
   {
-    "id": "4d2b2a60.5a15c4",
+    "id": "348ba1e1.19e85e",
     "type": "switchNode",
     "name": "switch ActivateSDWANConnectivityInstance",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2280.3388900756836,
-    "y": 590.3067970275879,
-    "z": "816d5e60.eba45",
+    "x": 2279.3349838256836,
+    "y": 595.3028907775879,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "eff7a2d.680436"
+        "27c81bce.91e324"
       ]
     ]
   },
   {
-    "id": "eff7a2d.680436",
+    "id": "27c81bce.91e324",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2532.338424682617,
-    "y": 591.3067345619202,
-    "z": "816d5e60.eba45",
+    "x": 2531.334518432617,
+    "y": 596.3028283119202,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b41985de.5559e8"
+        "917509ae.cf1bf8"
       ]
     ]
   },
   {
-    "id": "b41985de.5559e8",
+    "id": "917509ae.cf1bf8",
     "type": "set",
     "name": "set tmp.pnidx ",
     "xml": "<set>\n<parameter name='tmp.pnidx' value='`$pnidx`' />\n\n",
     "comments": "",
-    "x": 2688.3381118774414,
-    "y": 591.3067345619202,
-    "z": "816d5e60.eba45",
+    "x": 2687.3342056274414,
+    "y": 596.3028283119202,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2eff9ba0.ecf354",
+    "id": "1fd45985.393f26",
     "type": "for",
     "name": "for loop paramidx - Get topology from servicedata",
     "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 1682.3390655517578,
-    "y": 706.3064250946045,
-    "z": "816d5e60.eba45",
+    "x": 1681.3351593017578,
+    "y": 711.3025188446045,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f3cef2f6.2a146"
+        "4ebf01e5.37d06"
       ]
     ]
   },
   {
-    "id": "482a4c29.31cfa4",
+    "id": "8d7971fd.c23e3",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2134.339157104492,
-    "y": 685.3063306808472,
-    "z": "816d5e60.eba45",
+    "x": 2133.335250854492,
+    "y": 690.3024244308472,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "65d66991.892e68"
+        "e336f6e8.a1adc8"
       ]
     ]
   },
   {
-    "id": "65d66991.892e68",
+    "id": "e336f6e8.a1adc8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2285.339168548584,
-    "y": 683.3063726425171,
-    "z": "816d5e60.eba45",
+    "x": 2284.335262298584,
+    "y": 688.3024663925171,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1a0e340c.b9591c"
+        "f2813d3e.d5ec3"
       ]
     ]
   },
   {
-    "id": "1a0e340c.b9591c",
+    "id": "f2813d3e.d5ec3",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 2426.338897705078,
-    "y": 682.9063062667847,
-    "z": "816d5e60.eba45",
+    "x": 2425.334991455078,
+    "y": 687.9024000167847,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "8b82943e.e37978",
+    "id": "4a7f65c3.11a50c",
     "type": "switchNode",
     "name": "switch tmp.pnidx ",
     "xml": "<switch test=\"`$tmp.pnidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1653.338882446289,
-    "y": 665.9729976654053,
-    "z": "816d5e60.eba45",
+    "x": 1652.334976196289,
+    "y": 670.9690914154053,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6c46e25f.8ffa9c"
+        "42c35e07.6414a"
       ]
     ]
   },
   {
-    "id": "6c46e25f.8ffa9c",
+    "id": "42c35e07.6414a",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1808.7675552368164,
-    "y": 664.5443773269653,
-    "z": "816d5e60.eba45",
+    "x": 1807.7636489868164,
+    "y": 669.5404710769653,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7abaa33.8b7355c"
+        "79c31704.e1ea48"
       ]
     ]
   },
   {
-    "id": "7abaa33.8b7355c",
+    "id": "79c31704.e1ea48",
     "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": 1949.1961784362793,
-    "y": 665.6874666213989,
-    "z": "816d5e60.eba45",
+    "x": 1948.1922721862793,
+    "y": 670.6835603713989,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "f3550d2c.724f9",
+    "id": "d058b4fc.a3d908",
     "type": "switchNode",
     "name": "switch topology hub-spoke",
     "xml": "<switch test=\"`$prop.topology == 'hub-spoke'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1561.3387489318848,
-    "y": 768.3062467575073,
-    "z": "816d5e60.eba45",
+    "x": 1560.3348426818848,
+    "y": 773.3023405075073,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ab080c7a.92d5",
-        "3d04ef10.4ea32"
+        "80132a76.17bcc8",
+        "f4211b87.94b798"
       ]
     ]
   },
   {
-    "id": "ab080c7a.92d5",
+    "id": "80132a76.17bcc8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1751.338436126709,
-    "y": 793.3067321777344,
-    "z": "816d5e60.eba45",
+    "x": 1750.334529876709,
+    "y": 798.3028259277344,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "8abbeb7b.b004e8"
+        "7df004fc.b974bc"
       ]
     ]
   },
   {
-    "id": "3d04ef10.4ea32",
+    "id": "f4211b87.94b798",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1745.3393630981445,
-    "y": 754.3063945770264,
-    "z": "816d5e60.eba45",
+    "x": 1744.3354568481445,
+    "y": 759.3024883270264,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "86771426.4b32c8"
+        "f043ab05.abcb68"
       ]
     ]
   },
   {
-    "id": "86771426.4b32c8",
+    "id": "f043ab05.abcb68",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1881.3393669128418,
-    "y": 754.3063335418701,
-    "z": "816d5e60.eba45",
+    "x": 1880.3354606628418,
+    "y": 759.3024272918701,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "8abbeb7b.b004e8",
+    "id": "7df004fc.b974bc",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1756.67138671875,
-    "y": 861.3059663772583,
-    "z": "816d5e60.eba45",
+    "x": 1755.66748046875,
+    "y": 866.3020601272583,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "aa63c4ce.dcdf88"
+        "f2cfe93e.7237b8"
       ]
     ]
   },
   {
-    "id": "aa63c4ce.dcdf88",
+    "id": "f2cfe93e.7237b8",
     "type": "for",
     "name": "for ppidx.. mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='ppidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2164.004638671875,
-    "y": 861.6395845413208,
-    "z": "816d5e60.eba45",
+    "x": 2163.000732421875,
+    "y": 866.6356782913208,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "db34806a.eb197"
+        "de6797a2.586c78"
       ]
     ]
   },
   {
-    "id": "a12ec2fd.fe008",
+    "id": "ffb0cb19.6bd078",
     "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[$ppidx].allotted-resource-id`' />\n\n",
     "comments": "",
-    "x": 2255.0057525634766,
-    "y": 939.6398825645447,
-    "z": "816d5e60.eba45",
+    "x": 2254.0018463134766,
+    "y": 944.6359763145447,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "48c0bc5c.016e84",
+    "id": "7d29151f.aff58c",
     "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": 2273.0064544677734,
-    "y": 1050.306674003601,
-    "z": "816d5e60.eba45",
+    "x": 2272.0025482177734,
+    "y": 1055.302767753601,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6e2c1efa.030fd"
+        "99b001da.0efb4"
       ]
     ]
   },
   {
-    "id": "d87f1462.94a148",
+    "id": "175772d7.f9d53d",
     "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": 2682.006565093994,
-    "y": 1053.3067607879639,
-    "z": "816d5e60.eba45",
+    "x": 2681.002658843994,
+    "y": 1058.3028545379639,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "8902bff0.b993a"
+        "d13f62a9.a25bd"
       ]
     ]
   },
   {
-    "id": "8902bff0.b993a",
+    "id": "d13f62a9.a25bd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2823.0068969726562,
-    "y": 1052.3067598342896,
-    "z": "816d5e60.eba45",
+    "x": 2822.0029907226562,
+    "y": 1057.3028535842896,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d0dace3e.a4044"
+        "63261a78.0b6344"
       ]
     ]
   },
   {
-    "id": "d0dace3e.a4044",
+    "id": "63261a78.0b6344",
     "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": 2964.0069313049316,
-    "y": 1053.9066514968872,
-    "z": "816d5e60.eba45",
+    "x": 2963.0030250549316,
+    "y": 1058.9027452468872,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "a56e979.94c4668",
+    "id": "63613798.d70908",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2759.0059509277344,
-    "y": 956.973176240921,
-    "z": "816d5e60.eba45",
+    "x": 2758.0020446777344,
+    "y": 961.969269990921,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5e3a3525.ed601c"
+        "18ba51e1.01a3be"
       ]
     ]
   },
   {
-    "id": "36ee87ff.edcc88",
+    "id": "9fe7ff8.35548",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2755.8576736450195,
-    "y": 1011.0392594337463,
-    "z": "816d5e60.eba45",
+    "x": 2754.8537673950195,
+    "y": 1016.0353531837463,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "61955a75.34d004"
+        "2fd2f3c1.09b97c"
       ]
     ]
   },
   {
-    "id": "1dae6147.4a990f",
+    "id": "8ad9ee53.6aa87",
     "type": "switchNode",
     "name": "switch role hub",
     "xml": "<switch test=\"`$prop.role == hub`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2139.3390884399414,
-    "y": 1115.6397142410278,
-    "z": "816d5e60.eba45",
+    "x": 2138.3351821899414,
+    "y": 1120.6358079910278,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "918c56f9.c83968",
-        "c6d12fe7.97792"
+        "6011fd41.335614",
+        "472beb8.34ca814"
       ]
     ]
   },
   {
-    "id": "f44852b5.87cbc",
+    "id": "890f782e.076f68",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2455.3384742736816,
-    "y": 1091.6393175125122,
-    "z": "816d5e60.eba45",
+    "x": 2454.3345680236816,
+    "y": 1096.6354112625122,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "b92c0442.b0f838",
+    "id": "aa2b8cd4.2f9ae",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2865.3081092834473,
-    "y": 1187.1084241867065,
-    "z": "816d5e60.eba45",
+    "x": 2864.3042030334473,
+    "y": 1192.1045179367065,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c83cb2fc.e107f"
+        "4765f05a.45c5e"
       ]
     ]
   },
   {
-    "id": "3638a6d7.49015a",
+    "id": "1bed61f6.90e36e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2867.159679412842,
-    "y": 1247.174506187439,
-    "z": "816d5e60.eba45",
+    "x": 2866.155773162842,
+    "y": 1252.170599937439,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7e0afffe.3838d"
+        "151f6728.afe339"
       ]
     ]
   },
   {
-    "id": "7e0afffe.3838d",
+    "id": "151f6728.afe339",
     "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: SDWAN service-data not found\" />\n    \n",
     "comments": "",
-    "x": 3011.308452606201,
-    "y": 1209.4419202804565,
-    "z": "816d5e60.eba45",
+    "x": 3010.304546356201,
+    "y": 1214.4380140304565,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "c83cb2fc.e107f",
+    "id": "4765f05a.45c5e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2995.3081283569336,
-    "y": 1176.1085844039917,
-    "z": "816d5e60.eba45",
+    "x": 2994.3042221069336,
+    "y": 1181.1046781539917,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "f6606352.8ce6f",
+    "id": "f7f9e60d.d46178",
     "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": 2467.3395080566406,
-    "y": 1175.6399170160294,
-    "z": "816d5e60.eba45",
+    "x": 2466.3356018066406,
+    "y": 1180.6360107660294,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "5ea29b9f.be4264",
+    "id": "f464743.4983e88",
     "type": "for",
     "name": "for arvidx.. mdsal-arsd.service-data.vnfs.vnf_length[]",
     "xml": "<for index='arvidx' start='0' end='`$mdsal-arsd.service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2511.0059814453125,
-    "y": 1297.6397066116333,
-    "z": "816d5e60.eba45",
+    "x": 2510.0020751953125,
+    "y": 1302.6358003616333,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4d51cabb.29bdd4"
+        "535fb492.abce2c"
       ]
     ]
   },
   {
-    "id": "4d51cabb.29bdd4",
+    "id": "535fb492.abce2c",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2857.6723022460938,
-    "y": 1287.6396827697754,
-    "z": "816d5e60.eba45",
+    "x": 2856.6683959960938,
+    "y": 1292.6357765197754,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d3ef4c0.e5881b8",
-        "6e60b7ca.332018",
-        "a1284f22.c1dd1"
+        "b26020e0.3a846",
+        "5e2a4404.59208c",
+        "858743af.15464"
       ]
     ]
   },
   {
-    "id": "d3ef4c0.e5881b8",
+    "id": "b26020e0.3a846",
     "type": "switchNode",
     "name": "switch ActivateSDWANPortInstance",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3119.672410964966,
-    "y": 1258.6406421661377,
-    "z": "816d5e60.eba45",
+    "x": 3118.668504714966,
+    "y": 1263.6367359161377,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bf3a29ae.d2e8a8"
+        "6b78409.f5b87c"
       ]
     ]
   },
   {
-    "id": "5fa744b7.80a78c",
+    "id": "dde2f6f9.3c1848",
     "type": "switchNode",
     "name": "switch tmp.portvidx ",
     "xml": "<switch test=\"`$tmp.portvidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2592.672119140625,
-    "y": 1342.3063516616821,
-    "z": "816d5e60.eba45",
+    "x": 2591.668212890625,
+    "y": 1347.3024454116821,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "72b9c858.12ec88"
+        "58f23c0f.4a7544"
       ]
     ]
   },
   {
-    "id": "15f5118.456cfef",
+    "id": "3d280456.864e3c",
     "type": "for",
     "name": "for loop wportidx - Get wan port ID from servicedata",
     "xml": "<for index=\"wportidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2517.6727294921875,
-    "y": 1497.6406106948853,
-    "z": "816d5e60.eba45",
+    "x": 2516.6688232421875,
+    "y": 1502.6367044448853,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b2e9e931.6800c8"
+        "3b6a88cf.f649b8"
       ]
     ]
   },
   {
-    "id": "72b9c858.12ec88",
+    "id": "58f23c0f.4a7544",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2753.1005840301514,
-    "y": 1341.8778715133667,
-    "z": "816d5e60.eba45",
+    "x": 2752.0966777801514,
+    "y": 1346.8739652633667,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f81f5327.8ee49"
+        "6637a392.65819c"
       ]
     ]
   },
   {
-    "id": "f81f5327.8ee49",
+    "id": "6637a392.65819c",
     "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 (port) not found in service-data\" />\n",
     "comments": "",
-    "x": 2890.529541015625,
-    "y": 1342.0212831497192,
-    "z": "816d5e60.eba45",
+    "x": 2889.525634765625,
+    "y": 1347.0173768997192,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "bf3a29ae.d2e8a8",
+    "id": "6b78409.f5b87c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3347.67209815979,
-    "y": 1256.640643119812,
-    "z": "816d5e60.eba45",
+    "x": 3346.66819190979,
+    "y": 1261.636736869812,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2e9dbb2.cfc4c44"
+        "11f23b34.c014d5"
       ]
     ]
   },
   {
-    "id": "b2e9e931.6800c8",
+    "id": "3b6a88cf.f649b8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2860.673713684082,
-    "y": 1500.6408605575562,
-    "z": "816d5e60.eba45",
+    "x": 2859.669807434082,
+    "y": 1505.6369543075562,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "948d8437.e73248",
-        "89e2b91a.b2d6b8",
-        "18165b60.a7ba85",
-        "ccf6624c.26897"
+        "9eb62557.123aa8",
+        "6f944994.65d2c8",
+        "b81eb9e0.1976f8",
+        "3235095c.ee2c06"
       ]
     ]
   },
   {
-    "id": "948d8437.e73248",
+    "id": "9eb62557.123aa8",
     "type": "switchNode",
     "name": "switch transportNetworkName",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3155.674663543701,
-    "y": 1439.6413974761963,
-    "z": "816d5e60.eba45",
+    "x": 3154.670757293701,
+    "y": 1444.6374912261963,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "cfc84538.b28318"
+        "a7e30f58.58c4"
       ]
     ]
   },
   {
-    "id": "2e9dbb2.cfc4c44",
+    "id": "11f23b34.c014d5",
     "type": "set",
     "name": "set tmp.portvidx ",
     "xml": "<set>\n<parameter name='tmp.portvidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3502.671781539917,
-    "y": 1256.6406421661377,
-    "z": "816d5e60.eba45",
+    "x": 3501.667875289917,
+    "y": 1261.6367359161377,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "cfc84538.b28318",
+    "id": "a7e30f58.58c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3348.6746788024902,
-    "y": 1439.64155960083,
-    "z": "816d5e60.eba45",
+    "x": 3347.6707725524902,
+    "y": 1444.63765335083,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "cb06aff7.fe992"
+        "9cf2c3d4.0b4b5"
       ]
     ]
   },
   {
-    "id": "cb06aff7.fe992",
+    "id": "9cf2c3d4.0b4b5",
     "type": "set",
     "name": "set prop.hub.transportNetworkName",
     "xml": "<set>\n<parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
     "comments": "",
-    "x": 3566.6746864318848,
-    "y": 1438.24214553833,
-    "z": "816d5e60.eba45",
+    "x": 3565.6707801818848,
+    "y": 1443.23823928833,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "89e2b91a.b2d6b8",
+    "id": "6f944994.65d2c8",
     "type": "switchNode",
     "name": "switch wanPortId",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3117.007396697998,
-    "y": 1473.6410064697266,
-    "z": "816d5e60.eba45",
+    "x": 3116.003490447998,
+    "y": 1478.6371002197266,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c1169dfe.4c65a"
+        "b31bd9b2.46c7d8"
       ]
     ]
   },
   {
-    "id": "c1169dfe.4c65a",
+    "id": "b31bd9b2.46c7d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3278.007724761963,
-    "y": 1474.6410865783691,
-    "z": "816d5e60.eba45",
+    "x": 3277.003818511963,
+    "y": 1479.6371803283691,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6fd3807f.bc967"
+        "d3357919.f54078"
       ]
     ]
   },
   {
-    "id": "6fd3807f.bc967",
+    "id": "d3357919.f54078",
     "type": "set",
     "name": "set prop.hub.wanPortId",
     "xml": "<set>\n<parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
     "comments": "",
-    "x": 3468.008186340332,
-    "y": 1474.2413625717163,
-    "z": "816d5e60.eba45",
+    "x": 3467.004280090332,
+    "y": 1479.2374563217163,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2d5b2f06.016de",
+    "id": "2c43f3c.460060c",
     "type": "switchNode",
     "name": "switch  prop.hub.transportNetworkName==prop.spoke.transportNetworkName",
     "xml": "<switch test=\"`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2595.008056640625,
-    "y": 1600.308346748352,
-    "z": "816d5e60.eba45",
+    "x": 2594.004150390625,
+    "y": 1605.304440498352,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "336fdae9.175cb6",
-        "1f1ba045.97a09"
+        "cf49239.d51bfe",
+        "c6577e7a.d8dfd"
       ]
     ]
   },
   {
-    "id": "336fdae9.175cb6",
+    "id": "cf49239.d51bfe",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2941.0075874328613,
-    "y": 1637.3084206581116,
-    "z": "816d5e60.eba45",
+    "x": 2940.0036811828613,
+    "y": 1642.3045144081116,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4f105ce1.5af714"
+        "c20a45c1.991ea8"
       ]
     ]
   },
   {
-    "id": "1f1ba045.97a09",
+    "id": "c6577e7a.d8dfd",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2945.0080757141113,
-    "y": 1572.3080530166626,
-    "z": "816d5e60.eba45",
+    "x": 2944.0041694641113,
+    "y": 1577.3041467666626,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5909586.22baea8"
+        "7523e16b.4849a"
       ]
     ]
   },
   {
-    "id": "5909586.22baea8",
+    "id": "7523e16b.4849a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3085.0080032348633,
-    "y": 1600.308177947998,
-    "z": "816d5e60.eba45",
+    "x": 3084.0040969848633,
+    "y": 1605.304271697998,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "db34806a.eb197",
+    "id": "de6797a2.586c78",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1906.0361328125,
-    "y": 970.8372163772583,
-    "z": "816d5e60.eba45",
+    "x": 1905.0322265625,
+    "y": 975.8333101272583,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a12ec2fd.fe008",
-        "7504b3dc.db15fc",
-        "28b961ad.bfb2de",
-        "1dae6147.4a990f",
-        "48c0bc5c.016e84"
+        "ffb0cb19.6bd078",
+        "9b080888.c9b298",
+        "1ff59188.ff36ae",
+        "8ad9ee53.6aa87",
+        "7d29151f.aff58c"
       ]
     ]
   },
   {
-    "id": "3b80b5a9.9770ba",
+    "id": "524b783f.8c1128",
     "type": "switchNode",
     "name": "switch vpnId",
-    "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpnId'`\">\n",
+    "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2124.005172729492,
-    "y": 729.6393413543701,
-    "z": "816d5e60.eba45",
+    "x": 2123.001266479492,
+    "y": 734.6354351043701,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c6514d30.77c24"
+        "6c47f41b.3d3cac"
       ]
     ]
   },
   {
-    "id": "c6514d30.77c24",
+    "id": "6c47f41b.3d3cac",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2268.005184173584,
-    "y": 729.6393823623657,
-    "z": "816d5e60.eba45",
+    "x": 2267.001277923584,
+    "y": 734.6354761123657,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "777a9029.320d4"
+        "9b1a7d07.58406"
       ]
     ]
   },
   {
-    "id": "777a9029.320d4",
+    "id": "9b1a7d07.58406",
     "type": "set",
     "name": "set prop.vpnId",
     "xml": "<set>\n<parameter name='prop.vpnId' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 2426.0049057006836,
-    "y": 728.2393169403076,
-    "z": "816d5e60.eba45",
+    "x": 2425.0009994506836,
+    "y": 733.2354106903076,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "772df895.4e43b8",
+    "id": "c93e7e34.eb504",
     "type": "set",
     "name": "Set prop.hubTnpId",
     "xml": "<set>\n<parameter name='prop.hubTnpId' value='$prop.hub.wanPortId' />\n\n",
     "comments": "",
-    "x": 2632.340461730957,
-    "y": 1726.6402111053467,
-    "z": "816d5e60.eba45",
+    "x": 2631.336555480957,
+    "y": 1731.6363048553467,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "32021f5a.688fc",
+    "id": "33961398.8b885c",
     "type": "execute",
     "name": "execute RestApiCallNode underlay route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\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=\"underlayHubResp\"/>\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": 3461.3399982452393,
-    "y": 2412.9747483730316,
-    "z": "816d5e60.eba45",
+    "x": 3463.33624458313,
+    "y": 2602.9708592891693,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "dd81b865.bfe928",
-        "b6ee17f7.b3f2b8"
+        "54355641.66e388",
+        "a6852c79.79538"
       ]
     ]
   },
   {
-    "id": "b6ee17f7.b3f2b8",
+    "id": "a6852c79.79538",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728.339906692505,
-    "y": 2440.9747779369354,
-    "z": "816d5e60.eba45",
+    "x": 3730.3361530303955,
+    "y": 2630.970888853073,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "dd81b865.bfe928",
+    "id": "54355641.66e388",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3726.3395862579346,
-    "y": 2396.9747684001923,
-    "z": "816d5e60.eba45",
+    "x": 3728.335832595825,
+    "y": 2586.97087931633,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5f5cdc8d.3e29c4"
+        "e784c17f.677b5"
       ]
     ]
   },
   {
-    "id": "5f5cdc8d.3e29c4",
+    "id": "e784c17f.677b5",
     "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 sdwan hub route underlay rest api\" />\n",
     "comments": "",
-    "x": 3868.3402729034424,
-    "y": 2394.974851369858,
-    "z": "816d5e60.eba45",
+    "x": 3870.336519241333,
+    "y": 2584.9709622859955,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "ae46a29e.f97e3",
+    "id": "45a08ea1.9e3d3",
     "type": "set",
     "name": "Add prop.hub.route",
     "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.hubRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n",
     "comments": "",
-    "x": 3405.6733779907227,
-    "y": 2369.6412563323975,
-    "z": "816d5e60.eba45",
+    "x": 3407.6696243286133,
+    "y": 2559.637367248535,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "6c422db5.5ce744",
+    "id": "5e2b5a00.fe4964",
     "type": "execute",
     "name": "execute RestApiCallNode underlay route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\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=\"underlayspokeResp\"/>\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": 3480.6733779907227,
-    "y": 2511.6417214870453,
-    "z": "816d5e60.eba45",
+    "x": 3482.6696243286133,
+    "y": 2701.637832403183,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "911061e0.d1dd4",
-        "f999921.375d37"
+        "e568918e.3bed",
+        "6ef02e4e.06cc1"
       ]
     ]
   },
   {
-    "id": "f999921.375d37",
+    "id": "6ef02e4e.06cc1",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3732.6735248565674,
-    "y": 2540.6420180797577,
-    "z": "816d5e60.eba45",
+    "x": 3734.669771194458,
+    "y": 2730.6381289958954,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "911061e0.d1dd4",
+    "id": "e568918e.3bed",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3730.673204421997,
-    "y": 2496.6420085430145,
-    "z": "816d5e60.eba45",
+    "x": 3732.6694507598877,
+    "y": 2686.638119459152,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "98292650.e96428"
+        "43fb9f64.6e794"
       ]
     ]
   },
   {
-    "id": "98292650.e96428",
+    "id": "43fb9f64.6e794",
     "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 sdwan spoke route underlay rest api\" />\n",
     "comments": "",
-    "x": 3872.673891067505,
-    "y": 2494.64209151268,
-    "z": "816d5e60.eba45",
+    "x": 3874.6701374053955,
+    "y": 2684.6382024288177,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "6e60b7ca.332018",
+    "id": "5e2a4404.59208c",
     "type": "switchNode",
     "name": "switch ActivateSDWANDeviceInstance",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3130.535987854004,
-    "y": 1291.8376007080078,
-    "z": "816d5e60.eba45",
+    "x": 3129.532081604004,
+    "y": 1296.8336944580078,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "8aedc456.2f7ae8"
+        "355d1cb7.8466e4"
       ]
     ]
   },
   {
-    "id": "ae09c3af.7e2b1",
+    "id": "85c67b27.be5eb8",
     "type": "switchNode",
     "name": "switch tmp.devicevidx ",
     "xml": "<switch test=\"`$tmp.devicevidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2598.5355377197266,
-    "y": 1384.5038328170776,
-    "z": "816d5e60.eba45",
+    "x": 2597.5316314697266,
+    "y": 1389.4999265670776,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "250b22bf.a152be"
+        "188473e9.fdf33c"
       ]
     ]
   },
   {
-    "id": "250b22bf.a152be",
+    "id": "188473e9.fdf33c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2764.9639739990234,
-    "y": 1384.0753660202026,
-    "z": "816d5e60.eba45",
+    "x": 2763.9600677490234,
+    "y": 1389.0714597702026,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "923c6659.234fb8"
+        "ec42dab0.d633d8"
       ]
     ]
   },
   {
-    "id": "923c6659.234fb8",
+    "id": "ec42dab0.d633d8",
     "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 (device) not found in service-data\" />\n",
     "comments": "",
-    "x": 2905.392906188965,
-    "y": 1386.2183408737183,
-    "z": "816d5e60.eba45",
+    "x": 2904.388999938965,
+    "y": 1391.2144346237183,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "8aedc456.2f7ae8",
+    "id": "355d1cb7.8466e4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3358.535675048828,
-    "y": 1289.8376016616821,
-    "z": "816d5e60.eba45",
+    "x": 3357.531768798828,
+    "y": 1294.8336954116821,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bd37a285.897b2"
+        "73270e6c.070f4"
       ]
     ]
   },
   {
-    "id": "bd37a285.897b2",
+    "id": "73270e6c.070f4",
     "type": "set",
     "name": "set tmp.devicevidx ",
     "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3513.535358428955,
-    "y": 1289.8376007080078,
-    "z": "816d5e60.eba45",
+    "x": 3512.531452178955,
+    "y": 1294.8336944580078,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "a1284f22.c1dd1",
+    "id": "858743af.15464",
     "type": "switchNode",
     "name": "switch ActivateSiteInstance",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3093.5360584259033,
-    "y": 1325.837664604187,
-    "z": "816d5e60.eba45",
+    "x": 3092.5321521759033,
+    "y": 1330.833758354187,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b05e575a.27f578"
+        "f6939cb3.d0942"
       ]
     ]
   },
   {
-    "id": "3739eed6.72baf2",
+    "id": "1e774611.be647a",
     "type": "switchNode",
     "name": "switch tmp.sitevidx ",
     "xml": "<switch test=\"`$tmp.sitevidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2597.5354080200195,
-    "y": 1422.5037107467651,
-    "z": "816d5e60.eba45",
+    "x": 2596.5315017700195,
+    "y": 1427.4998044967651,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3396efac.e6fa3"
+        "bc02814a.d7499"
       ]
     ]
   },
   {
-    "id": "3396efac.e6fa3",
+    "id": "bc02814a.d7499",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2757.963872909546,
-    "y": 1422.0752305984497,
-    "z": "816d5e60.eba45",
+    "x": 2756.959966659546,
+    "y": 1427.0713243484497,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "35fde04d.b7b7a"
+        "d392366e.9150d8"
       ]
     ]
   },
   {
-    "id": "35fde04d.b7b7a",
+    "id": "d392366e.9150d8",
     "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 (site) not found in service-data\" />\n",
     "comments": "",
-    "x": 2906.392827987671,
-    "y": 1424.2182369232178,
-    "z": "816d5e60.eba45",
+    "x": 2905.388921737671,
+    "y": 1429.2143306732178,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "b05e575a.27f578",
+    "id": "f6939cb3.d0942",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3281.535623550415,
-    "y": 1325.837830543518,
-    "z": "816d5e60.eba45",
+    "x": 3280.531717300415,
+    "y": 1330.833924293518,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "18980fd.036c1f"
+        "ab570b08.b1c7a8"
       ]
     ]
   },
   {
-    "id": "18980fd.036c1f",
+    "id": "ab570b08.b1c7a8",
     "type": "set",
     "name": "set tmp.sitevidx ",
     "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3436.535306930542,
-    "y": 1325.8378295898438,
-    "z": "816d5e60.eba45",
+    "x": 3435.531400680542,
+    "y": 1330.8339233398438,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "5b475dee.c12664",
+    "id": "37339d04.d0e692",
     "type": "for",
     "name": "for loop deviceidx - Get wan port ID from servicedata",
     "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2729.5370559692383,
-    "y": 1762.837965965271,
-    "z": "816d5e60.eba45",
+    "x": 2728.5331497192383,
+    "y": 1767.834059715271,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "42885256.de226c"
+        "fc5d79c.538d088"
       ]
     ]
   },
   {
-    "id": "a3360f10.ddde5",
+    "id": "29161345.19c04c",
     "type": "switchNode",
     "name": "switch deviceId",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3190.5384101867676,
-    "y": 1676.838833808899,
-    "z": "816d5e60.eba45",
+    "x": 3189.5345039367676,
+    "y": 1681.834927558899,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ecee3f37.bc6a5"
+        "cded98bd.ccea58"
       ]
     ]
   },
   {
-    "id": "ecee3f37.bc6a5",
+    "id": "cded98bd.ccea58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3341.5387840270996,
-    "y": 1673.839077949524,
-    "z": "816d5e60.eba45",
+    "x": 3340.5348777770996,
+    "y": 1678.835171699524,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1f5be2a4.d6905d"
+        "d9cc984d.9f9d28"
       ]
     ]
   },
   {
-    "id": "1f5be2a4.d6905d",
+    "id": "d9cc984d.9f9d28",
     "type": "set",
     "name": "set prop.hub.deviceId",
     "xml": "<set>\n<parameter name='prop.hub.deviceId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n",
     "comments": "",
-    "x": 3516.539031982422,
-    "y": 1673.4396028518677,
-    "z": "816d5e60.eba45",
+    "x": 3515.535125732422,
+    "y": 1678.4356966018677,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "4b7a9b51.8c06a4",
+    "id": "125c1fec.50ea4",
     "type": "for",
     "name": "for loop siteidx - Get site ID from servicedata",
     "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2704.0369415283203,
-    "y": 1819.83798122406,
-    "z": "816d5e60.eba45",
+    "x": 2703.0330352783203,
+    "y": 1824.83407497406,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "48cb425f.55b89c"
+        "d543abbf.21d958"
       ]
     ]
   },
   {
-    "id": "d000ff03.568cc",
+    "id": "e6b24865.170e78",
     "type": "comment",
     "name": "Add route src->dst, dst->src",
     "info": "",
     "comments": "",
-    "x": 2920.6726989746094,
-    "y": 1867.6398572921753,
-    "z": "816d5e60.eba45",
+    "x": 2919.6687927246094,
+    "y": 1872.6359510421753,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "29f55e34.5e8332",
+    "id": "79cfeb5f.61b2e4",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2142.338134765625,
-    "y": 1247.972653388977,
-    "z": "816d5e60.eba45",
+    "x": 2141.334228515625,
+    "y": 1252.968747138977,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5ea29b9f.be4264",
-        "15f5118.456cfef",
-        "2d5b2f06.016de",
-        "e6f50ce2.c15fa",
-        "f6606352.8ce6f",
-        "ed12d667.ce10c8",
-        "bae059eb.7d03c8"
+        "f464743.4983e88",
+        "3d280456.864e3c",
+        "2c43f3c.460060c",
+        "18153066.3dcbc",
+        "f7f9e60d.d46178",
+        "a780d837.5bb548",
+        "fcb5aaf7.a56738"
       ]
     ]
   },
   {
-    "id": "e6f50ce2.c15fa",
+    "id": "18153066.3dcbc",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2397.337890625,
-    "y": 1384.3060274124146,
-    "z": "816d5e60.eba45",
+    "x": 2396.333984375,
+    "y": 1389.3021211624146,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5fa744b7.80a78c",
-        "ae09c3af.7e2b1",
-        "3739eed6.72baf2"
+        "dde2f6f9.3c1848",
+        "85c67b27.be5eb8",
+        "1e774611.be647a"
       ]
     ]
   },
   {
-    "id": "4f105ce1.5af714",
+    "id": "c20a45c1.991ea8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2417.3389282226562,
-    "y": 1756.639549255371,
-    "z": "816d5e60.eba45",
+    "x": 2416.3350219726562,
+    "y": 1761.635643005371,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "772df895.4e43b8",
-        "5b475dee.c12664",
-        "4b7a9b51.8c06a4",
-        "4ae4f054.fa7eb"
+        "c93e7e34.eb504",
+        "37339d04.d0e692",
+        "125c1fec.50ea4",
+        "f1944c46.f8a7e"
       ]
     ]
   },
   {
-    "id": "18165b60.a7ba85",
+    "id": "b81eb9e0.1976f8",
     "type": "switchNode",
     "name": "switch providerIpAddress",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3138.5358810424805,
-    "y": 1510.8373112678528,
-    "z": "816d5e60.eba45",
+    "x": 3137.5319747924805,
+    "y": 1515.8334050178528,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "547ceb11.0ca1f4"
+        "9a3783d0.0d525"
       ]
     ]
   },
   {
-    "id": "547ceb11.0ca1f4",
+    "id": "9a3783d0.0d525",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3314.536865234375,
-    "y": 1510.8374338150024,
-    "z": "816d5e60.eba45",
+    "x": 3313.532958984375,
+    "y": 1515.8335275650024,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "79cc0282.5e8e0c"
+        "87437b42.24d3e8"
       ]
     ]
   },
   {
-    "id": "79cc0282.5e8e0c",
+    "id": "87437b42.24d3e8",
     "type": "set",
     "name": "set prop.hub.providerIpAddress",
     "xml": "<set>\n<parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
     "comments": "",
-    "x": 3516.5369033813477,
-    "y": 1511.4373540878296,
-    "z": "816d5e60.eba45",
+    "x": 3515.5329971313477,
+    "y": 1516.4334478378296,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "ccf6624c.26897",
+    "id": "3235095c.ee2c06",
     "type": "switchNode",
     "name": "switch ipAddress",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3111.0359630584717,
-    "y": 1548.337396621704,
-    "z": "816d5e60.eba45",
+    "x": 3110.0320568084717,
+    "y": 1553.333490371704,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "11581651.226caa"
+        "901583b2.3d45c"
       ]
     ]
   },
   {
-    "id": "11581651.226caa",
+    "id": "901583b2.3d45c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3315.0369033813477,
-    "y": 1548.3373484611511,
-    "z": "816d5e60.eba45",
+    "x": 3314.0329971313477,
+    "y": 1553.3334422111511,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4b6a5df1.4c4ce4"
+        "3c3cbc3f.366104"
       ]
     ]
   },
   {
-    "id": "4b6a5df1.4c4ce4",
+    "id": "3c3cbc3f.366104",
     "type": "set",
     "name": "set prop.hub.ipAddress",
     "xml": "<set>\n<parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
     "comments": "",
-    "x": 3510.036907196045,
-    "y": 1547.9373240470886,
-    "z": "816d5e60.eba45",
+    "x": 3509.033000946045,
+    "y": 1552.9334177970886,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "162bc63c.6a40ba",
+    "id": "3208baf8.6aed86",
     "type": "set",
     "name": "Add prop.spoke.route",
     "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.spokeRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n\n\n",
     "comments": "",
-    "x": 3415.5373935699463,
-    "y": 2480.338482618332,
-    "z": "816d5e60.eba45",
+    "x": 3417.533639907837,
+    "y": 2670.3345935344696,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "e68f1fae.052f",
+    "id": "723ddf07.218d1",
     "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": 367.3382110595703,
-    "y": 1122.3382453918457,
-    "z": "816d5e60.eba45",
+    "x": 366.3343048095703,
+    "y": 1127.3343391418457,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "20ecb75b.a622b8",
+    "id": "428d17cf.9d4528",
     "type": "execute",
     "name": "generate connection attachment 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-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1416.6711120605469,
-    "y": 184.30574321746826,
-    "z": "816d5e60.eba45",
+    "x": 1415.6672058105469,
+    "y": 189.30183696746826,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "f4ac6977.3d92e8",
+    "id": "31785cb6.7e6854",
     "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-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1543.671142578125,
-    "y": 232.3057336807251,
-    "z": "816d5e60.eba45",
+    "x": 1542.667236328125,
+    "y": 237.3018274307251,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4d085fb4.7bdbe",
-        "60f770e5.3c645"
+        "2398fd5d.dbac12",
+        "7edde1df.f81a4"
       ]
     ]
   },
   {
-    "id": "e17df7dc.7298b8",
+    "id": "8a7f6cb5.ac077",
     "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-parent-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-psd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1768.0052947998047,
-    "y": 566.3060474395752,
-    "z": "816d5e60.eba45",
+    "x": 1767.0013885498047,
+    "y": 571.3021411895752,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3af4c28.a27653e",
-        "b8d8640d.13eac8"
+        "3ba72ba0.13a9f4",
+        "b947c854.e35438"
       ]
     ]
   },
   {
-    "id": "496b2343.92811c",
+    "id": "39b9e240.c55f5e",
     "type": "execute",
     "name": "generate connection attachment parent 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-parent-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1745.0049438476562,
-    "y": 512.3059749603271,
-    "z": "816d5e60.eba45",
+    "x": 1744.0010375976562,
+    "y": 517.3020687103271,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "de20210d.6ba26",
+    "id": "e2c10566.d14818",
     "type": "comment",
     "name": "full mesh do nothing",
     "info": "",
     "comments": "",
-    "x": 1579.671745300293,
-    "y": 723.3060131072998,
-    "z": "816d5e60.eba45",
+    "x": 1578.667839050293,
+    "y": 728.3021068572998,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "688e61c6.6ef82",
+    "id": "3ed45cd4.e3df94",
     "type": "comment",
     "name": "hub-spoke",
     "info": "",
     "comments": "",
-    "x": 2580.6711463928223,
-    "y": 820.3059029579163,
-    "z": "816d5e60.eba45",
+    "x": 2579.6672401428223,
+    "y": 825.3019967079163,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "7504b3dc.db15fc",
+    "id": "9b080888.c9b298",
     "type": "execute",
     "name": "generate connection attachment 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-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": 2253.0042991638184,
-    "y": 971.3058981895447,
-    "z": "816d5e60.eba45",
+    "x": 2252.0003929138184,
+    "y": 976.3019919395447,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "28b961ad.bfb2de",
+    "id": "1ff59188.ff36ae",
     "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": 2384.004379272461,
-    "y": 1010.9725279808044,
-    "z": "816d5e60.eba45",
+    "x": 2383.000473022461,
+    "y": 1015.9686217308044,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a56e979.94c4668",
-        "36ee87ff.edcc88"
+        "63613798.d70908",
+        "9fe7ff8.35548"
       ]
     ]
   },
   {
-    "id": "ed12d667.ce10c8",
+    "id": "a780d837.5bb548",
     "type": "execute",
     "name": "generate 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-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2434.508274078369,
-    "y": 1212.3097982406616,
-    "z": "816d5e60.eba45",
+    "x": 2433.504367828369,
+    "y": 1217.3058919906616,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "bae059eb.7d03c8",
+    "id": "fcb5aaf7.a56738",
     "type": "execute",
     "name": "execute RestApiCallNode - get service data of 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-arsd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2550.5084075927734,
-    "y": 1249.3096895217896,
-    "z": "816d5e60.eba45",
+    "x": 2549.5045013427734,
+    "y": 1254.3057832717896,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b92c0442.b0f838",
-        "3638a6d7.49015a"
+        "aa2b8cd4.2f9ae",
+        "1bed61f6.90e36e"
       ]
     ]
   },
   {
-    "id": "c6d12fe7.97792",
+    "id": "472beb8.34ca814",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2314.5039710998535,
-    "y": 1134.8057622909546,
-    "z": "816d5e60.eba45",
+    "x": 2313.5000648498535,
+    "y": 1139.8018560409546,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "29f55e34.5e8332"
+        "79cfeb5f.61b2e4"
       ]
     ]
   },
   {
-    "id": "918c56f9.c83968",
+    "id": "6011fd41.335614",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2320.504219055176,
-    "y": 1091.805853843689,
-    "z": "816d5e60.eba45",
+    "x": 2319.500312805176,
+    "y": 1096.801947593689,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f44852b5.87cbc"
+        "890f782e.076f68"
       ]
     ]
   },
   {
-    "id": "c4ef0618.a01ef8",
+    "id": "87284033.76d89",
     "type": "for",
     "name": "for loop roleidx - Get role from allotted resource",
     "xml": "<for index=\"roleidx\" start=\"0\" end=\"`$mdsal-ar.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": 2895.5047760009766,
-    "y": 239.30567932128906,
-    "z": "816d5e60.eba45",
+    "x": 2894.5008697509766,
+    "y": 244.30177307128906,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "67fa3697.488778"
+        "73b90990.d19928"
       ]
     ]
   },
   {
-    "id": "67fa3697.488778",
+    "id": "73b90990.d19928",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3154.5050888061523,
-    "y": 238.3059949874878,
-    "z": "816d5e60.eba45",
+    "x": 3153.5011825561523,
+    "y": 243.3020887374878,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "907c7650.cad4a8"
+        "8cac5932.b8b208"
       ]
     ]
   },
   {
-    "id": "907c7650.cad4a8",
+    "id": "8cac5932.b8b208",
     "type": "switchNode",
     "name": "switch Role",
     "xml": "<switch test=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].name == 'role'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3303.505100250244,
-    "y": 239.3058319091797,
-    "z": "816d5e60.eba45",
+    "x": 3302.501194000244,
+    "y": 244.3019256591797,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d808a0cf.f074f"
+        "bf369f65.c443d"
       ]
     ]
   },
   {
-    "id": "d539825b.12e92",
+    "id": "9b7f20f8.db3b3",
     "type": "set",
     "name": "set prop.spoke.role",
     "xml": "<set>\n<parameter name='prop.spoke.role' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].value`' />\n",
     "comments": "",
-    "x": 3608.505661010742,
-    "y": 236.90573978424072,
-    "z": "816d5e60.eba45",
+    "x": 3607.501754760742,
+    "y": 241.90183353424072,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "d808a0cf.f074f",
+    "id": "bf369f65.c443d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3439.00492477417,
-    "y": 236.30567169189453,
-    "z": "816d5e60.eba45",
+    "x": 3438.00101852417,
+    "y": 241.30176544189453,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d539825b.12e92"
+        "9b7f20f8.db3b3"
       ]
     ]
   },
   {
-    "id": "5d0ffac5.1d4814",
+    "id": "8baae43.65cdc18",
     "type": "switchNode",
     "name": "switch spoke",
     "xml": "<switch test=\"`$prop.spoke.role == 'spoke'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1331.004280090332,
-    "y": 383.305606842041,
-    "z": "816d5e60.eba45",
+    "x": 1330.000373840332,
+    "y": 388.301700592041,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d39c2ae1.e3a298"
+        "b158c146.c1f85"
       ]
     ]
   },
   {
-    "id": "d39c2ae1.e3a298",
+    "id": "b158c146.c1f85",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1472.004035949707,
-    "y": 384.30564403533936,
-    "z": "816d5e60.eba45",
+    "x": 1471.000129699707,
+    "y": 389.30173778533936,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "401953e4.0343fc"
+        "67d378cf.68e458"
       ]
     ]
   },
   {
-    "id": "3b2ee77e.0ad758",
+    "id": "b0c4da2c.234108",
     "type": "for",
     "name": "for i.. service-data.vnfs.vnf_length[]",
     "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1744.5045623779297,
-    "y": 438.3056392669678,
-    "z": "816d5e60.eba45",
+    "x": 1743.5006561279297,
+    "y": 443.3017330169678,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "847bf9c5.b5b848"
+        "63ff4ec5.ab647"
       ]
     ]
   },
   {
-    "id": "847bf9c5.b5b848",
+    "id": "63ff4ec5.ab647",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2078.170753479004,
-    "y": 382.3055696487427,
-    "z": "816d5e60.eba45",
+    "x": 2077.166847229004,
+    "y": 387.3016633987427,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7d9b7d9a.b8ca74",
-        "6a3836f9.009c38",
-        "55c5f84e.24eae8"
+        "84784063.67ffb",
+        "341080b7.07512",
+        "ed155104.c2191"
       ]
     ]
   },
   {
-    "id": "7d9b7d9a.b8ca74",
+    "id": "84784063.67ffb",
     "type": "switchNode",
     "name": "switch ActivateSDWANPortInstance",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2349.1707916259766,
-    "y": 328.3064560890198,
-    "z": "816d5e60.eba45",
+    "x": 2348.1668853759766,
+    "y": 333.3025498390198,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5b0d5f1.e72d3a"
+        "126e021b.594fce"
       ]
     ]
   },
   {
-    "id": "5b0d5f1.e72d3a",
+    "id": "126e021b.594fce",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2562.170555114746,
-    "y": 329.3064589500427,
-    "z": "816d5e60.eba45",
+    "x": 2561.166648864746,
+    "y": 334.3025527000427,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2bd1babe.4be726"
+        "c1a0895d.a44898"
       ]
     ]
   },
   {
-    "id": "2bd1babe.4be726",
+    "id": "c1a0895d.a44898",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2711.0042991638184,
-    "y": 331.3056483268738,
-    "z": "816d5e60.eba45",
+    "x": 2710.0003929138184,
+    "y": 336.3017420768738,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5b294f75.d92f3"
+        "cad8cdd9.d6465"
       ]
     ]
   },
   {
-    "id": "5b294f75.d92f3",
+    "id": "cad8cdd9.d6465",
     "type": "for",
     "name": "for loop widx - Get wan port ID from servicedata",
     "xml": "<for index=\"widx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2984.004249572754,
-    "y": 329.6728663444519,
-    "z": "816d5e60.eba45",
+    "x": 2983.000343322754,
+    "y": 334.6689600944519,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "32cc5203.15e8fe"
+        "e45e8fbc.86968"
       ]
     ]
   },
   {
-    "id": "32cc5203.15e8fe",
+    "id": "e45e8fbc.86968",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3253.0051765441895,
-    "y": 328.67311239242554,
-    "z": "816d5e60.eba45",
+    "x": 3252.0012702941895,
+    "y": 333.66920614242554,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2831a4a1.42336c",
-        "8813fbf3.259e18",
-        "c11e3914.922088",
-        "5141e407.34b3cc"
+        "bc53f544.71b638",
+        "25d65cd3.81eaf4",
+        "af8fabf7.c19df8",
+        "97c92085.94f67"
       ]
     ]
   },
   {
-    "id": "2831a4a1.42336c",
+    "id": "bc53f544.71b638",
     "type": "switchNode",
     "name": "switch transportNetworkName",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'transportNetworkName'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3496.0062103271484,
-    "y": 283.6736855506897,
-    "z": "816d5e60.eba45",
+    "x": 3495.0023040771484,
+    "y": 288.6697793006897,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2a15c273.32ab0e"
+        "de0d2806.856438"
       ]
     ]
   },
   {
-    "id": "2a15c273.32ab0e",
+    "id": "de0d2806.856438",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3696.0059852600098,
-    "y": 283.6738476753235,
-    "z": "816d5e60.eba45",
+    "x": 3695.0020790100098,
+    "y": 288.6699414253235,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5b3ec893.cb96e8"
+        "9a3c947a.1c5d88"
       ]
     ]
   },
   {
-    "id": "5b3ec893.cb96e8",
+    "id": "9a3c947a.1c5d88",
     "type": "set",
     "name": "set prop.spoke.transportNetworkName",
     "xml": "<set>\n<parameter name='prop.spoke.transportNetworkName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
     "comments": "",
-    "x": 3923.006721496582,
-    "y": 285.2744297981262,
-    "z": "816d5e60.eba45",
+    "x": 3922.002815246582,
+    "y": 290.2705235481262,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "401953e4.0343fc",
+    "id": "67d378cf.68e458",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1224.9733276367188,
-    "y": 694.2745552062988,
-    "z": "816d5e60.eba45",
+    "x": 1223.9694213867188,
+    "y": 699.2706489562988,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3b2ee77e.0ad758",
-        "496b2343.92811c",
-        "e17df7dc.7298b8",
-        "c548252d.342ee8",
-        "2eff9ba0.ecf354",
-        "f3550d2c.724f9",
-        "8b82943e.e37978",
-        "7fba3a52.cfca64"
+        "b0c4da2c.234108",
+        "39b9e240.c55f5e",
+        "8a7f6cb5.ac077",
+        "9ef76182.7b173",
+        "1fd45985.393f26",
+        "d058b4fc.a3d908",
+        "4a7f65c3.11a50c",
+        "86cead5c.3dd72"
       ]
     ]
   },
   {
-    "id": "6a3836f9.009c38",
+    "id": "341080b7.07512",
     "type": "switchNode",
     "name": "switch ActivateSDWANDeviceInstance",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2341.5042266845703,
-    "y": 402.3056607246399,
-    "z": "816d5e60.eba45",
+    "x": 2340.5003204345703,
+    "y": 407.3017544746399,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7c4ac4a1.4747bc"
+        "b16c0723.99d848"
       ]
     ]
   },
   {
-    "id": "7c4ac4a1.4747bc",
+    "id": "b16c0723.99d848",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2560.5039768218994,
-    "y": 403.30564546585083,
-    "z": "816d5e60.eba45",
+    "x": 2559.5000705718994,
+    "y": 408.30173921585083,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f4aa9e41.b53e5"
+        "6b12cdd6.190a84"
       ]
     ]
   },
   {
-    "id": "f4aa9e41.b53e5",
+    "id": "6b12cdd6.190a84",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2711.3379669189453,
-    "y": 409.3048367500305,
-    "z": "816d5e60.eba45",
+    "x": 2710.3340606689453,
+    "y": 414.3009305000305,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "82e0fc37.26ed9"
+        "c142c3ae.d5baf"
       ]
     ]
   },
   {
-    "id": "82e0fc37.26ed9",
+    "id": "c142c3ae.d5baf",
     "type": "for",
     "name": "for loop didx - Get device ID from servicedata",
     "xml": "<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2970.338218688965,
-    "y": 411.67213201522827,
-    "z": "816d5e60.eba45",
+    "x": 2969.334312438965,
+    "y": 416.66822576522827,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c5f6af8d.43acf"
+        "6fd86632.b15c78"
       ]
     ]
   },
   {
-    "id": "c5f6af8d.43acf",
+    "id": "6fd86632.b15c78",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3256.338726043701,
-    "y": 444.67231702804565,
-    "z": "816d5e60.eba45",
+    "x": 3255.334819793701,
+    "y": 449.66841077804565,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "eb564ac9.966e08"
+        "4c164cba.1f51b4"
       ]
     ]
   },
   {
-    "id": "eb564ac9.966e08",
+    "id": "4c164cba.1f51b4",
     "type": "switchNode",
     "name": "switch deviceId",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].name == 'deviceId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3439.3396377563477,
-    "y": 444.67292737960815,
-    "z": "816d5e60.eba45",
+    "x": 3438.3357315063477,
+    "y": 449.66902112960815,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f15b5da7.6e6af"
+        "4e22d2eb.17a27c"
       ]
     ]
   },
   {
-    "id": "f15b5da7.6e6af",
+    "id": "4e22d2eb.17a27c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3639.339412689209,
-    "y": 444.67308950424194,
-    "z": "816d5e60.eba45",
+    "x": 3638.335506439209,
+    "y": 449.66918325424194,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "24ab8642.92a16a"
+        "bda2d14d.2382d"
       ]
     ]
   },
   {
-    "id": "24ab8642.92a16a",
+    "id": "bda2d14d.2382d",
     "type": "set",
     "name": "set prop.spoke.deviceId",
     "xml": "<set>\n<parameter name='prop.spoke.deviceId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].value`' />\n",
     "comments": "",
-    "x": 3834.3400955200195,
-    "y": 441.27367067337036,
-    "z": "816d5e60.eba45",
+    "x": 3833.3361892700195,
+    "y": 446.26976442337036,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "55c5f84e.24eae8",
+    "id": "ed155104.c2191",
     "type": "switchNode",
     "name": "switch ActivateSiteInstance",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2320.5043411254883,
-    "y": 463.30569219589233,
-    "z": "816d5e60.eba45",
+    "x": 2319.5004348754883,
+    "y": 468.30178594589233,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7ebe3d6.3c123c4"
+        "3684ce31.756aa2"
       ]
     ]
   },
   {
-    "id": "7ebe3d6.3c123c4",
+    "id": "3684ce31.756aa2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2554.503978729248,
-    "y": 464.3056321144104,
-    "z": "816d5e60.eba45",
+    "x": 2553.500072479248,
+    "y": 469.3017258644104,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "eaa83766.f196c8"
+        "379dde17.f5f7e2"
       ]
     ]
   },
   {
-    "id": "eaa83766.f196c8",
+    "id": "379dde17.f5f7e2",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2706.3379669189453,
-    "y": 486.30486822128296,
-    "z": "816d5e60.eba45",
+    "x": 2705.3340606689453,
+    "y": 491.30096197128296,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d0b475ec.f63c48",
-        "3857554a.ced0aa"
+        "54ff4036.7eef1",
+        "dc7900f6.c1794"
       ]
     ]
   },
   {
-    "id": "d0b475ec.f63c48",
+    "id": "54ff4036.7eef1",
     "type": "for",
     "name": "for loop widx - Get wan site ID from servicedata",
     "xml": "<for index=\"sidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2987.3377990722656,
-    "y": 485.672070980072,
-    "z": "816d5e60.eba45",
+    "x": 2986.3338928222656,
+    "y": 490.668164730072,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d6950beb.98c1a8"
+        "53c73c75.c0fe44"
       ]
     ]
   },
   {
-    "id": "d6950beb.98c1a8",
+    "id": "53c73c75.c0fe44",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3256.338726043701,
-    "y": 484.67231702804565,
-    "z": "816d5e60.eba45",
+    "x": 3255.334819793701,
+    "y": 489.66841077804565,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f84a2fdd.ca38",
-        "8488fc33.1f86c",
-        "4d409006.b4615"
+        "1d2d8e3b.d07092",
+        "812b076f.3b7138",
+        "8b3ca259.e59f8"
       ]
     ]
   },
   {
-    "id": "f84a2fdd.ca38",
+    "id": "1d2d8e3b.d07092",
     "type": "switchNode",
     "name": "switch siteId",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'siteId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3445.33992767334,
-    "y": 534.6729888916016,
-    "z": "816d5e60.eba45",
+    "x": 3444.33602142334,
+    "y": 539.6690826416016,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "785cdd27.fd93c4"
+        "35fdfb9a.5d5ab4"
       ]
     ]
   },
   {
-    "id": "785cdd27.fd93c4",
+    "id": "35fdfb9a.5d5ab4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3645.3394050598145,
-    "y": 522.6731033325195,
-    "z": "816d5e60.eba45",
+    "x": 3644.3354988098145,
+    "y": 527.6691970825195,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5c156f9.fbc869"
+        "ea9da0a4.eb61c"
       ]
     ]
   },
   {
-    "id": "5c156f9.fbc869",
+    "id": "ea9da0a4.eb61c",
     "type": "set",
     "name": "set prop.spoke.siteId",
     "xml": "<set>\n<parameter name='prop.spoke.siteId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
     "comments": "",
-    "x": 3838.340358734131,
-    "y": 529.2737336158752,
-    "z": "816d5e60.eba45",
+    "x": 3837.336452484131,
+    "y": 534.2698273658752,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "8813fbf3.259e18",
+    "id": "25d65cd3.81eaf4",
     "type": "switchNode",
     "name": "switch wanPortId",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'wanPortId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3469.50390625,
-    "y": 320.3057417869568,
-    "z": "816d5e60.eba45",
+    "x": 3468.5,
+    "y": 325.3018355369568,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d0babd8f.c557b"
+        "70f2426c.7fe2dc"
       ]
     ]
   },
   {
-    "id": "d0babd8f.c557b",
+    "id": "70f2426c.7fe2dc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3699.5039100646973,
-    "y": 320.3058533668518,
-    "z": "816d5e60.eba45",
+    "x": 3698.5000038146973,
+    "y": 325.3019471168518,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e2b46cce.ea19d"
+        "2a2fa3c7.e081ac"
       ]
     ]
   },
   {
-    "id": "e2b46cce.ea19d",
+    "id": "2a2fa3c7.e081ac",
     "type": "set",
     "name": "set prop.spoke.wanPortId",
     "xml": "<set>\n<parameter name='prop.spoke.wanPortId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
     "comments": "",
-    "x": 3926.5046463012695,
-    "y": 321.90643548965454,
-    "z": "816d5e60.eba45",
+    "x": 3925.5007400512695,
+    "y": 326.90252923965454,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "c11e3914.922088",
+    "id": "af8fabf7.c19df8",
     "type": "switchNode",
     "name": "switch providerIpAddress",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'providerIpAddress'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3487.504066467285,
-    "y": 364.30569219589233,
-    "z": "816d5e60.eba45",
+    "x": 3486.500160217285,
+    "y": 369.30178594589233,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c0d01537.19ceb8"
+        "b8a267e9.b9ee48"
       ]
     ]
   },
   {
-    "id": "c0d01537.19ceb8",
+    "id": "b8a267e9.b9ee48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3687.5038414001465,
-    "y": 364.3058543205261,
-    "z": "816d5e60.eba45",
+    "x": 3686.4999351501465,
+    "y": 369.3019480705261,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6ecb9e8.25b2b6"
+        "1f49c17b.29132f"
       ]
     ]
   },
   {
-    "id": "6ecb9e8.25b2b6",
+    "id": "1f49c17b.29132f",
     "type": "set",
     "name": "set prop.spoke.providerIpAddress",
     "xml": "<set>\n<parameter name='prop.spoke.providerIpAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
     "comments": "",
-    "x": 3914.5045776367188,
-    "y": 365.90643644332886,
-    "z": "816d5e60.eba45",
+    "x": 3913.5006713867188,
+    "y": 370.90253019332886,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "5141e407.34b3cc",
+    "id": "97c92085.94f67",
     "type": "switchNode",
     "name": "switch ipAddress",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'ipAddress'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3467.503894805908,
-    "y": 403.30572843551636,
-    "z": "816d5e60.eba45",
+    "x": 3466.499988555908,
+    "y": 408.30182218551636,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f9d0d35c.eced2"
+        "f16f752f.3e9e18"
       ]
     ]
   },
   {
-    "id": "f9d0d35c.eced2",
+    "id": "f16f752f.3e9e18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3691.5037231445312,
-    "y": 403.3058457374573,
-    "z": "816d5e60.eba45",
+    "x": 3690.4998168945312,
+    "y": 408.3019394874573,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b1e06d93.e9e08"
+        "ca30b35f.a1be"
       ]
     ]
   },
   {
-    "id": "b1e06d93.e9e08",
+    "id": "ca30b35f.a1be",
     "type": "set",
     "name": "set prop.spoke.ipAddress",
     "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
     "comments": "",
-    "x": 3918.5044593811035,
-    "y": 404.90642786026,
-    "z": "816d5e60.eba45",
+    "x": 3917.5005531311035,
+    "y": 409.90252161026,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "89904125.f9c2d",
+    "id": "88f8bb94.113e88",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1035.003807067871,
-    "y": 262.5039482116699,
-    "z": "816d5e60.eba45",
+    "x": 1033.999900817871,
+    "y": 267.5000419616699,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f587f945.9668c8",
-        "20ecb75b.a622b8",
-        "f4ac6977.3d92e8",
-        "5d0ffac5.1d4814"
+        "2cdd7d19.2083a2",
+        "428d17cf.9d4528",
+        "31785cb6.7e6854",
+        "8baae43.65cdc18"
       ]
     ]
   },
   {
-    "id": "26a7429c.87187e",
+    "id": "47687d06.0a1964",
     "type": "comment",
     "name": "get spoke device,site,wanport info",
     "info": "",
     "comments": "",
-    "x": 1791.97265625,
-    "y": 385.97265338897705,
-    "z": "816d5e60.eba45",
+    "x": 1790.96875,
+    "y": 390.96874713897705,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "be393db5.b2c4b",
+    "id": "c21c0002.43242",
     "type": "comment",
     "name": "Add routes only on activation of spoke Attach site",
     "info": "",
     "comments": "",
-    "x": 1452.5038223266602,
-    "y": 329.00396728515625,
-    "z": "816d5e60.eba45",
+    "x": 1451.4999160766602,
+    "y": 334.00006103515625,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "3b335da8.075402",
+    "id": "7b6f0604.c9da18",
     "type": "comment",
     "name": "Loop for all the hub allotted resources, get respective service data and get vnfs info",
     "info": "",
     "comments": "",
-    "x": 2208.50390625,
-    "y": 824.503963470459,
-    "z": "816d5e60.eba45",
+    "x": 2207.5,
+    "y": 829.500057220459,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "48cb425f.55b89c",
+    "id": "d543abbf.21d958",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2964.5036239624023,
-    "y": 1806.0038652420044,
-    "z": "816d5e60.eba45",
+    "x": 2963.4997177124023,
+    "y": 1810.9999589920044,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6735788d.2eda88",
-        "25ec0b7b.fede14"
+        "a19625ef.be4768",
+        "450fbdd4.50bf64"
       ]
     ]
   },
   {
-    "id": "42885256.de226c",
+    "id": "fc5d79c.538d088",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3014.5036811828613,
-    "y": 1679.003749847412,
-    "z": "816d5e60.eba45",
+    "x": 3013.4997749328613,
+    "y": 1683.999843597412,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a3360f10.ddde5"
+        "29161345.19c04c"
       ]
     ]
   },
   {
-    "id": "6735788d.2eda88",
+    "id": "a19625ef.be4768",
     "type": "switchNode",
     "name": "switch siteId",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3149.503547668457,
-    "y": 1817.0037078857422,
-    "z": "816d5e60.eba45",
+    "x": 3148.499641418457,
+    "y": 1821.9998016357422,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b824c970.9e9c08"
+        "fce00f2c.408f7"
       ]
     ]
   },
   {
-    "id": "b824c970.9e9c08",
+    "id": "fce00f2c.408f7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3300.503917694092,
-    "y": 1816.003890991211,
-    "z": "816d5e60.eba45",
+    "x": 3299.500011444092,
+    "y": 1820.999984741211,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1ab1bd98.e41432"
+        "a6e04d71.45ffd"
       ]
     ]
   },
   {
-    "id": "1ab1bd98.e41432",
+    "id": "a6e04d71.45ffd",
     "type": "set",
     "name": "set prop.hub.siteId",
     "xml": "<set>\n<parameter name='prop.hub.siteId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n",
     "comments": "",
-    "x": 3472.5039253234863,
-    "y": 1813.6044597625732,
-    "z": "816d5e60.eba45",
+    "x": 3471.5000190734863,
+    "y": 1818.6005535125732,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "4ae4f054.fa7eb",
+    "id": "f1944c46.f8a7e",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2626.0036544799805,
-    "y": 2169.0043516159058,
-    "z": "816d5e60.eba45",
+    "x": 2624.9997482299805,
+    "y": 2174.0004453659058,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a20f0327.bdb75",
-        "464f548c.98a25c"
+        "4a7669f9.690ed8",
+        "9523edcb.d7c9a"
       ]
     ]
   },
   {
-    "id": "a20f0327.bdb75",
+    "id": "4a7669f9.690ed8",
     "type": "outcome",
     "name": "ActivateSDWANAttachmentInstance",
     "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 2896.0310592651367,
-    "y": 1980.0353841781616,
-    "z": "816d5e60.eba45",
+    "x": 2895.0271530151367,
+    "y": 1985.0314779281616,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3d36ce09.d3a452"
+        "5392f603.1e5608"
       ]
     ]
   },
   {
-    "id": "cbad3e92.5f2c5",
+    "id": "ed2e9b23.246118",
     "type": "execute",
     "name": "execute RestApiCallNode underlay route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\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=\"underlayHubResp\"/>\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": 3485.5039291381836,
-    "y": 1911.0042324066162,
-    "z": "816d5e60.eba45",
+    "x": 3483.500099182129,
+    "y": 1914.0003824234009,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4b4ae946.a41e78",
-        "7402b676.36e648"
+        "e1bfc10d.7f44e",
+        "523fbf6b.72c95"
       ]
     ]
   },
   {
-    "id": "7402b676.36e648",
+    "id": "523fbf6b.72c95",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3731.503833770752,
-    "y": 1888.0041208267212,
-    "z": "816d5e60.eba45",
+    "x": 3730.499927520752,
+    "y": 1893.0002145767212,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b4ae946.a41e78",
+    "id": "e1bfc10d.7f44e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3729.5035133361816,
-    "y": 1844.004111289978,
-    "z": "816d5e60.eba45",
+    "x": 3728.4996070861816,
+    "y": 1849.000205039978,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bae0bb4c.569758"
+        "5684be77.d184a"
       ]
     ]
   },
   {
-    "id": "bae0bb4c.569758",
+    "id": "5684be77.d184a",
     "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 sdwan hub route underlay rest api\" />\n",
     "comments": "",
-    "x": 3871.5041999816895,
-    "y": 1842.0041942596436,
-    "z": "816d5e60.eba45",
+    "x": 3870.5002937316895,
+    "y": 1847.0002880096436,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "c33f2b8.8f859d8",
+    "id": "fc0a8ce8.4d15f",
     "type": "set",
     "name": "Add prop.hub.route",
     "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n",
     "comments": "",
-    "x": 3421.8374042510986,
-    "y": 1864.6708335876465,
-    "z": "816d5e60.eba45",
+    "x": 3418.8337020874023,
+    "y": 1884.666922569275,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "d88550f2.429ff",
+    "id": "4be3d8b3.562cb8",
     "type": "execute",
     "name": "execute RestApiCallNode underlay route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\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=\"underlayspokeResp\"/>\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": 3490.837547302246,
-    "y": 2012.671347618103,
-    "z": "816d5e60.eba45",
+    "x": 3500.834144592285,
+    "y": 2119.6675004959106,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "dc754a4a.149ee8",
-        "9860dbdc.fb5c78"
+        "5f8c1bef.56c114",
+        "a3d1295e.fa6b28"
       ]
     ]
   },
   {
-    "id": "9860dbdc.fb5c78",
+    "id": "a3d1295e.fa6b28",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3742.837652206421,
-    "y": 2000.6713070869446,
-    "z": "816d5e60.eba45",
+    "x": 3752.83424949646,
+    "y": 2107.667459964752,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "dc754a4a.149ee8",
+    "id": "5f8c1bef.56c114",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3740.8373317718506,
-    "y": 1956.6712975502014,
-    "z": "816d5e60.eba45",
+    "x": 3750.8339290618896,
+    "y": 2063.667450428009,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1b7c78ed.47ac47"
+        "e475f129.f6d52"
       ]
     ]
   },
   {
-    "id": "1b7c78ed.47ac47",
+    "id": "e475f129.f6d52",
     "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 sdwan spoke route underlay rest api\" />\n",
     "comments": "",
-    "x": 3882.8380184173584,
-    "y": 1954.671380519867,
-    "z": "816d5e60.eba45",
+    "x": 3892.8346157073975,
+    "y": 2061.6675333976746,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "abc725a.b5905d8",
+    "id": "9b5e472e.7046c8",
     "type": "set",
     "name": "Add prop.spoke.route",
     "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />                                                \n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n",
     "comments": "",
-    "x": 3431.7014198303223,
-    "y": 1975.368059873581,
-    "z": "816d5e60.eba45",
+    "x": 3441.6980171203613,
+    "y": 2082.3642127513885,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "4460a0d6.c4761",
+    "id": "f4ba3683.379f28",
     "type": "set",
     "name": "set  prop.underlay.routeIds",
     "xml": "<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<!--parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeSiteId' value='`$prop.spoke.siteId`' /-->\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$underlayHubResp.success[0].id`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$underlayspokeResp.success[0].id`' />\n\n\n\n",
     "comments": "",
-    "x": 3442.6688232421875,
-    "y": 2060.034790992737,
-    "z": "816d5e60.eba45",
+    "x": 3451.665542602539,
+    "y": 2242.0309886932373,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "3d36ce09.d3a452",
+    "id": "5392f603.1e5608",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3132.003578186035,
-    "y": 1977.5038175582886,
-    "z": "816d5e60.eba45",
+    "x": 3130.999671936035,
+    "y": 1982.4999113082886,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c33f2b8.8f859d8",
-        "abc725a.b5905d8",
-        "4460a0d6.c4761",
-        "d88550f2.429ff",
-        "cbad3e92.5f2c5",
-        "f03bf85a.59ad68",
-        "6591e05b.5ae5",
-        "ab6e34c5.6a48d8"
+        "fc0a8ce8.4d15f",
+        "9b5e472e.7046c8",
+        "f4ba3683.379f28",
+        "4be3d8b3.562cb8",
+        "ed2e9b23.246118",
+        "26c99249.a4074e",
+        "41b2e501.e4cadc",
+        "805d9d92.cb3bf",
+        "f41a7058.b220e",
+        "57accb29.01bb34"
       ]
     ]
   },
   {
-    "id": "50a88f49.37ad4",
+    "id": "cf3f5a97.bb53e8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3161.0035285949707,
-    "y": 2434.504150390625,
-    "z": "816d5e60.eba45",
+    "x": 3162.9997749328613,
+    "y": 2624.5002613067627,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ae46a29e.f97e3",
-        "162bc63c.6a40ba",
-        "32021f5a.688fc",
-        "6c422db5.5ce744",
-        "74f4468a.192018"
+        "45a08ea1.9e3d3",
+        "3208baf8.6aed86",
+        "33961398.8b885c",
+        "5e2b5a00.fe4964",
+        "3396ac88.cb4974",
+        "a8dab23b.85144",
+        "3c48a4f4.f048ec"
       ]
     ]
   },
   {
-    "id": "464f548c.98a25c",
+    "id": "9523edcb.d7c9a",
     "type": "outcome",
     "name": "DeactivateSDWANAttachmentInstance",
     "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 2909.5035858154297,
-    "y": 2428.5039615631104,
-    "z": "816d5e60.eba45",
+    "x": 2911.4998321533203,
+    "y": 2618.500072479248,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "50a88f49.37ad4"
+        "cf3f5a97.bb53e8"
       ]
     ]
   },
   {
-    "id": "6591e05b.5ae5",
+    "id": "41b2e501.e4cadc",
     "type": "set",
     "name": "Add sites to list and update length",
     "xml": "<set>\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteName' value='`$prop.hub.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteName' value='`$prop.spoke.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteId' value='`$prop.spoke.siteId`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
     "comments": "",
-    "x": 3447.035110473633,
-    "y": 2185.035671234131,
-    "z": "816d5e60.eba45",
+    "x": 3456.0318298339844,
+    "y": 2367.0318689346313,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "d686d76a.66e9d8",
+    "id": "84283d54.1b30c",
     "type": "comment",
     "name": "save hubsiteIds and spoke siteIds for provision",
     "info": "",
     "comments": "",
-    "x": 3479.035484313965,
-    "y": 2141.035545349121,
-    "z": "816d5e60.eba45",
+    "x": 3488.0322036743164,
+    "y": 2323.0317430496216,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "8488fc33.1f86c",
+    "id": "812b076f.3b7138",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3446.034912109375,
-    "y": 484.03515625,
-    "z": "816d5e60.eba45",
+    "x": 3445.031005859375,
+    "y": 489.03125,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a468bfef.f0d69"
+        "e2b5302b.c9211"
       ]
     ]
   },
   {
-    "id": "a468bfef.f0d69",
+    "id": "e2b5302b.c9211",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3646.0346870422363,
-    "y": 484.0353183746338,
-    "z": "816d5e60.eba45",
+    "x": 3645.0307807922363,
+    "y": 489.0314121246338,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "861bdc8.697e72"
+        "3a42d854.33d438"
       ]
     ]
   },
   {
-    "id": "861bdc8.697e72",
+    "id": "3a42d854.33d438",
     "type": "set",
     "name": "set prop.spoke.siteName",
     "xml": "<set>\n<parameter name='prop.spoke.siteName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
     "comments": "",
-    "x": 3834.0354919433594,
-    "y": 482.63593196868896,
-    "z": "816d5e60.eba45",
+    "x": 3833.0315856933594,
+    "y": 487.63202571868896,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "25ec0b7b.fede14",
+    "id": "450fbdd4.50bf64",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3148.0349349975586,
-    "y": 1783.5350151062012,
-    "z": "816d5e60.eba45",
+    "x": 3147.0310287475586,
+    "y": 1788.5311088562012,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "38461c3f.4e0404"
+        "7d26f71b.6a9a68"
       ]
     ]
   },
   {
-    "id": "38461c3f.4e0404",
+    "id": "7d26f71b.6a9a68",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3299.0353050231934,
-    "y": 1782.53519821167,
-    "z": "816d5e60.eba45",
+    "x": 3298.0313987731934,
+    "y": 1787.53129196167,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1ccd9e7.6905962"
+        "570427f3.ac5a28"
       ]
     ]
   },
   {
-    "id": "1ccd9e7.6905962",
+    "id": "570427f3.ac5a28",
     "type": "set",
     "name": "set prop.hub.siteName",
     "xml": "<set>\n<parameter name='prop.hub.siteName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n",
     "comments": "",
-    "x": 3471.035312652588,
-    "y": 1780.1357669830322,
-    "z": "816d5e60.eba45",
+    "x": 3470.031406402588,
+    "y": 1785.1318607330322,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "18ea4160.5b97af",
+    "id": "431fc2f2.17609c",
     "type": "set",
     "name": "set prop.provision.siteIds_length=0",
     "xml": "<set>\n<parameter name='prop.provision.siteIds_length' value='0' />\n\n\n\n",
     "comments": "",
-    "x": 471.03517150878906,
-    "y": 370.0351610183716,
-    "z": "816d5e60.eba45",
+    "x": 470.03126525878906,
+    "y": 375.0312547683716,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2ccd4dc3.00e152",
+    "id": "bebb2153.0e2a7",
     "type": "execute",
     "name": "execute RestApiCallNode site provision urls",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site-provision.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites/provision-urls'`\" />\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=\"provisionUrlRsp\"/>\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": 823.0352020263672,
-    "y": 802.0353775024414,
-    "z": "816d5e60.eba45",
+    "x": 822.0312957763672,
+    "y": 807.0314712524414,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bbd8ad8.5648f5",
-        "8ff338f4.67b7f8"
+        "e47835d0.8f5408",
+        "8e71b3d6.afc8d"
       ]
     ]
   },
   {
-    "id": "8ff338f4.67b7f8",
+    "id": "8e71b3d6.afc8d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1087.0354614257812,
-    "y": 824.0354223251343,
-    "z": "816d5e60.eba45",
+    "x": 1086.0315551757812,
+    "y": 829.0315160751343,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbd8ad8.5648f5",
+    "id": "e47835d0.8f5408",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1088.0352478027344,
-    "y": 781.0353603363037,
-    "z": "816d5e60.eba45",
+    "x": 1087.0313415527344,
+    "y": 786.0314540863037,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bb20e181.d535d"
+        "610d5a0c.9e2794"
       ]
     ]
   },
   {
-    "id": "bb20e181.d535d",
+    "id": "610d5a0c.9e2794",
     "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 provision url rest api\" />\n",
     "comments": "",
-    "x": 1267.0358047485352,
-    "y": 779.0354115962982,
-    "z": "816d5e60.eba45",
+    "x": 1266.0318984985352,
+    "y": 784.0315053462982,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "84666856.592818",
+    "id": "38f6b67d.380b9a",
     "type": "for",
     "name": "for providx..prop.provision.siteIds[]",
     "xml": "<for index='providx' start='0' end='`$prop.provision.siteIds_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 464.0352020263672,
-    "y": 574.0352010726929,
-    "z": "816d5e60.eba45",
+    "x": 463.0312957763672,
+    "y": 579.0312948226929,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e0c31833.56f938"
+        "3da0634c.7d37dc"
       ]
     ]
   },
   {
-    "id": "e0c31833.56f938",
+    "id": "3da0634c.7d37dc",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 488.0352439880371,
-    "y": 784.035174369812,
-    "z": "816d5e60.eba45",
+    "x": 487.0313377380371,
+    "y": 789.031268119812,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "14ab7296.d70c4d",
-        "2ccd4dc3.00e152",
-        "28a5422.99608be"
+        "89ba9fe.36f7b6",
+        "bebb2153.0e2a7",
+        "ae5d2651.0df3f8"
       ]
     ]
   },
   {
-    "id": "14ab7296.d70c4d",
+    "id": "89ba9fe.36f7b6",
     "type": "set",
     "name": "set prop.spoke.hubSiteId, spokeSiteId",
     "xml": "<set>\n<parameter name='prop.provision.hubSitename' value='`$prop.provision.siteIds[$providx].hubSiteName`' />\n<parameter name='prop.provision.spokeSitename' value='`$prop.provision.siteIds[$providx].spokeSiteName`' />\n<parameter name='prop.provision.hubspokesite[0]' value='`$prop.provision.siteIds[$providx].hubSiteId`' />\n<parameter name='prop.provision.hubspokesite[1]' value='`$prop.provision.siteIds[$providx].spokeSiteId`' />\n<parameter name='prop.provision.hubspokesite_length' value='2' />\n",
     "comments": "",
-    "x": 799.0379028320312,
-    "y": 660.6368894577026,
-    "z": "816d5e60.eba45",
+    "x": 798.0339965820312,
+    "y": 665.6329832077026,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "28a5422.99608be",
+    "id": "ae5d2651.0df3f8",
     "type": "record",
     "name": "record provision url response to the file",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`'/opt/opendaylight/current/data/log/' + 'HUB-' + $prop.provision.hubSitename + '-SPOKE-' + $prop.provision.spokeSitename + '-provisionUrl'`\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value='`$provisionUrlRsp.success[0].url`'/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 795.0352783203125,
-    "y": 896.0352420806885,
-    "z": "816d5e60.eba45",
+    "x": 794.0313720703125,
+    "y": 901.0313358306885,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e2c1efa.030fd",
+    "id": "99b001da.0efb4",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2537.035388946533,
-    "y": 1051.0352325439453,
-    "z": "816d5e60.eba45",
+    "x": 2536.031482696533,
+    "y": 1056.0313262939453,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d87f1462.94a148"
+        "175772d7.f9d53d"
       ]
     ]
   },
   {
-    "id": "e621a712.c02488",
+    "id": "e38b67ea.4c8758",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2017.0350646972656,
-    "y": 614.0352153778076,
-    "z": "816d5e60.eba45",
+    "x": 2016.0311584472656,
+    "y": 619.0313091278076,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4d2b2a60.5a15c4"
+        "348ba1e1.19e85e"
       ]
     ]
   },
   {
-    "id": "f3cef2f6.2a146",
+    "id": "4ebf01e5.37d06",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1961.0352325439453,
-    "y": 705.0351238250732,
-    "z": "816d5e60.eba45",
+    "x": 1960.0313262939453,
+    "y": 710.0312175750732,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "482a4c29.31cfa4",
-        "3b80b5a9.9770ba"
+        "8d7971fd.c23e3",
+        "524b783f.8c1128"
       ]
     ]
   },
   {
-    "id": "f03bf85a.59ad68",
+    "id": "26c99249.a4074e",
     "type": "set",
     "name": "set prop.underlay.routeIds_length++",
     "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n\n\n\n\n",
     "comments": "",
-    "x": 3472.004440307617,
-    "y": 2096.2538681030273,
-    "z": "816d5e60.eba45",
+    "x": 3481.0011596679688,
+    "y": 2278.250065803528,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "ab6e34c5.6a48d8",
+    "id": "805d9d92.cb3bf",
     "type": "set",
     "name": "Update prop.provision.siteIds_length",
     "xml": "<set>\n<parameter name='prop.provision.siteIds_length' value='`$prop.provision.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",
     "comments": "",
-    "x": 3455.504180908203,
-    "y": 2220.253963470459,
-    "z": "816d5e60.eba45",
+    "x": 3464.5009002685547,
+    "y": 2402.2501611709595,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "3857554a.ced0aa",
+    "id": "dc7900f6.c1794",
     "type": "set",
     "name": "set prop.spoke.siteidx",
     "xml": "<set>\n<parameter name='prop.spoke.siteidx' value='`$i`' />\n\n",
     "comments": "",
-    "x": 2905.7540969848633,
-    "y": 450.0039348602295,
-    "z": "816d5e60.eba45",
+    "x": 2904.7501907348633,
+    "y": 455.0000286102295,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2ce54718.3d9808",
+    "id": "54fe9391.9e9afc",
     "type": "set",
     "name": "set  underlay route ids to service data",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"underlayRouteIds\" />\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$tmp.routeString`' />\n\n\n",
     "comments": "",
-    "x": 1928.0045471191406,
-    "y": 1937.0043048858643,
-    "z": "816d5e60.eba45",
+    "x": 1927.0006408691406,
+    "y": 1942.0003986358643,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "f80aa612.1d1cd8",
+    "id": "32bd7569.5de31a",
     "type": "set",
     "name": "set prop.underlay.routeIds_length=0",
     "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='0' />\n\n\n\n",
     "comments": "",
-    "x": 476.0000305175781,
-    "y": 322.0000190734863,
-    "z": "816d5e60.eba45",
+    "x": 474.9961242675781,
+    "y": 326.9961128234863,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "74f4468a.192018",
+    "id": "3396ac88.cb4974",
     "type": "for",
     "name": "for loop uidx - Get route Id from prop.underlay.routeIds",
     "xml": "<for index=\"uidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.6667861938477,
-    "y": 2307.3333892822266,
-    "z": "816d5e60.eba45",
+    "x": 3518.6630325317383,
+    "y": 2497.3295001983643,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2f560e9d.06e792"
+        "48bdd272.66024c"
       ]
     ]
   },
   {
-    "id": "2f560e9d.06e792",
+    "id": "48bdd272.66024c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3808.333480834961,
-    "y": 2307.3333892822266,
-    "z": "816d5e60.eba45",
+    "x": 3810.3297271728516,
+    "y": 2497.3295001983643,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "dbb8a9cb.01e2a8"
+        "164a1404.cbc8dc"
       ]
     ]
   },
   {
-    "id": "dbb8a9cb.01e2a8",
+    "id": "164a1404.cbc8dc",
     "type": "switchNode",
     "name": "switch prop.hub.siteId",
     "xml": "<switch test=\"`$prop.underlay.routeIds[$uidx].hubSiteId == $prop.hub.siteId`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3997.33349609375,
-    "y": 2307.3335523605347,
-    "z": "816d5e60.eba45",
+    "x": 3999.3297424316406,
+    "y": 2497.3296632766724,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4aa46b8.0419394"
+        "beeec1da.addd9"
       ]
     ]
   },
   {
-    "id": "4aa46b8.0419394",
+    "id": "beeec1da.addd9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4168.332931518555,
-    "y": 2307.3335514068604,
-    "z": "816d5e60.eba45",
+    "x": 4170.329177856445,
+    "y": 2497.329662322998,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "74eb4369.b3544c"
+        "8b49993a.fe8e88"
       ]
     ]
   },
   {
-    "id": "74eb4369.b3544c",
+    "id": "8b49993a.fe8e88",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4322.332931518555,
-    "y": 2311.333559036255,
-    "z": "816d5e60.eba45",
+    "x": 4324.329177856445,
+    "y": 2501.3296699523926,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "86900a6.74da6f8"
+        "ef00b5c0.d59378"
       ]
     ]
   },
   {
-    "id": "86900a6.74da6f8",
+    "id": "ef00b5c0.d59378",
     "type": "set",
     "name": "set prop.hubRouteId prop.spokeRouteId",
     "xml": "<set>\n<parameter name='prop.hubRouteId' value='`$prop.underlay.routeIds[$uidx].hubRouteId`' />\n<parameter name='prop.spokeRouteId' value='`$prop.underlay.routeIds[$uidx].spokeRouteId`' />\n",
     "comments": "",
-    "x": 4408.332939147949,
-    "y": 2383.333562850952,
-    "z": "816d5e60.eba45",
+    "x": 4410.32918548584,
+    "y": 2573.32967376709,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "4d409006.b4615",
+    "id": "8b3ca259.e59f8",
     "type": "switchNode",
     "name": "switch underlayRouteIds",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'underlayRouteIds'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3451,
-    "y": 588.6666259765625,
-    "z": "816d5e60.eba45",
+    "x": 3449.99609375,
+    "y": 593.6627197265625,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c14c6f3d.397e6"
+        "90960264.013bb"
       ]
     ]
   },
   {
-    "id": "c14c6f3d.397e6",
+    "id": "90960264.013bb",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3650.9994773864746,
-    "y": 576.6667404174805,
-    "z": "816d5e60.eba45",
+    "x": 3649.9955711364746,
+    "y": 581.6628341674805,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b91a3e00.56049"
+        "dec6d150.266b1"
       ]
     ]
   },
   {
-    "id": "e6b57715.d86fd8",
+    "id": "f1e8e357.7d127",
     "type": "set",
     "name": "set prop.underlay.routeIds",
     "xml": "<set>\n<parameter name='prop.underlay.routeIdsString' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
     "comments": "",
-    "x": 4022.000877380371,
-    "y": 576.2674503326416,
-    "z": "816d5e60.eba45",
+    "x": 4020.996971130371,
+    "y": 581.2635440826416,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "7fba3a52.cfca64",
+    "id": "86cead5c.3dd72",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1138.0002899169922,
-    "y": 2028.333535194397,
-    "z": "816d5e60.eba45",
+    "x": 1136.9963836669922,
+    "y": 2033.329628944397,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6d3232d8.e0205c",
-        "394f9ac2.7c54d6"
+        "d86f6d8b.19f1b",
+        "42a75c7f.9dc134"
       ]
     ]
   },
   {
-    "id": "6d3232d8.e0205c",
+    "id": "d86f6d8b.19f1b",
     "type": "outcome",
     "name": "ActivateSDWANAttachmentInstance",
     "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1402.0003356933594,
-    "y": 1983.333532333374,
-    "z": "816d5e60.eba45",
+    "x": 1400.9964294433594,
+    "y": 1988.329626083374,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "cc4350b5.e04f4"
+        "1dbe9d9f.7f9c82"
       ]
     ]
   },
   {
-    "id": "cc4350b5.e04f4",
+    "id": "1dbe9d9f.7f9c82",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1643.9728469848633,
-    "y": 1979.8022832870483,
-    "z": "816d5e60.eba45",
+    "x": 1642.9689407348633,
+    "y": 1984.7983770370483,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2ce54718.3d9808",
-        "c043509c.599d6",
-        "af0af852.8614c8",
-        "879d0a95.c86bf8"
+        "54fe9391.9e9afc",
+        "5d55b77d.4fae98",
+        "59b1613.c1f67a",
+        "8abe0b00.ec56e8"
       ]
     ]
   },
   {
-    "id": "a489ec70.35a57",
+    "id": "a9b02dc4.79bbe",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1647.9728355407715,
-    "y": 2063.8024520874023,
-    "z": "816d5e60.eba45",
+    "x": 1646.9689292907715,
+    "y": 2068.7985458374023,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f104a03c.3d9ea"
+        "ae1dbfd0.9ebac"
       ]
     ]
   },
   {
-    "id": "394f9ac2.7c54d6",
+    "id": "42a75c7f.9dc134",
     "type": "outcome",
     "name": "DeactivateSDWANAttachmentInstance",
     "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1399.4729766845703,
-    "y": 2065.8022890090942,
-    "z": "816d5e60.eba45",
+    "x": 1398.4690704345703,
+    "y": 2070.7983827590942,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a489ec70.35a57"
+        "a9b02dc4.79bbe"
       ]
     ]
   },
   {
-    "id": "f104a03c.3d9ea",
+    "id": "ae1dbfd0.9ebac",
     "type": "set",
     "name": "set input parameter length -1",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length - 1`' />\n\n\n\n\n",
     "comments": "",
-    "x": 1876.6665344238281,
-    "y": 2062.33353805542,
-    "z": "816d5e60.eba45",
+    "x": 1875.6626281738281,
+    "y": 2067.32963180542,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "f8e23d7f.b3d02",
+    "id": "4d624738.aa86f8",
     "type": "comment",
     "name": "Get route routes IDs",
     "info": "",
     "comments": "",
-    "x": 3416.333251953125,
-    "y": 2268.6666259765625,
-    "z": "816d5e60.eba45",
+    "x": 3418.3294982910156,
+    "y": 2458.6627368927,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "c043509c.599d6",
+    "id": "5d55b77d.4fae98",
     "type": "set",
     "name": "set  underlay route ids to service data",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n",
     "comments": "",
-    "x": 1917.333480834961,
-    "y": 2011.666579246521,
-    "z": "816d5e60.eba45",
+    "x": 1916.329574584961,
+    "y": 2016.662672996521,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "af0af852.8614c8",
+    "id": "59b1613.c1f67a",
     "type": "for",
     "name": "for jidx paramidx - Get topology from servicedata",
     "xml": "<for index=\"jidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2006.3334045410156,
-    "y": 1558.333351135254,
-    "z": "816d5e60.eba45",
+    "x": 2005.3294982910156,
+    "y": 1563.329444885254,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "96c0f1e3.46564"
+        "f4c8ed71.c2698"
       ]
     ]
   },
   {
-    "id": "71e83fcd.3926a",
+    "id": "3450a2a3.3f3b2e",
     "type": "execute",
     "name": "execute concat",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat1\"/>\n    <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].hubRouteId`'/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2190.333740234375,
-    "y": 1692.0005540847778,
-    "z": "816d5e60.eba45",
+    "x": 2189.329833984375,
+    "y": 1696.9966478347778,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b1d10b7.e85ce",
+    "id": "5db41da3.1856f4",
     "type": "execute",
     "name": "execute concat",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$prop.underlay.routeIds[$jidx].hubSiteId`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat\"/>\n    <parameter name=\"target\" value=\",\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2200.3337326049805,
-    "y": 1644.6668920516968,
-    "z": "816d5e60.eba45",
+    "x": 2199.3298263549805,
+    "y": 1649.6629858016968,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "96c0f1e3.46564",
+    "id": "f4c8ed71.c2698",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1913.333423614502,
-    "y": 1743.6666812896729,
-    "z": "816d5e60.eba45",
+    "x": 1912.329517364502,
+    "y": 1748.6627750396729,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5b1d10b7.e85ce",
-        "71e83fcd.3926a",
-        "4f918e1e.65c27",
-        "743189f.b107678",
-        "a740f981.130cb8",
-        "7f673568.55d36c"
+        "5db41da3.1856f4",
+        "3450a2a3.3f3b2e",
+        "46517f63.3d70e",
+        "74bf87c6.f701b8",
+        "ec44da8a.7837c8",
+        "f31858ee.e326d8"
       ]
     ]
   },
   {
-    "id": "4f918e1e.65c27",
+    "id": "46517f63.3d70e",
     "type": "execute",
     "name": "execute concat",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat1`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat2\"/>\n    <parameter name=\"target\" value=\",\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2197.3334426879883,
-    "y": 1731.6667852401733,
-    "z": "816d5e60.eba45",
+    "x": 2196.3295364379883,
+    "y": 1736.6628789901733,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "743189f.b107678",
+    "id": "74bf87c6.f701b8",
     "type": "execute",
     "name": "execute concat",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat2`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat3\"/>\n    <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].spokeRouteId`'/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2197.3334426879883,
-    "y": 1767.6667852401733,
-    "z": "816d5e60.eba45",
+    "x": 2196.3295364379883,
+    "y": 1772.6628789901733,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "a740f981.130cb8",
+    "id": "ec44da8a.7837c8",
     "type": "execute",
     "name": "execute concat",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat3`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat4\"/>\n    <parameter name=\"target\" value=\" | \"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2190.3334426879883,
-    "y": 1808.0001592636108,
-    "z": "816d5e60.eba45",
+    "x": 2189.3295364379883,
+    "y": 1812.9962530136108,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "7f673568.55d36c",
+    "id": "f31858ee.e326d8",
     "type": "execute",
     "name": "execute concat",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.routeString`'/>\n    <parameter name=\"outputPath\" value=\"tmp.routeString\"/>\n    <parameter name=\"target\" value='`$tmp.concat4`'/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2193.333381652832,
-    "y": 1862.6666984558105,
-    "z": "816d5e60.eba45",
+    "x": 2192.329475402832,
+    "y": 1867.6627922058105,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "879d0a95.c86bf8",
+    "id": "8abe0b00.ec56e8",
     "type": "set",
     "name": "Set tmp.routeString",
     "xml": "<set>\n<parameter name='tmp.routeString' value=\"\" />\n\n",
     "comments": "",
-    "x": 1910.3334045410156,
-    "y": 1499.6666822433472,
-    "z": "816d5e60.eba45",
+    "x": 1909.3294982910156,
+    "y": 1504.6627759933472,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "b91a3e00.56049",
+    "id": "dec6d150.266b1",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3799.0002250671387,
-    "y": 623.0000381469727,
-    "z": "816d5e60.eba45",
+    "x": 3797.9963188171387,
+    "y": 627.9961318969727,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e6b57715.d86fd8",
-        "4cfad752.b82ab8"
+        "f1e8e357.7d127",
+        "38377ec9.53b982"
       ]
     ]
   },
   {
-    "id": "4cfad752.b82ab8",
+    "id": "38377ec9.53b982",
     "type": "execute",
     "name": "execute split |",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsString`'/>\n<parameter name=\"regex\" value=\" | \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValue\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3977.0002365112305,
-    "y": 643.0000381469727,
-    "z": "816d5e60.eba45",
+    "x": 3975.9963302612305,
+    "y": 647.9961318969727,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "18dab504.682e9b",
-        "e6713c9a.ccf4e"
+        "3268a5b9.fb215a",
+        "c3ab3d57.d9ba"
       ]
     ]
   },
   {
-    "id": "e6713c9a.ccf4e",
+    "id": "c3ab3d57.d9ba",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4154.0002517700195,
-    "y": 624.0000371932983,
-    "z": "816d5e60.eba45",
+    "x": 4152.9963455200195,
+    "y": 628.9961309432983,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f6d503b7.ca422"
+        "d7617cb0.7601e"
       ]
     ]
   },
   {
-    "id": "18dab504.682e9b",
+    "id": "3268a5b9.fb215a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4143.0002517700195,
-    "y": 672.000039100647,
-    "z": "816d5e60.eba45",
+    "x": 4141.9963455200195,
+    "y": 676.996132850647,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "24d2d870.cadd68"
+        "d317db0c.b51f88"
       ]
     ]
   },
   {
-    "id": "a99b2248.b5ad4",
+    "id": "82fa522b.8f097",
     "type": "set",
     "name": "set ipAddress prefixLength",
     "xml": "<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.underlay.routeIdsValues[0]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$prop.underlay.routeIdsValues[1]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$prop.underlay.routeIdsValues[2]`' />",
     "comments": "",
-    "x": 5340.001117706299,
-    "y": 558.0002794265747,
-    "z": "816d5e60.eba45",
+    "x": 5338.997211456299,
+    "y": 562.9963731765747,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "24d2d870.cadd68",
+    "id": "d317db0c.b51f88",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4273.000255584717,
-    "y": 672.000039100647,
-    "z": "816d5e60.eba45",
+    "x": 4271.996349334717,
+    "y": 676.996132850647,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "f6d503b7.ca422",
+    "id": "d7617cb0.7601e",
     "type": "for",
     "name": "for loop ridx ",
     "xml": "<for index=\"ridx\" start=\"0\" end=\"`$prop.underlay.routeIdsValue_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 4299.999938964844,
-    "y": 622.0000371932983,
-    "z": "816d5e60.eba45",
+    "x": 4298.996032714844,
+    "y": 626.9961309432983,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d316c9fd.2bfac8"
+        "bae53b24.86f3f8"
       ]
     ]
   },
   {
-    "id": "d316c9fd.2bfac8",
+    "id": "bae53b24.86f3f8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4478.332950592041,
-    "y": 619.0000381469727,
-    "z": "816d5e60.eba45",
+    "x": 4477.329044342041,
+    "y": 623.9961318969727,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "cc212d5d.4ecc7"
+        "95e8ce94.9a6d1"
       ]
     ]
   },
   {
-    "id": "cc212d5d.4ecc7",
+    "id": "95e8ce94.9a6d1",
     "type": "execute",
     "name": "execute split ,",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsValue[$ridx]`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValues\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4653.332962036133,
-    "y": 618.000036239624,
-    "z": "816d5e60.eba45",
+    "x": 4652.329055786133,
+    "y": 622.996129989624,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a41a70c9.992e7",
-        "4e196c9a.1ec4e4"
+        "17ee1f73.6ce3e1",
+        "32bb2edf.2bc022"
       ]
     ]
   },
   {
-    "id": "a41a70c9.992e7",
+    "id": "17ee1f73.6ce3e1",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4810.33296585083,
-    "y": 595.0000438690186,
-    "z": "816d5e60.eba45",
+    "x": 4809.32905960083,
+    "y": 599.9961376190186,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "29342783.705ee8"
+        "25d53393.ccdc7c"
       ]
     ]
   },
   {
-    "id": "4e196c9a.1ec4e4",
+    "id": "32bb2edf.2bc022",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4799.33296585083,
-    "y": 643.0000457763672,
-    "z": "816d5e60.eba45",
+    "x": 4798.32905960083,
+    "y": 647.9961395263672,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "31dadcd0.9c88f4"
+        "e299e773.789348"
       ]
     ]
   },
   {
-    "id": "31dadcd0.9c88f4",
+    "id": "e299e773.789348",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4929.332969665527,
-    "y": 643.0000457763672,
-    "z": "816d5e60.eba45",
+    "x": 4928.329063415527,
+    "y": 647.9961395263672,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "c309d201.f689a",
+    "id": "cee6dd44.82ca8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5132.665496826172,
-    "y": 574.0001978874207,
-    "z": "816d5e60.eba45",
+    "x": 5131.661590576172,
+    "y": 578.9962916374207,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a99b2248.b5ad4",
-        "d11539fc.77a698"
+        "82fa522b.8f097",
+        "e872fc0f.e3138"
       ]
     ]
   },
   {
-    "id": "d11539fc.77a698",
+    "id": "e872fc0f.e3138",
     "type": "set",
     "name": "set ipAddress prefixLength",
     "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n",
     "comments": "",
-    "x": 5332.333156585693,
-    "y": 600.000075340271,
-    "z": "816d5e60.eba45",
+    "x": 5331.329250335693,
+    "y": 604.996169090271,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "29342783.705ee8",
+    "id": "25d53393.ccdc7c",
     "type": "switchNode",
     "name": "switch prop.underlay.routeIdsValues_length",
     "xml": "<switch test='`$prop.underlay.routeIdsValues_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5008.667121887207,
-    "y": 476.0000686645508,
-    "z": "816d5e60.eba45",
+    "x": 5007.663215637207,
+    "y": 480.9961624145508,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4afb066.ff7c6f8",
-        "6e26a8d2.50c7d8"
+        "1988903d.6e7c9",
+        "31c7868c.1d918a"
       ]
     ]
   },
   {
-    "id": "4afb066.ff7c6f8",
+    "id": "1988903d.6e7c9",
     "type": "outcome",
     "name": "3",
     "xml": "<outcome value='3'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5243.636054992676,
-    "y": 512.9687957763672,
-    "z": "816d5e60.eba45",
+    "x": 5242.632148742676,
+    "y": 517.9648895263672,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c309d201.f689a"
+        "cee6dd44.82ca8"
       ]
     ]
   },
   {
-    "id": "6e26a8d2.50c7d8",
+    "id": "31c7868c.1d918a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5260.666980743408,
-    "y": 395.00000953674316,
-    "z": "816d5e60.eba45",
+    "x": 5259.663074493408,
+    "y": 399.99610328674316,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "cde0413a.7980f"
+        "c3b9df69.c6c78"
       ]
     ]
   },
   {
-    "id": "cde0413a.7980f",
+    "id": "c3b9df69.c6c78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5421.66650390625,
-    "y": 435,
-    "z": "816d5e60.eba45",
+    "x": 5420.66259765625,
+    "y": 439.99609375,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "61955a75.34d004",
+    "id": "2fd2f3c1.09b97c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 2901.006446838379,
-    "y": 1008.3067564964294,
-    "z": "816d5e60.eba45",
+    "x": 2900.002540588379,
+    "y": 1013.3028502464294,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "5e3a3525.ed601c",
+    "id": "18ba51e1.01a3be",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2887.0059547424316,
-    "y": 956.9731774330139,
-    "z": "816d5e60.eba45",
+    "x": 2886.0020484924316,
+    "y": 961.9692711830139,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "f41a7058.b220e",
+    "type": "set",
+    "name": "hardcode hub route",
+    "xml": "<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n",
+    "comments": "",
+    "x": 3420.0038681030273,
+    "y": 1853.0039892196655,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "57accb29.01bb34",
+    "type": "set",
+    "name": "hardcode spoke route",
+    "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />",
+    "comments": "",
+    "x": 3435.004409790039,
+    "y": 2051.0039653778076,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "a8dab23b.85144",
+    "type": "set",
+    "name": "hardcode hub route",
+    "xml": "<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n",
+    "comments": "",
+    "x": 3470.333251953125,
+    "y": 2532,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "3c48a4f4.f048ec",
+    "type": "set",
+    "name": "hardcode spoke route",
+    "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />",
+    "comments": "",
+    "x": 3476.333251953125,
+    "y": 2639,
+    "z": "afa42c56.2fe06",
+    "wires": []
   }
 ]