integration test issues fix for sdwan and sotn
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
index a0a0fa2..d90a5cc 100644 (file)
@@ -1,20 +1,20 @@
 [
   {
-    "id": "b5ebbde.e59a04",
+    "id": "8722df6b.da333",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 109,
-    "y": 43,
-    "z": "33eaf422.44290c",
+    "x": 118,
+    "y": 57,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a87f9663.877998"
+        "5f0a72e7.8810fc"
       ]
     ]
   },
   {
-    "id": "a87f9663.877998",
+    "id": "5f0a72e7.8810fc",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 225.2856903076172,
-    "y": 94.23810768127441,
-    "z": "33eaf422.44290c",
+    "x": 234.2856903076172,
+    "y": 108.23810768127441,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "8c1b6d3.067719"
+        "a6501208.be07a"
       ]
     ]
   },
   {
-    "id": "8c1b6d3.067719",
+    "id": "a6501208.be07a",
     "type": "method",
     "name": "method sdwan-wanport-vnf-topology-operation-underlay",
     "xml": "<method rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 228.42861938476562,
-    "y": 179.00003147125244,
-    "z": "33eaf422.44290c",
+    "x": 237.42861938476562,
+    "y": 193.00003147125244,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3cd9be6d.873c82"
+        "fbe9ed1f.31b14"
       ]
     ]
   },
   {
-    "id": "3cd9be6d.873c82",
+    "id": "fbe9ed1f.31b14",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 160.66668701171875,
-    "y": 287.66673278808594,
-    "z": "33eaf422.44290c",
+    "x": 169.66668701171875,
+    "y": 301.66673278808594,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2d7b33ef.a2d9ac",
-        "383a5f3d.e4cb2",
-        "70ceaafc.e0d3f4",
-        "c880f4e9.6d6098"
+        "ba308345.6a0be",
+        "723ddf07.218d1",
+        "431fc2f2.17609c",
+        "38f6b67d.380b9a",
+        "32bd7569.5de31a"
       ]
     ]
   },
   {
-    "id": "2d7b33ef.a2d9ac",
+    "id": "ba308345.6a0be",
     "type": "for",
     "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
     "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 598.0004119873047,
-    "y": 398.66683769226074,
-    "z": "33eaf422.44290c",
+    "x": 604.000431060791,
+    "y": 440.6668539047241,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e9598182.81589"
+        "88f8bb94.113e88"
       ]
     ]
   },
   {
-    "id": "be430b5e.14a828",
+    "id": "2cdd7d19.2083a2",
     "type": "set",
     "name": "set prop.ar.allotted-resource-id",
     "xml": "<set>\n<parameter name='prop.ar.allotted-resource-id' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id`' />\n",
     "comments": "",
-    "x": 1385.0013427734375,
-    "y": 115.96877861022949,
-    "z": "33eaf422.44290c",
+    "x": 1394.0013427734375,
+    "y": 129.9687786102295,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "423b3b97.a50914",
+    "id": "f2739d06.3f82a",
     "type": "comment",
     "name": "Query MDSAL for AR",
     "info": "",
     "comments": "",
-    "x": 1710.3340148925781,
-    "y": 139.96864795684814,
-    "z": "33eaf422.44290c",
+    "x": 1719.3340148925781,
+    "y": 153.96864795684814,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "dab21607.3703b8",
+    "id": "4600defb.d9dc1",
     "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": 2189.334873199463,
+    "y": 172.96862697601318,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "90cd3398.44586",
+    "id": "2398fd5d.dbac12",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1959.66841506958,
-    "y": 194.63526725769043,
-    "z": "33eaf422.44290c",
+    "x": 1968.66841506958,
+    "y": 208.63526725769043,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1d70b537.cd409b"
+        "179e1db5.4a8f02"
       ]
     ]
   },
   {
-    "id": "1d70b537.cd409b",
+    "id": "179e1db5.4a8f02",
     "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": 2123.668254852295,
+    "y": 208.13510036468506,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d282839d.a628"
+        "35d0f2e8.ed82ae"
       ]
     ]
   },
   {
-    "id": "bce07922.8c4f98",
+    "id": "f8dd83a.151c88",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2438.3587913513184,
-    "y": 190.75424098968506,
-    "z": "33eaf422.44290c",
+    "x": 2447.3587913513184,
+    "y": 204.75424098968506,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3b07cad3.619296"
+        "2218a177.4e456e"
       ]
     ]
   },
   {
-    "id": "ee52805a.8bd8",
+    "id": "7900e8ec.0ba228",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachement resource not found\" />\n    \n",
     "comments": "",
-    "x": 2584.1275672912598,
-    "y": 230.20122909545898,
-    "z": "33eaf422.44290c",
+    "x": 2593.1275672912598,
+    "y": 244.20122909545898,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "259f1fc9.28f91",
+    "id": "7edde1df.f81a4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1952.5201416015625,
-    "y": 241.70127391815186,
-    "z": "33eaf422.44290c",
+    "x": 1961.5201416015625,
+    "y": 255.70127391815186,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b7b7bf01.123cf"
+        "ae127aa8.bf8958"
       ]
     ]
   },
   {
-    "id": "b7b7bf01.123cf",
+    "id": "ae127aa8.bf8958",
     "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": 2111.5199851989746,
+    "y": 256.36782932281494,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7cd11e1b.bfaf1"
+        "c86b6674.f9da58"
       ]
     ]
   },
   {
-    "id": "7c51c058.0306e",
+    "id": "735fee8b.f10fd",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2426.6867446899414,
-    "y": 228.03460121154785,
-    "z": "33eaf422.44290c",
+    "x": 2435.6867446899414,
+    "y": 242.03460121154785,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ee52805a.8bd8"
+        "7900e8ec.0ba228"
       ]
     ]
   },
   {
-    "id": "d282839d.a628",
+    "id": "35d0f2e8.ed82ae",
     "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": 2287.668430328369,
+    "y": 208.6352834701538,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bce07922.8c4f98",
-        "7c51c058.0306e"
+        "f8dd83a.151c88",
+        "735fee8b.f10fd"
       ]
     ]
   },
   {
-    "id": "91cc0551.bc01e8",
+    "id": "99f51e24.95bbd",
     "type": "set",
     "name": "set parent-service-instance-id",
     "xml": "<set>\n<parameter name='prop.parent-service-instance-id' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />\n\n",
     "comments": "",
-    "x": 2834.0020294189453,
-    "y": 191.63526439666748,
-    "z": "33eaf422.44290c",
+    "x": 2843.0020294189453,
+    "y": 205.63526439666748,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "3b07cad3.619296",
+    "id": "2218a177.4e456e",
     "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": 2597.4778213500977,
+    "y": 204.80180072784424,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "91cc0551.bc01e8",
-        "dc60366a.2e9048"
+        "99f51e24.95bbd",
+        "87284033.76d89"
       ]
     ]
   },
   {
-    "id": "7cd11e1b.bfaf1",
+    "id": "c86b6674.f9da58",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachement resource not found\" />\n    \n",
     "comments": "",
-    "x": 2270.001438140869,
-    "y": 240.63520526885986,
-    "z": "33eaf422.44290c",
+    "x": 2279.001438140869,
+    "y": 254.63520526885986,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "dab3ccab.cce12",
+    "id": "3ba72ba0.13a9f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2057.303554534912,
-    "y": 512.7709312438965,
-    "z": "33eaf422.44290c",
+    "x": 2066.303554534912,
+    "y": 526.7709312438965,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d5fc5211.c019"
+        "3c18f953.7698e6"
       ]
     ]
   },
   {
-    "id": "4c1ffccd.7a1ed4",
+    "id": "b947c854.e35438",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2049.15535736084,
-    "y": 547.8370161056519,
-    "z": "33eaf422.44290c",
+    "x": 2058.15535736084,
+    "y": 561.8370161056519,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4fdb783b.5926a8"
+        "5f7ffb48.00ef54"
       ]
     ]
   },
   {
-    "id": "4fdb783b.5926a8",
+    "id": "5f7ffb48.00ef54",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 2195.304130554199,
-    "y": 548.1045122146606,
-    "z": "33eaf422.44290c",
+    "x": 2204.304130554199,
+    "y": 562.1045122146606,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "d5fc5211.c019",
+    "id": "3c18f953.7698e6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2177.3038024902344,
-    "y": 512.771014213562,
-    "z": "33eaf422.44290c",
+    "x": 2186.3038024902344,
+    "y": 526.771014213562,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "c5126628.a1afc8",
+    "id": "9ef76182.7b173",
     "type": "for",
     "name": "for pnidx.. mdsal-psd.networks.network_length[]",
     "xml": "<for index='pnidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1740.6683502197266,
-    "y": 612.3028893470764,
-    "z": "33eaf422.44290c",
+    "x": 1749.6683502197266,
+    "y": 626.3028893470764,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "84a7b7df.1615b8"
+        "e38b67ea.4c8758"
       ]
     ]
   },
   {
-    "id": "c8ac708.b0a709",
+    "id": "348ba1e1.19e85e",
     "type": "switchNode",
     "name": "switch ActivateSDWANConnectivityInstance",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2277.3349990844727,
-    "y": 583.3028283119202,
-    "z": "33eaf422.44290c",
+    "x": 2279.3349838256836,
+    "y": 595.3028907775879,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "af2e2a1f.e9aba8"
+        "27c81bce.91e324"
       ]
     ]
   },
   {
-    "id": "af2e2a1f.e9aba8",
+    "id": "27c81bce.91e324",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2522.334518432617,
-    "y": 582.3028283119202,
-    "z": "33eaf422.44290c",
+    "x": 2531.334518432617,
+    "y": 596.3028283119202,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "64a2447b.58478c"
+        "917509ae.cf1bf8"
       ]
     ]
   },
   {
-    "id": "64a2447b.58478c",
+    "id": "917509ae.cf1bf8",
     "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": 2687.3342056274414,
+    "y": 596.3028283119202,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "cf236aa.4478b98",
+    "id": "1fd45985.393f26",
     "type": "for",
     "name": "for loop paramidx - Get topology from servicedata",
     "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 1746.3349304199219,
-    "y": 662.3024039268494,
-    "z": "33eaf422.44290c",
+    "x": 1681.3351593017578,
+    "y": 711.3025188446045,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "8e2c0789.42db78"
+        "4ebf01e5.37d06"
       ]
     ]
   },
   {
-    "id": "5a69b1be.1055d",
+    "id": "8d7971fd.c23e3",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2178.335252761841,
-    "y": 660.3024020195007,
-    "z": "33eaf422.44290c",
+    "x": 2133.335250854492,
+    "y": 690.3024244308472,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "333e463b.eac74a"
+        "e336f6e8.a1adc8"
       ]
     ]
   },
   {
-    "id": "333e463b.eac74a",
+    "id": "e336f6e8.a1adc8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2329.3352642059326,
-    "y": 658.3024439811707,
-    "z": "33eaf422.44290c",
+    "x": 2284.335262298584,
+    "y": 688.3024663925171,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3622de43.1881c2"
+        "f2813d3e.d5ec3"
       ]
     ]
   },
   {
-    "id": "3622de43.1881c2",
+    "id": "f2813d3e.d5ec3",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 2470.3349933624268,
-    "y": 657.9023776054382,
-    "z": "33eaf422.44290c",
+    "x": 2425.334991455078,
+    "y": 687.9024000167847,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "b9ac21ad.456c9",
+    "id": "4a7f65c3.11a50c",
     "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": 1652.334976196289,
+    "y": 670.9690914154053,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "14fa21e1.174cde"
+        "42c35e07.6414a"
       ]
     ]
   },
   {
-    "id": "14fa21e1.174cde",
+    "id": "42c35e07.6414a",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2331.7633361816406,
-    "y": 622.5404515266418,
-    "z": "33eaf422.44290c",
+    "x": 1807.7636489868164,
+    "y": 669.5404710769653,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "aa33b299.d2b4d"
+        "79c31704.e1ea48"
       ]
     ]
   },
   {
-    "id": "aa33b299.d2b4d",
+    "id": "79c31704.e1ea48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
     "comments": "",
-    "x": 2475.1921920776367,
-    "y": 622.6835255622864,
-    "z": "33eaf422.44290c",
+    "x": 1948.1922721862793,
+    "y": 670.6835603713989,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "f19570ac.55187",
+    "id": "d058b4fc.a3d908",
     "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": 1560.3348426818848,
+    "y": 773.3023405075073,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "aa80dabf.aca3c8",
-        "4031750f.9789cc"
+        "80132a76.17bcc8",
+        "f4211b87.94b798"
       ]
     ]
   },
   {
-    "id": "aa80dabf.aca3c8",
+    "id": "80132a76.17bcc8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1741.334529876709,
-    "y": 784.3028259277344,
-    "z": "33eaf422.44290c",
+    "x": 1750.334529876709,
+    "y": 798.3028259277344,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "768ac816.c95648"
+        "7df004fc.b974bc"
       ]
     ]
   },
   {
-    "id": "4031750f.9789cc",
+    "id": "f4211b87.94b798",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1742.3353233337402,
-    "y": 712.3024568557739,
-    "z": "33eaf422.44290c",
+    "x": 1744.3354568481445,
+    "y": 759.3024883270264,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bcb708b4.4756f8"
+        "f043ab05.abcb68"
       ]
     ]
   },
   {
-    "id": "bcb708b4.4756f8",
+    "id": "f043ab05.abcb68",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1872.3353271484375,
-    "y": 711.3024568557739,
-    "z": "33eaf422.44290c",
+    "x": 1880.3354606628418,
+    "y": 759.3024272918701,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "768ac816.c95648",
+    "id": "7df004fc.b974bc",
     "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": 1755.66748046875,
+    "y": 866.3020601272583,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "37a8a2fc.2a711e"
+        "f2cfe93e.7237b8"
       ]
     ]
   },
   {
-    "id": "37a8a2fc.2a711e",
+    "id": "f2cfe93e.7237b8",
     "type": "for",
     "name": "for ppidx.. mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='ppidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2154.000732421875,
-    "y": 852.6356782913208,
-    "z": "33eaf422.44290c",
+    "x": 2163.000732421875,
+    "y": 866.6356782913208,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2c05f76b.7d8c98"
+        "de6797a2.586c78"
       ]
     ]
   },
   {
-    "id": "27aa5d13.3e58c2",
+    "id": "ffb0cb19.6bd078",
     "type": "set",
     "name": "set prop.ar.provided-allotted-resource-id",
     "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$ppidx].allotted-resource-id`' />\n\n",
     "comments": "",
-    "x": 2245.0018463134766,
-    "y": 930.6359763145447,
-    "z": "33eaf422.44290c",
+    "x": 2254.0018463134766,
+    "y": 944.6359763145447,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2e8e3485.54a23c",
+    "id": "7d29151f.aff58c",
     "type": "for",
     "name": "for loop aridx - Get role from allotted resource",
     "xml": "<for index=\"aridx\" start=\"0\" end=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2263.0025482177734,
-    "y": 1041.302767753601,
-    "z": "33eaf422.44290c",
+    "x": 2272.0025482177734,
+    "y": 1055.302767753601,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1e03ba47.0fb3f6"
+        "99b001da.0efb4"
       ]
     ]
   },
   {
-    "id": "a525e63a.cc2b38",
+    "id": "175772d7.f9d53d",
     "type": "switchNode",
     "name": "switch Role",
     "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'Role'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2672.002658843994,
-    "y": 1044.3028545379639,
-    "z": "33eaf422.44290c",
+    "x": 2681.002658843994,
+    "y": 1058.3028545379639,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3f99d6d3.e0611a"
+        "d13f62a9.a25bd"
       ]
     ]
   },
   {
-    "id": "3f99d6d3.e0611a",
+    "id": "d13f62a9.a25bd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2813.0029907226562,
-    "y": 1043.3028535842896,
-    "z": "33eaf422.44290c",
+    "x": 2822.0029907226562,
+    "y": 1057.3028535842896,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7bec0d2f.0381d4"
+        "63261a78.0b6344"
       ]
     ]
   },
   {
-    "id": "7bec0d2f.0381d4",
+    "id": "63261a78.0b6344",
     "type": "set",
     "name": "set prop.role",
     "xml": "<set>\n<parameter name='prop.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n",
     "comments": "",
-    "x": 2954.0030250549316,
-    "y": 1044.9027452468872,
-    "z": "33eaf422.44290c",
+    "x": 2963.0030250549316,
+    "y": 1058.9027452468872,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "8fa9655b.7c6ef8",
+    "id": "63613798.d70908",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2749.0020446777344,
-    "y": 947.969269990921,
-    "z": "33eaf422.44290c",
+    "x": 2758.0020446777344,
+    "y": 961.969269990921,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "788b9cb8.8b37d4"
+        "18ba51e1.01a3be"
       ]
     ]
   },
   {
-    "id": "3a2551b1.4f0ace",
+    "id": "9fe7ff8.35548",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2745.8537673950195,
-    "y": 1002.0353531837463,
-    "z": "33eaf422.44290c",
+    "x": 2754.8537673950195,
+    "y": 1016.0353531837463,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5672e76f.825118"
+        "2fd2f3c1.09b97c"
       ]
     ]
   },
   {
-    "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": "8ad9ee53.6aa87",
     "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": 2138.3351821899414,
+    "y": 1120.6358079910278,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "145fa94e.f27887",
-        "f3be5614.599b68"
+        "6011fd41.335614",
+        "472beb8.34ca814"
       ]
     ]
   },
   {
-    "id": "da4408c3.f5c0d8",
+    "id": "890f782e.076f68",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2445.3345680236816,
-    "y": 1082.6354112625122,
-    "z": "33eaf422.44290c",
+    "x": 2454.3345680236816,
+    "y": 1096.6354112625122,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "77da5adf.834034",
+    "id": "aa2b8cd4.2f9ae",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2855.3042030334473,
-    "y": 1178.1045179367065,
-    "z": "33eaf422.44290c",
+    "x": 2864.3042030334473,
+    "y": 1192.1045179367065,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "8a4c0c4d.62361"
+        "4765f05a.45c5e"
       ]
     ]
   },
   {
-    "id": "8429ea0a.844dc8",
+    "id": "1bed61f6.90e36e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2857.155773162842,
-    "y": 1238.170599937439,
-    "z": "33eaf422.44290c",
+    "x": 2866.155773162842,
+    "y": 1252.170599937439,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e9382022.a0267"
+        "151f6728.afe339"
       ]
     ]
   },
   {
-    "id": "e9382022.a0267",
+    "id": "151f6728.afe339",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SDWAN service-data not found\" />\n    \n",
     "comments": "",
-    "x": 3001.304546356201,
-    "y": 1200.4380140304565,
-    "z": "33eaf422.44290c",
+    "x": 3010.304546356201,
+    "y": 1214.4380140304565,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "8a4c0c4d.62361",
+    "id": "4765f05a.45c5e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2985.3042221069336,
-    "y": 1167.1046781539917,
-    "z": "33eaf422.44290c",
+    "x": 2994.3042221069336,
+    "y": 1181.1046781539917,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "cf6c45e0.a382b8",
+    "id": "f7f9e60d.d46178",
     "type": "set",
     "name": "set prop.ar-service-instance-id",
     "xml": "<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
     "comments": "",
-    "x": 2457.3356018066406,
-    "y": 1166.6360107660294,
-    "z": "33eaf422.44290c",
+    "x": 2466.3356018066406,
+    "y": 1180.6360107660294,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "57a73c1e.aeb484",
+    "id": "f464743.4983e88",
     "type": "for",
     "name": "for arvidx.. mdsal-arsd.service-data.vnfs.vnf_length[]",
     "xml": "<for index='arvidx' start='0' end='`$mdsal-arsd.service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2501.0020751953125,
-    "y": 1288.6358003616333,
-    "z": "33eaf422.44290c",
+    "x": 2510.0020751953125,
+    "y": 1302.6358003616333,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c345e276.9551d"
+        "535fb492.abce2c"
       ]
     ]
   },
   {
-    "id": "c345e276.9551d",
+    "id": "535fb492.abce2c",
     "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": 2856.6683959960938,
+    "y": 1292.6357765197754,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "568b8936.7e3108",
-        "39f7ac2d.b359d4",
-        "5ab57864.07d758"
+        "b26020e0.3a846",
+        "5e2a4404.59208c",
+        "858743af.15464"
       ]
     ]
   },
   {
-    "id": "568b8936.7e3108",
+    "id": "b26020e0.3a846",
     "type": "switchNode",
     "name": "switch ActivateSDWANPortInstance",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3105.6684799194336,
-    "y": 1233.636646270752,
-    "z": "33eaf422.44290c",
+    "x": 3118.668504714966,
+    "y": 1263.6367359161377,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "61fa4242.861d3c"
+        "6b78409.f5b87c"
       ]
     ]
   },
   {
-    "id": "cb874e53.482c8",
+    "id": "dde2f6f9.3c1848",
     "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": 2591.668212890625,
+    "y": 1347.3024454116821,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6aed06ab.403dd8"
+        "58f23c0f.4a7544"
       ]
     ]
   },
   {
-    "id": "815939d8.db2788",
+    "id": "3d280456.864e3c",
     "type": "for",
     "name": "for loop wportidx - Get wan port ID from servicedata",
     "xml": "<for index=\"wportidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2507.6688232421875,
-    "y": 1488.6367044448853,
-    "z": "33eaf422.44290c",
+    "x": 2516.6688232421875,
+    "y": 1502.6367044448853,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "233ccbaa.09c2a4"
+        "3b6a88cf.f649b8"
       ]
     ]
   },
   {
-    "id": "6aed06ab.403dd8",
+    "id": "58f23c0f.4a7544",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2743.0966777801514,
-    "y": 1332.8739652633667,
-    "z": "33eaf422.44290c",
+    "x": 2752.0966777801514,
+    "y": 1346.8739652633667,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ed789211.6aa24"
+        "6637a392.65819c"
       ]
     ]
   },
   {
-    "id": "ed789211.6aa24",
+    "id": "6637a392.65819c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id (port) not found in service-data\" />\n",
     "comments": "",
-    "x": 2880.525634765625,
-    "y": 1333.0173768997192,
-    "z": "33eaf422.44290c",
+    "x": 2889.525634765625,
+    "y": 1347.0173768997192,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "61fa4242.861d3c",
+    "id": "6b78409.f5b87c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3333.668167114258,
-    "y": 1231.6366472244263,
-    "z": "33eaf422.44290c",
+    "x": 3346.66819190979,
+    "y": 1261.636736869812,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "8dcdd808.562708"
+        "11f23b34.c014d5"
       ]
     ]
   },
   {
-    "id": "233ccbaa.09c2a4",
+    "id": "3b6a88cf.f649b8",
     "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": 2859.669807434082,
+    "y": 1505.6369543075562,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a50a8ecc.70146",
-        "c6553e69.23e06",
-        "a6ca66b6.132b88",
-        "f8ad0824.756498"
+        "9eb62557.123aa8",
+        "6f944994.65d2c8",
+        "b81eb9e0.1976f8",
+        "3235095c.ee2c06"
       ]
     ]
   },
   {
-    "id": "a50a8ecc.70146",
+    "id": "9eb62557.123aa8",
     "type": "switchNode",
     "name": "switch transportNetworkName",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3145.670757293701,
-    "y": 1430.6374912261963,
-    "z": "33eaf422.44290c",
+    "x": 3154.670757293701,
+    "y": 1444.6374912261963,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1b0657c2.3d75f8"
+        "a7e30f58.58c4"
       ]
     ]
   },
   {
-    "id": "8dcdd808.562708",
+    "id": "11f23b34.c014d5",
     "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": 3501.667875289917,
+    "y": 1261.6367359161377,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "1b0657c2.3d75f8",
+    "id": "a7e30f58.58c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3338.6707725524902,
-    "y": 1430.63765335083,
-    "z": "33eaf422.44290c",
+    "x": 3347.6707725524902,
+    "y": 1444.63765335083,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b34f100.12863f"
+        "9cf2c3d4.0b4b5"
       ]
     ]
   },
   {
-    "id": "b34f100.12863f",
+    "id": "9cf2c3d4.0b4b5",
     "type": "set",
     "name": "set prop.hub.transportNetworkName",
     "xml": "<set>\n<parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
     "comments": "",
-    "x": 3556.6707801818848,
-    "y": 1429.23823928833,
-    "z": "33eaf422.44290c",
+    "x": 3565.6707801818848,
+    "y": 1443.23823928833,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "c6553e69.23e06",
+    "id": "6f944994.65d2c8",
     "type": "switchNode",
     "name": "switch wanPortId",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3107.003490447998,
-    "y": 1464.6371002197266,
-    "z": "33eaf422.44290c",
+    "x": 3116.003490447998,
+    "y": 1478.6371002197266,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2bec9518.ec7c8a"
+        "b31bd9b2.46c7d8"
       ]
     ]
   },
   {
-    "id": "2bec9518.ec7c8a",
+    "id": "b31bd9b2.46c7d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3268.003818511963,
-    "y": 1465.6371803283691,
-    "z": "33eaf422.44290c",
+    "x": 3277.003818511963,
+    "y": 1479.6371803283691,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "37425798.ff2018"
+        "d3357919.f54078"
       ]
     ]
   },
   {
-    "id": "37425798.ff2018",
+    "id": "d3357919.f54078",
     "type": "set",
     "name": "set prop.hub.wanPortId",
     "xml": "<set>\n<parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
     "comments": "",
-    "x": 3458.004280090332,
-    "y": 1465.2374563217163,
-    "z": "33eaf422.44290c",
+    "x": 3467.004280090332,
+    "y": 1479.2374563217163,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "d298818e.120b",
+    "id": "2c43f3c.460060c",
     "type": "switchNode",
     "name": "switch  prop.hub.transportNetworkName==prop.spoke.transportNetworkName",
     "xml": "<switch test=\"`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2585.004150390625,
-    "y": 1591.304440498352,
-    "z": "33eaf422.44290c",
+    "x": 2594.004150390625,
+    "y": 1605.304440498352,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7a56c9bb.004ba8",
-        "6f7c3402.62f4ac"
+        "cf49239.d51bfe",
+        "c6577e7a.d8dfd"
       ]
     ]
   },
   {
-    "id": "7a56c9bb.004ba8",
+    "id": "cf49239.d51bfe",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2931.0036811828613,
-    "y": 1628.3045144081116,
-    "z": "33eaf422.44290c",
+    "x": 2940.0036811828613,
+    "y": 1642.3045144081116,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3d53e5a5.8f912a"
+        "c20a45c1.991ea8"
       ]
     ]
   },
   {
-    "id": "6f7c3402.62f4ac",
+    "id": "c6577e7a.d8dfd",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2935.0041694641113,
-    "y": 1563.3041467666626,
-    "z": "33eaf422.44290c",
+    "x": 2944.0041694641113,
+    "y": 1577.3041467666626,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "67b638dd.ee4608"
+        "7523e16b.4849a"
       ]
     ]
   },
   {
-    "id": "67b638dd.ee4608",
+    "id": "7523e16b.4849a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3075.0040969848633,
-    "y": 1591.304271697998,
-    "z": "33eaf422.44290c",
+    "x": 3084.0040969848633,
+    "y": 1605.304271697998,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "2c05f76b.7d8c98",
+    "id": "de6797a2.586c78",
     "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": 1905.0322265625,
+    "y": 975.8333101272583,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "27aa5d13.3e58c2",
-        "2e8e3485.54a23c",
-        "f102bda6.18929",
-        "74cd5045.40831",
-        "447d9e5f.d5a82"
+        "ffb0cb19.6bd078",
+        "9b080888.c9b298",
+        "1ff59188.ff36ae",
+        "8ad9ee53.6aa87",
+        "7d29151f.aff58c"
       ]
     ]
   },
   {
-    "id": "e66f705e.b1887",
+    "id": "524b783f.8c1128",
     "type": "switchNode",
     "name": "switch vpnId",
-    "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpnId'`\">\n",
+    "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2168.001268386841,
-    "y": 704.6354126930237,
-    "z": "33eaf422.44290c",
+    "x": 2123.001266479492,
+    "y": 734.6354351043701,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3f0e1104.f843be"
+        "6c47f41b.3d3cac"
       ]
     ]
   },
   {
-    "id": "3f0e1104.f843be",
+    "id": "6c47f41b.3d3cac",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2312.0012798309326,
-    "y": 704.6354537010193,
-    "z": "33eaf422.44290c",
+    "x": 2267.001277923584,
+    "y": 734.6354761123657,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ca8d4515.16e2d8"
+        "9b1a7d07.58406"
       ]
     ]
   },
   {
-    "id": "ca8d4515.16e2d8",
+    "id": "9b1a7d07.58406",
     "type": "set",
     "name": "set prop.vpnId",
     "xml": "<set>\n<parameter name='prop.vpnId' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n",
     "comments": "",
-    "x": 2470.001001358032,
-    "y": 703.2353882789612,
-    "z": "33eaf422.44290c",
+    "x": 2425.0009994506836,
+    "y": 733.2354106903076,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "49f7ab80.b2f444",
+    "id": "c93e7e34.eb504",
     "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": 2631.336555480957,
+    "y": 1731.6363048553467,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "e429ce4e.ff4d3",
+    "id": "33961398.8b885c",
     "type": "execute",
     "name": "execute RestApiCallNode underlay route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayHubResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3483.335531234741,
-    "y": 2176.970527648926,
-    "z": "33eaf422.44290c",
+    "x": 3463.33624458313,
+    "y": 2602.9708592891693,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ec4a9fe3.5d773",
-        "c11c5434.daa9b8"
+        "54355641.66e388",
+        "a6852c79.79538"
       ]
     ]
   },
   {
-    "id": "c11c5434.daa9b8",
+    "id": "a6852c79.79538",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3730.3355026245117,
-    "y": 2161.970682144165,
-    "z": "33eaf422.44290c",
+    "x": 3730.3361530303955,
+    "y": 2630.970888853073,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "ec4a9fe3.5d773",
+    "id": "54355641.66e388",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728.3351821899414,
-    "y": 2117.970672607422,
-    "z": "33eaf422.44290c",
+    "x": 3728.335832595825,
+    "y": 2586.97087931633,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "dfdd1a66.f211b8"
+        "e784c17f.677b5"
       ]
     ]
   },
   {
-    "id": "dfdd1a66.f211b8",
+    "id": "e784c17f.677b5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing sdwan hub route underlay rest api\" />\n",
     "comments": "",
-    "x": 3870.335868835449,
-    "y": 2115.9707555770874,
-    "z": "33eaf422.44290c",
+    "x": 3870.336519241333,
+    "y": 2584.9709622859955,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "f88633ef.4a895",
+    "id": "45a08ea1.9e3d3",
     "type": "set",
     "name": "Add prop.hub.route",
-    "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.hubRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanportId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n",
+    "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": 3407.6696243286133,
+    "y": 2559.637367248535,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "9c47cd10.cba71",
+    "id": "5e2b5a00.fe4964",
     "type": "execute",
     "name": "execute RestApiCallNode underlay route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayspokeResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3489.669235229492,
-    "y": 2282.637691259384,
-    "z": "33eaf422.44290c",
+    "x": 3482.6696243286133,
+    "y": 2701.637832403183,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "97c364c.1574998",
-        "46a68448.91960c"
+        "e568918e.3bed",
+        "6ef02e4e.06cc1"
       ]
     ]
   },
   {
-    "id": "46a68448.91960c",
+    "id": "6ef02e4e.06cc1",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3734.669120788574,
-    "y": 2261.6379222869873,
-    "z": "33eaf422.44290c",
+    "x": 3734.669771194458,
+    "y": 2730.6381289958954,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "97c364c.1574998",
+    "id": "e568918e.3bed",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3732.668800354004,
-    "y": 2217.637912750244,
-    "z": "33eaf422.44290c",
+    "x": 3732.6694507598877,
+    "y": 2686.638119459152,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "32d31d6b.e39f42"
+        "43fb9f64.6e794"
       ]
     ]
   },
   {
-    "id": "32d31d6b.e39f42",
+    "id": "43fb9f64.6e794",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing sdwan spoke route underlay rest api\" />\n",
     "comments": "",
-    "x": 3874.6694869995117,
-    "y": 2215.6379957199097,
-    "z": "33eaf422.44290c",
+    "x": 3874.6701374053955,
+    "y": 2684.6382024288177,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "39f7ac2d.b359d4",
+    "id": "5e2a4404.59208c",
     "type": "switchNode",
     "name": "switch ActivateSDWANDeviceInstance",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3116.5320568084717,
-    "y": 1266.833604812622,
-    "z": "33eaf422.44290c",
+    "x": 3129.532081604004,
+    "y": 1296.8336944580078,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f872eafd.ca0638"
+        "355d1cb7.8466e4"
       ]
     ]
   },
   {
-    "id": "50e86192.f47ba",
+    "id": "85c67b27.be5eb8",
     "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": 2597.5316314697266,
+    "y": 1389.4999265670776,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e276c36a.0c845"
+        "188473e9.fdf33c"
       ]
     ]
   },
   {
-    "id": "e276c36a.0c845",
+    "id": "188473e9.fdf33c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2754.9600677490234,
-    "y": 1375.0714597702026,
-    "z": "33eaf422.44290c",
+    "x": 2763.9600677490234,
+    "y": 1389.0714597702026,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "58c8206f.bb829"
+        "ec42dab0.d633d8"
       ]
     ]
   },
   {
-    "id": "58c8206f.bb829",
+    "id": "ec42dab0.d633d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id (device) not found in service-data\" />\n",
     "comments": "",
-    "x": 2895.388999938965,
-    "y": 1377.2144346237183,
-    "z": "33eaf422.44290c",
+    "x": 2904.388999938965,
+    "y": 1391.2144346237183,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "f872eafd.ca0638",
+    "id": "355d1cb7.8466e4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3344.531744003296,
-    "y": 1264.8336057662964,
-    "z": "33eaf422.44290c",
+    "x": 3357.531768798828,
+    "y": 1294.8336954116821,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "9b7f11e8.f156f"
+        "73270e6c.070f4"
       ]
     ]
   },
   {
-    "id": "9b7f11e8.f156f",
+    "id": "73270e6c.070f4",
     "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": 3512.531452178955,
+    "y": 1294.8336944580078,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "5ab57864.07d758",
+    "id": "858743af.15464",
     "type": "switchNode",
     "name": "switch ActivateSiteInstance",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3079.532127380371,
-    "y": 1300.8336687088013,
-    "z": "33eaf422.44290c",
+    "x": 3092.5321521759033,
+    "y": 1330.833758354187,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c3a08b58.d519a8"
+        "f6939cb3.d0942"
       ]
     ]
   },
   {
-    "id": "971c87ae.5fde98",
+    "id": "1e774611.be647a",
     "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": 2596.5315017700195,
+    "y": 1427.4998044967651,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "9fcf4fcb.f5c0f"
+        "bc02814a.d7499"
       ]
     ]
   },
   {
-    "id": "9fcf4fcb.f5c0f",
+    "id": "bc02814a.d7499",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2747.959966659546,
-    "y": 1413.0713243484497,
-    "z": "33eaf422.44290c",
+    "x": 2756.959966659546,
+    "y": 1427.0713243484497,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2e7d1637.59ed7a"
+        "d392366e.9150d8"
       ]
     ]
   },
   {
-    "id": "2e7d1637.59ed7a",
+    "id": "d392366e.9150d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id (site) not found in service-data\" />\n",
     "comments": "",
-    "x": 2896.388921737671,
-    "y": 1415.2143306732178,
-    "z": "33eaf422.44290c",
+    "x": 2905.388921737671,
+    "y": 1429.2143306732178,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "c3a08b58.d519a8",
+    "id": "f6939cb3.d0942",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3267.531692504883,
-    "y": 1300.8338346481323,
-    "z": "33eaf422.44290c",
+    "x": 3280.531717300415,
+    "y": 1330.833924293518,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "90c635f1.794b58"
+        "ab570b08.b1c7a8"
       ]
     ]
   },
   {
-    "id": "90c635f1.794b58",
+    "id": "ab570b08.b1c7a8",
     "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": 3435.531400680542,
+    "y": 1330.8339233398438,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "d7805819.9cd108",
+    "id": "37339d04.d0e692",
     "type": "for",
     "name": "for loop deviceidx - Get wan port ID from servicedata",
     "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2719.5331497192383,
-    "y": 1753.834059715271,
-    "z": "33eaf422.44290c",
+    "x": 2728.5331497192383,
+    "y": 1767.834059715271,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "82cf7632.68ed28"
+        "fc5d79c.538d088"
       ]
     ]
   },
   {
-    "id": "2060fdef.b0b7d2",
+    "id": "29161345.19c04c",
     "type": "switchNode",
     "name": "switch deviceId",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3180.5345039367676,
-    "y": 1667.834927558899,
-    "z": "33eaf422.44290c",
+    "x": 3189.5345039367676,
+    "y": 1681.834927558899,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2cf983c4.8e5dac"
+        "cded98bd.ccea58"
       ]
     ]
   },
   {
-    "id": "2cf983c4.8e5dac",
+    "id": "cded98bd.ccea58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3331.5348777770996,
-    "y": 1664.835171699524,
-    "z": "33eaf422.44290c",
+    "x": 3340.5348777770996,
+    "y": 1678.835171699524,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "234f9431.3dcaac"
+        "d9cc984d.9f9d28"
       ]
     ]
   },
   {
-    "id": "234f9431.3dcaac",
+    "id": "d9cc984d.9f9d28",
     "type": "set",
     "name": "set prop.hub.deviceId",
     "xml": "<set>\n<parameter name='prop.hub.deviceId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n",
     "comments": "",
-    "x": 3506.535125732422,
-    "y": 1664.4356966018677,
-    "z": "33eaf422.44290c",
+    "x": 3515.535125732422,
+    "y": 1678.4356966018677,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "4ed5eacf.f6a1c4",
+    "id": "125c1fec.50ea4",
     "type": "for",
     "name": "for loop siteidx - Get site ID from servicedata",
     "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 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": 2703.0330352783203,
+    "y": 1824.83407497406,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7e8ff406.9f32cc"
+        "d543abbf.21d958"
       ]
     ]
   },
   {
-    "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": "e6b24865.170e78",
     "type": "comment",
     "name": "Add route src->dst, dst->src",
     "info": "",
     "comments": "",
-    "x": 2910.6687927246094,
-    "y": 1858.6359510421753,
-    "z": "33eaf422.44290c",
+    "x": 2919.6687927246094,
+    "y": 1872.6359510421753,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2f1d0b59.a2f164",
+    "id": "79cfeb5f.61b2e4",
     "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": 2141.334228515625,
+    "y": 1252.968747138977,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "57a73c1e.aeb484",
-        "815939d8.db2788",
-        "d298818e.120b",
-        "bc0801cd.444e3",
-        "cf6c45e0.a382b8",
-        "380e9d46.aac952",
-        "150f28bb.9cebb7"
+        "f464743.4983e88",
+        "3d280456.864e3c",
+        "2c43f3c.460060c",
+        "18153066.3dcbc",
+        "f7f9e60d.d46178",
+        "a780d837.5bb548",
+        "fcb5aaf7.a56738"
       ]
     ]
   },
   {
-    "id": "bc0801cd.444e3",
+    "id": "18153066.3dcbc",
     "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": 2396.333984375,
+    "y": 1389.3021211624146,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "cb874e53.482c8",
-        "50e86192.f47ba",
-        "971c87ae.5fde98"
+        "dde2f6f9.3c1848",
+        "85c67b27.be5eb8",
+        "1e774611.be647a"
       ]
     ]
   },
   {
-    "id": "3d53e5a5.8f912a",
+    "id": "c20a45c1.991ea8",
     "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": 2416.3350219726562,
+    "y": 1761.635643005371,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "49f7ab80.b2f444",
-        "d7805819.9cd108",
-        "4ed5eacf.f6a1c4",
-        "927db1a6.0967b",
-        "9c607856.359088"
+        "c93e7e34.eb504",
+        "37339d04.d0e692",
+        "125c1fec.50ea4",
+        "f1944c46.f8a7e"
       ]
     ]
   },
   {
-    "id": "a6ca66b6.132b88",
+    "id": "b81eb9e0.1976f8",
     "type": "switchNode",
     "name": "switch providerIpAddress",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3128.5319747924805,
-    "y": 1501.8334050178528,
-    "z": "33eaf422.44290c",
+    "x": 3137.5319747924805,
+    "y": 1515.8334050178528,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "22164d6f.99a622"
+        "9a3783d0.0d525"
       ]
     ]
   },
   {
-    "id": "22164d6f.99a622",
+    "id": "9a3783d0.0d525",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3304.532958984375,
-    "y": 1501.8335275650024,
-    "z": "33eaf422.44290c",
+    "x": 3313.532958984375,
+    "y": 1515.8335275650024,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "46635360.d5dd9c"
+        "87437b42.24d3e8"
       ]
     ]
   },
   {
-    "id": "46635360.d5dd9c",
+    "id": "87437b42.24d3e8",
     "type": "set",
     "name": "set prop.hub.providerIpAddress",
     "xml": "<set>\n<parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
     "comments": "",
-    "x": 3506.5329971313477,
-    "y": 1502.4334478378296,
-    "z": "33eaf422.44290c",
+    "x": 3515.5329971313477,
+    "y": 1516.4334478378296,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "f8ad0824.756498",
+    "id": "3235095c.ee2c06",
     "type": "switchNode",
     "name": "switch ipAddress",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3101.0320568084717,
-    "y": 1539.333490371704,
-    "z": "33eaf422.44290c",
+    "x": 3110.0320568084717,
+    "y": 1553.333490371704,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ae5c5a08.535ae8"
+        "901583b2.3d45c"
       ]
     ]
   },
   {
-    "id": "ae5c5a08.535ae8",
+    "id": "901583b2.3d45c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3305.0329971313477,
-    "y": 1539.3334422111511,
-    "z": "33eaf422.44290c",
+    "x": 3314.0329971313477,
+    "y": 1553.3334422111511,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a2ccd569.27b3a8"
+        "3c3cbc3f.366104"
       ]
     ]
   },
   {
-    "id": "a2ccd569.27b3a8",
+    "id": "3c3cbc3f.366104",
     "type": "set",
     "name": "set prop.hub.ipAddress",
     "xml": "<set>\n<parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
     "comments": "",
-    "x": 3500.033000946045,
-    "y": 1538.9334177970886,
-    "z": "33eaf422.44290c",
+    "x": 3509.033000946045,
+    "y": 1552.9334177970886,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "7ec8de50.abc7a",
+    "id": "3208baf8.6aed86",
     "type": "set",
     "name": "Add prop.spoke.route",
-    "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.spokeRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanportId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n\n\n",
+    "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": 3417.533639907837,
+    "y": 2670.3345935344696,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "383a5f3d.e4cb2",
+    "id": "723ddf07.218d1",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 357.3343048095703,
-    "y": 1113.3343391418457,
-    "z": "33eaf422.44290c",
+    "x": 366.3343048095703,
+    "y": 1127.3343391418457,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "66dd18ab.e48f08",
+    "id": "428d17cf.9d4528",
     "type": "execute",
     "name": "generate connection attachment AR url ",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1406.6672058105469,
-    "y": 175.30183696746826,
-    "z": "33eaf422.44290c",
+    "x": 1415.6672058105469,
+    "y": 189.30183696746826,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "8e4434c9.93e608",
+    "id": "31785cb6.7e6854",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1533.667236328125,
-    "y": 223.3018274307251,
-    "z": "33eaf422.44290c",
+    "x": 1542.667236328125,
+    "y": 237.3018274307251,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "90cd3398.44586",
-        "259f1fc9.28f91"
+        "2398fd5d.dbac12",
+        "7edde1df.f81a4"
       ]
     ]
   },
   {
-    "id": "b50f711c.f7671",
+    "id": "8a7f6cb5.ac077",
     "type": "execute",
     "name": "execute RestApiCallNode - get parent service data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-parent-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1759.0013122558594,
-    "y": 537.3021445274353,
-    "z": "33eaf422.44290c",
+    "x": 1767.0013885498047,
+    "y": 571.3021411895752,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "dab3ccab.cce12",
-        "4c1ffccd.7a1ed4"
+        "3ba72ba0.13a9f4",
+        "b947c854.e35438"
       ]
     ]
   },
   {
-    "id": "4176c827.c206f8",
+    "id": "39b9e240.c55f5e",
     "type": "execute",
     "name": "generate connection attachment parent url ",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-parent-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1735.0010375976562,
-    "y": 503.30206871032715,
-    "z": "33eaf422.44290c",
+    "x": 1744.0010375976562,
+    "y": 517.3020687103271,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "38bc1f98.0d705",
+    "id": "e2c10566.d14818",
     "type": "comment",
     "name": "full mesh do nothing",
     "info": "",
     "comments": "",
-    "x": 1569.667839050293,
-    "y": 714.3021068572998,
-    "z": "33eaf422.44290c",
+    "x": 1578.667839050293,
+    "y": 728.3021068572998,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "d2bafee.be2ed",
+    "id": "3ed45cd4.e3df94",
     "type": "comment",
     "name": "hub-spoke",
     "info": "",
     "comments": "",
-    "x": 2570.6672401428223,
-    "y": 811.3019967079163,
-    "z": "33eaf422.44290c",
+    "x": 2579.6672401428223,
+    "y": 825.3019967079163,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "74cd5045.40831",
+    "id": "9b080888.c9b298",
     "type": "execute",
     "name": "generate connection attachment AR url ",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar.provided-allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2243.0003929138184,
-    "y": 962.3019919395447,
-    "z": "33eaf422.44290c",
+    "x": 2252.0003929138184,
+    "y": 976.3019919395447,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "447d9e5f.d5a82",
+    "id": "1ff59188.ff36ae",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2374.000473022461,
-    "y": 1001.9686217308044,
-    "z": "33eaf422.44290c",
+    "x": 2383.000473022461,
+    "y": 1015.9686217308044,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "8fa9655b.7c6ef8",
-        "3a2551b1.4f0ace"
+        "63613798.d70908",
+        "9fe7ff8.35548"
       ]
     ]
   },
   {
-    "id": "380e9d46.aac952",
+    "id": "a780d837.5bb548",
     "type": "execute",
     "name": "generate service data url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2424.504367828369,
-    "y": 1203.3058919906616,
-    "z": "33eaf422.44290c",
+    "x": 2433.504367828369,
+    "y": 1217.3058919906616,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "150f28bb.9cebb7",
+    "id": "fcb5aaf7.a56738",
     "type": "execute",
     "name": "execute RestApiCallNode - get service data of allotted resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-arsd\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2540.5045013427734,
-    "y": 1240.3057832717896,
-    "z": "33eaf422.44290c",
+    "x": 2549.5045013427734,
+    "y": 1254.3057832717896,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "77da5adf.834034",
-        "8429ea0a.844dc8"
+        "aa2b8cd4.2f9ae",
+        "1bed61f6.90e36e"
       ]
     ]
   },
   {
-    "id": "f3be5614.599b68",
+    "id": "472beb8.34ca814",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2304.5000648498535,
-    "y": 1125.8018560409546,
-    "z": "33eaf422.44290c",
+    "x": 2313.5000648498535,
+    "y": 1139.8018560409546,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2f1d0b59.a2f164"
+        "79cfeb5f.61b2e4"
       ]
     ]
   },
   {
-    "id": "145fa94e.f27887",
+    "id": "6011fd41.335614",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2310.500312805176,
-    "y": 1082.801947593689,
-    "z": "33eaf422.44290c",
+    "x": 2319.500312805176,
+    "y": 1096.801947593689,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "da4408c3.f5c0d8"
+        "890f782e.076f68"
       ]
     ]
   },
   {
-    "id": "dc60366a.2e9048",
+    "id": "87284033.76d89",
     "type": "for",
     "name": "for loop roleidx - Get role from allotted resource",
     "xml": "<for index=\"roleidx\" start=\"0\" end=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2885.5008697509766,
-    "y": 230.30177307128906,
-    "z": "33eaf422.44290c",
+    "x": 2894.5008697509766,
+    "y": 244.30177307128906,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "b2e56fad.1ec69"
+        "73b90990.d19928"
       ]
     ]
   },
   {
-    "id": "b2e56fad.1ec69",
+    "id": "73b90990.d19928",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3144.5011825561523,
-    "y": 229.3020887374878,
-    "z": "33eaf422.44290c",
+    "x": 3153.5011825561523,
+    "y": 243.3020887374878,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "694d9509.75a9ec"
+        "8cac5932.b8b208"
       ]
     ]
   },
   {
-    "id": "694d9509.75a9ec",
+    "id": "8cac5932.b8b208",
     "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": 3302.501194000244,
+    "y": 244.3019256591797,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "7d090fc5.01ae4"
+        "bf369f65.c443d"
       ]
     ]
   },
   {
-    "id": "c3f6a3e4.765a9",
+    "id": "9b7f20f8.db3b3",
     "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": 3607.501754760742,
+    "y": 241.90183353424072,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "7d090fc5.01ae4",
+    "id": "bf369f65.c443d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3429.00101852417,
-    "y": 227.30176544189453,
-    "z": "33eaf422.44290c",
+    "x": 3438.00101852417,
+    "y": 241.30176544189453,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c3f6a3e4.765a9"
+        "9b7f20f8.db3b3"
       ]
     ]
   },
   {
-    "id": "64901ca2.c8fd44",
+    "id": "8baae43.65cdc18",
     "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": 1330.000373840332,
+    "y": 388.301700592041,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3df0d9b2.5cda06"
+        "b158c146.c1f85"
       ]
     ]
   },
   {
-    "id": "3df0d9b2.5cda06",
+    "id": "b158c146.c1f85",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1462.000129699707,
-    "y": 375.30173778533936,
-    "z": "33eaf422.44290c",
+    "x": 1471.000129699707,
+    "y": 389.30173778533936,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e7d060c2.d5397"
+        "67d378cf.68e458"
       ]
     ]
   },
   {
-    "id": "51f4030a.ed3f5c",
+    "id": "b0c4da2c.234108",
     "type": "for",
     "name": "for i.. service-data.vnfs.vnf_length[]",
     "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1734.5006561279297,
-    "y": 429.3017330169678,
-    "z": "33eaf422.44290c",
+    "x": 1743.5006561279297,
+    "y": 443.3017330169678,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "62a2db1c.5168f4"
+        "63ff4ec5.ab647"
       ]
     ]
   },
   {
-    "id": "62a2db1c.5168f4",
+    "id": "63ff4ec5.ab647",
     "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": 2077.166847229004,
+    "y": 387.3016633987427,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5123e57d.8bae0c",
-        "23b51d10.325942",
-        "e569fce4.0fcf9"
+        "84784063.67ffb",
+        "341080b7.07512",
+        "ed155104.c2191"
       ]
     ]
   },
   {
-    "id": "5123e57d.8bae0c",
+    "id": "84784063.67ffb",
     "type": "switchNode",
     "name": "switch ActivateSDWANPortInstance",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2339.1668853759766,
-    "y": 319.3025498390198,
-    "z": "33eaf422.44290c",
+    "x": 2348.1668853759766,
+    "y": 333.3025498390198,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6db9ff05.77666"
+        "126e021b.594fce"
       ]
     ]
   },
   {
-    "id": "6db9ff05.77666",
+    "id": "126e021b.594fce",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2552.166648864746,
-    "y": 320.3025527000427,
-    "z": "33eaf422.44290c",
+    "x": 2561.166648864746,
+    "y": 334.3025527000427,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "277a3bfe.22cd04"
+        "c1a0895d.a44898"
       ]
     ]
   },
   {
-    "id": "277a3bfe.22cd04",
+    "id": "c1a0895d.a44898",
     "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": 2710.0003929138184,
+    "y": 336.3017420768738,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "342216f2.a96c5a"
+        "cad8cdd9.d6465"
       ]
     ]
   },
   {
-    "id": "342216f2.a96c5a",
+    "id": "cad8cdd9.d6465",
     "type": "for",
     "name": "for loop widx - Get wan port ID from servicedata",
     "xml": "<for index=\"widx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2974.000343322754,
-    "y": 320.6689600944519,
-    "z": "33eaf422.44290c",
+    "x": 2983.000343322754,
+    "y": 334.6689600944519,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bd426655.141608"
+        "e45e8fbc.86968"
       ]
     ]
   },
   {
-    "id": "bd426655.141608",
+    "id": "e45e8fbc.86968",
     "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": 3252.0012702941895,
+    "y": 333.66920614242554,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "d3ada690.01d678",
-        "daf81956.349368",
-        "5bef4443.c838fc",
-        "a4bd0e48.6d82f"
+        "bc53f544.71b638",
+        "25d65cd3.81eaf4",
+        "af8fabf7.c19df8",
+        "97c92085.94f67"
       ]
     ]
   },
   {
-    "id": "d3ada690.01d678",
+    "id": "bc53f544.71b638",
     "type": "switchNode",
     "name": "switch transportNetworkName",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'transportNetworkName'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3486.0023040771484,
-    "y": 274.6697793006897,
-    "z": "33eaf422.44290c",
+    "x": 3495.0023040771484,
+    "y": 288.6697793006897,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "894b8be3.a2d3b8"
+        "de0d2806.856438"
       ]
     ]
   },
   {
-    "id": "894b8be3.a2d3b8",
+    "id": "de0d2806.856438",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3686.0020790100098,
-    "y": 274.6699414253235,
-    "z": "33eaf422.44290c",
+    "x": 3695.0020790100098,
+    "y": 288.6699414253235,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4cf3ccb2.4c44b4"
+        "9a3c947a.1c5d88"
       ]
     ]
   },
   {
-    "id": "4cf3ccb2.4c44b4",
+    "id": "9a3c947a.1c5d88",
     "type": "set",
     "name": "set prop.spoke.transportNetworkName",
     "xml": "<set>\n<parameter name='prop.spoke.transportNetworkName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
     "comments": "",
-    "x": 3913.002815246582,
-    "y": 276.2705235481262,
-    "z": "33eaf422.44290c",
+    "x": 3922.002815246582,
+    "y": 290.2705235481262,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "e7d060c2.d5397",
+    "id": "67d378cf.68e458",
     "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": 1223.9694213867188,
+    "y": 699.2706489562988,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "51f4030a.ed3f5c",
-        "4176c827.c206f8",
-        "b50f711c.f7671",
-        "c5126628.a1afc8",
-        "cf236aa.4478b98",
-        "f19570ac.55187"
+        "b0c4da2c.234108",
+        "39b9e240.c55f5e",
+        "8a7f6cb5.ac077",
+        "9ef76182.7b173",
+        "1fd45985.393f26",
+        "d058b4fc.a3d908",
+        "4a7f65c3.11a50c",
+        "86cead5c.3dd72"
       ]
     ]
   },
   {
-    "id": "23b51d10.325942",
+    "id": "341080b7.07512",
     "type": "switchNode",
     "name": "switch ActivateSDWANDeviceInstance",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2331.5003204345703,
-    "y": 393.3017544746399,
-    "z": "33eaf422.44290c",
+    "x": 2340.5003204345703,
+    "y": 407.3017544746399,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "14d0bfc7.55b7a"
+        "b16c0723.99d848"
       ]
     ]
   },
   {
-    "id": "14d0bfc7.55b7a",
+    "id": "b16c0723.99d848",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2550.5000705718994,
-    "y": 394.30173921585083,
-    "z": "33eaf422.44290c",
+    "x": 2559.5000705718994,
+    "y": 408.30173921585083,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "da1c13db.62f86"
+        "6b12cdd6.190a84"
       ]
     ]
   },
   {
-    "id": "da1c13db.62f86",
+    "id": "6b12cdd6.190a84",
     "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": 2710.3340606689453,
+    "y": 414.3009305000305,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e71b7f46.84637"
+        "c142c3ae.d5baf"
       ]
     ]
   },
   {
-    "id": "e71b7f46.84637",
+    "id": "c142c3ae.d5baf",
     "type": "for",
     "name": "for loop didx - Get device ID from servicedata",
     "xml": "<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2960.334312438965,
-    "y": 402.66822576522827,
-    "z": "33eaf422.44290c",
+    "x": 2969.334312438965,
+    "y": 416.66822576522827,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ae18d850.3d05e8"
+        "6fd86632.b15c78"
       ]
     ]
   },
   {
-    "id": "ae18d850.3d05e8",
+    "id": "6fd86632.b15c78",
     "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": 3255.334819793701,
+    "y": 449.66841077804565,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1383d6a4.a044c9"
+        "4c164cba.1f51b4"
       ]
     ]
   },
   {
-    "id": "1383d6a4.a044c9",
+    "id": "4c164cba.1f51b4",
     "type": "switchNode",
     "name": "switch deviceId",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].name == 'deviceId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3429.3357315063477,
-    "y": 435.66902112960815,
-    "z": "33eaf422.44290c",
+    "x": 3438.3357315063477,
+    "y": 449.66902112960815,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "cbbd7b54.04add8"
+        "4e22d2eb.17a27c"
       ]
     ]
   },
   {
-    "id": "cbbd7b54.04add8",
+    "id": "4e22d2eb.17a27c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3629.335506439209,
-    "y": 435.66918325424194,
-    "z": "33eaf422.44290c",
+    "x": 3638.335506439209,
+    "y": 449.66918325424194,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2002292c.f851e6"
+        "bda2d14d.2382d"
       ]
     ]
   },
   {
-    "id": "2002292c.f851e6",
+    "id": "bda2d14d.2382d",
     "type": "set",
     "name": "set prop.spoke.deviceId",
     "xml": "<set>\n<parameter name='prop.spoke.deviceId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].value`' />\n",
     "comments": "",
-    "x": 3824.3361892700195,
-    "y": 432.26976442337036,
-    "z": "33eaf422.44290c",
+    "x": 3833.3361892700195,
+    "y": 446.26976442337036,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "e569fce4.0fcf9",
+    "id": "ed155104.c2191",
     "type": "switchNode",
     "name": "switch ActivateSiteInstance",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    \n    \n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2310.5004348754883,
-    "y": 454.30178594589233,
-    "z": "33eaf422.44290c",
+    "x": 2319.5004348754883,
+    "y": 468.30178594589233,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2c51cabd.1c1bf6"
+        "3684ce31.756aa2"
       ]
     ]
   },
   {
-    "id": "2c51cabd.1c1bf6",
+    "id": "3684ce31.756aa2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2544.500072479248,
-    "y": 455.3017258644104,
-    "z": "33eaf422.44290c",
+    "x": 2553.500072479248,
+    "y": 469.3017258644104,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "4b1a4a05.7589d4"
+        "379dde17.f5f7e2"
       ]
     ]
   },
   {
-    "id": "4b1a4a05.7589d4",
+    "id": "379dde17.f5f7e2",
     "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": 2705.3340606689453,
+    "y": 491.30096197128296,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "bfdd7dbc.be644"
+        "54ff4036.7eef1",
+        "dc7900f6.c1794"
       ]
     ]
   },
   {
-    "id": "bfdd7dbc.be644",
+    "id": "54ff4036.7eef1",
     "type": "for",
     "name": "for loop widx - Get wan site ID from servicedata",
     "xml": "<for index=\"sidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
     "comments": "",
     "outputs": 1,
-    "x": 2977.3338928222656,
-    "y": 476.668164730072,
-    "z": "33eaf422.44290c",
+    "x": 2986.3338928222656,
+    "y": 490.668164730072,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "86ec8da.eb7757"
+        "53c73c75.c0fe44"
       ]
     ]
   },
   {
-    "id": "86ec8da.eb7757",
+    "id": "53c73c75.c0fe44",
     "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": 3255.334819793701,
+    "y": 489.66841077804565,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ea6a5ab7.abd8e8",
-        "b2aac804.e6f348"
+        "1d2d8e3b.d07092",
+        "812b076f.3b7138",
+        "8b3ca259.e59f8"
       ]
     ]
   },
   {
-    "id": "ea6a5ab7.abd8e8",
+    "id": "1d2d8e3b.d07092",
     "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": 3444.33602142334,
+    "y": 539.6690826416016,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "46e734ca.67fa0c"
+        "35fdfb9a.5d5ab4"
       ]
     ]
   },
   {
-    "id": "46e734ca.67fa0c",
+    "id": "35fdfb9a.5d5ab4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3635.3354988098145,
-    "y": 513.6691970825195,
-    "z": "33eaf422.44290c",
+    "x": 3644.3354988098145,
+    "y": 527.6691970825195,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f2397edb.062c5"
+        "ea9da0a4.eb61c"
       ]
     ]
   },
   {
-    "id": "f2397edb.062c5",
+    "id": "ea9da0a4.eb61c",
     "type": "set",
     "name": "set prop.spoke.siteId",
     "xml": "<set>\n<parameter name='prop.spoke.siteId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
     "comments": "",
-    "x": 3823.3363037109375,
-    "y": 512.2698106765747,
-    "z": "33eaf422.44290c",
+    "x": 3837.336452484131,
+    "y": 534.2698273658752,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "daf81956.349368",
+    "id": "25d65cd3.81eaf4",
     "type": "switchNode",
     "name": "switch wanPortId",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'wanPortId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3459.5,
-    "y": 311.3018355369568,
-    "z": "33eaf422.44290c",
+    "x": 3468.5,
+    "y": 325.3018355369568,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "34972355.9c297c"
+        "70f2426c.7fe2dc"
       ]
     ]
   },
   {
-    "id": "34972355.9c297c",
+    "id": "70f2426c.7fe2dc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3689.5000038146973,
-    "y": 311.3019471168518,
-    "z": "33eaf422.44290c",
+    "x": 3698.5000038146973,
+    "y": 325.3019471168518,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6f9ff7e2.2957f8"
+        "2a2fa3c7.e081ac"
       ]
     ]
   },
   {
-    "id": "6f9ff7e2.2957f8",
+    "id": "2a2fa3c7.e081ac",
     "type": "set",
     "name": "set prop.spoke.wanPortId",
     "xml": "<set>\n<parameter name='prop.spoke.wanPortId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
     "comments": "",
-    "x": 3916.5007400512695,
-    "y": 312.90252923965454,
-    "z": "33eaf422.44290c",
+    "x": 3925.5007400512695,
+    "y": 326.90252923965454,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "5bef4443.c838fc",
+    "id": "af8fabf7.c19df8",
     "type": "switchNode",
     "name": "switch providerIpAddress",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'providerIpAddress'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3477.500160217285,
-    "y": 355.30178594589233,
-    "z": "33eaf422.44290c",
+    "x": 3486.500160217285,
+    "y": 369.30178594589233,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "9220a2ce.263ec"
+        "b8a267e9.b9ee48"
       ]
     ]
   },
   {
-    "id": "9220a2ce.263ec",
+    "id": "b8a267e9.b9ee48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3677.4999351501465,
-    "y": 355.3019480705261,
-    "z": "33eaf422.44290c",
+    "x": 3686.4999351501465,
+    "y": 369.3019480705261,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "95bab342.b39b3"
+        "1f49c17b.29132f"
       ]
     ]
   },
   {
-    "id": "95bab342.b39b3",
+    "id": "1f49c17b.29132f",
     "type": "set",
     "name": "set prop.spoke.providerIpAddress",
     "xml": "<set>\n<parameter name='prop.spoke.providerIpAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
     "comments": "",
-    "x": 3904.5006713867188,
-    "y": 356.90253019332886,
-    "z": "33eaf422.44290c",
+    "x": 3913.5006713867188,
+    "y": 370.90253019332886,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "a4bd0e48.6d82f",
+    "id": "97c92085.94f67",
     "type": "switchNode",
     "name": "switch ipAddress",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'ipAddress'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3457.499988555908,
-    "y": 394.30182218551636,
-    "z": "33eaf422.44290c",
+    "x": 3466.499988555908,
+    "y": 408.30182218551636,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "511d5688.773858"
+        "f16f752f.3e9e18"
       ]
     ]
   },
   {
-    "id": "511d5688.773858",
+    "id": "f16f752f.3e9e18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3681.4998168945312,
-    "y": 394.3019394874573,
-    "z": "33eaf422.44290c",
+    "x": 3690.4998168945312,
+    "y": 408.3019394874573,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "fc2e69a1.2d4298"
+        "ca30b35f.a1be"
       ]
     ]
   },
   {
-    "id": "fc2e69a1.2d4298",
+    "id": "ca30b35f.a1be",
     "type": "set",
     "name": "set prop.spoke.ipAddress",
     "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n",
     "comments": "",
-    "x": 3908.5005531311035,
-    "y": 395.90252161026,
-    "z": "33eaf422.44290c",
+    "x": 3917.5005531311035,
+    "y": 409.90252161026,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "e9598182.81589",
+    "id": "88f8bb94.113e88",
     "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": 1033.999900817871,
+    "y": 267.5000419616699,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "be430b5e.14a828",
-        "66dd18ab.e48f08",
-        "8e4434c9.93e608",
-        "64901ca2.c8fd44"
+        "2cdd7d19.2083a2",
+        "428d17cf.9d4528",
+        "31785cb6.7e6854",
+        "8baae43.65cdc18"
       ]
     ]
   },
   {
-    "id": "813e415f.e07c",
+    "id": "47687d06.0a1964",
     "type": "comment",
     "name": "get spoke device,site,wanport info",
     "info": "",
     "comments": "",
-    "x": 1781.96875,
-    "y": 376.96874713897705,
-    "z": "33eaf422.44290c",
+    "x": 1790.96875,
+    "y": 390.96874713897705,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2db9ead7.c2b4b6",
+    "id": "c21c0002.43242",
     "type": "comment",
     "name": "Add routes only on activation of spoke Attach site",
     "info": "",
     "comments": "",
-    "x": 1418.4998245239258,
-    "y": 336.0000162124634,
-    "z": "33eaf422.44290c",
+    "x": 1451.4999160766602,
+    "y": 334.00006103515625,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2dcb0ef7.828042",
+    "id": "7b6f0604.c9da18",
     "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": 2207.5,
+    "y": 829.500057220459,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "c6190b7b.0c6f78",
+    "id": "d543abbf.21d958",
     "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": 2963.4997177124023,
+    "y": 1810.9999589920044,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c9e1f848.8aa118",
-        "f616545c.e692d8",
-        "dcfe4dc9.3d83d",
-        "edcfc449.815b98"
+        "a19625ef.be4768",
+        "450fbdd4.50bf64"
       ]
     ]
   },
   {
-    "id": "82cf7632.68ed28",
+    "id": "fc5d79c.538d088",
     "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": 3013.4997749328613,
+    "y": 1683.999843597412,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "71be6aaa.93fe04"
+        "29161345.19c04c"
       ]
     ]
   },
   {
-    "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": "a19625ef.be4768",
     "type": "switchNode",
     "name": "switch siteId",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3141.4996185302734,
-    "y": 1749.9998207092285,
-    "z": "33eaf422.44290c",
+    "x": 3148.499641418457,
+    "y": 1821.9998016357422,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3ef84487.f4b53c"
+        "fce00f2c.408f7"
       ]
     ]
   },
   {
-    "id": "3ef84487.f4b53c",
+    "id": "fce00f2c.408f7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292.499988555908,
-    "y": 1749.0000038146973,
-    "z": "33eaf422.44290c",
+    "x": 3299.500011444092,
+    "y": 1820.999984741211,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "97d8673.5139598"
+        "a6e04d71.45ffd"
       ]
     ]
   },
   {
-    "id": "97d8673.5139598",
+    "id": "a6e04d71.45ffd",
     "type": "set",
     "name": "set prop.hub.siteId",
     "xml": "<set>\n<parameter name='prop.hub.siteId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n",
     "comments": "",
-    "x": 3464.4999961853027,
-    "y": 1746.6005725860596,
-    "z": "33eaf422.44290c",
+    "x": 3471.5000190734863,
+    "y": 1818.6005535125732,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "927db1a6.0967b",
+    "id": "f1944c46.f8a7e",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2619.9996948242188,
-    "y": 2002.0004615783691,
-    "z": "33eaf422.44290c",
+    "x": 2624.9997482299805,
+    "y": 2174.0004453659058,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "1a118523.efe04b",
-        "3baee628.49c52a"
+        "4a7669f9.690ed8",
+        "9523edcb.d7c9a"
       ]
     ]
   },
   {
-    "id": "1a118523.efe04b",
+    "id": "4a7669f9.690ed8",
     "type": "outcome",
     "name": "ActivateSDWANAttachmentInstance",
     "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 2886.0271530151367,
-    "y": 1971.0314779281616,
-    "z": "33eaf422.44290c",
+    "x": 2895.0271530151367,
+    "y": 1985.0314779281616,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "78365f62.f88ae"
+        "5392f603.1e5608"
       ]
     ]
   },
   {
-    "id": "d881cca6.da522",
+    "id": "ed2e9b23.246118",
     "type": "execute",
     "name": "execute RestApiCallNode underlay route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayHubResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3480.4997940063477,
-    "y": 1892.000228881836,
-    "z": "33eaf422.44290c",
+    "x": 3483.500099182129,
+    "y": 1914.0003824234009,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "e1ec68ab.cefaf8",
-        "62d40a0d.8230b4"
+        "e1bfc10d.7f44e",
+        "523fbf6b.72c95"
       ]
     ]
   },
   {
-    "id": "62d40a0d.8230b4",
+    "id": "523fbf6b.72c95",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3721.499927520752,
-    "y": 1879.0002145767212,
-    "z": "33eaf422.44290c",
+    "x": 3730.499927520752,
+    "y": 1893.0002145767212,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "e1ec68ab.cefaf8",
+    "id": "e1bfc10d.7f44e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3719.4996070861816,
-    "y": 1835.000205039978,
-    "z": "33eaf422.44290c",
+    "x": 3728.4996070861816,
+    "y": 1849.000205039978,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "93f8ad33.2f9f3"
+        "5684be77.d184a"
       ]
     ]
   },
   {
-    "id": "93f8ad33.2f9f3",
+    "id": "5684be77.d184a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing sdwan hub route underlay rest api\" />\n",
     "comments": "",
-    "x": 3861.5002937316895,
-    "y": 1833.0002880096436,
-    "z": "33eaf422.44290c",
+    "x": 3870.5002937316895,
+    "y": 1847.0002880096436,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2cb0acf9.dc8014",
+    "id": "fc0a8ce8.4d15f",
     "type": "set",
     "name": "Add prop.hub.route",
-    "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanportId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n",
+    "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": 3418.8337020874023,
+    "y": 1884.666922569275,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "a3cb5620.778698",
+    "id": "4be3d8b3.562cb8",
     "type": "execute",
     "name": "execute RestApiCallNode underlay route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayspokeResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3486.8334980010986,
-    "y": 1997.6673924922943,
-    "z": "33eaf422.44290c",
+    "x": 3500.834144592285,
+    "y": 2119.6675004959106,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "da8f9dd5.0d7f2",
-        "54a9a5c9.a84bec"
+        "5f8c1bef.56c114",
+        "a3d1295e.fa6b28"
       ]
     ]
   },
   {
-    "id": "54a9a5c9.a84bec",
+    "id": "a3d1295e.fa6b28",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3732.833745956421,
-    "y": 1991.6674008369446,
-    "z": "33eaf422.44290c",
+    "x": 3752.83424949646,
+    "y": 2107.667459964752,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "da8f9dd5.0d7f2",
+    "id": "5f8c1bef.56c114",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3730.8334255218506,
-    "y": 1947.6673913002014,
-    "z": "33eaf422.44290c",
+    "x": 3750.8339290618896,
+    "y": 2063.667450428009,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "405d037f.766c0c"
+        "e475f129.f6d52"
       ]
     ]
   },
   {
-    "id": "405d037f.766c0c",
+    "id": "e475f129.f6d52",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing sdwan spoke route underlay rest api\" />\n",
     "comments": "",
-    "x": 3872.8341121673584,
-    "y": 1945.667474269867,
-    "z": "33eaf422.44290c",
+    "x": 3892.8346157073975,
+    "y": 2061.6675333976746,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "cf64a525.59cc78",
+    "id": "9b5e472e.7046c8",
     "type": "set",
     "name": "Add prop.spoke.route",
-    "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanportId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n",
+    "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": 3441.6980171203613,
+    "y": 2082.3642127513885,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "986185e9.8eec08",
+    "id": "f4ba3683.379f28",
     "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": 3451.665542602539,
+    "y": 2242.0309886932373,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "78365f62.f88ae",
+    "id": "5392f603.1e5608",
     "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": 3130.999671936035,
+    "y": 1982.4999113082886,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2cb0acf9.dc8014",
-        "cf64a525.59cc78",
-        "986185e9.8eec08",
-        "a3cb5620.778698",
-        "d881cca6.da522"
+        "fc0a8ce8.4d15f",
+        "9b5e472e.7046c8",
+        "f4ba3683.379f28",
+        "4be3d8b3.562cb8",
+        "ed2e9b23.246118",
+        "26c99249.a4074e",
+        "41b2e501.e4cadc",
+        "805d9d92.cb3bf",
+        "f41a7058.b220e",
+        "57accb29.01bb34"
       ]
     ]
   },
   {
-    "id": "105d9963.f193b7",
+    "id": "cf3f5a97.bb53e8",
     "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": 3162.9997749328613,
+    "y": 2624.5002613067627,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "f88633ef.4a895",
-        "7ec8de50.abc7a",
-        "e429ce4e.ff4d3",
-        "9c47cd10.cba71"
+        "45a08ea1.9e3d3",
+        "3208baf8.6aed86",
+        "33961398.8b885c",
+        "5e2b5a00.fe4964",
+        "3396ac88.cb4974",
+        "a8dab23b.85144",
+        "3c48a4f4.f048ec"
       ]
     ]
   },
   {
-    "id": "3baee628.49c52a",
+    "id": "9523edcb.d7c9a",
     "type": "outcome",
     "name": "DeactivateSDWANAttachmentInstance",
     "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 2891.499725341797,
-    "y": 2040.4999132156372,
-    "z": "33eaf422.44290c",
+    "x": 2911.4998321533203,
+    "y": 2618.500072479248,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "105d9963.f193b7"
+        "cf3f5a97.bb53e8"
       ]
     ]
   },
   {
-    "id": "9c607856.359088",
+    "id": "41b2e501.e4cadc",
     "type": "set",
     "name": "Add sites to list and update length",
-    "xml": "<set>\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteName' value='`$prop.hub.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteName' value='`$prop.spoke.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteId' value='`$prop.spoke.siteId`' />\n<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": 3456.0318298339844,
+    "y": 2367.0318689346313,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "5323bc16.bbf554",
+    "id": "84283d54.1b30c",
     "type": "comment",
     "name": "save hubsiteIds and spoke siteIds for provision",
     "info": "",
     "comments": "",
-    "x": 2668.031265258789,
-    "y": 2251.0313568115234,
-    "z": "33eaf422.44290c",
+    "x": 3488.0322036743164,
+    "y": 2323.0317430496216,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "b2aac804.e6f348",
+    "id": "812b076f.3b7138",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3436.031005859375,
-    "y": 475.03125,
-    "z": "33eaf422.44290c",
+    "x": 3445.031005859375,
+    "y": 489.03125,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "2e9ab920.c2df16"
+        "e2b5302b.c9211"
       ]
     ]
   },
   {
-    "id": "2e9ab920.c2df16",
+    "id": "e2b5302b.c9211",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3636.0307807922363,
-    "y": 475.0314121246338,
-    "z": "33eaf422.44290c",
+    "x": 3645.0307807922363,
+    "y": 489.0314121246338,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "3bc80b86.299434"
+        "3a42d854.33d438"
       ]
     ]
   },
   {
-    "id": "3bc80b86.299434",
+    "id": "3a42d854.33d438",
     "type": "set",
     "name": "set prop.spoke.siteName",
     "xml": "<set>\n<parameter name='prop.spoke.siteName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
     "comments": "",
-    "x": 3824.0315856933594,
-    "y": 473.63202571868896,
-    "z": "33eaf422.44290c",
+    "x": 3833.0315856933594,
+    "y": 487.63202571868896,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "edcfc449.815b98",
+    "id": "450fbdd4.50bf64",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3140.031005859375,
-    "y": 1716.5311279296875,
-    "z": "33eaf422.44290c",
+    "x": 3147.0310287475586,
+    "y": 1788.5311088562012,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "47785d0f.321164"
+        "7d26f71b.6a9a68"
       ]
     ]
   },
   {
-    "id": "47785d0f.321164",
+    "id": "7d26f71b.6a9a68",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3291.0313758850098,
-    "y": 1715.5313110351562,
-    "z": "33eaf422.44290c",
+    "x": 3298.0313987731934,
+    "y": 1787.53129196167,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "36650635.dab3aa"
+        "570427f3.ac5a28"
       ]
     ]
   },
   {
-    "id": "36650635.dab3aa",
+    "id": "570427f3.ac5a28",
     "type": "set",
     "name": "set prop.hub.siteName",
     "xml": "<set>\n<parameter name='prop.hub.siteName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n",
     "comments": "",
-    "x": 3463.0313835144043,
-    "y": 1713.1318798065186,
-    "z": "33eaf422.44290c",
+    "x": 3470.031406402588,
+    "y": 1785.1318607330322,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "70ceaafc.e0d3f4",
+    "id": "431fc2f2.17609c",
     "type": "set",
     "name": "set prop.provision.siteIds_length=0",
     "xml": "<set>\n<parameter name='prop.provision.siteIds_length' value='0' />\n\n\n\n",
     "comments": "",
-    "x": 461.03126525878906,
-    "y": 361.0312547683716,
-    "z": "33eaf422.44290c",
+    "x": 470.03126525878906,
+    "y": 375.0312547683716,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "2ebcd1d4.0c3f8e",
+    "id": "bebb2153.0e2a7",
     "type": "execute",
     "name": "execute RestApiCallNode site provision urls",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site-provision.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites/provision-urls'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"provisionUrlRsp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 813.0312957763672,
-    "y": 793.0314712524414,
-    "z": "33eaf422.44290c",
+    "x": 822.0312957763672,
+    "y": 807.0314712524414,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "ad0b5373.47c4b",
-        "2423f336.bee55c"
+        "e47835d0.8f5408",
+        "8e71b3d6.afc8d"
       ]
     ]
   },
   {
-    "id": "2423f336.bee55c",
+    "id": "8e71b3d6.afc8d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1077.0315551757812,
-    "y": 815.0315160751343,
-    "z": "33eaf422.44290c",
+    "x": 1086.0315551757812,
+    "y": 829.0315160751343,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "ad0b5373.47c4b",
+    "id": "e47835d0.8f5408",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1078.0313415527344,
-    "y": 772.0314540863037,
-    "z": "33eaf422.44290c",
+    "x": 1087.0313415527344,
+    "y": 786.0314540863037,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "21440771.f9b178"
+        "610d5a0c.9e2794"
       ]
     ]
   },
   {
-    "id": "21440771.f9b178",
+    "id": "610d5a0c.9e2794",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing provision url rest api\" />\n",
     "comments": "",
-    "x": 1257.0318984985352,
-    "y": 770.0315053462982,
-    "z": "33eaf422.44290c",
+    "x": 1266.0318984985352,
+    "y": 784.0315053462982,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "c880f4e9.6d6098",
+    "id": "38f6b67d.380b9a",
     "type": "for",
     "name": "for providx..prop.provision.siteIds[]",
     "xml": "<for index='providx' start='0' end='`$prop.provision.siteIds_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 454.0312957763672,
-    "y": 565.0312948226929,
-    "z": "33eaf422.44290c",
+    "x": 463.0312957763672,
+    "y": 579.0312948226929,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "6ab9e97f.2340e8"
+        "3da0634c.7d37dc"
       ]
     ]
   },
   {
-    "id": "6ab9e97f.2340e8",
+    "id": "3da0634c.7d37dc",
     "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": 487.0313377380371,
+    "y": 789.031268119812,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5392610f.9b85f",
-        "2ebcd1d4.0c3f8e",
-        "e83cbadb.6b3148"
+        "89ba9fe.36f7b6",
+        "bebb2153.0e2a7",
+        "ae5d2651.0df3f8"
       ]
     ]
   },
   {
-    "id": "5392610f.9b85f",
+    "id": "89ba9fe.36f7b6",
     "type": "set",
     "name": "set prop.spoke.hubSiteId, spokeSiteId",
     "xml": "<set>\n<parameter name='prop.provision.hubSitename' value='`$prop.provision.siteIds[$providx].hubSiteName`' />\n<parameter name='prop.provision.spokeSitename' value='`$prop.provision.siteIds[$providx].spokeSiteName`' />\n<parameter name='prop.provision.hubspokesite[0]' value='`$prop.provision.siteIds[$providx].hubSiteId`' />\n<parameter name='prop.provision.hubspokesite[1]' value='`$prop.provision.siteIds[$providx].spokeSiteId`' />\n<parameter name='prop.provision.hubspokesite_length' value='2' />\n",
     "comments": "",
-    "x": 789.0339965820312,
-    "y": 651.6329832077026,
-    "z": "33eaf422.44290c",
+    "x": 798.0339965820312,
+    "y": 665.6329832077026,
+    "z": "afa42c56.2fe06",
     "wires": []
   },
   {
-    "id": "e83cbadb.6b3148",
+    "id": "ae5d2651.0df3f8",
     "type": "record",
     "name": "record provision url response to the file",
-    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`'/opt/opendaylight/current/data/log/' + 'HUB-' + $prop.provision.hubSitename + '-SPOKE-' + $prop.provision.spokeSitename + '-provisionUrl'`\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value='`$provisionUrlRsp`'/>\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": 794.0313720703125,
+    "y": 901.0313358306885,
+    "z": "afa42c56.2fe06",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e03ba47.0fb3f6",
+    "id": "99b001da.0efb4",
     "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": 2536.031482696533,
+    "y": 1056.0313262939453,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "a525e63a.cc2b38"
+        "175772d7.f9d53d"
       ]
     ]
   },
   {
-    "id": "84a7b7df.1615b8",
+    "id": "e38b67ea.4c8758",
     "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": 2016.0311584472656,
+    "y": 619.0313091278076,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "c8ac708.b0a709",
-        "b9ac21ad.456c9"
+        "348ba1e1.19e85e"
       ]
     ]
   },
   {
-    "id": "8e2c0789.42db78",
+    "id": "4ebf01e5.37d06",
     "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": 1960.0313262939453,
+    "y": 710.0312175750732,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "8d7971fd.c23e3",
+        "524b783f.8c1128"
+      ]
+    ]
+  },
+  {
+    "id": "26c99249.a4074e",
+    "type": "set",
+    "name": "set prop.underlay.routeIds_length++",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 3481.0011596679688,
+    "y": 2278.250065803528,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "805d9d92.cb3bf",
+    "type": "set",
+    "name": "Update prop.provision.siteIds_length",
+    "xml": "<set>\n<parameter name='prop.provision.siteIds_length' value='`$prop.provision.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",
+    "comments": "",
+    "x": 3464.5009002685547,
+    "y": 2402.2501611709595,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "dc7900f6.c1794",
+    "type": "set",
+    "name": "set prop.spoke.siteidx",
+    "xml": "<set>\n<parameter name='prop.spoke.siteidx' value='`$i`' />\n\n",
+    "comments": "",
+    "x": 2904.7501907348633,
+    "y": 455.0000286102295,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "54fe9391.9e9afc",
+    "type": "set",
+    "name": "set  underlay route ids to service data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"underlayRouteIds\" />\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$tmp.routeString`' />\n\n\n",
+    "comments": "",
+    "x": 1927.0006408691406,
+    "y": 1942.0003986358643,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "32bd7569.5de31a",
+    "type": "set",
+    "name": "set prop.underlay.routeIds_length=0",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='0' />\n\n\n\n",
+    "comments": "",
+    "x": 474.9961242675781,
+    "y": 326.9961128234863,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "3396ac88.cb4974",
+    "type": "for",
+    "name": "for loop uidx - Get route Id from prop.underlay.routeIds",
+    "xml": "<for index=\"uidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3518.6630325317383,
+    "y": 2497.3295001983643,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "48bdd272.66024c"
+      ]
+    ]
+  },
+  {
+    "id": "48bdd272.66024c",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3810.3297271728516,
+    "y": 2497.3295001983643,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "164a1404.cbc8dc"
+      ]
+    ]
+  },
+  {
+    "id": "164a1404.cbc8dc",
+    "type": "switchNode",
+    "name": "switch prop.hub.siteId",
+    "xml": "<switch test=\"`$prop.underlay.routeIds[$uidx].hubSiteId == $prop.hub.siteId`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3999.3297424316406,
+    "y": 2497.3296632766724,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "beeec1da.addd9"
+      ]
+    ]
+  },
+  {
+    "id": "beeec1da.addd9",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4170.329177856445,
+    "y": 2497.329662322998,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "8b49993a.fe8e88"
+      ]
+    ]
+  },
+  {
+    "id": "8b49993a.fe8e88",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4324.329177856445,
+    "y": 2501.3296699523926,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "ef00b5c0.d59378"
+      ]
+    ]
+  },
+  {
+    "id": "ef00b5c0.d59378",
+    "type": "set",
+    "name": "set prop.hubRouteId prop.spokeRouteId",
+    "xml": "<set>\n<parameter name='prop.hubRouteId' value='`$prop.underlay.routeIds[$uidx].hubRouteId`' />\n<parameter name='prop.spokeRouteId' value='`$prop.underlay.routeIds[$uidx].spokeRouteId`' />\n",
+    "comments": "",
+    "x": 4410.32918548584,
+    "y": 2573.32967376709,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "8b3ca259.e59f8",
+    "type": "switchNode",
+    "name": "switch underlayRouteIds",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'underlayRouteIds'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3449.99609375,
+    "y": 593.6627197265625,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "90960264.013bb"
+      ]
+    ]
+  },
+  {
+    "id": "90960264.013bb",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3649.9955711364746,
+    "y": 581.6628341674805,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "dec6d150.266b1"
+      ]
+    ]
+  },
+  {
+    "id": "f1e8e357.7d127",
+    "type": "set",
+    "name": "set prop.underlay.routeIds",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIdsString' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n",
+    "comments": "",
+    "x": 4020.996971130371,
+    "y": 581.2635440826416,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "86cead5c.3dd72",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1136.9963836669922,
+    "y": 2033.329628944397,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "d86f6d8b.19f1b",
+        "42a75c7f.9dc134"
+      ]
+    ]
+  },
+  {
+    "id": "d86f6d8b.19f1b",
+    "type": "outcome",
+    "name": "ActivateSDWANAttachmentInstance",
+    "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1400.9964294433594,
+    "y": 1988.329626083374,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "1dbe9d9f.7f9c82"
+      ]
+    ]
+  },
+  {
+    "id": "1dbe9d9f.7f9c82",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1642.9689407348633,
+    "y": 1984.7983770370483,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "54fe9391.9e9afc",
+        "5d55b77d.4fae98",
+        "59b1613.c1f67a",
+        "8abe0b00.ec56e8"
+      ]
+    ]
+  },
+  {
+    "id": "a9b02dc4.79bbe",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1646.9689292907715,
+    "y": 2068.7985458374023,
+    "z": "afa42c56.2fe06",
     "wires": [
       [
-        "5a69b1be.1055d",
-        "e66f705e.b1887"
+        "ae1dbfd0.9ebac"
       ]
     ]
+  },
+  {
+    "id": "42a75c7f.9dc134",
+    "type": "outcome",
+    "name": "DeactivateSDWANAttachmentInstance",
+    "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1398.4690704345703,
+    "y": 2070.7983827590942,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "a9b02dc4.79bbe"
+      ]
+    ]
+  },
+  {
+    "id": "ae1dbfd0.9ebac",
+    "type": "set",
+    "name": "set input parameter length -1",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length - 1`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 1875.6626281738281,
+    "y": 2067.32963180542,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "4d624738.aa86f8",
+    "type": "comment",
+    "name": "Get route routes IDs",
+    "info": "",
+    "comments": "",
+    "x": 3418.3294982910156,
+    "y": 2458.6627368927,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "5d55b77d.4fae98",
+    "type": "set",
+    "name": "set  underlay route ids to service data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n",
+    "comments": "",
+    "x": 1916.329574584961,
+    "y": 2016.662672996521,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "59b1613.c1f67a",
+    "type": "for",
+    "name": "for jidx paramidx - Get topology from servicedata",
+    "xml": "<for index=\"jidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2005.3294982910156,
+    "y": 1563.329444885254,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "f4c8ed71.c2698"
+      ]
+    ]
+  },
+  {
+    "id": "3450a2a3.3f3b2e",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat1\"/>\n    <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].hubRouteId`'/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2189.329833984375,
+    "y": 1696.9966478347778,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "5db41da3.1856f4",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$prop.underlay.routeIds[$jidx].hubSiteId`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat\"/>\n    <parameter name=\"target\" value=\",\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2199.3298263549805,
+    "y": 1649.6629858016968,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f4c8ed71.c2698",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1912.329517364502,
+    "y": 1748.6627750396729,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "5db41da3.1856f4",
+        "3450a2a3.3f3b2e",
+        "46517f63.3d70e",
+        "74bf87c6.f701b8",
+        "ec44da8a.7837c8",
+        "f31858ee.e326d8"
+      ]
+    ]
+  },
+  {
+    "id": "46517f63.3d70e",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat1`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat2\"/>\n    <parameter name=\"target\" value=\",\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2196.3295364379883,
+    "y": 1736.6628789901733,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "74bf87c6.f701b8",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat2`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat3\"/>\n    <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].spokeRouteId`'/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2196.3295364379883,
+    "y": 1772.6628789901733,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ec44da8a.7837c8",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.concat3`'/>\n    <parameter name=\"outputPath\" value=\"tmp.concat4\"/>\n    <parameter name=\"target\" value=\" | \"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2189.3295364379883,
+    "y": 1812.9962530136108,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f31858ee.e326d8",
+    "type": "execute",
+    "name": "execute concat",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$tmp.routeString`'/>\n    <parameter name=\"outputPath\" value=\"tmp.routeString\"/>\n    <parameter name=\"target\" value='`$tmp.concat4`'/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2192.329475402832,
+    "y": 1867.6627922058105,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8abe0b00.ec56e8",
+    "type": "set",
+    "name": "Set tmp.routeString",
+    "xml": "<set>\n<parameter name='tmp.routeString' value=\"\" />\n\n",
+    "comments": "",
+    "x": 1909.3294982910156,
+    "y": 1504.6627759933472,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "dec6d150.266b1",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3797.9963188171387,
+    "y": 627.9961318969727,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "f1e8e357.7d127",
+        "38377ec9.53b982"
+      ]
+    ]
+  },
+  {
+    "id": "38377ec9.53b982",
+    "type": "execute",
+    "name": "execute split |",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsString`'/>\n<parameter name=\"regex\" value=\" | \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValue\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3975.9963302612305,
+    "y": 647.9961318969727,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "3268a5b9.fb215a",
+        "c3ab3d57.d9ba"
+      ]
+    ]
+  },
+  {
+    "id": "c3ab3d57.d9ba",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4152.9963455200195,
+    "y": 628.9961309432983,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "d7617cb0.7601e"
+      ]
+    ]
+  },
+  {
+    "id": "3268a5b9.fb215a",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4141.9963455200195,
+    "y": 676.996132850647,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "d317db0c.b51f88"
+      ]
+    ]
+  },
+  {
+    "id": "82fa522b.8f097",
+    "type": "set",
+    "name": "set ipAddress prefixLength",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.underlay.routeIdsValues[0]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$prop.underlay.routeIdsValues[1]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$prop.underlay.routeIdsValues[2]`' />",
+    "comments": "",
+    "x": 5338.997211456299,
+    "y": 562.9963731765747,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "d317db0c.b51f88",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4271.996349334717,
+    "y": 676.996132850647,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d7617cb0.7601e",
+    "type": "for",
+    "name": "for loop ridx ",
+    "xml": "<for index=\"ridx\" start=\"0\" end=\"`$prop.underlay.routeIdsValue_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4298.996032714844,
+    "y": 626.9961309432983,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "bae53b24.86f3f8"
+      ]
+    ]
+  },
+  {
+    "id": "bae53b24.86f3f8",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4477.329044342041,
+    "y": 623.9961318969727,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "95e8ce94.9a6d1"
+      ]
+    ]
+  },
+  {
+    "id": "95e8ce94.9a6d1",
+    "type": "execute",
+    "name": "execute split ,",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsValue[$ridx]`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValues\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4652.329055786133,
+    "y": 622.996129989624,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "17ee1f73.6ce3e1",
+        "32bb2edf.2bc022"
+      ]
+    ]
+  },
+  {
+    "id": "17ee1f73.6ce3e1",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4809.32905960083,
+    "y": 599.9961376190186,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "25d53393.ccdc7c"
+      ]
+    ]
+  },
+  {
+    "id": "32bb2edf.2bc022",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4798.32905960083,
+    "y": 647.9961395263672,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "e299e773.789348"
+      ]
+    ]
+  },
+  {
+    "id": "e299e773.789348",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4928.329063415527,
+    "y": 647.9961395263672,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "cee6dd44.82ca8",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5131.661590576172,
+    "y": 578.9962916374207,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "82fa522b.8f097",
+        "e872fc0f.e3138"
+      ]
+    ]
+  },
+  {
+    "id": "e872fc0f.e3138",
+    "type": "set",
+    "name": "set ipAddress prefixLength",
+    "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n",
+    "comments": "",
+    "x": 5331.329250335693,
+    "y": 604.996169090271,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "25d53393.ccdc7c",
+    "type": "switchNode",
+    "name": "switch prop.underlay.routeIdsValues_length",
+    "xml": "<switch test='`$prop.underlay.routeIdsValues_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5007.663215637207,
+    "y": 480.9961624145508,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "1988903d.6e7c9",
+        "31c7868c.1d918a"
+      ]
+    ]
+  },
+  {
+    "id": "1988903d.6e7c9",
+    "type": "outcome",
+    "name": "3",
+    "xml": "<outcome value='3'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5242.632148742676,
+    "y": 517.9648895263672,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "cee6dd44.82ca8"
+      ]
+    ]
+  },
+  {
+    "id": "31c7868c.1d918a",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5259.663074493408,
+    "y": 399.99610328674316,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      [
+        "c3b9df69.c6c78"
+      ]
+    ]
+  },
+  {
+    "id": "c3b9df69.c6c78",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5420.66259765625,
+    "y": 439.99609375,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2fd2f3c1.09b97c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
+    "comments": "",
+    "x": 2900.002540588379,
+    "y": 1013.3028502464294,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "18ba51e1.01a3be",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2886.0020484924316,
+    "y": 961.9692711830139,
+    "z": "afa42c56.2fe06",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f41a7058.b220e",
+    "type": "set",
+    "name": "hardcode hub route",
+    "xml": "<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n",
+    "comments": "",
+    "x": 3420.0038681030273,
+    "y": 1853.0039892196655,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "57accb29.01bb34",
+    "type": "set",
+    "name": "hardcode spoke route",
+    "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />",
+    "comments": "",
+    "x": 3435.004409790039,
+    "y": 2051.0039653778076,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "a8dab23b.85144",
+    "type": "set",
+    "name": "hardcode hub route",
+    "xml": "<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n",
+    "comments": "",
+    "x": 3470.333251953125,
+    "y": 2532,
+    "z": "afa42c56.2fe06",
+    "wires": []
+  },
+  {
+    "id": "3c48a4f4.f048ec",
+    "type": "set",
+    "name": "hardcode spoke route",
+    "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />",
+    "comments": "",
+    "x": 3476.333251953125,
+    "y": 2639,
+    "z": "afa42c56.2fe06",
+    "wires": []
   }
 ]