SDWAN flow based end-end test and issue fix
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
index a0a0fa2..ad15140 100644 (file)
@@ -1,20 +1,20 @@
 [
   {
-    "id": "b5ebbde.e59a04",
+    "id": "acaf9f12.dd321",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 109,
-    "y": 43,
-    "z": "33eaf422.44290c",
+    "x": 119.00390625,
+    "y": 52.00390625,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "a87f9663.877998"
+        "9e7830e2.084e3"
       ]
     ]
   },
   {
-    "id": "a87f9663.877998",
+    "id": "9e7830e2.084e3",
     "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": 225.2856903076172,
-    "y": 94.23810768127441,
-    "z": "33eaf422.44290c",
+    "x": 235.2895965576172,
+    "y": 103.24201393127441,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "8c1b6d3.067719"
+        "b00ec17b.44975"
       ]
     ]
   },
   {
-    "id": "8c1b6d3.067719",
+    "id": "b00ec17b.44975",
     "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": 228.42861938476562,
-    "y": 179.00003147125244,
-    "z": "33eaf422.44290c",
+    "x": 238.43252563476562,
+    "y": 188.00393772125244,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3cd9be6d.873c82"
+        "2452d404.5dd7bc"
       ]
     ]
   },
   {
-    "id": "3cd9be6d.873c82",
+    "id": "2452d404.5dd7bc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 160.66668701171875,
-    "y": 287.66673278808594,
-    "z": "33eaf422.44290c",
+    "x": 170.67059326171875,
+    "y": 296.67063903808594,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2d7b33ef.a2d9ac",
-        "383a5f3d.e4cb2",
-        "70ceaafc.e0d3f4",
-        "c880f4e9.6d6098"
+        "74620ff1.b94be",
+        "e68f1fae.052f",
+        "18ea4160.5b97af",
+        "84666856.592818",
+        "f80aa612.1d1cd8"
       ]
     ]
   },
   {
-    "id": "2d7b33ef.a2d9ac",
+    "id": "74620ff1.b94be",
     "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": 598.0004119873047,
-    "y": 398.66683769226074,
-    "z": "33eaf422.44290c",
+    "x": 605.004337310791,
+    "y": 435.6707601547241,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "e9598182.81589"
+        "89904125.f9c2d"
       ]
     ]
   },
   {
-    "id": "be430b5e.14a828",
+    "id": "f587f945.9668c8",
     "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": 1385.0013427734375,
-    "y": 115.96877861022949,
-    "z": "33eaf422.44290c",
+    "x": 1395.0052490234375,
+    "y": 124.97268486022949,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "423b3b97.a50914",
+    "id": "7103c5d5.4c730c",
     "type": "comment",
     "name": "Query MDSAL for AR",
     "info": "",
     "comments": "",
-    "x": 1710.3340148925781,
-    "y": 139.96864795684814,
-    "z": "33eaf422.44290c",
+    "x": 1720.3379211425781,
+    "y": 148.97255420684814,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "dab21607.3703b8",
+    "id": "95a2de04.a237b",
     "type": "comment",
     "name": "Query MDSAL to get parent service based on service instance id from AR",
     "info": "",
     "comments": "",
-    "x": 2180.334873199463,
-    "y": 158.96862697601318,
-    "z": "33eaf422.44290c",
+    "x": 2190.338779449463,
+    "y": 167.97253322601318,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "90cd3398.44586",
+    "id": "4d085fb4.7bdbe",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1959.66841506958,
-    "y": 194.63526725769043,
-    "z": "33eaf422.44290c",
+    "x": 1969.67232131958,
+    "y": 203.63917350769043,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "1d70b537.cd409b"
+        "6619fa96.9e1c44"
       ]
     ]
   },
   {
-    "id": "1d70b537.cd409b",
+    "id": "6619fa96.9e1c44",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2114.668254852295,
-    "y": 194.13510036468506,
-    "z": "33eaf422.44290c",
+    "x": 2124.672161102295,
+    "y": 203.13900661468506,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "d282839d.a628"
+        "65302594.0054ec"
       ]
     ]
   },
   {
-    "id": "bce07922.8c4f98",
+    "id": "33787bc7.0b4834",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2438.3587913513184,
-    "y": 190.75424098968506,
-    "z": "33eaf422.44290c",
+    "x": 2448.3626976013184,
+    "y": 199.75814723968506,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3b07cad3.619296"
+        "545b3871.7610f8"
       ]
     ]
   },
   {
-    "id": "ee52805a.8bd8",
+    "id": "17a34962.7bafd7",
     "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": 2584.1275672912598,
-    "y": 230.20122909545898,
-    "z": "33eaf422.44290c",
+    "x": 2594.1314735412598,
+    "y": 239.20513534545898,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "259f1fc9.28f91",
+    "id": "60f770e5.3c645",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1952.5201416015625,
-    "y": 241.70127391815186,
-    "z": "33eaf422.44290c",
+    "x": 1962.5240478515625,
+    "y": 250.70518016815186,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "b7b7bf01.123cf"
+        "a69f2107.3bfff"
       ]
     ]
   },
   {
-    "id": "b7b7bf01.123cf",
+    "id": "a69f2107.3bfff",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2102.5199851989746,
-    "y": 242.36782932281494,
-    "z": "33eaf422.44290c",
+    "x": 2112.5238914489746,
+    "y": 251.37173557281494,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "7cd11e1b.bfaf1"
+        "48f1dbd9.82eaf4"
       ]
     ]
   },
   {
-    "id": "7c51c058.0306e",
+    "id": "3677d240.46bcee",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2426.6867446899414,
-    "y": 228.03460121154785,
-    "z": "33eaf422.44290c",
+    "x": 2436.6906509399414,
+    "y": 237.03850746154785,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "ee52805a.8bd8"
+        "17a34962.7bafd7"
       ]
     ]
   },
   {
-    "id": "d282839d.a628",
+    "id": "65302594.0054ec",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2278.668430328369,
-    "y": 194.6352834701538,
-    "z": "33eaf422.44290c",
+    "x": 2288.672336578369,
+    "y": 203.6391897201538,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "bce07922.8c4f98",
-        "7c51c058.0306e"
+        "33787bc7.0b4834",
+        "3677d240.46bcee"
       ]
     ]
   },
   {
-    "id": "91cc0551.bc01e8",
+    "id": "f2c93863.974c98",
     "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": 2834.0020294189453,
-    "y": 191.63526439666748,
-    "z": "33eaf422.44290c",
+    "x": 2844.0059356689453,
+    "y": 200.63917064666748,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "3b07cad3.619296",
+    "id": "545b3871.7610f8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2588.4778213500977,
-    "y": 190.80180072784424,
-    "z": "33eaf422.44290c",
+    "x": 2598.4817276000977,
+    "y": 199.80570697784424,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "91cc0551.bc01e8",
-        "dc60366a.2e9048"
+        "f2c93863.974c98",
+        "c4ef0618.a01ef8"
       ]
     ]
   },
   {
-    "id": "7cd11e1b.bfaf1",
+    "id": "48f1dbd9.82eaf4",
     "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": 2270.001438140869,
-    "y": 240.63520526885986,
-    "z": "33eaf422.44290c",
+    "x": 2280.005344390869,
+    "y": 249.63911151885986,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "dab3ccab.cce12",
+    "id": "3af4c28.a27653e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2057.303554534912,
-    "y": 512.7709312438965,
-    "z": "33eaf422.44290c",
+    "x": 2067.307460784912,
+    "y": 521.7748374938965,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "d5fc5211.c019"
+        "29090a88.41c1f6"
       ]
     ]
   },
   {
-    "id": "4c1ffccd.7a1ed4",
+    "id": "b8d8640d.13eac8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2049.15535736084,
-    "y": 547.8370161056519,
-    "z": "33eaf422.44290c",
+    "x": 2059.15926361084,
+    "y": 556.8409223556519,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "4fdb783b.5926a8"
+        "bda3efcf.89dfe"
       ]
     ]
   },
   {
-    "id": "4fdb783b.5926a8",
+    "id": "bda3efcf.89dfe",
     "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": 2195.304130554199,
-    "y": 548.1045122146606,
-    "z": "33eaf422.44290c",
+    "x": 2205.308036804199,
+    "y": 557.1084184646606,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "d5fc5211.c019",
+    "id": "29090a88.41c1f6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2177.3038024902344,
-    "y": 512.771014213562,
-    "z": "33eaf422.44290c",
+    "x": 2187.3077087402344,
+    "y": 521.774920463562,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "c5126628.a1afc8",
+    "id": "c548252d.342ee8",
     "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": 1740.6683502197266,
-    "y": 612.3028893470764,
-    "z": "33eaf422.44290c",
+    "x": 1750.6722564697266,
+    "y": 621.3067955970764,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "84a7b7df.1615b8"
+        "e621a712.c02488"
       ]
     ]
   },
   {
-    "id": "c8ac708.b0a709",
+    "id": "4d2b2a60.5a15c4",
     "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": 2277.3349990844727,
-    "y": 583.3028283119202,
-    "z": "33eaf422.44290c",
+    "x": 2280.3388900756836,
+    "y": 590.3067970275879,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "af2e2a1f.e9aba8"
+        "eff7a2d.680436"
       ]
     ]
   },
   {
-    "id": "af2e2a1f.e9aba8",
+    "id": "eff7a2d.680436",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2522.334518432617,
-    "y": 582.3028283119202,
-    "z": "33eaf422.44290c",
+    "x": 2532.338424682617,
+    "y": 591.3067345619202,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "64a2447b.58478c"
+        "b41985de.5559e8"
       ]
     ]
   },
   {
-    "id": "64a2447b.58478c",
+    "id": "b41985de.5559e8",
     "type": "set",
     "name": "set tmp.pnidx ",
     "xml": "<set>\n<parameter name='tmp.pnidx' value='`$pnidx`' />\n\n",
     "comments": "",
-    "x": 2678.3342056274414,
-    "y": 582.3028283119202,
-    "z": "33eaf422.44290c",
+    "x": 2688.3381118774414,
+    "y": 591.3067345619202,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "cf236aa.4478b98",
+    "id": "2eff9ba0.ecf354",
     "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": 1746.3349304199219,
-    "y": 662.3024039268494,
-    "z": "33eaf422.44290c",
+    "x": 1682.3390655517578,
+    "y": 706.3064250946045,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "8e2c0789.42db78"
+        "f3cef2f6.2a146"
       ]
     ]
   },
   {
-    "id": "5a69b1be.1055d",
+    "id": "482a4c29.31cfa4",
     "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": 2178.335252761841,
-    "y": 660.3024020195007,
-    "z": "33eaf422.44290c",
+    "x": 2134.339157104492,
+    "y": 685.3063306808472,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "333e463b.eac74a"
+        "65d66991.892e68"
       ]
     ]
   },
   {
-    "id": "333e463b.eac74a",
+    "id": "65d66991.892e68",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2329.3352642059326,
-    "y": 658.3024439811707,
-    "z": "33eaf422.44290c",
+    "x": 2285.339168548584,
+    "y": 683.3063726425171,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3622de43.1881c2"
+        "1a0e340c.b9591c"
       ]
     ]
   },
   {
-    "id": "3622de43.1881c2",
+    "id": "1a0e340c.b9591c",
     "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": 2470.3349933624268,
-    "y": 657.9023776054382,
-    "z": "33eaf422.44290c",
+    "x": 2426.338897705078,
+    "y": 682.9063062667847,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "b9ac21ad.456c9",
+    "id": "8b82943e.e37978",
     "type": "switchNode",
     "name": "switch tmp.pnidx ",
     "xml": "<switch test=\"`$tmp.pnidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2184.3346939086914,
-    "y": 622.9690413475037,
-    "z": "33eaf422.44290c",
+    "x": 1653.338882446289,
+    "y": 665.9729976654053,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "14fa21e1.174cde"
+        "6c46e25f.8ffa9c"
       ]
     ]
   },
   {
-    "id": "14fa21e1.174cde",
+    "id": "6c46e25f.8ffa9c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2331.7633361816406,
-    "y": 622.5404515266418,
-    "z": "33eaf422.44290c",
+    "x": 1808.7675552368164,
+    "y": 664.5443773269653,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "aa33b299.d2b4d"
+        "7abaa33.8b7355c"
       ]
     ]
   },
   {
-    "id": "aa33b299.d2b4d",
+    "id": "7abaa33.8b7355c",
     "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": 2475.1921920776367,
-    "y": 622.6835255622864,
-    "z": "33eaf422.44290c",
+    "x": 1949.1961784362793,
+    "y": 665.6874666213989,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "f19570ac.55187",
+    "id": "f3550d2c.724f9",
     "type": "switchNode",
     "name": "switch topology hub-spoke",
     "xml": "<switch test=\"`$prop.topology == 'hub-spoke'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1551.3348426818848,
-    "y": 759.3023405075073,
-    "z": "33eaf422.44290c",
+    "x": 1561.3387489318848,
+    "y": 768.3062467575073,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "aa80dabf.aca3c8",
-        "4031750f.9789cc"
+        "ab080c7a.92d5",
+        "3d04ef10.4ea32"
       ]
     ]
   },
   {
-    "id": "aa80dabf.aca3c8",
+    "id": "ab080c7a.92d5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1741.334529876709,
-    "y": 784.3028259277344,
-    "z": "33eaf422.44290c",
+    "x": 1751.338436126709,
+    "y": 793.3067321777344,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "768ac816.c95648"
+        "8abbeb7b.b004e8"
       ]
     ]
   },
   {
-    "id": "4031750f.9789cc",
+    "id": "3d04ef10.4ea32",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1742.3353233337402,
-    "y": 712.3024568557739,
-    "z": "33eaf422.44290c",
+    "x": 1745.3393630981445,
+    "y": 754.3063945770264,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "bcb708b4.4756f8"
+        "86771426.4b32c8"
       ]
     ]
   },
   {
-    "id": "bcb708b4.4756f8",
+    "id": "86771426.4b32c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1872.3353271484375,
-    "y": 711.3024568557739,
-    "z": "33eaf422.44290c",
+    "x": 1881.3393669128418,
+    "y": 754.3063335418701,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "768ac816.c95648",
+    "id": "8abbeb7b.b004e8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1746.66748046875,
-    "y": 852.3020601272583,
-    "z": "33eaf422.44290c",
+    "x": 1756.67138671875,
+    "y": 861.3059663772583,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "37a8a2fc.2a711e"
+        "aa63c4ce.dcdf88"
       ]
     ]
   },
   {
-    "id": "37a8a2fc.2a711e",
+    "id": "aa63c4ce.dcdf88",
     "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": 2154.000732421875,
-    "y": 852.6356782913208,
-    "z": "33eaf422.44290c",
+    "x": 2164.004638671875,
+    "y": 861.6395845413208,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2c05f76b.7d8c98"
+        "db34806a.eb197"
       ]
     ]
   },
   {
-    "id": "27aa5d13.3e58c2",
+    "id": "a12ec2fd.fe008",
     "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": 2245.0018463134766,
-    "y": 930.6359763145447,
-    "z": "33eaf422.44290c",
+    "x": 2255.0057525634766,
+    "y": 939.6398825645447,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "2e8e3485.54a23c",
+    "id": "48c0bc5c.016e84",
     "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": 2263.0025482177734,
-    "y": 1041.302767753601,
-    "z": "33eaf422.44290c",
+    "x": 2273.0064544677734,
+    "y": 1050.306674003601,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "1e03ba47.0fb3f6"
+        "6e2c1efa.030fd"
       ]
     ]
   },
   {
-    "id": "a525e63a.cc2b38",
+    "id": "d87f1462.94a148",
     "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": 2672.002658843994,
-    "y": 1044.3028545379639,
-    "z": "33eaf422.44290c",
+    "x": 2682.006565093994,
+    "y": 1053.3067607879639,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3f99d6d3.e0611a"
+        "8902bff0.b993a"
       ]
     ]
   },
   {
-    "id": "3f99d6d3.e0611a",
+    "id": "8902bff0.b993a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2813.0029907226562,
-    "y": 1043.3028535842896,
-    "z": "33eaf422.44290c",
+    "x": 2823.0068969726562,
+    "y": 1052.3067598342896,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "7bec0d2f.0381d4"
+        "d0dace3e.a4044"
       ]
     ]
   },
   {
-    "id": "7bec0d2f.0381d4",
+    "id": "d0dace3e.a4044",
     "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": 2954.0030250549316,
-    "y": 1044.9027452468872,
-    "z": "33eaf422.44290c",
+    "x": 2964.0069313049316,
+    "y": 1053.9066514968872,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "8fa9655b.7c6ef8",
+    "id": "a56e979.94c4668",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2749.0020446777344,
-    "y": 947.969269990921,
-    "z": "33eaf422.44290c",
+    "x": 2759.0059509277344,
+    "y": 956.973176240921,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "788b9cb8.8b37d4"
+        "5e3a3525.ed601c"
       ]
     ]
   },
   {
-    "id": "3a2551b1.4f0ace",
+    "id": "36ee87ff.edcc88",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2745.8537673950195,
-    "y": 1002.0353531837463,
-    "z": "33eaf422.44290c",
+    "x": 2755.8576736450195,
+    "y": 1011.0392594337463,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "5672e76f.825118"
+        "61955a75.34d004"
       ]
     ]
   },
   {
-    "id": "5672e76f.825118",
-    "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": 2891.002540588379,
-    "y": 999.3028502464294,
-    "z": "33eaf422.44290c",
-    "wires": []
-  },
-  {
-    "id": "788b9cb8.8b37d4",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2877.0020484924316,
-    "y": 947.9692711830139,
-    "z": "33eaf422.44290c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f102bda6.18929",
+    "id": "1dae6147.4a990f",
     "type": "switchNode",
     "name": "switch role hub",
     "xml": "<switch test=\"`$prop.role == hub`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2129.3351821899414,
-    "y": 1106.6358079910278,
-    "z": "33eaf422.44290c",
+    "x": 2139.3390884399414,
+    "y": 1115.6397142410278,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "145fa94e.f27887",
-        "f3be5614.599b68"
+        "918c56f9.c83968",
+        "c6d12fe7.97792"
       ]
     ]
   },
   {
-    "id": "da4408c3.f5c0d8",
+    "id": "f44852b5.87cbc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2445.3345680236816,
-    "y": 1082.6354112625122,
-    "z": "33eaf422.44290c",
+    "x": 2455.3384742736816,
+    "y": 1091.6393175125122,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "77da5adf.834034",
+    "id": "b92c0442.b0f838",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2855.3042030334473,
-    "y": 1178.1045179367065,
-    "z": "33eaf422.44290c",
+    "x": 2865.3081092834473,
+    "y": 1187.1084241867065,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "8a4c0c4d.62361"
+        "c83cb2fc.e107f"
       ]
     ]
   },
   {
-    "id": "8429ea0a.844dc8",
+    "id": "3638a6d7.49015a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2857.155773162842,
-    "y": 1238.170599937439,
-    "z": "33eaf422.44290c",
+    "x": 2867.159679412842,
+    "y": 1247.174506187439,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "e9382022.a0267"
+        "7e0afffe.3838d"
       ]
     ]
   },
   {
-    "id": "e9382022.a0267",
+    "id": "7e0afffe.3838d",
     "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": 3001.304546356201,
-    "y": 1200.4380140304565,
-    "z": "33eaf422.44290c",
+    "x": 3011.308452606201,
+    "y": 1209.4419202804565,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "8a4c0c4d.62361",
+    "id": "c83cb2fc.e107f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2985.3042221069336,
-    "y": 1167.1046781539917,
-    "z": "33eaf422.44290c",
+    "x": 2995.3081283569336,
+    "y": 1176.1085844039917,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "cf6c45e0.a382b8",
+    "id": "f6606352.8ce6f",
     "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": 2457.3356018066406,
-    "y": 1166.6360107660294,
-    "z": "33eaf422.44290c",
+    "x": 2467.3395080566406,
+    "y": 1175.6399170160294,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "57a73c1e.aeb484",
+    "id": "5ea29b9f.be4264",
     "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": 2501.0020751953125,
-    "y": 1288.6358003616333,
-    "z": "33eaf422.44290c",
+    "x": 2511.0059814453125,
+    "y": 1297.6397066116333,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "c345e276.9551d"
+        "4d51cabb.29bdd4"
       ]
     ]
   },
   {
-    "id": "c345e276.9551d",
+    "id": "4d51cabb.29bdd4",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2847.6683959960938,
-    "y": 1278.6357765197754,
-    "z": "33eaf422.44290c",
+    "x": 2857.6723022460938,
+    "y": 1287.6396827697754,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "568b8936.7e3108",
-        "39f7ac2d.b359d4",
-        "5ab57864.07d758"
+        "d3ef4c0.e5881b8",
+        "6e60b7ca.332018",
+        "a1284f22.c1dd1"
       ]
     ]
   },
   {
-    "id": "568b8936.7e3108",
+    "id": "d3ef4c0.e5881b8",
     "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": 3105.6684799194336,
-    "y": 1233.636646270752,
-    "z": "33eaf422.44290c",
+    "x": 3119.672410964966,
+    "y": 1258.6406421661377,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "61fa4242.861d3c"
+        "bf3a29ae.d2e8a8"
       ]
     ]
   },
   {
-    "id": "cb874e53.482c8",
+    "id": "5fa744b7.80a78c",
     "type": "switchNode",
     "name": "switch tmp.portvidx ",
     "xml": "<switch test=\"`$tmp.portvidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2582.668212890625,
-    "y": 1333.3024454116821,
-    "z": "33eaf422.44290c",
+    "x": 2592.672119140625,
+    "y": 1342.3063516616821,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "6aed06ab.403dd8"
+        "72b9c858.12ec88"
       ]
     ]
   },
   {
-    "id": "815939d8.db2788",
+    "id": "15f5118.456cfef",
     "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": 2507.6688232421875,
-    "y": 1488.6367044448853,
-    "z": "33eaf422.44290c",
+    "x": 2517.6727294921875,
+    "y": 1497.6406106948853,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "233ccbaa.09c2a4"
+        "b2e9e931.6800c8"
       ]
     ]
   },
   {
-    "id": "6aed06ab.403dd8",
+    "id": "72b9c858.12ec88",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2743.0966777801514,
-    "y": 1332.8739652633667,
-    "z": "33eaf422.44290c",
+    "x": 2753.1005840301514,
+    "y": 1341.8778715133667,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "ed789211.6aa24"
+        "f81f5327.8ee49"
       ]
     ]
   },
   {
-    "id": "ed789211.6aa24",
+    "id": "f81f5327.8ee49",
     "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": 2880.525634765625,
-    "y": 1333.0173768997192,
-    "z": "33eaf422.44290c",
+    "x": 2890.529541015625,
+    "y": 1342.0212831497192,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "61fa4242.861d3c",
+    "id": "bf3a29ae.d2e8a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3333.668167114258,
-    "y": 1231.6366472244263,
-    "z": "33eaf422.44290c",
+    "x": 3347.67209815979,
+    "y": 1256.640643119812,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "8dcdd808.562708"
+        "2e9dbb2.cfc4c44"
       ]
     ]
   },
   {
-    "id": "233ccbaa.09c2a4",
+    "id": "b2e9e931.6800c8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2850.669807434082,
-    "y": 1491.6369543075562,
-    "z": "33eaf422.44290c",
+    "x": 2860.673713684082,
+    "y": 1500.6408605575562,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "a50a8ecc.70146",
-        "c6553e69.23e06",
-        "a6ca66b6.132b88",
-        "f8ad0824.756498"
+        "948d8437.e73248",
+        "89e2b91a.b2d6b8",
+        "18165b60.a7ba85",
+        "ccf6624c.26897"
       ]
     ]
   },
   {
-    "id": "a50a8ecc.70146",
+    "id": "948d8437.e73248",
     "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": 3145.670757293701,
-    "y": 1430.6374912261963,
-    "z": "33eaf422.44290c",
+    "x": 3155.674663543701,
+    "y": 1439.6413974761963,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "1b0657c2.3d75f8"
+        "cfc84538.b28318"
       ]
     ]
   },
   {
-    "id": "8dcdd808.562708",
+    "id": "2e9dbb2.cfc4c44",
     "type": "set",
     "name": "set tmp.portvidx ",
     "xml": "<set>\n<parameter name='tmp.portvidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3488.6678504943848,
-    "y": 1231.636646270752,
-    "z": "33eaf422.44290c",
+    "x": 3502.671781539917,
+    "y": 1256.6406421661377,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "1b0657c2.3d75f8",
+    "id": "cfc84538.b28318",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3338.6707725524902,
-    "y": 1430.63765335083,
-    "z": "33eaf422.44290c",
+    "x": 3348.6746788024902,
+    "y": 1439.64155960083,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "b34f100.12863f"
+        "cb06aff7.fe992"
       ]
     ]
   },
   {
-    "id": "b34f100.12863f",
+    "id": "cb06aff7.fe992",
     "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": 3556.6707801818848,
-    "y": 1429.23823928833,
-    "z": "33eaf422.44290c",
+    "x": 3566.6746864318848,
+    "y": 1438.24214553833,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "c6553e69.23e06",
+    "id": "89e2b91a.b2d6b8",
     "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": 3107.003490447998,
-    "y": 1464.6371002197266,
-    "z": "33eaf422.44290c",
+    "x": 3117.007396697998,
+    "y": 1473.6410064697266,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2bec9518.ec7c8a"
+        "c1169dfe.4c65a"
       ]
     ]
   },
   {
-    "id": "2bec9518.ec7c8a",
+    "id": "c1169dfe.4c65a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3268.003818511963,
-    "y": 1465.6371803283691,
-    "z": "33eaf422.44290c",
+    "x": 3278.007724761963,
+    "y": 1474.6410865783691,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "37425798.ff2018"
+        "6fd3807f.bc967"
       ]
     ]
   },
   {
-    "id": "37425798.ff2018",
+    "id": "6fd3807f.bc967",
     "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": 3458.004280090332,
-    "y": 1465.2374563217163,
-    "z": "33eaf422.44290c",
+    "x": 3468.008186340332,
+    "y": 1474.2413625717163,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "d298818e.120b",
+    "id": "2d5b2f06.016de",
     "type": "switchNode",
     "name": "switch  prop.hub.transportNetworkName==prop.spoke.transportNetworkName",
     "xml": "<switch test=\"`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2585.004150390625,
-    "y": 1591.304440498352,
-    "z": "33eaf422.44290c",
+    "x": 2595.008056640625,
+    "y": 1600.308346748352,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "7a56c9bb.004ba8",
-        "6f7c3402.62f4ac"
+        "336fdae9.175cb6",
+        "1f1ba045.97a09"
       ]
     ]
   },
   {
-    "id": "7a56c9bb.004ba8",
+    "id": "336fdae9.175cb6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2931.0036811828613,
-    "y": 1628.3045144081116,
-    "z": "33eaf422.44290c",
+    "x": 2941.0075874328613,
+    "y": 1637.3084206581116,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3d53e5a5.8f912a"
+        "4f105ce1.5af714"
       ]
     ]
   },
   {
-    "id": "6f7c3402.62f4ac",
+    "id": "1f1ba045.97a09",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2935.0041694641113,
-    "y": 1563.3041467666626,
-    "z": "33eaf422.44290c",
+    "x": 2945.0080757141113,
+    "y": 1572.3080530166626,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "67b638dd.ee4608"
+        "5909586.22baea8"
       ]
     ]
   },
   {
-    "id": "67b638dd.ee4608",
+    "id": "5909586.22baea8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3075.0040969848633,
-    "y": 1591.304271697998,
-    "z": "33eaf422.44290c",
+    "x": 3085.0080032348633,
+    "y": 1600.308177947998,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "2c05f76b.7d8c98",
+    "id": "db34806a.eb197",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1896.0322265625,
-    "y": 961.8333101272583,
-    "z": "33eaf422.44290c",
+    "x": 1906.0361328125,
+    "y": 970.8372163772583,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "27aa5d13.3e58c2",
-        "2e8e3485.54a23c",
-        "f102bda6.18929",
-        "74cd5045.40831",
-        "447d9e5f.d5a82"
+        "a12ec2fd.fe008",
+        "7504b3dc.db15fc",
+        "28b961ad.bfb2de",
+        "1dae6147.4a990f",
+        "48c0bc5c.016e84"
       ]
     ]
   },
   {
-    "id": "e66f705e.b1887",
+    "id": "3b80b5a9.9770ba",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 2168.001268386841,
-    "y": 704.6354126930237,
-    "z": "33eaf422.44290c",
+    "x": 2124.005172729492,
+    "y": 729.6393413543701,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3f0e1104.f843be"
+        "c6514d30.77c24"
       ]
     ]
   },
   {
-    "id": "3f0e1104.f843be",
+    "id": "c6514d30.77c24",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2312.0012798309326,
-    "y": 704.6354537010193,
-    "z": "33eaf422.44290c",
+    "x": 2268.005184173584,
+    "y": 729.6393823623657,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "ca8d4515.16e2d8"
+        "777a9029.320d4"
       ]
     ]
   },
   {
-    "id": "ca8d4515.16e2d8",
+    "id": "777a9029.320d4",
     "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": 2470.001001358032,
-    "y": 703.2353882789612,
-    "z": "33eaf422.44290c",
+    "x": 2426.0049057006836,
+    "y": 728.2393169403076,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "49f7ab80.b2f444",
+    "id": "772df895.4e43b8",
     "type": "set",
     "name": "Set prop.hubTnpId",
     "xml": "<set>\n<parameter name='prop.hubTnpId' value='$prop.hub.wanPortId' />\n\n",
     "comments": "",
-    "x": 2622.336555480957,
-    "y": 1717.6363048553467,
-    "z": "33eaf422.44290c",
+    "x": 2632.340461730957,
+    "y": 1726.6402111053467,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "e429ce4e.ff4d3",
+    "id": "32021f5a.688fc",
     "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": 3483.335531234741,
-    "y": 2176.970527648926,
-    "z": "33eaf422.44290c",
+    "x": 3461.3399982452393,
+    "y": 2412.9747483730316,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "ec4a9fe3.5d773",
-        "c11c5434.daa9b8"
+        "dd81b865.bfe928",
+        "b6ee17f7.b3f2b8"
       ]
     ]
   },
   {
-    "id": "c11c5434.daa9b8",
+    "id": "b6ee17f7.b3f2b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3730.3355026245117,
-    "y": 2161.970682144165,
-    "z": "33eaf422.44290c",
+    "x": 3728.339906692505,
+    "y": 2440.9747779369354,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "ec4a9fe3.5d773",
+    "id": "dd81b865.bfe928",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728.3351821899414,
-    "y": 2117.970672607422,
-    "z": "33eaf422.44290c",
+    "x": 3726.3395862579346,
+    "y": 2396.9747684001923,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "dfdd1a66.f211b8"
+        "5f5cdc8d.3e29c4"
       ]
     ]
   },
   {
-    "id": "dfdd1a66.f211b8",
+    "id": "5f5cdc8d.3e29c4",
     "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": 3870.335868835449,
-    "y": 2115.9707555770874,
-    "z": "33eaf422.44290c",
+    "x": 3868.3402729034424,
+    "y": 2394.974851369858,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "f88633ef.4a895",
+    "id": "ae46a29e.f97e3",
     "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",
+    "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": 3414.669235229492,
-    "y": 2140.6372261047363,
-    "z": "33eaf422.44290c",
+    "x": 3405.6733779907227,
+    "y": 2369.6412563323975,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "9c47cd10.cba71",
+    "id": "6c422db5.5ce744",
     "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": 3489.669235229492,
-    "y": 2282.637691259384,
-    "z": "33eaf422.44290c",
+    "x": 3480.6733779907227,
+    "y": 2511.6417214870453,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "97c364c.1574998",
-        "46a68448.91960c"
+        "911061e0.d1dd4",
+        "f999921.375d37"
       ]
     ]
   },
   {
-    "id": "46a68448.91960c",
+    "id": "f999921.375d37",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3734.669120788574,
-    "y": 2261.6379222869873,
-    "z": "33eaf422.44290c",
+    "x": 3732.6735248565674,
+    "y": 2540.6420180797577,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "97c364c.1574998",
+    "id": "911061e0.d1dd4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3732.668800354004,
-    "y": 2217.637912750244,
-    "z": "33eaf422.44290c",
+    "x": 3730.673204421997,
+    "y": 2496.6420085430145,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "32d31d6b.e39f42"
+        "98292650.e96428"
       ]
     ]
   },
   {
-    "id": "32d31d6b.e39f42",
+    "id": "98292650.e96428",
     "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": 3874.6694869995117,
-    "y": 2215.6379957199097,
-    "z": "33eaf422.44290c",
+    "x": 3872.673891067505,
+    "y": 2494.64209151268,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "39f7ac2d.b359d4",
+    "id": "6e60b7ca.332018",
     "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": 3116.5320568084717,
-    "y": 1266.833604812622,
-    "z": "33eaf422.44290c",
+    "x": 3130.535987854004,
+    "y": 1291.8376007080078,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "f872eafd.ca0638"
+        "8aedc456.2f7ae8"
       ]
     ]
   },
   {
-    "id": "50e86192.f47ba",
+    "id": "ae09c3af.7e2b1",
     "type": "switchNode",
     "name": "switch tmp.devicevidx ",
     "xml": "<switch test=\"`$tmp.devicevidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2588.5316314697266,
-    "y": 1375.4999265670776,
-    "z": "33eaf422.44290c",
+    "x": 2598.5355377197266,
+    "y": 1384.5038328170776,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "e276c36a.0c845"
+        "250b22bf.a152be"
       ]
     ]
   },
   {
-    "id": "e276c36a.0c845",
+    "id": "250b22bf.a152be",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2754.9600677490234,
-    "y": 1375.0714597702026,
-    "z": "33eaf422.44290c",
+    "x": 2764.9639739990234,
+    "y": 1384.0753660202026,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "58c8206f.bb829"
+        "923c6659.234fb8"
       ]
     ]
   },
   {
-    "id": "58c8206f.bb829",
+    "id": "923c6659.234fb8",
     "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": 2895.388999938965,
-    "y": 1377.2144346237183,
-    "z": "33eaf422.44290c",
+    "x": 2905.392906188965,
+    "y": 1386.2183408737183,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "f872eafd.ca0638",
+    "id": "8aedc456.2f7ae8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3344.531744003296,
-    "y": 1264.8336057662964,
-    "z": "33eaf422.44290c",
+    "x": 3358.535675048828,
+    "y": 1289.8376016616821,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "9b7f11e8.f156f"
+        "bd37a285.897b2"
       ]
     ]
   },
   {
-    "id": "9b7f11e8.f156f",
+    "id": "bd37a285.897b2",
     "type": "set",
     "name": "set tmp.devicevidx ",
     "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3499.531427383423,
-    "y": 1264.833604812622,
-    "z": "33eaf422.44290c",
+    "x": 3513.535358428955,
+    "y": 1289.8376007080078,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "5ab57864.07d758",
+    "id": "a1284f22.c1dd1",
     "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": 3079.532127380371,
-    "y": 1300.8336687088013,
-    "z": "33eaf422.44290c",
+    "x": 3093.5360584259033,
+    "y": 1325.837664604187,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "c3a08b58.d519a8"
+        "b05e575a.27f578"
       ]
     ]
   },
   {
-    "id": "971c87ae.5fde98",
+    "id": "3739eed6.72baf2",
     "type": "switchNode",
     "name": "switch tmp.sitevidx ",
     "xml": "<switch test=\"`$tmp.sitevidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2587.5315017700195,
-    "y": 1413.4998044967651,
-    "z": "33eaf422.44290c",
+    "x": 2597.5354080200195,
+    "y": 1422.5037107467651,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "9fcf4fcb.f5c0f"
+        "3396efac.e6fa3"
       ]
     ]
   },
   {
-    "id": "9fcf4fcb.f5c0f",
+    "id": "3396efac.e6fa3",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2747.959966659546,
-    "y": 1413.0713243484497,
-    "z": "33eaf422.44290c",
+    "x": 2757.963872909546,
+    "y": 1422.0752305984497,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2e7d1637.59ed7a"
+        "35fde04d.b7b7a"
       ]
     ]
   },
   {
-    "id": "2e7d1637.59ed7a",
+    "id": "35fde04d.b7b7a",
     "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": 2896.388921737671,
-    "y": 1415.2143306732178,
-    "z": "33eaf422.44290c",
+    "x": 2906.392827987671,
+    "y": 1424.2182369232178,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "c3a08b58.d519a8",
+    "id": "b05e575a.27f578",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3267.531692504883,
-    "y": 1300.8338346481323,
-    "z": "33eaf422.44290c",
+    "x": 3281.535623550415,
+    "y": 1325.837830543518,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "90c635f1.794b58"
+        "18980fd.036c1f"
       ]
     ]
   },
   {
-    "id": "90c635f1.794b58",
+    "id": "18980fd.036c1f",
     "type": "set",
     "name": "set tmp.sitevidx ",
     "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3422.5313758850098,
-    "y": 1300.833833694458,
-    "z": "33eaf422.44290c",
+    "x": 3436.535306930542,
+    "y": 1325.8378295898438,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "d7805819.9cd108",
+    "id": "5b475dee.c12664",
     "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": 2719.5331497192383,
-    "y": 1753.834059715271,
-    "z": "33eaf422.44290c",
+    "x": 2729.5370559692383,
+    "y": 1762.837965965271,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "82cf7632.68ed28"
+        "42885256.de226c"
       ]
     ]
   },
   {
-    "id": "2060fdef.b0b7d2",
+    "id": "a3360f10.ddde5",
     "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": 3180.5345039367676,
-    "y": 1667.834927558899,
-    "z": "33eaf422.44290c",
+    "x": 3190.5384101867676,
+    "y": 1676.838833808899,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2cf983c4.8e5dac"
+        "ecee3f37.bc6a5"
       ]
     ]
   },
   {
-    "id": "2cf983c4.8e5dac",
+    "id": "ecee3f37.bc6a5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3331.5348777770996,
-    "y": 1664.835171699524,
-    "z": "33eaf422.44290c",
+    "x": 3341.5387840270996,
+    "y": 1673.839077949524,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "234f9431.3dcaac"
+        "1f5be2a4.d6905d"
       ]
     ]
   },
   {
-    "id": "234f9431.3dcaac",
+    "id": "1f5be2a4.d6905d",
     "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": 3506.535125732422,
-    "y": 1664.4356966018677,
-    "z": "33eaf422.44290c",
+    "x": 3516.539031982422,
+    "y": 1673.4396028518677,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "4ed5eacf.f6a1c4",
+    "id": "4b7a9b51.8c06a4",
     "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": 2694.0330352783203,
-    "y": 1810.83407497406,
-    "z": "33eaf422.44290c",
-    "wires": [
-      [
-        "c6190b7b.0c6f78"
-      ]
-    ]
-  },
-  {
-    "id": "c9e1f848.8aa118",
-    "type": "switchNode",
-    "name": "switch spokeRouteId",
-    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'spokeRouteId'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3160.034511566162,
-    "y": 1822.8348779678345,
-    "z": "33eaf422.44290c",
-    "wires": [
-      [
-        "480353b6.36bf3c"
-      ]
-    ]
-  },
-  {
-    "id": "480353b6.36bf3c",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3323.035057067871,
-    "y": 1820.8351745605469,
-    "z": "33eaf422.44290c",
+    "x": 2704.0369415283203,
+    "y": 1819.83798122406,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "7e8ff406.9f32cc"
+        "48cb425f.55b89c"
       ]
     ]
   },
   {
-    "id": "7e8ff406.9f32cc",
-    "type": "set",
-    "name": "set prop.spokeRouteId",
-    "xml": "<set>\n<parameter name='prop.spokeRouteId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n",
-    "comments": "",
-    "x": 3492.0350646972656,
-    "y": 1820.4357604980469,
-    "z": "33eaf422.44290c",
-    "wires": []
-  },
-  {
-    "id": "4f4875cc.67999c",
+    "id": "d000ff03.568cc",
     "type": "comment",
     "name": "Add route src->dst, dst->src",
     "info": "",
     "comments": "",
-    "x": 2910.6687927246094,
-    "y": 1858.6359510421753,
-    "z": "33eaf422.44290c",
+    "x": 2920.6726989746094,
+    "y": 1867.6398572921753,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "2f1d0b59.a2f164",
+    "id": "29f55e34.5e8332",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2132.334228515625,
-    "y": 1238.968747138977,
-    "z": "33eaf422.44290c",
+    "x": 2142.338134765625,
+    "y": 1247.972653388977,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "57a73c1e.aeb484",
-        "815939d8.db2788",
-        "d298818e.120b",
-        "bc0801cd.444e3",
-        "cf6c45e0.a382b8",
-        "380e9d46.aac952",
-        "150f28bb.9cebb7"
+        "5ea29b9f.be4264",
+        "15f5118.456cfef",
+        "2d5b2f06.016de",
+        "e6f50ce2.c15fa",
+        "f6606352.8ce6f",
+        "ed12d667.ce10c8",
+        "bae059eb.7d03c8"
       ]
     ]
   },
   {
-    "id": "bc0801cd.444e3",
+    "id": "e6f50ce2.c15fa",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2387.333984375,
-    "y": 1375.3021211624146,
-    "z": "33eaf422.44290c",
+    "x": 2397.337890625,
+    "y": 1384.3060274124146,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "cb874e53.482c8",
-        "50e86192.f47ba",
-        "971c87ae.5fde98"
+        "5fa744b7.80a78c",
+        "ae09c3af.7e2b1",
+        "3739eed6.72baf2"
       ]
     ]
   },
   {
-    "id": "3d53e5a5.8f912a",
+    "id": "4f105ce1.5af714",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2381.3349609375,
-    "y": 1747.6356172561646,
-    "z": "33eaf422.44290c",
+    "x": 2417.3389282226562,
+    "y": 1756.639549255371,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "49f7ab80.b2f444",
-        "d7805819.9cd108",
-        "4ed5eacf.f6a1c4",
-        "927db1a6.0967b",
-        "9c607856.359088"
+        "772df895.4e43b8",
+        "5b475dee.c12664",
+        "4b7a9b51.8c06a4",
+        "4ae4f054.fa7eb"
       ]
     ]
   },
   {
-    "id": "a6ca66b6.132b88",
+    "id": "18165b60.a7ba85",
     "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": 3128.5319747924805,
-    "y": 1501.8334050178528,
-    "z": "33eaf422.44290c",
+    "x": 3138.5358810424805,
+    "y": 1510.8373112678528,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "22164d6f.99a622"
+        "547ceb11.0ca1f4"
       ]
     ]
   },
   {
-    "id": "22164d6f.99a622",
+    "id": "547ceb11.0ca1f4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3304.532958984375,
-    "y": 1501.8335275650024,
-    "z": "33eaf422.44290c",
+    "x": 3314.536865234375,
+    "y": 1510.8374338150024,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "46635360.d5dd9c"
+        "79cc0282.5e8e0c"
       ]
     ]
   },
   {
-    "id": "46635360.d5dd9c",
+    "id": "79cc0282.5e8e0c",
     "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": 3506.5329971313477,
-    "y": 1502.4334478378296,
-    "z": "33eaf422.44290c",
+    "x": 3516.5369033813477,
+    "y": 1511.4373540878296,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "f8ad0824.756498",
+    "id": "ccf6624c.26897",
     "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": 3101.0320568084717,
-    "y": 1539.333490371704,
-    "z": "33eaf422.44290c",
+    "x": 3111.0359630584717,
+    "y": 1548.337396621704,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "ae5c5a08.535ae8"
+        "11581651.226caa"
       ]
     ]
   },
   {
-    "id": "ae5c5a08.535ae8",
+    "id": "11581651.226caa",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3305.0329971313477,
-    "y": 1539.3334422111511,
-    "z": "33eaf422.44290c",
+    "x": 3315.0369033813477,
+    "y": 1548.3373484611511,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "a2ccd569.27b3a8"
+        "4b6a5df1.4c4ce4"
       ]
     ]
   },
   {
-    "id": "a2ccd569.27b3a8",
+    "id": "4b6a5df1.4c4ce4",
     "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": 3500.033000946045,
-    "y": 1538.9334177970886,
-    "z": "33eaf422.44290c",
+    "x": 3510.036907196045,
+    "y": 1547.9373240470886,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "7ec8de50.abc7a",
+    "id": "162bc63c.6a40ba",
     "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",
+    "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": 3424.533250808716,
-    "y": 2251.334452390671,
-    "z": "33eaf422.44290c",
+    "x": 3415.5373935699463,
+    "y": 2480.338482618332,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "383a5f3d.e4cb2",
+    "id": "e68f1fae.052f",
     "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": 357.3343048095703,
-    "y": 1113.3343391418457,
-    "z": "33eaf422.44290c",
+    "x": 367.3382110595703,
+    "y": 1122.3382453918457,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "66dd18ab.e48f08",
+    "id": "20ecb75b.a622b8",
     "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": 1406.6672058105469,
-    "y": 175.30183696746826,
-    "z": "33eaf422.44290c",
+    "x": 1416.6711120605469,
+    "y": 184.30574321746826,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "8e4434c9.93e608",
+    "id": "f4ac6977.3d92e8",
     "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": 1533.667236328125,
-    "y": 223.3018274307251,
-    "z": "33eaf422.44290c",
+    "x": 1543.671142578125,
+    "y": 232.3057336807251,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "90cd3398.44586",
-        "259f1fc9.28f91"
+        "4d085fb4.7bdbe",
+        "60f770e5.3c645"
       ]
     ]
   },
   {
-    "id": "b50f711c.f7671",
+    "id": "e17df7dc.7298b8",
     "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": 1759.0013122558594,
-    "y": 537.3021445274353,
-    "z": "33eaf422.44290c",
+    "x": 1768.0052947998047,
+    "y": 566.3060474395752,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "dab3ccab.cce12",
-        "4c1ffccd.7a1ed4"
+        "3af4c28.a27653e",
+        "b8d8640d.13eac8"
       ]
     ]
   },
   {
-    "id": "4176c827.c206f8",
+    "id": "496b2343.92811c",
     "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": 1735.0010375976562,
-    "y": 503.30206871032715,
-    "z": "33eaf422.44290c",
+    "x": 1745.0049438476562,
+    "y": 512.3059749603271,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "38bc1f98.0d705",
+    "id": "de20210d.6ba26",
     "type": "comment",
     "name": "full mesh do nothing",
     "info": "",
     "comments": "",
-    "x": 1569.667839050293,
-    "y": 714.3021068572998,
-    "z": "33eaf422.44290c",
+    "x": 1579.671745300293,
+    "y": 723.3060131072998,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "d2bafee.be2ed",
+    "id": "688e61c6.6ef82",
     "type": "comment",
     "name": "hub-spoke",
     "info": "",
     "comments": "",
-    "x": 2570.6672401428223,
-    "y": 811.3019967079163,
-    "z": "33eaf422.44290c",
+    "x": 2580.6711463928223,
+    "y": 820.3059029579163,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "74cd5045.40831",
+    "id": "7504b3dc.db15fc",
     "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": 2243.0003929138184,
-    "y": 962.3019919395447,
-    "z": "33eaf422.44290c",
+    "x": 2253.0042991638184,
+    "y": 971.3058981895447,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "447d9e5f.d5a82",
+    "id": "28b961ad.bfb2de",
     "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": 2374.000473022461,
-    "y": 1001.9686217308044,
-    "z": "33eaf422.44290c",
+    "x": 2384.004379272461,
+    "y": 1010.9725279808044,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "8fa9655b.7c6ef8",
-        "3a2551b1.4f0ace"
+        "a56e979.94c4668",
+        "36ee87ff.edcc88"
       ]
     ]
   },
   {
-    "id": "380e9d46.aac952",
+    "id": "ed12d667.ce10c8",
     "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": 2424.504367828369,
-    "y": 1203.3058919906616,
-    "z": "33eaf422.44290c",
+    "x": 2434.508274078369,
+    "y": 1212.3097982406616,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "150f28bb.9cebb7",
+    "id": "bae059eb.7d03c8",
     "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": 2540.5045013427734,
-    "y": 1240.3057832717896,
-    "z": "33eaf422.44290c",
+    "x": 2550.5084075927734,
+    "y": 1249.3096895217896,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "77da5adf.834034",
-        "8429ea0a.844dc8"
+        "b92c0442.b0f838",
+        "3638a6d7.49015a"
       ]
     ]
   },
   {
-    "id": "f3be5614.599b68",
+    "id": "c6d12fe7.97792",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2304.5000648498535,
-    "y": 1125.8018560409546,
-    "z": "33eaf422.44290c",
+    "x": 2314.5039710998535,
+    "y": 1134.8057622909546,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2f1d0b59.a2f164"
+        "29f55e34.5e8332"
       ]
     ]
   },
   {
-    "id": "145fa94e.f27887",
+    "id": "918c56f9.c83968",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2310.500312805176,
-    "y": 1082.801947593689,
-    "z": "33eaf422.44290c",
+    "x": 2320.504219055176,
+    "y": 1091.805853843689,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "da4408c3.f5c0d8"
+        "f44852b5.87cbc"
       ]
     ]
   },
   {
-    "id": "dc60366a.2e9048",
+    "id": "c4ef0618.a01ef8",
     "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": 2885.5008697509766,
-    "y": 230.30177307128906,
-    "z": "33eaf422.44290c",
+    "x": 2895.5047760009766,
+    "y": 239.30567932128906,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "b2e56fad.1ec69"
+        "67fa3697.488778"
       ]
     ]
   },
   {
-    "id": "b2e56fad.1ec69",
+    "id": "67fa3697.488778",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3144.5011825561523,
-    "y": 229.3020887374878,
-    "z": "33eaf422.44290c",
+    "x": 3154.5050888061523,
+    "y": 238.3059949874878,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "694d9509.75a9ec"
+        "907c7650.cad4a8"
       ]
     ]
   },
   {
-    "id": "694d9509.75a9ec",
+    "id": "907c7650.cad4a8",
     "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[$roleidx].name == 'role'`\">\n",
+    "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": 3293.501194000244,
-    "y": 230.3019256591797,
-    "z": "33eaf422.44290c",
+    "x": 3303.505100250244,
+    "y": 239.3058319091797,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "7d090fc5.01ae4"
+        "d808a0cf.f074f"
       ]
     ]
   },
   {
-    "id": "c3f6a3e4.765a9",
+    "id": "d539825b.12e92",
     "type": "set",
     "name": "set prop.spoke.role",
-    "xml": "<set>\n<parameter name='prop.spoke.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].value`' />\n",
+    "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": 3598.501754760742,
-    "y": 227.90183353424072,
-    "z": "33eaf422.44290c",
+    "x": 3608.505661010742,
+    "y": 236.90573978424072,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "7d090fc5.01ae4",
+    "id": "d808a0cf.f074f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3429.00101852417,
-    "y": 227.30176544189453,
-    "z": "33eaf422.44290c",
+    "x": 3439.00492477417,
+    "y": 236.30567169189453,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "c3f6a3e4.765a9"
+        "d539825b.12e92"
       ]
     ]
   },
   {
-    "id": "64901ca2.c8fd44",
+    "id": "5d0ffac5.1d4814",
     "type": "switchNode",
     "name": "switch spoke",
     "xml": "<switch test=\"`$prop.spoke.role == 'spoke'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1321.000373840332,
-    "y": 374.301700592041,
-    "z": "33eaf422.44290c",
+    "x": 1331.004280090332,
+    "y": 383.305606842041,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3df0d9b2.5cda06"
+        "d39c2ae1.e3a298"
       ]
     ]
   },
   {
-    "id": "3df0d9b2.5cda06",
+    "id": "d39c2ae1.e3a298",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1462.000129699707,
-    "y": 375.30173778533936,
-    "z": "33eaf422.44290c",
+    "x": 1472.004035949707,
+    "y": 384.30564403533936,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "e7d060c2.d5397"
+        "401953e4.0343fc"
       ]
     ]
   },
   {
-    "id": "51f4030a.ed3f5c",
+    "id": "3b2ee77e.0ad758",
     "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": 1734.5006561279297,
-    "y": 429.3017330169678,
-    "z": "33eaf422.44290c",
+    "x": 1744.5045623779297,
+    "y": 438.3056392669678,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "62a2db1c.5168f4"
+        "847bf9c5.b5b848"
       ]
     ]
   },
   {
-    "id": "62a2db1c.5168f4",
+    "id": "847bf9c5.b5b848",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2068.166847229004,
-    "y": 373.3016633987427,
-    "z": "33eaf422.44290c",
+    "x": 2078.170753479004,
+    "y": 382.3055696487427,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "5123e57d.8bae0c",
-        "23b51d10.325942",
-        "e569fce4.0fcf9"
+        "7d9b7d9a.b8ca74",
+        "6a3836f9.009c38",
+        "55c5f84e.24eae8"
       ]
     ]
   },
   {
-    "id": "5123e57d.8bae0c",
+    "id": "7d9b7d9a.b8ca74",
     "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": 2339.1668853759766,
-    "y": 319.3025498390198,
-    "z": "33eaf422.44290c",
+    "x": 2349.1707916259766,
+    "y": 328.3064560890198,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "6db9ff05.77666"
+        "5b0d5f1.e72d3a"
       ]
     ]
   },
   {
-    "id": "6db9ff05.77666",
+    "id": "5b0d5f1.e72d3a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2552.166648864746,
-    "y": 320.3025527000427,
-    "z": "33eaf422.44290c",
+    "x": 2562.170555114746,
+    "y": 329.3064589500427,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "277a3bfe.22cd04"
+        "2bd1babe.4be726"
       ]
     ]
   },
   {
-    "id": "277a3bfe.22cd04",
+    "id": "2bd1babe.4be726",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2701.0003929138184,
-    "y": 322.3017420768738,
-    "z": "33eaf422.44290c",
+    "x": 2711.0042991638184,
+    "y": 331.3056483268738,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "342216f2.a96c5a"
+        "5b294f75.d92f3"
       ]
     ]
   },
   {
-    "id": "342216f2.a96c5a",
+    "id": "5b294f75.d92f3",
     "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": 2974.000343322754,
-    "y": 320.6689600944519,
-    "z": "33eaf422.44290c",
+    "x": 2984.004249572754,
+    "y": 329.6728663444519,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "bd426655.141608"
+        "32cc5203.15e8fe"
       ]
     ]
   },
   {
-    "id": "bd426655.141608",
+    "id": "32cc5203.15e8fe",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3243.0012702941895,
-    "y": 319.66920614242554,
-    "z": "33eaf422.44290c",
+    "x": 3253.0051765441895,
+    "y": 328.67311239242554,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "d3ada690.01d678",
-        "daf81956.349368",
-        "5bef4443.c838fc",
-        "a4bd0e48.6d82f"
+        "2831a4a1.42336c",
+        "8813fbf3.259e18",
+        "c11e3914.922088",
+        "5141e407.34b3cc"
       ]
     ]
   },
   {
-    "id": "d3ada690.01d678",
+    "id": "2831a4a1.42336c",
     "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": 3486.0023040771484,
-    "y": 274.6697793006897,
-    "z": "33eaf422.44290c",
+    "x": 3496.0062103271484,
+    "y": 283.6736855506897,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "894b8be3.a2d3b8"
+        "2a15c273.32ab0e"
       ]
     ]
   },
   {
-    "id": "894b8be3.a2d3b8",
+    "id": "2a15c273.32ab0e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3686.0020790100098,
-    "y": 274.6699414253235,
-    "z": "33eaf422.44290c",
+    "x": 3696.0059852600098,
+    "y": 283.6738476753235,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "4cf3ccb2.4c44b4"
+        "5b3ec893.cb96e8"
       ]
     ]
   },
   {
-    "id": "4cf3ccb2.4c44b4",
+    "id": "5b3ec893.cb96e8",
     "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": 3913.002815246582,
-    "y": 276.2705235481262,
-    "z": "33eaf422.44290c",
+    "x": 3923.006721496582,
+    "y": 285.2744297981262,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "e7d060c2.d5397",
+    "id": "401953e4.0343fc",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1214.9694213867188,
-    "y": 685.2706489562988,
-    "z": "33eaf422.44290c",
+    "x": 1224.9733276367188,
+    "y": 694.2745552062988,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "51f4030a.ed3f5c",
-        "4176c827.c206f8",
-        "b50f711c.f7671",
-        "c5126628.a1afc8",
-        "cf236aa.4478b98",
-        "f19570ac.55187"
+        "3b2ee77e.0ad758",
+        "496b2343.92811c",
+        "e17df7dc.7298b8",
+        "c548252d.342ee8",
+        "2eff9ba0.ecf354",
+        "f3550d2c.724f9",
+        "8b82943e.e37978",
+        "7fba3a52.cfca64"
       ]
     ]
   },
   {
-    "id": "23b51d10.325942",
+    "id": "6a3836f9.009c38",
     "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": 2331.5003204345703,
-    "y": 393.3017544746399,
-    "z": "33eaf422.44290c",
+    "x": 2341.5042266845703,
+    "y": 402.3056607246399,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "14d0bfc7.55b7a"
+        "7c4ac4a1.4747bc"
       ]
     ]
   },
   {
-    "id": "14d0bfc7.55b7a",
+    "id": "7c4ac4a1.4747bc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2550.5000705718994,
-    "y": 394.30173921585083,
-    "z": "33eaf422.44290c",
+    "x": 2560.5039768218994,
+    "y": 403.30564546585083,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "da1c13db.62f86"
+        "f4aa9e41.b53e5"
       ]
     ]
   },
   {
-    "id": "da1c13db.62f86",
+    "id": "f4aa9e41.b53e5",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2701.3340606689453,
-    "y": 400.3009305000305,
-    "z": "33eaf422.44290c",
+    "x": 2711.3379669189453,
+    "y": 409.3048367500305,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "e71b7f46.84637"
+        "82e0fc37.26ed9"
       ]
     ]
   },
   {
-    "id": "e71b7f46.84637",
+    "id": "82e0fc37.26ed9",
     "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": 2960.334312438965,
-    "y": 402.66822576522827,
-    "z": "33eaf422.44290c",
+    "x": 2970.338218688965,
+    "y": 411.67213201522827,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "ae18d850.3d05e8"
+        "c5f6af8d.43acf"
       ]
     ]
   },
   {
-    "id": "ae18d850.3d05e8",
+    "id": "c5f6af8d.43acf",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3246.334819793701,
-    "y": 435.66841077804565,
-    "z": "33eaf422.44290c",
+    "x": 3256.338726043701,
+    "y": 444.67231702804565,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "1383d6a4.a044c9"
+        "eb564ac9.966e08"
       ]
     ]
   },
   {
-    "id": "1383d6a4.a044c9",
+    "id": "eb564ac9.966e08",
     "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": 3429.3357315063477,
-    "y": 435.66902112960815,
-    "z": "33eaf422.44290c",
+    "x": 3439.3396377563477,
+    "y": 444.67292737960815,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "cbbd7b54.04add8"
+        "f15b5da7.6e6af"
       ]
     ]
   },
   {
-    "id": "cbbd7b54.04add8",
+    "id": "f15b5da7.6e6af",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3629.335506439209,
-    "y": 435.66918325424194,
-    "z": "33eaf422.44290c",
+    "x": 3639.339412689209,
+    "y": 444.67308950424194,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2002292c.f851e6"
+        "24ab8642.92a16a"
       ]
     ]
   },
   {
-    "id": "2002292c.f851e6",
+    "id": "24ab8642.92a16a",
     "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": 3824.3361892700195,
-    "y": 432.26976442337036,
-    "z": "33eaf422.44290c",
+    "x": 3834.3400955200195,
+    "y": 441.27367067337036,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "e569fce4.0fcf9",
+    "id": "55c5f84e.24eae8",
     "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": 2310.5004348754883,
-    "y": 454.30178594589233,
-    "z": "33eaf422.44290c",
+    "x": 2320.5043411254883,
+    "y": 463.30569219589233,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2c51cabd.1c1bf6"
+        "7ebe3d6.3c123c4"
       ]
     ]
   },
   {
-    "id": "2c51cabd.1c1bf6",
+    "id": "7ebe3d6.3c123c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2544.500072479248,
-    "y": 455.3017258644104,
-    "z": "33eaf422.44290c",
+    "x": 2554.503978729248,
+    "y": 464.3056321144104,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "4b1a4a05.7589d4"
+        "eaa83766.f196c8"
       ]
     ]
   },
   {
-    "id": "4b1a4a05.7589d4",
+    "id": "eaa83766.f196c8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2696.3340606689453,
-    "y": 477.30096197128296,
-    "z": "33eaf422.44290c",
+    "x": 2706.3379669189453,
+    "y": 486.30486822128296,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "bfdd7dbc.be644"
+        "d0b475ec.f63c48",
+        "3857554a.ced0aa"
       ]
     ]
   },
   {
-    "id": "bfdd7dbc.be644",
+    "id": "d0b475ec.f63c48",
     "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": 2977.3338928222656,
-    "y": 476.668164730072,
-    "z": "33eaf422.44290c",
+    "x": 2987.3377990722656,
+    "y": 485.672070980072,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "86ec8da.eb7757"
+        "d6950beb.98c1a8"
       ]
     ]
   },
   {
-    "id": "86ec8da.eb7757",
+    "id": "d6950beb.98c1a8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3246.334819793701,
-    "y": 475.66841077804565,
-    "z": "33eaf422.44290c",
+    "x": 3256.338726043701,
+    "y": 484.67231702804565,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "ea6a5ab7.abd8e8",
-        "b2aac804.e6f348"
+        "f84a2fdd.ca38",
+        "8488fc33.1f86c",
+        "4d409006.b4615"
       ]
     ]
   },
   {
-    "id": "ea6a5ab7.abd8e8",
+    "id": "f84a2fdd.ca38",
     "type": "switchNode",
-    "name": "switch name",
+    "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": 3435.335723876953,
-    "y": 513.6690349578857,
-    "z": "33eaf422.44290c",
+    "x": 3445.33992767334,
+    "y": 534.6729888916016,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "46e734ca.67fa0c"
+        "785cdd27.fd93c4"
       ]
     ]
   },
   {
-    "id": "46e734ca.67fa0c",
+    "id": "785cdd27.fd93c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3635.3354988098145,
-    "y": 513.6691970825195,
-    "z": "33eaf422.44290c",
+    "x": 3645.3394050598145,
+    "y": 522.6731033325195,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "f2397edb.062c5"
+        "5c156f9.fbc869"
       ]
     ]
   },
   {
-    "id": "f2397edb.062c5",
+    "id": "5c156f9.fbc869",
     "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": 3823.3363037109375,
-    "y": 512.2698106765747,
-    "z": "33eaf422.44290c",
+    "x": 3838.340358734131,
+    "y": 529.2737336158752,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "daf81956.349368",
+    "id": "8813fbf3.259e18",
     "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": 3459.5,
-    "y": 311.3018355369568,
-    "z": "33eaf422.44290c",
+    "x": 3469.50390625,
+    "y": 320.3057417869568,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "34972355.9c297c"
+        "d0babd8f.c557b"
       ]
     ]
   },
   {
-    "id": "34972355.9c297c",
+    "id": "d0babd8f.c557b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3689.5000038146973,
-    "y": 311.3019471168518,
-    "z": "33eaf422.44290c",
+    "x": 3699.5039100646973,
+    "y": 320.3058533668518,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "6f9ff7e2.2957f8"
+        "e2b46cce.ea19d"
       ]
     ]
   },
   {
-    "id": "6f9ff7e2.2957f8",
+    "id": "e2b46cce.ea19d",
     "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": 3916.5007400512695,
-    "y": 312.90252923965454,
-    "z": "33eaf422.44290c",
+    "x": 3926.5046463012695,
+    "y": 321.90643548965454,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "5bef4443.c838fc",
+    "id": "c11e3914.922088",
     "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": 3477.500160217285,
-    "y": 355.30178594589233,
-    "z": "33eaf422.44290c",
+    "x": 3487.504066467285,
+    "y": 364.30569219589233,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "9220a2ce.263ec"
+        "c0d01537.19ceb8"
       ]
     ]
   },
   {
-    "id": "9220a2ce.263ec",
+    "id": "c0d01537.19ceb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3677.4999351501465,
-    "y": 355.3019480705261,
-    "z": "33eaf422.44290c",
+    "x": 3687.5038414001465,
+    "y": 364.3058543205261,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "95bab342.b39b3"
+        "6ecb9e8.25b2b6"
       ]
     ]
   },
   {
-    "id": "95bab342.b39b3",
+    "id": "6ecb9e8.25b2b6",
     "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": 3904.5006713867188,
-    "y": 356.90253019332886,
-    "z": "33eaf422.44290c",
+    "x": 3914.5045776367188,
+    "y": 365.90643644332886,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "a4bd0e48.6d82f",
+    "id": "5141e407.34b3cc",
     "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": 3457.499988555908,
-    "y": 394.30182218551636,
-    "z": "33eaf422.44290c",
+    "x": 3467.503894805908,
+    "y": 403.30572843551636,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "511d5688.773858"
+        "f9d0d35c.eced2"
       ]
     ]
   },
   {
-    "id": "511d5688.773858",
+    "id": "f9d0d35c.eced2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3681.4998168945312,
-    "y": 394.3019394874573,
-    "z": "33eaf422.44290c",
+    "x": 3691.5037231445312,
+    "y": 403.3058457374573,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "fc2e69a1.2d4298"
+        "b1e06d93.e9e08"
       ]
     ]
   },
   {
-    "id": "fc2e69a1.2d4298",
+    "id": "b1e06d93.e9e08",
     "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": 3908.5005531311035,
-    "y": 395.90252161026,
-    "z": "33eaf422.44290c",
+    "x": 3918.5044593811035,
+    "y": 404.90642786026,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "e9598182.81589",
+    "id": "89904125.f9c2d",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1024.999900817871,
-    "y": 253.50004196166992,
-    "z": "33eaf422.44290c",
+    "x": 1035.003807067871,
+    "y": 262.5039482116699,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "be430b5e.14a828",
-        "66dd18ab.e48f08",
-        "8e4434c9.93e608",
-        "64901ca2.c8fd44"
+        "f587f945.9668c8",
+        "20ecb75b.a622b8",
+        "f4ac6977.3d92e8",
+        "5d0ffac5.1d4814"
       ]
     ]
   },
   {
-    "id": "813e415f.e07c",
+    "id": "26a7429c.87187e",
     "type": "comment",
     "name": "get spoke device,site,wanport info",
     "info": "",
     "comments": "",
-    "x": 1781.96875,
-    "y": 376.96874713897705,
-    "z": "33eaf422.44290c",
+    "x": 1791.97265625,
+    "y": 385.97265338897705,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "2db9ead7.c2b4b6",
+    "id": "be393db5.b2c4b",
     "type": "comment",
     "name": "Add routes only on activation of spoke Attach site",
     "info": "",
     "comments": "",
-    "x": 1418.4998245239258,
-    "y": 336.0000162124634,
-    "z": "33eaf422.44290c",
+    "x": 1452.5038223266602,
+    "y": 329.00396728515625,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "2dcb0ef7.828042",
+    "id": "3b335da8.075402",
     "type": "comment",
     "name": "Loop for all the hub allotted resources, get respective service data and get vnfs info",
     "info": "",
     "comments": "",
-    "x": 2198.5,
-    "y": 815.500057220459,
-    "z": "33eaf422.44290c",
+    "x": 2208.50390625,
+    "y": 824.503963470459,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "c6190b7b.0c6f78",
+    "id": "48cb425f.55b89c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2954.4997177124023,
-    "y": 1796.9999589920044,
-    "z": "33eaf422.44290c",
+    "x": 2964.5036239624023,
+    "y": 1806.0038652420044,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "c9e1f848.8aa118",
-        "f616545c.e692d8",
-        "dcfe4dc9.3d83d",
-        "edcfc449.815b98"
+        "6735788d.2eda88",
+        "25ec0b7b.fede14"
       ]
     ]
   },
   {
-    "id": "82cf7632.68ed28",
+    "id": "42885256.de226c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3004.4997749328613,
-    "y": 1669.999843597412,
-    "z": "33eaf422.44290c",
-    "wires": [
-      [
-        "2060fdef.b0b7d2"
-      ]
-    ]
-  },
-  {
-    "id": "dcfe4dc9.3d83d",
-    "type": "switchNode",
-    "name": "switch hubRouteId",
-    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'hubRouteId'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3159.4996376037598,
-    "y": 1784.9998378753662,
-    "z": "33eaf422.44290c",
-    "wires": [
-      [
-        "4b1456a4.ed61c8"
-      ]
-    ]
-  },
-  {
-    "id": "4b1456a4.ed61c8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3322.5000228881836,
-    "y": 1784.000150680542,
-    "z": "33eaf422.44290c",
+    "x": 3014.5036811828613,
+    "y": 1679.003749847412,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "71be6aaa.93fe04"
+        "a3360f10.ddde5"
       ]
     ]
   },
   {
-    "id": "71be6aaa.93fe04",
-    "type": "set",
-    "name": "set prop.hubRouteId",
-    "xml": "<set>\n<parameter name='prop.hubRouteId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n",
-    "comments": "",
-    "x": 3482.500015258789,
-    "y": 1781.6005897521973,
-    "z": "33eaf422.44290c",
-    "wires": []
-  },
-  {
-    "id": "f616545c.e692d8",
+    "id": "6735788d.2eda88",
     "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": 3141.4996185302734,
-    "y": 1749.9998207092285,
-    "z": "33eaf422.44290c",
+    "x": 3149.503547668457,
+    "y": 1817.0037078857422,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3ef84487.f4b53c"
+        "b824c970.9e9c08"
       ]
     ]
   },
   {
-    "id": "3ef84487.f4b53c",
+    "id": "b824c970.9e9c08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292.499988555908,
-    "y": 1749.0000038146973,
-    "z": "33eaf422.44290c",
+    "x": 3300.503917694092,
+    "y": 1816.003890991211,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "97d8673.5139598"
+        "1ab1bd98.e41432"
       ]
     ]
   },
   {
-    "id": "97d8673.5139598",
+    "id": "1ab1bd98.e41432",
     "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": 3464.4999961853027,
-    "y": 1746.6005725860596,
-    "z": "33eaf422.44290c",
+    "x": 3472.5039253234863,
+    "y": 1813.6044597625732,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "927db1a6.0967b",
+    "id": "4ae4f054.fa7eb",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2619.9996948242188,
-    "y": 2002.0004615783691,
-    "z": "33eaf422.44290c",
+    "x": 2626.0036544799805,
+    "y": 2169.0043516159058,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "1a118523.efe04b",
-        "3baee628.49c52a"
+        "a20f0327.bdb75",
+        "464f548c.98a25c"
       ]
     ]
   },
   {
-    "id": "1a118523.efe04b",
+    "id": "a20f0327.bdb75",
     "type": "outcome",
     "name": "ActivateSDWANAttachmentInstance",
     "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 2886.0271530151367,
-    "y": 1971.0314779281616,
-    "z": "33eaf422.44290c",
+    "x": 2896.0310592651367,
+    "y": 1980.0353841781616,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "78365f62.f88ae"
+        "3d36ce09.d3a452"
       ]
     ]
   },
   {
-    "id": "d881cca6.da522",
+    "id": "cbad3e92.5f2c5",
     "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": 3480.4997940063477,
-    "y": 1892.000228881836,
-    "z": "33eaf422.44290c",
+    "x": 3485.5039291381836,
+    "y": 1911.0042324066162,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "e1ec68ab.cefaf8",
-        "62d40a0d.8230b4"
+        "4b4ae946.a41e78",
+        "7402b676.36e648"
       ]
     ]
   },
   {
-    "id": "62d40a0d.8230b4",
+    "id": "7402b676.36e648",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3721.499927520752,
-    "y": 1879.0002145767212,
-    "z": "33eaf422.44290c",
+    "x": 3731.503833770752,
+    "y": 1888.0041208267212,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "e1ec68ab.cefaf8",
+    "id": "4b4ae946.a41e78",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3719.4996070861816,
-    "y": 1835.000205039978,
-    "z": "33eaf422.44290c",
+    "x": 3729.5035133361816,
+    "y": 1844.004111289978,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "93f8ad33.2f9f3"
+        "bae0bb4c.569758"
       ]
     ]
   },
   {
-    "id": "93f8ad33.2f9f3",
+    "id": "bae0bb4c.569758",
     "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": 3861.5002937316895,
-    "y": 1833.0002880096436,
-    "z": "33eaf422.44290c",
+    "x": 3871.5041999816895,
+    "y": 1842.0041942596436,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "2cb0acf9.dc8014",
+    "id": "c33f2b8.8f859d8",
     "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",
+    "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": 3411.8334980010986,
-    "y": 1855.6669273376465,
-    "z": "33eaf422.44290c",
+    "x": 3421.8374042510986,
+    "y": 1864.6708335876465,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "a3cb5620.778698",
+    "id": "d88550f2.429ff",
     "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": 3486.8334980010986,
-    "y": 1997.6673924922943,
-    "z": "33eaf422.44290c",
+    "x": 3490.837547302246,
+    "y": 2012.671347618103,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "da8f9dd5.0d7f2",
-        "54a9a5c9.a84bec"
+        "dc754a4a.149ee8",
+        "9860dbdc.fb5c78"
       ]
     ]
   },
   {
-    "id": "54a9a5c9.a84bec",
+    "id": "9860dbdc.fb5c78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3732.833745956421,
-    "y": 1991.6674008369446,
-    "z": "33eaf422.44290c",
+    "x": 3742.837652206421,
+    "y": 2000.6713070869446,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "da8f9dd5.0d7f2",
+    "id": "dc754a4a.149ee8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3730.8334255218506,
-    "y": 1947.6673913002014,
-    "z": "33eaf422.44290c",
+    "x": 3740.8373317718506,
+    "y": 1956.6712975502014,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "405d037f.766c0c"
+        "1b7c78ed.47ac47"
       ]
     ]
   },
   {
-    "id": "405d037f.766c0c",
+    "id": "1b7c78ed.47ac47",
     "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.8341121673584,
-    "y": 1945.667474269867,
-    "z": "33eaf422.44290c",
+    "x": 3882.8380184173584,
+    "y": 1954.671380519867,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "cf64a525.59cc78",
+    "id": "abc725a.b5905d8",
     "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",
+    "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": 3421.6975135803223,
-    "y": 1966.364153623581,
-    "z": "33eaf422.44290c",
+    "x": 3431.7014198303223,
+    "y": 1975.368059873581,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "986185e9.8eec08",
+    "id": "4460a0d6.c4761",
     "type": "set",
-    "name": "set route Id's in site parameters",
-    "xml": "<set>\n<parameter name='mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='hubRouteId' />\n<parameter name='mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$underlayHubResp[0].id`' />\n<parameter name='mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1].name' value='spokeRouteId' />\n<parameter name='mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1].value' value='`$underlayspokeResp[0].id`' />\n<parameter name='mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 2`' />\n\n\n\n\n",
+    "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": 3446.6644744873047,
-    "y": 2054.0307354927063,
-    "z": "33eaf422.44290c",
+    "x": 3442.6688232421875,
+    "y": 2060.034790992737,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "78365f62.f88ae",
+    "id": "3d36ce09.d3a452",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3121.999671936035,
-    "y": 1968.4999113082886,
-    "z": "33eaf422.44290c",
+    "x": 3132.003578186035,
+    "y": 1977.5038175582886,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2cb0acf9.dc8014",
-        "cf64a525.59cc78",
-        "986185e9.8eec08",
-        "a3cb5620.778698",
-        "d881cca6.da522"
+        "c33f2b8.8f859d8",
+        "abc725a.b5905d8",
+        "4460a0d6.c4761",
+        "d88550f2.429ff",
+        "cbad3e92.5f2c5",
+        "f03bf85a.59ad68",
+        "6591e05b.5ae5",
+        "ab6e34c5.6a48d8"
       ]
     ]
   },
   {
-    "id": "105d9963.f193b7",
+    "id": "50a88f49.37ad4",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3142.999668121338,
-    "y": 2046.5001020431519,
-    "z": "33eaf422.44290c",
+    "x": 3161.0035285949707,
+    "y": 2434.504150390625,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "f88633ef.4a895",
-        "7ec8de50.abc7a",
-        "e429ce4e.ff4d3",
-        "9c47cd10.cba71"
+        "ae46a29e.f97e3",
+        "162bc63c.6a40ba",
+        "32021f5a.688fc",
+        "6c422db5.5ce744",
+        "74f4468a.192018"
       ]
     ]
   },
   {
-    "id": "3baee628.49c52a",
+    "id": "464f548c.98a25c",
     "type": "outcome",
     "name": "DeactivateSDWANAttachmentInstance",
     "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 2891.499725341797,
-    "y": 2040.4999132156372,
-    "z": "33eaf422.44290c",
+    "x": 2909.5035858154297,
+    "y": 2428.5039615631104,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "105d9963.f193b7"
+        "50a88f49.37ad4"
       ]
     ]
   },
   {
-    "id": "9c607856.359088",
+    "id": "6591e05b.5ae5",
     "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<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",
+    "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": 2636.030891418457,
-    "y": 2295.031482696533,
-    "z": "33eaf422.44290c",
+    "x": 3447.035110473633,
+    "y": 2185.035671234131,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "5323bc16.bbf554",
+    "id": "d686d76a.66e9d8",
     "type": "comment",
     "name": "save hubsiteIds and spoke siteIds for provision",
     "info": "",
     "comments": "",
-    "x": 2668.031265258789,
-    "y": 2251.0313568115234,
-    "z": "33eaf422.44290c",
+    "x": 3479.035484313965,
+    "y": 2141.035545349121,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "b2aac804.e6f348",
+    "id": "8488fc33.1f86c",
     "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": 3436.031005859375,
-    "y": 475.03125,
-    "z": "33eaf422.44290c",
+    "x": 3446.034912109375,
+    "y": 484.03515625,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "2e9ab920.c2df16"
+        "a468bfef.f0d69"
       ]
     ]
   },
   {
-    "id": "2e9ab920.c2df16",
+    "id": "a468bfef.f0d69",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3636.0307807922363,
-    "y": 475.0314121246338,
-    "z": "33eaf422.44290c",
+    "x": 3646.0346870422363,
+    "y": 484.0353183746338,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "3bc80b86.299434"
+        "861bdc8.697e72"
       ]
     ]
   },
   {
-    "id": "3bc80b86.299434",
+    "id": "861bdc8.697e72",
     "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": 3824.0315856933594,
-    "y": 473.63202571868896,
-    "z": "33eaf422.44290c",
+    "x": 3834.0354919433594,
+    "y": 482.63593196868896,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "edcfc449.815b98",
+    "id": "25ec0b7b.fede14",
     "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": 3140.031005859375,
-    "y": 1716.5311279296875,
-    "z": "33eaf422.44290c",
+    "x": 3148.0349349975586,
+    "y": 1783.5350151062012,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "47785d0f.321164"
+        "38461c3f.4e0404"
       ]
     ]
   },
   {
-    "id": "47785d0f.321164",
+    "id": "38461c3f.4e0404",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3291.0313758850098,
-    "y": 1715.5313110351562,
-    "z": "33eaf422.44290c",
+    "x": 3299.0353050231934,
+    "y": 1782.53519821167,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "36650635.dab3aa"
+        "1ccd9e7.6905962"
       ]
     ]
   },
   {
-    "id": "36650635.dab3aa",
+    "id": "1ccd9e7.6905962",
     "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": 3463.0313835144043,
-    "y": 1713.1318798065186,
-    "z": "33eaf422.44290c",
+    "x": 3471.035312652588,
+    "y": 1780.1357669830322,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "70ceaafc.e0d3f4",
+    "id": "18ea4160.5b97af",
     "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": 461.03126525878906,
-    "y": 361.0312547683716,
-    "z": "33eaf422.44290c",
+    "x": 471.03517150878906,
+    "y": 370.0351610183716,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "2ebcd1d4.0c3f8e",
+    "id": "2ccd4dc3.00e152",
     "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": 813.0312957763672,
-    "y": 793.0314712524414,
-    "z": "33eaf422.44290c",
+    "x": 823.0352020263672,
+    "y": 802.0353775024414,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "ad0b5373.47c4b",
-        "2423f336.bee55c"
+        "bbd8ad8.5648f5",
+        "8ff338f4.67b7f8"
       ]
     ]
   },
   {
-    "id": "2423f336.bee55c",
+    "id": "8ff338f4.67b7f8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1077.0315551757812,
-    "y": 815.0315160751343,
-    "z": "33eaf422.44290c",
+    "x": 1087.0354614257812,
+    "y": 824.0354223251343,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "ad0b5373.47c4b",
+    "id": "bbd8ad8.5648f5",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1078.0313415527344,
-    "y": 772.0314540863037,
-    "z": "33eaf422.44290c",
+    "x": 1088.0352478027344,
+    "y": 781.0353603363037,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "21440771.f9b178"
+        "bb20e181.d535d"
       ]
     ]
   },
   {
-    "id": "21440771.f9b178",
+    "id": "bb20e181.d535d",
     "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": 1257.0318984985352,
-    "y": 770.0315053462982,
-    "z": "33eaf422.44290c",
+    "x": 1267.0358047485352,
+    "y": 779.0354115962982,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "c880f4e9.6d6098",
+    "id": "84666856.592818",
     "type": "for",
     "name": "for providx..prop.provision.siteIds[]",
     "xml": "<for index='providx' start='0' end='`$prop.provision.siteIds_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 454.0312957763672,
-    "y": 565.0312948226929,
-    "z": "33eaf422.44290c",
+    "x": 464.0352020263672,
+    "y": 574.0352010726929,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "6ab9e97f.2340e8"
+        "e0c31833.56f938"
       ]
     ]
   },
   {
-    "id": "6ab9e97f.2340e8",
+    "id": "e0c31833.56f938",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 478.0313377380371,
-    "y": 775.031268119812,
-    "z": "33eaf422.44290c",
+    "x": 488.0352439880371,
+    "y": 784.035174369812,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "5392610f.9b85f",
-        "2ebcd1d4.0c3f8e",
-        "e83cbadb.6b3148"
+        "14ab7296.d70c4d",
+        "2ccd4dc3.00e152",
+        "28a5422.99608be"
       ]
     ]
   },
   {
-    "id": "5392610f.9b85f",
+    "id": "14ab7296.d70c4d",
     "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": 789.0339965820312,
-    "y": 651.6329832077026,
-    "z": "33eaf422.44290c",
+    "x": 799.0379028320312,
+    "y": 660.6368894577026,
+    "z": "816d5e60.eba45",
     "wires": []
   },
   {
-    "id": "e83cbadb.6b3148",
+    "id": "28a5422.99608be",
     "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`'/>\n\n",
+    "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": 785.0313720703125,
-    "y": 887.0313358306885,
-    "z": "33eaf422.44290c",
+    "x": 795.0352783203125,
+    "y": 896.0352420806885,
+    "z": "816d5e60.eba45",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e03ba47.0fb3f6",
+    "id": "6e2c1efa.030fd",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2527.031482696533,
-    "y": 1042.0313262939453,
-    "z": "33eaf422.44290c",
+    "x": 2537.035388946533,
+    "y": 1051.0352325439453,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "a525e63a.cc2b38"
+        "d87f1462.94a148"
       ]
     ]
   },
   {
-    "id": "84a7b7df.1615b8",
+    "id": "e621a712.c02488",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2007.0311584472656,
-    "y": 605.0313091278076,
-    "z": "33eaf422.44290c",
+    "x": 2017.0350646972656,
+    "y": 614.0352153778076,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "c8ac708.b0a709",
-        "b9ac21ad.456c9"
+        "4d2b2a60.5a15c4"
       ]
     ]
   },
   {
-    "id": "8e2c0789.42db78",
+    "id": "f3cef2f6.2a146",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2014.0312194824219,
-    "y": 680.0311765670776,
-    "z": "33eaf422.44290c",
+    "x": 1961.0352325439453,
+    "y": 705.0351238250732,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "482a4c29.31cfa4",
+        "3b80b5a9.9770ba"
+      ]
+    ]
+  },
+  {
+    "id": "f03bf85a.59ad68",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "ab6e34c5.6a48d8",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "3857554a.ced0aa",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "2ce54718.3d9808",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "f80aa612.1d1cd8",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "74f4468a.192018",
+    "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",
+    "wires": [
+      [
+        "2f560e9d.06e792"
+      ]
+    ]
+  },
+  {
+    "id": "2f560e9d.06e792",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3808.333480834961,
+    "y": 2307.3333892822266,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "dbb8a9cb.01e2a8"
+      ]
+    ]
+  },
+  {
+    "id": "dbb8a9cb.01e2a8",
+    "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",
+    "wires": [
+      [
+        "4aa46b8.0419394"
+      ]
+    ]
+  },
+  {
+    "id": "4aa46b8.0419394",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4168.332931518555,
+    "y": 2307.3335514068604,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "74eb4369.b3544c"
+      ]
+    ]
+  },
+  {
+    "id": "74eb4369.b3544c",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4322.332931518555,
+    "y": 2311.333559036255,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "86900a6.74da6f8"
+      ]
+    ]
+  },
+  {
+    "id": "86900a6.74da6f8",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "4d409006.b4615",
+    "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",
+    "wires": [
+      [
+        "c14c6f3d.397e6"
+      ]
+    ]
+  },
+  {
+    "id": "c14c6f3d.397e6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3650.9994773864746,
+    "y": 576.6667404174805,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "b91a3e00.56049"
+      ]
+    ]
+  },
+  {
+    "id": "e6b57715.d86fd8",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "7fba3a52.cfca64",
+    "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",
+    "wires": [
+      [
+        "6d3232d8.e0205c",
+        "394f9ac2.7c54d6"
+      ]
+    ]
+  },
+  {
+    "id": "6d3232d8.e0205c",
+    "type": "outcome",
+    "name": "ActivateSDWANAttachmentInstance",
+    "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1402.0003356933594,
+    "y": 1983.333532333374,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "cc4350b5.e04f4"
+      ]
+    ]
+  },
+  {
+    "id": "cc4350b5.e04f4",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1643.9728469848633,
+    "y": 1979.8022832870483,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "2ce54718.3d9808",
+        "c043509c.599d6",
+        "af0af852.8614c8",
+        "879d0a95.c86bf8"
+      ]
+    ]
+  },
+  {
+    "id": "a489ec70.35a57",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1647.9728355407715,
+    "y": 2063.8024520874023,
+    "z": "816d5e60.eba45",
     "wires": [
       [
-        "5a69b1be.1055d",
-        "e66f705e.b1887"
+        "f104a03c.3d9ea"
       ]
     ]
+  },
+  {
+    "id": "394f9ac2.7c54d6",
+    "type": "outcome",
+    "name": "DeactivateSDWANAttachmentInstance",
+    "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1399.4729766845703,
+    "y": 2065.8022890090942,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "a489ec70.35a57"
+      ]
+    ]
+  },
+  {
+    "id": "f104a03c.3d9ea",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "f8e23d7f.b3d02",
+    "type": "comment",
+    "name": "Get route routes IDs",
+    "info": "",
+    "comments": "",
+    "x": 3416.333251953125,
+    "y": 2268.6666259765625,
+    "z": "816d5e60.eba45",
+    "wires": []
+  },
+  {
+    "id": "c043509c.599d6",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "af0af852.8614c8",
+    "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",
+    "wires": [
+      [
+        "96c0f1e3.46564"
+      ]
+    ]
+  },
+  {
+    "id": "71e83fcd.3926a",
+    "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",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "5b1d10b7.e85ce",
+    "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",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "96c0f1e3.46564",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1913.333423614502,
+    "y": 1743.6666812896729,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "5b1d10b7.e85ce",
+        "71e83fcd.3926a",
+        "4f918e1e.65c27",
+        "743189f.b107678",
+        "a740f981.130cb8",
+        "7f673568.55d36c"
+      ]
+    ]
+  },
+  {
+    "id": "4f918e1e.65c27",
+    "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",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "743189f.b107678",
+    "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",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a740f981.130cb8",
+    "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",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7f673568.55d36c",
+    "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",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "879d0a95.c86bf8",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "b91a3e00.56049",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3799.0002250671387,
+    "y": 623.0000381469727,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "e6b57715.d86fd8",
+        "4cfad752.b82ab8"
+      ]
+    ]
+  },
+  {
+    "id": "4cfad752.b82ab8",
+    "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",
+    "wires": [
+      [
+        "18dab504.682e9b",
+        "e6713c9a.ccf4e"
+      ]
+    ]
+  },
+  {
+    "id": "e6713c9a.ccf4e",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4154.0002517700195,
+    "y": 624.0000371932983,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "f6d503b7.ca422"
+      ]
+    ]
+  },
+  {
+    "id": "18dab504.682e9b",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4143.0002517700195,
+    "y": 672.000039100647,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "24d2d870.cadd68"
+      ]
+    ]
+  },
+  {
+    "id": "a99b2248.b5ad4",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "24d2d870.cadd68",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4273.000255584717,
+    "y": 672.000039100647,
+    "z": "816d5e60.eba45",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f6d503b7.ca422",
+    "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",
+    "wires": [
+      [
+        "d316c9fd.2bfac8"
+      ]
+    ]
+  },
+  {
+    "id": "d316c9fd.2bfac8",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4478.332950592041,
+    "y": 619.0000381469727,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "cc212d5d.4ecc7"
+      ]
+    ]
+  },
+  {
+    "id": "cc212d5d.4ecc7",
+    "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",
+    "wires": [
+      [
+        "a41a70c9.992e7",
+        "4e196c9a.1ec4e4"
+      ]
+    ]
+  },
+  {
+    "id": "a41a70c9.992e7",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4810.33296585083,
+    "y": 595.0000438690186,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "29342783.705ee8"
+      ]
+    ]
+  },
+  {
+    "id": "4e196c9a.1ec4e4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4799.33296585083,
+    "y": 643.0000457763672,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "31dadcd0.9c88f4"
+      ]
+    ]
+  },
+  {
+    "id": "31dadcd0.9c88f4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4929.332969665527,
+    "y": 643.0000457763672,
+    "z": "816d5e60.eba45",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c309d201.f689a",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5132.665496826172,
+    "y": 574.0001978874207,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "a99b2248.b5ad4",
+        "d11539fc.77a698"
+      ]
+    ]
+  },
+  {
+    "id": "d11539fc.77a698",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "29342783.705ee8",
+    "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",
+    "wires": [
+      [
+        "4afb066.ff7c6f8",
+        "6e26a8d2.50c7d8"
+      ]
+    ]
+  },
+  {
+    "id": "4afb066.ff7c6f8",
+    "type": "outcome",
+    "name": "3",
+    "xml": "<outcome value='3'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5243.636054992676,
+    "y": 512.9687957763672,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "c309d201.f689a"
+      ]
+    ]
+  },
+  {
+    "id": "6e26a8d2.50c7d8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5260.666980743408,
+    "y": 395.00000953674316,
+    "z": "816d5e60.eba45",
+    "wires": [
+      [
+        "cde0413a.7980f"
+      ]
+    ]
+  },
+  {
+    "id": "cde0413a.7980f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5421.66650390625,
+    "y": 435,
+    "z": "816d5e60.eba45",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "61955a75.34d004",
+    "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",
+    "wires": []
+  },
+  {
+    "id": "5e3a3525.ed601c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2887.0059547424316,
+    "y": 956.9731774330139,
+    "z": "816d5e60.eba45",
+    "wires": [
+      []
+    ]
   }
 ]