Fix ss-generate-name DG
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
index d90a5cc..b04fe60 100644 (file)
@@ -1,20 +1,20 @@
 [
   {
-    "id": "8722df6b.da333",
+    "id": "df1ca662.8747b8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 118,
-    "y": 57,
-    "z": "afa42c56.2fe06",
+    "x": 92,
+    "y": 26,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "5f0a72e7.8810fc"
+        "f03eb016.75be2"
       ]
     ]
   },
   {
-    "id": "5f0a72e7.8810fc",
+    "id": "f03eb016.75be2",
     "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": 234.2856903076172,
-    "y": 108.23810768127441,
-    "z": "afa42c56.2fe06",
+    "x": 208.2856903076172,
+    "y": 77.23810768127441,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "a6501208.be07a"
+        "d1c55e79.a107d"
       ]
     ]
   },
   {
-    "id": "a6501208.be07a",
+    "id": "d1c55e79.a107d",
     "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": 237.42861938476562,
-    "y": 193.00003147125244,
-    "z": "afa42c56.2fe06",
+    "x": 211.42861938476562,
+    "y": 162.00003147125244,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "fbe9ed1f.31b14"
+        "39b0cbc5.a6e634"
       ]
     ]
   },
   {
-    "id": "fbe9ed1f.31b14",
+    "id": "39b0cbc5.a6e634",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 169.66668701171875,
-    "y": 301.66673278808594,
-    "z": "afa42c56.2fe06",
+    "x": 143.66668701171875,
+    "y": 270.66673278808594,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ba308345.6a0be",
-        "723ddf07.218d1",
-        "431fc2f2.17609c",
-        "38f6b67d.380b9a",
-        "32bd7569.5de31a"
+        "6e5ac20d.e60c4c",
+        "b99b3963.4b1368",
+        "962ad5c3.0da1a8",
+        "da982ae7.c19088",
+        "546d6174.f994f"
       ]
     ]
   },
   {
-    "id": "ba308345.6a0be",
+    "id": "6e5ac20d.e60c4c",
     "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": 604.000431060791,
-    "y": 440.6668539047241,
-    "z": "afa42c56.2fe06",
+    "x": 578.000431060791,
+    "y": 409.6668539047241,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "88f8bb94.113e88"
+        "ad0a3663.ab8598"
       ]
     ]
   },
   {
-    "id": "2cdd7d19.2083a2",
+    "id": "2acab811.c13ee8",
     "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": 1394.0013427734375,
-    "y": 129.9687786102295,
-    "z": "afa42c56.2fe06",
+    "x": 1368.0013427734375,
+    "y": 98.96877861022949,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "f2739d06.3f82a",
+    "id": "4102e103.78e0d",
     "type": "comment",
     "name": "Query MDSAL for AR",
     "info": "",
     "comments": "",
-    "x": 1719.3340148925781,
-    "y": 153.96864795684814,
-    "z": "afa42c56.2fe06",
+    "x": 1693.3340148925781,
+    "y": 122.96864795684814,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "4600defb.d9dc1",
+    "id": "2988c3dc.9f08bc",
     "type": "comment",
     "name": "Query MDSAL to get parent service based on service instance id from AR",
     "info": "",
     "comments": "",
-    "x": 2189.334873199463,
-    "y": 172.96862697601318,
-    "z": "afa42c56.2fe06",
+    "x": 2163.334873199463,
+    "y": 141.96862697601318,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "2398fd5d.dbac12",
+    "id": "43ba54c6.bea31c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1968.66841506958,
-    "y": 208.63526725769043,
-    "z": "afa42c56.2fe06",
+    "x": 1942.66841506958,
+    "y": 177.63526725769043,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "179e1db5.4a8f02"
+        "90fef119.efb27"
       ]
     ]
   },
   {
-    "id": "179e1db5.4a8f02",
+    "id": "90fef119.efb27",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2123.668254852295,
-    "y": 208.13510036468506,
-    "z": "afa42c56.2fe06",
+    "x": 2097.668254852295,
+    "y": 177.13510036468506,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "35d0f2e8.ed82ae"
+        "3f50e700.ebbfb8"
       ]
     ]
   },
   {
-    "id": "f8dd83a.151c88",
+    "id": "22fe4487.ea79bc",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2447.3587913513184,
-    "y": 204.75424098968506,
-    "z": "afa42c56.2fe06",
+    "x": 2421.3587913513184,
+    "y": 173.75424098968506,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "2218a177.4e456e"
+        "eb3089e9.bab518"
       ]
     ]
   },
   {
-    "id": "7900e8ec.0ba228",
+    "id": "202db162.ce306e",
     "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": 2593.1275672912598,
-    "y": 244.20122909545898,
-    "z": "afa42c56.2fe06",
+    "x": 2567.1275672912598,
+    "y": 213.20122909545898,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "7edde1df.f81a4",
+    "id": "b9e47095.da1a3",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1961.5201416015625,
-    "y": 255.70127391815186,
-    "z": "afa42c56.2fe06",
+    "x": 1935.5201416015625,
+    "y": 224.70127391815186,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ae127aa8.bf8958"
+        "1559b306.93fa9d"
       ]
     ]
   },
   {
-    "id": "ae127aa8.bf8958",
+    "id": "1559b306.93fa9d",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2111.5199851989746,
-    "y": 256.36782932281494,
-    "z": "afa42c56.2fe06",
+    "x": 2085.5199851989746,
+    "y": 225.36782932281494,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "c86b6674.f9da58"
+        "6807513b.840e7"
       ]
     ]
   },
   {
-    "id": "735fee8b.f10fd",
+    "id": "d76066f5.ec2ac8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2435.6867446899414,
-    "y": 242.03460121154785,
-    "z": "afa42c56.2fe06",
+    "x": 2409.6867446899414,
+    "y": 211.03460121154785,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "7900e8ec.0ba228"
+        "202db162.ce306e"
       ]
     ]
   },
   {
-    "id": "35d0f2e8.ed82ae",
+    "id": "3f50e700.ebbfb8",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2287.668430328369,
-    "y": 208.6352834701538,
-    "z": "afa42c56.2fe06",
+    "x": 2261.668430328369,
+    "y": 177.6352834701538,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f8dd83a.151c88",
-        "735fee8b.f10fd"
+        "22fe4487.ea79bc",
+        "d76066f5.ec2ac8"
       ]
     ]
   },
   {
-    "id": "99f51e24.95bbd",
+    "id": "1ecae18f.8c5d6e",
     "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": 2843.0020294189453,
-    "y": 205.63526439666748,
-    "z": "afa42c56.2fe06",
+    "x": 2817.0020294189453,
+    "y": 174.63526439666748,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "2218a177.4e456e",
+    "id": "eb3089e9.bab518",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2597.4778213500977,
-    "y": 204.80180072784424,
-    "z": "afa42c56.2fe06",
+    "x": 2571.4778213500977,
+    "y": 173.80180072784424,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "99f51e24.95bbd",
-        "87284033.76d89"
+        "1ecae18f.8c5d6e",
+        "c22c6bf7.654618"
       ]
     ]
   },
   {
-    "id": "c86b6674.f9da58",
+    "id": "6807513b.840e7",
     "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": 2279.001438140869,
-    "y": 254.63520526885986,
-    "z": "afa42c56.2fe06",
+    "x": 2253.001438140869,
+    "y": 223.63520526885986,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "3ba72ba0.13a9f4",
+    "id": "bc09ac7e.2dfa1",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2066.303554534912,
-    "y": 526.7709312438965,
-    "z": "afa42c56.2fe06",
+    "x": 2040.303554534912,
+    "y": 495.7709312438965,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "3c18f953.7698e6"
+        "4a6d5f3.c343ea"
       ]
     ]
   },
   {
-    "id": "b947c854.e35438",
+    "id": "f0b156c6.5db3a8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2058.15535736084,
-    "y": 561.8370161056519,
-    "z": "afa42c56.2fe06",
+    "x": 2032.1553573608398,
+    "y": 530.8370161056519,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "5f7ffb48.00ef54"
+        "22ca566e.18afda"
       ]
     ]
   },
   {
-    "id": "5f7ffb48.00ef54",
+    "id": "22ca566e.18afda",
     "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": 2204.304130554199,
-    "y": 562.1045122146606,
-    "z": "afa42c56.2fe06",
+    "x": 2178.304130554199,
+    "y": 531.1045122146606,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "3c18f953.7698e6",
+    "id": "4a6d5f3.c343ea",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2186.3038024902344,
-    "y": 526.771014213562,
-    "z": "afa42c56.2fe06",
+    "x": 2160.3038024902344,
+    "y": 495.771014213562,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "9ef76182.7b173",
+    "id": "c9fcea4f.295c68",
     "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": 1749.6683502197266,
-    "y": 626.3028893470764,
-    "z": "afa42c56.2fe06",
+    "x": 1723.6683502197266,
+    "y": 595.3028893470764,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e38b67ea.4c8758"
+        "d063fbaf.bf9cb8"
       ]
     ]
   },
   {
-    "id": "348ba1e1.19e85e",
+    "id": "4b3c3b19.b12c44",
     "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": 2279.3349838256836,
-    "y": 595.3028907775879,
-    "z": "afa42c56.2fe06",
+    "x": 2253.3349838256836,
+    "y": 564.3028907775879,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "27c81bce.91e324"
+        "353c03be.8a3dec"
       ]
     ]
   },
   {
-    "id": "27c81bce.91e324",
+    "id": "353c03be.8a3dec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2531.334518432617,
-    "y": 596.3028283119202,
-    "z": "afa42c56.2fe06",
+    "x": 2505.334518432617,
+    "y": 565.3028283119202,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "917509ae.cf1bf8"
+        "8948df3b.5b4e8"
       ]
     ]
   },
   {
-    "id": "917509ae.cf1bf8",
+    "id": "8948df3b.5b4e8",
     "type": "set",
     "name": "set tmp.pnidx ",
     "xml": "<set>\n<parameter name='tmp.pnidx' value='`$pnidx`' />\n\n",
     "comments": "",
-    "x": 2687.3342056274414,
-    "y": 596.3028283119202,
-    "z": "afa42c56.2fe06",
+    "x": 2661.3342056274414,
+    "y": 565.3028283119202,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "1fd45985.393f26",
+    "id": "f17464be.205b38",
     "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": 1681.3351593017578,
-    "y": 711.3025188446045,
-    "z": "afa42c56.2fe06",
+    "x": 1655.3351593017578,
+    "y": 680.3025188446045,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "4ebf01e5.37d06"
+        "a24202ba.c8c7c"
       ]
     ]
   },
   {
-    "id": "8d7971fd.c23e3",
+    "id": "1134832c.af388d",
     "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": 2133.335250854492,
-    "y": 690.3024244308472,
-    "z": "afa42c56.2fe06",
+    "x": 2107.335250854492,
+    "y": 659.3024244308472,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e336f6e8.a1adc8"
+        "b4638122.81f25"
       ]
     ]
   },
   {
-    "id": "e336f6e8.a1adc8",
+    "id": "b4638122.81f25",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2284.335262298584,
-    "y": 688.3024663925171,
-    "z": "afa42c56.2fe06",
+    "x": 2258.335262298584,
+    "y": 657.3024663925171,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f2813d3e.d5ec3"
+        "6ab1ecb6.c4b6a4"
       ]
     ]
   },
   {
-    "id": "f2813d3e.d5ec3",
+    "id": "6ab1ecb6.c4b6a4",
     "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": 2425.334991455078,
-    "y": 687.9024000167847,
-    "z": "afa42c56.2fe06",
+    "x": 2399.334991455078,
+    "y": 656.9024000167847,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "4a7f65c3.11a50c",
+    "id": "427fd71a.a641b8",
     "type": "switchNode",
     "name": "switch tmp.pnidx ",
     "xml": "<switch test=\"`$tmp.pnidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1652.334976196289,
-    "y": 670.9690914154053,
-    "z": "afa42c56.2fe06",
+    "x": 1626.334976196289,
+    "y": 639.9690914154053,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "42c35e07.6414a"
+        "3b308668.883fda"
       ]
     ]
   },
   {
-    "id": "42c35e07.6414a",
+    "id": "3b308668.883fda",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1807.7636489868164,
-    "y": 669.5404710769653,
-    "z": "afa42c56.2fe06",
+    "x": 1781.7636489868164,
+    "y": 638.5404710769653,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "79c31704.e1ea48"
+        "1025ab31.d734f5"
       ]
     ]
   },
   {
-    "id": "79c31704.e1ea48",
+    "id": "1025ab31.d734f5",
     "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": 1948.1922721862793,
-    "y": 670.6835603713989,
-    "z": "afa42c56.2fe06",
+    "x": 1922.1922721862793,
+    "y": 639.6835603713989,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "d058b4fc.a3d908",
+    "id": "3aec24fb.014f5c",
     "type": "switchNode",
     "name": "switch topology hub-spoke",
     "xml": "<switch test=\"`$prop.topology == 'hub-spoke'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1560.3348426818848,
-    "y": 773.3023405075073,
-    "z": "afa42c56.2fe06",
+    "x": 1534.3348426818848,
+    "y": 742.3023405075073,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "80132a76.17bcc8",
-        "f4211b87.94b798"
+        "11a1e34f.7c4fdd",
+        "32341b46.a26b84"
       ]
     ]
   },
   {
-    "id": "80132a76.17bcc8",
+    "id": "11a1e34f.7c4fdd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1750.334529876709,
-    "y": 798.3028259277344,
-    "z": "afa42c56.2fe06",
+    "x": 1724.334529876709,
+    "y": 767.3028259277344,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "7df004fc.b974bc"
+        "26c0cc7e.899014"
       ]
     ]
   },
   {
-    "id": "f4211b87.94b798",
+    "id": "32341b46.a26b84",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1744.3354568481445,
-    "y": 759.3024883270264,
-    "z": "afa42c56.2fe06",
+    "x": 1718.3354568481445,
+    "y": 728.3024883270264,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f043ab05.abcb68"
+        "92373ae3.dba458"
       ]
     ]
   },
   {
-    "id": "f043ab05.abcb68",
+    "id": "92373ae3.dba458",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1880.3354606628418,
-    "y": 759.3024272918701,
-    "z": "afa42c56.2fe06",
+    "x": 1854.3354606628418,
+    "y": 728.3024272918701,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "7df004fc.b974bc",
+    "id": "26c0cc7e.899014",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1755.66748046875,
-    "y": 866.3020601272583,
-    "z": "afa42c56.2fe06",
+    "x": 1729.66748046875,
+    "y": 835.3020601272583,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f2cfe93e.7237b8"
+        "a5cfaff.0a25c5"
       ]
     ]
   },
   {
-    "id": "f2cfe93e.7237b8",
+    "id": "a5cfaff.0a25c5",
     "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": 2163.000732421875,
-    "y": 866.6356782913208,
-    "z": "afa42c56.2fe06",
+    "x": 2137.000732421875,
+    "y": 835.6356782913208,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "de6797a2.586c78"
+        "528bb6e8.287b28"
       ]
     ]
   },
   {
-    "id": "ffb0cb19.6bd078",
+    "id": "45c7f2c8.9bbc9c",
     "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": 2254.0018463134766,
-    "y": 944.6359763145447,
-    "z": "afa42c56.2fe06",
+    "x": 2228.0018463134766,
+    "y": 913.6359763145447,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "7d29151f.aff58c",
+    "id": "d3076636.df66e8",
     "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": 2272.0025482177734,
-    "y": 1055.302767753601,
-    "z": "afa42c56.2fe06",
+    "x": 2246.0025482177734,
+    "y": 1024.302767753601,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "99b001da.0efb4"
+        "94a7fcab.3f18"
       ]
     ]
   },
   {
-    "id": "175772d7.f9d53d",
+    "id": "e9ad6cc9.abb1",
     "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": 2681.002658843994,
-    "y": 1058.3028545379639,
-    "z": "afa42c56.2fe06",
+    "x": 2655.002658843994,
+    "y": 1027.3028545379639,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "d13f62a9.a25bd"
+        "356c0745.261588"
       ]
     ]
   },
   {
-    "id": "d13f62a9.a25bd",
+    "id": "356c0745.261588",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2822.0029907226562,
-    "y": 1057.3028535842896,
-    "z": "afa42c56.2fe06",
+    "x": 2796.0029907226562,
+    "y": 1026.3028535842896,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "63261a78.0b6344"
+        "2ecc17c9.bbea08"
       ]
     ]
   },
   {
-    "id": "63261a78.0b6344",
+    "id": "2ecc17c9.bbea08",
     "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": 2963.0030250549316,
-    "y": 1058.9027452468872,
-    "z": "afa42c56.2fe06",
+    "x": 2937.0030250549316,
+    "y": 1027.9027452468872,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "63613798.d70908",
+    "id": "7d6e3904.ff8ae8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2758.0020446777344,
-    "y": 961.969269990921,
-    "z": "afa42c56.2fe06",
+    "x": 2732.0020446777344,
+    "y": 930.969269990921,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "18ba51e1.01a3be"
+        "92d1a6eb.dd91a8"
       ]
     ]
   },
   {
-    "id": "9fe7ff8.35548",
+    "id": "b0148b51.89ec18",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2754.8537673950195,
-    "y": 1016.0353531837463,
-    "z": "afa42c56.2fe06",
+    "x": 2728.8537673950195,
+    "y": 985.0353531837463,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "2fd2f3c1.09b97c"
+        "c6ccd14a.96548"
       ]
     ]
   },
   {
-    "id": "8ad9ee53.6aa87",
+    "id": "59d6c0f4.defd7",
     "type": "switchNode",
     "name": "switch role hub",
     "xml": "<switch test=\"`$prop.role == hub`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2138.3351821899414,
-    "y": 1120.6358079910278,
-    "z": "afa42c56.2fe06",
+    "x": 2112.3351821899414,
+    "y": 1089.6358079910278,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "6011fd41.335614",
-        "472beb8.34ca814"
+        "d2d633b9.72ffd",
+        "10c92564.7d8f7b"
       ]
     ]
   },
   {
-    "id": "890f782e.076f68",
+    "id": "a9370615.1e0a18",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2454.3345680236816,
-    "y": 1096.6354112625122,
-    "z": "afa42c56.2fe06",
+    "x": 2428.3345680236816,
+    "y": 1065.6354112625122,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "aa2b8cd4.2f9ae",
+    "id": "f944f364.78c47",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2864.3042030334473,
-    "y": 1192.1045179367065,
-    "z": "afa42c56.2fe06",
+    "x": 2838.3042030334473,
+    "y": 1161.1045179367065,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "4765f05a.45c5e"
+        "b250bb74.e941e8"
       ]
     ]
   },
   {
-    "id": "1bed61f6.90e36e",
+    "id": "e08d96d8.e1bd48",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2866.155773162842,
-    "y": 1252.170599937439,
-    "z": "afa42c56.2fe06",
+    "x": 2840.155773162842,
+    "y": 1221.170599937439,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "151f6728.afe339"
+        "d9301d98.96024"
       ]
     ]
   },
   {
-    "id": "151f6728.afe339",
+    "id": "d9301d98.96024",
     "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": 3010.304546356201,
-    "y": 1214.4380140304565,
-    "z": "afa42c56.2fe06",
+    "x": 2984.304546356201,
+    "y": 1183.4380140304565,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "4765f05a.45c5e",
+    "id": "b250bb74.e941e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2994.3042221069336,
-    "y": 1181.1046781539917,
-    "z": "afa42c56.2fe06",
+    "x": 2968.3042221069336,
+    "y": 1150.1046781539917,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7f9e60d.d46178",
+    "id": "31ca4096.fa657",
     "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": 2466.3356018066406,
-    "y": 1180.6360107660294,
-    "z": "afa42c56.2fe06",
+    "x": 2440.3356018066406,
+    "y": 1149.6360107660294,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "f464743.4983e88",
+    "id": "3250db4e.aae6c4",
     "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": 2510.0020751953125,
-    "y": 1302.6358003616333,
-    "z": "afa42c56.2fe06",
+    "x": 2484.0020751953125,
+    "y": 1271.6358003616333,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "535fb492.abce2c"
+        "5be088b1.9bd9d8"
       ]
     ]
   },
   {
-    "id": "535fb492.abce2c",
+    "id": "5be088b1.9bd9d8",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2856.6683959960938,
-    "y": 1292.6357765197754,
-    "z": "afa42c56.2fe06",
+    "x": 2830.6683959960938,
+    "y": 1261.6357765197754,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "b26020e0.3a846",
-        "5e2a4404.59208c",
-        "858743af.15464"
+        "b0a1b0f0.1cd88",
+        "64161d13.320da4",
+        "a305e869.75b198"
       ]
     ]
   },
   {
-    "id": "b26020e0.3a846",
+    "id": "b0a1b0f0.1cd88",
     "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": 3118.668504714966,
-    "y": 1263.6367359161377,
-    "z": "afa42c56.2fe06",
+    "x": 3092.668504714966,
+    "y": 1232.6367359161377,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "6b78409.f5b87c"
+        "f4aa7045.eb114"
       ]
     ]
   },
   {
-    "id": "dde2f6f9.3c1848",
+    "id": "494b8c51.d5a454",
     "type": "switchNode",
-    "name": "switch tmp.portvidx ",
-    "xml": "<switch test=\"`$tmp.portvidx`\">\n\n",
+    "name": "switch tmp.wanportvidx ",
+    "xml": "<switch test=\"`$tmp.wanportvidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2591.668212890625,
-    "y": 1347.3024454116821,
-    "z": "afa42c56.2fe06",
+    "x": 2565.668212890625,
+    "y": 1316.3024454116821,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "58f23c0f.4a7544"
+        "a2447b78.519d38"
       ]
     ]
   },
   {
-    "id": "3d280456.864e3c",
+    "id": "273881de.ee082e",
     "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": 2516.6688232421875,
-    "y": 1502.6367044448853,
-    "z": "afa42c56.2fe06",
+    "x": 3747.6689834594727,
+    "y": 1225.6369161605835,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "3b6a88cf.f649b8"
+        "b8659698.4fa9a8"
       ]
     ]
   },
   {
-    "id": "58f23c0f.4a7544",
+    "id": "a2447b78.519d38",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2752.0966777801514,
-    "y": 1346.8739652633667,
-    "z": "afa42c56.2fe06",
+    "x": 2737.096935272217,
+    "y": 1319.8741512298584,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "6637a392.65819c"
+        "f6e26890.4d8a38"
       ]
     ]
   },
   {
-    "id": "6637a392.65819c",
+    "id": "f6e26890.4d8a38",
     "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": 2889.525634765625,
-    "y": 1347.0173768997192,
-    "z": "afa42c56.2fe06",
+    "x": 2881.525650024414,
+    "y": 1322.0174312591553,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "6b78409.f5b87c",
+    "id": "f4aa7045.eb114",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3346.66819190979,
-    "y": 1261.636736869812,
-    "z": "afa42c56.2fe06",
+    "x": 3320.66819190979,
+    "y": 1230.636736869812,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "11f23b34.c014d5"
+        "ab1ef1f9.e54ea"
       ]
     ]
   },
   {
-    "id": "3b6a88cf.f649b8",
+    "id": "b8659698.4fa9a8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2859.669807434082,
-    "y": 1505.6369543075562,
-    "z": "afa42c56.2fe06",
+    "x": 3699.6701984405518,
+    "y": 1309.6374425888062,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "9eb62557.123aa8",
-        "6f944994.65d2c8",
-        "b81eb9e0.1976f8",
-        "3235095c.ee2c06"
+        "79f89faa.fb19f"
       ]
     ]
   },
   {
-    "id": "9eb62557.123aa8",
+    "id": "79f89faa.fb19f",
     "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": 3154.670757293701,
-    "y": 1444.6374912261963,
-    "z": "afa42c56.2fe06",
+    "x": 3917.6711139678955,
+    "y": 1307.6379308700562,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "a7e30f58.58c4"
+        "863adb79.9947c8"
       ]
     ]
   },
   {
-    "id": "11f23b34.c014d5",
+    "id": "564bf8e9.5ea9e8",
     "type": "set",
     "name": "set tmp.portvidx ",
     "xml": "<set>\n<parameter name='tmp.portvidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3501.667875289917,
-    "y": 1261.6367359161377,
-    "z": "afa42c56.2fe06",
+    "x": 3644.667995452881,
+    "y": 1183.6369037628174,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "a7e30f58.58c4",
+    "id": "863adb79.9947c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3347.6707725524902,
-    "y": 1444.63765335083,
-    "z": "afa42c56.2fe06",
+    "x": 4114.671541213989,
+    "y": 1306.6380996704102,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "9cf2c3d4.0b4b5"
+        "896da4ec.a5e9f8"
       ]
     ]
   },
   {
-    "id": "9cf2c3d4.0b4b5",
+    "id": "662f75a8.5b0d6c",
     "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": 3565.6707801818848,
-    "y": 1443.23823928833,
-    "z": "afa42c56.2fe06",
+    "x": 4371.6733751297,
+    "y": 1506.2391166687012,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "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": 3116.003490447998,
-    "y": 1478.6371002197266,
-    "z": "afa42c56.2fe06",
-    "wires": [
-      [
-        "b31bd9b2.46c7d8"
-      ]
-    ]
-  },
-  {
-    "id": "b31bd9b2.46c7d8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3277.003818511963,
-    "y": 1479.6371803283691,
-    "z": "afa42c56.2fe06",
-    "wires": [
-      [
-        "d3357919.f54078"
-      ]
-    ]
-  },
-  {
-    "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": 3467.004280090332,
-    "y": 1479.2374563217163,
-    "z": "afa42c56.2fe06",
-    "wires": []
-  },
-  {
-    "id": "2c43f3c.460060c",
+    "id": "372c4b67.d587a4",
     "type": "switchNode",
     "name": "switch  prop.hub.transportNetworkName==prop.spoke.transportNetworkName",
     "xml": "<switch test=\"`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2594.004150390625,
-    "y": 1605.304440498352,
-    "z": "afa42c56.2fe06",
+    "x": 2564.00431060791,
+    "y": 1466.3046674728394,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "cf49239.d51bfe",
-        "c6577e7a.d8dfd"
+        "ad67f3dd.ea7da",
+        "f32a34f9.fa2a88"
       ]
     ]
   },
   {
-    "id": "cf49239.d51bfe",
+    "id": "ad67f3dd.ea7da",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2940.0036811828613,
-    "y": 1642.3045144081116,
-    "z": "afa42c56.2fe06",
+    "x": 2910.0038414001465,
+    "y": 1503.3047413825989,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "c20a45c1.991ea8"
+        "6ddb13cd.d02b7c"
       ]
     ]
   },
   {
-    "id": "c6577e7a.d8dfd",
+    "id": "f32a34f9.fa2a88",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2944.0041694641113,
-    "y": 1577.3041467666626,
-    "z": "afa42c56.2fe06",
+    "x": 2904.004650115967,
+    "y": 1440.3046016693115,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "7523e16b.4849a"
+        "93fee3b6.b53b4"
       ]
     ]
   },
   {
-    "id": "7523e16b.4849a",
+    "id": "93fee3b6.b53b4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3084.0040969848633,
-    "y": 1605.304271697998,
-    "z": "afa42c56.2fe06",
+    "x": 3034.004837036133,
+    "y": 1440.3047542572021,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "de6797a2.586c78",
+    "id": "528bb6e8.287b28",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1905.0322265625,
-    "y": 975.8333101272583,
-    "z": "afa42c56.2fe06",
+    "x": 1879.0322265625,
+    "y": 944.8333101272583,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ffb0cb19.6bd078",
-        "9b080888.c9b298",
-        "1ff59188.ff36ae",
-        "8ad9ee53.6aa87",
-        "7d29151f.aff58c"
+        "45c7f2c8.9bbc9c",
+        "9540984f.e97fb8",
+        "b384d688.b2dd28",
+        "59d6c0f4.defd7",
+        "d3076636.df66e8"
       ]
     ]
   },
   {
-    "id": "524b783f.8c1128",
+    "id": "e393fec8.f9974",
     "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 == 'vpn-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2123.001266479492,
-    "y": 734.6354351043701,
-    "z": "afa42c56.2fe06",
+    "x": 2097.001266479492,
+    "y": 703.6354351043701,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "6c47f41b.3d3cac"
+        "d6a90986.8eb118"
       ]
     ]
   },
   {
-    "id": "6c47f41b.3d3cac",
+    "id": "d6a90986.8eb118",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2267.001277923584,
-    "y": 734.6354761123657,
-    "z": "afa42c56.2fe06",
+    "x": 2241.001277923584,
+    "y": 703.6354761123657,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "9b1a7d07.58406"
+        "c1f6fc9b.d909f"
       ]
     ]
   },
   {
-    "id": "9b1a7d07.58406",
+    "id": "c1f6fc9b.d909f",
     "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": 2425.0009994506836,
-    "y": 733.2354106903076,
-    "z": "afa42c56.2fe06",
+    "x": 2399.0009994506836,
+    "y": 702.2354106903076,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "c93e7e34.eb504",
+    "id": "56fbb125.4613b",
     "type": "set",
     "name": "Set prop.hubTnpId",
     "xml": "<set>\n<parameter name='prop.hubTnpId' value='$prop.hub.wanPortId' />\n\n",
     "comments": "",
-    "x": 2631.336555480957,
-    "y": 1731.6363048553467,
-    "z": "afa42c56.2fe06",
+    "x": 2616.3368072509766,
+    "y": 1739.6364259719849,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "33961398.8b885c",
+    "id": "7c9721cc.23414",
     "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`\" />",
+    "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.onap.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": 3463.33624458313,
-    "y": 2602.9708592891693,
-    "z": "afa42c56.2fe06",
+    "x": 3437.33624458313,
+    "y": 2571.9708592891693,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "54355641.66e388",
-        "a6852c79.79538"
+        "f29c10b7.ab96c",
+        "d1ca729c.637d"
       ]
     ]
   },
   {
-    "id": "a6852c79.79538",
+    "id": "d1ca729c.637d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3730.3361530303955,
-    "y": 2630.970888853073,
-    "z": "afa42c56.2fe06",
+    "x": 3704.3361530303955,
+    "y": 2599.970888853073,
+    "z": "ea31d3f9.c58ce",
     "wires": [
-      []
+      [
+        "4079a316.d4531c"
+      ]
     ]
   },
   {
-    "id": "54355641.66e388",
+    "id": "f29c10b7.ab96c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728.335832595825,
-    "y": 2586.97087931633,
-    "z": "afa42c56.2fe06",
+    "x": 3702.335832595825,
+    "y": 2555.97087931633,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e784c17f.677b5"
+        "7b4a5da7.783c64"
       ]
     ]
   },
   {
-    "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.336519241333,
-    "y": 2584.9709622859955,
-    "z": "afa42c56.2fe06",
-    "wires": []
-  },
-  {
-    "id": "45a08ea1.9e3d3",
+    "id": "31f4dc9.4459824",
     "type": "set",
     "name": "Add prop.hub.route",
     "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.hubRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n",
     "comments": "",
-    "x": 3407.6696243286133,
-    "y": 2559.637367248535,
-    "z": "afa42c56.2fe06",
+    "x": 3381.6696243286133,
+    "y": 2528.637367248535,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "5e2b5a00.fe4964",
+    "id": "bd1192a1.70e0b",
     "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`\" />",
+    "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.onap.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": 3482.6696243286133,
-    "y": 2701.637832403183,
-    "z": "afa42c56.2fe06",
+    "x": 3456.6696243286133,
+    "y": 2670.637832403183,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e568918e.3bed",
-        "6ef02e4e.06cc1"
+        "1372bf53.f8d271",
+        "7d49f976.fe2c38"
       ]
     ]
   },
   {
-    "id": "6ef02e4e.06cc1",
+    "id": "7d49f976.fe2c38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3734.669771194458,
-    "y": 2730.6381289958954,
-    "z": "afa42c56.2fe06",
+    "x": 3708.669771194458,
+    "y": 2699.6381289958954,
+    "z": "ea31d3f9.c58ce",
     "wires": [
-      []
+      [
+        "a38da1c5.3c2df"
+      ]
     ]
   },
   {
-    "id": "e568918e.3bed",
+    "id": "1372bf53.f8d271",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3732.6694507598877,
-    "y": 2686.638119459152,
-    "z": "afa42c56.2fe06",
+    "x": 3706.6694507598877,
+    "y": 2655.638119459152,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "43fb9f64.6e794"
+        "ae6e8595.d05358"
       ]
     ]
   },
   {
-    "id": "43fb9f64.6e794",
+    "id": "1618d5.6f61e72c",
     "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.6701374053955,
-    "y": 2684.6382024288177,
-    "z": "afa42c56.2fe06",
+    "x": 3996.6703186035156,
+    "y": 2649.6383113861084,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "5e2a4404.59208c",
+    "id": "64161d13.320da4",
     "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": 3129.532081604004,
-    "y": 1296.8336944580078,
-    "z": "afa42c56.2fe06",
+    "x": 3103.532081604004,
+    "y": 1265.8336944580078,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "355d1cb7.8466e4"
+        "9f32e086.83793"
       ]
     ]
   },
   {
-    "id": "85c67b27.be5eb8",
+    "id": "c2ac42b9.22b8d",
     "type": "switchNode",
     "name": "switch tmp.devicevidx ",
     "xml": "<switch test=\"`$tmp.devicevidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2597.5316314697266,
-    "y": 1389.4999265670776,
-    "z": "afa42c56.2fe06",
+    "x": 2571.5316314697266,
+    "y": 1358.4999265670776,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "188473e9.fdf33c"
+        "e36692fe.8d819"
       ]
     ]
   },
   {
-    "id": "188473e9.fdf33c",
+    "id": "e36692fe.8d819",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2763.9600677490234,
-    "y": 1389.0714597702026,
-    "z": "afa42c56.2fe06",
+    "x": 2737.9600677490234,
+    "y": 1358.0714597702026,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ec42dab0.d633d8"
+        "3d811052.fd24c"
       ]
     ]
   },
   {
-    "id": "ec42dab0.d633d8",
+    "id": "3d811052.fd24c",
     "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": 2904.388999938965,
-    "y": 1391.2144346237183,
-    "z": "afa42c56.2fe06",
+    "x": 2878.388999938965,
+    "y": 1360.2144346237183,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "355d1cb7.8466e4",
+    "id": "9f32e086.83793",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3357.531768798828,
-    "y": 1294.8336954116821,
-    "z": "afa42c56.2fe06",
+    "x": 3331.531768798828,
+    "y": 1263.8336954116821,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "73270e6c.070f4"
+        "869ea93a.54ef48"
       ]
     ]
   },
   {
-    "id": "73270e6c.070f4",
+    "id": "869ea93a.54ef48",
     "type": "set",
     "name": "set tmp.devicevidx ",
     "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3512.531452178955,
-    "y": 1294.8336944580078,
-    "z": "afa42c56.2fe06",
+    "x": 3486.531452178955,
+    "y": 1263.8336944580078,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "858743af.15464",
+    "id": "a305e869.75b198",
     "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": 3092.5321521759033,
-    "y": 1330.833758354187,
-    "z": "afa42c56.2fe06",
+    "x": 3066.5321521759033,
+    "y": 1299.833758354187,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f6939cb3.d0942"
+        "ab60af44.1fc14"
       ]
     ]
   },
   {
-    "id": "1e774611.be647a",
+    "id": "aae2a2df.f7cc",
     "type": "switchNode",
     "name": "switch tmp.sitevidx ",
     "xml": "<switch test=\"`$tmp.sitevidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2596.5315017700195,
-    "y": 1427.4998044967651,
-    "z": "afa42c56.2fe06",
+    "x": 2570.5315017700195,
+    "y": 1396.4998044967651,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "bc02814a.d7499"
+        "834ee4ef.5fe588"
       ]
     ]
   },
   {
-    "id": "bc02814a.d7499",
+    "id": "834ee4ef.5fe588",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2756.959966659546,
-    "y": 1427.0713243484497,
-    "z": "afa42c56.2fe06",
+    "x": 2730.959966659546,
+    "y": 1396.0713243484497,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "d392366e.9150d8"
+        "4979a718.8325b8"
       ]
     ]
   },
   {
-    "id": "d392366e.9150d8",
+    "id": "4979a718.8325b8",
     "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": 2905.388921737671,
-    "y": 1429.2143306732178,
-    "z": "afa42c56.2fe06",
+    "x": 2879.388921737671,
+    "y": 1398.2143306732178,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "f6939cb3.d0942",
+    "id": "ab60af44.1fc14",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3280.531717300415,
-    "y": 1330.833924293518,
-    "z": "afa42c56.2fe06",
+    "x": 3254.531717300415,
+    "y": 1299.833924293518,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ab570b08.b1c7a8"
+        "1aaf3b5d.3c7645"
       ]
     ]
   },
   {
-    "id": "ab570b08.b1c7a8",
+    "id": "1aaf3b5d.3c7645",
     "type": "set",
     "name": "set tmp.sitevidx ",
     "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n",
     "comments": "",
-    "x": 3435.531400680542,
-    "y": 1330.8339233398438,
-    "z": "afa42c56.2fe06",
+    "x": 3409.531400680542,
+    "y": 1299.8339233398438,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "37339d04.d0e692",
+    "id": "409305d5.93be5c",
     "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": 2728.5331497192383,
-    "y": 1767.834059715271,
-    "z": "afa42c56.2fe06",
+    "x": 2703.5333099365234,
+    "y": 1781.8342418670654,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "fc5d79c.538d088"
+        "f3da0084.2ed3d"
       ]
     ]
   },
   {
-    "id": "29161345.19c04c",
+    "id": "490623bf.f5be2c",
     "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": 3189.5345039367676,
-    "y": 1681.834927558899,
-    "z": "afa42c56.2fe06",
+    "x": 3188.5345611572266,
+    "y": 1712.8350954055786,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "cded98bd.ccea58"
+        "fe8795f9.d93fb8"
       ]
     ]
   },
   {
-    "id": "cded98bd.ccea58",
+    "id": "fe8795f9.d93fb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3340.5348777770996,
-    "y": 1678.835171699524,
-    "z": "afa42c56.2fe06",
+    "x": 3339.5349349975586,
+    "y": 1709.8353395462036,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "d9cc984d.9f9d28"
+        "9a7de836.6030f8"
       ]
     ]
   },
   {
-    "id": "d9cc984d.9f9d28",
+    "id": "9a7de836.6030f8",
     "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": 3515.535125732422,
-    "y": 1678.4356966018677,
-    "z": "afa42c56.2fe06",
+    "x": 3514.535182952881,
+    "y": 1709.4358644485474,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "125c1fec.50ea4",
+    "id": "e6c5f470.5c1408",
     "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": 2703.0330352783203,
-    "y": 1824.83407497406,
-    "z": "afa42c56.2fe06",
+    "x": 2670.0331268310547,
+    "y": 1843.8342113494873,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "d543abbf.21d958"
+        "ee5b33c3.334cb"
       ]
     ]
   },
   {
-    "id": "e6b24865.170e78",
+    "id": "f647b09c.a81c",
     "type": "comment",
     "name": "Add route src->dst, dst->src",
     "info": "",
     "comments": "",
-    "x": 2919.6687927246094,
-    "y": 1872.6359510421753,
-    "z": "afa42c56.2fe06",
+    "x": 3005.668716430664,
+    "y": 1860.6360301971436,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "79cfeb5f.61b2e4",
+    "id": "2ed283b9.4ced6c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2141.334228515625,
-    "y": 1252.968747138977,
-    "z": "afa42c56.2fe06",
+    "x": 2115.334228515625,
+    "y": 1221.968747138977,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f464743.4983e88",
-        "3d280456.864e3c",
-        "2c43f3c.460060c",
-        "18153066.3dcbc",
-        "f7f9e60d.d46178",
-        "a780d837.5bb548",
-        "fcb5aaf7.a56738"
+        "3250db4e.aae6c4",
+        "372c4b67.d587a4",
+        "8238d072.258df",
+        "31ca4096.fa657",
+        "a06e1b02.e2dcb8",
+        "5f595aa8.cf14c4"
       ]
     ]
   },
   {
-    "id": "18153066.3dcbc",
+    "id": "8238d072.258df",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2396.333984375,
-    "y": 1389.3021211624146,
-    "z": "afa42c56.2fe06",
+    "x": 2370.333984375,
+    "y": 1358.3021211624146,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "dde2f6f9.3c1848",
-        "85c67b27.be5eb8",
-        "1e774611.be647a"
+        "c2ac42b9.22b8d",
+        "aae2a2df.f7cc",
+        "494b8c51.d5a454"
       ]
     ]
   },
   {
-    "id": "c20a45c1.991ea8",
+    "id": "6ddb13cd.d02b7c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2416.3350219726562,
-    "y": 1761.635643005371,
-    "z": "afa42c56.2fe06",
-    "wires": [
-      [
-        "c93e7e34.eb504",
-        "37339d04.d0e692",
-        "125c1fec.50ea4",
-        "f1944c46.f8a7e"
-      ]
-    ]
-  },
-  {
-    "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": 3137.5319747924805,
-    "y": 1515.8334050178528,
-    "z": "afa42c56.2fe06",
+    "x": 2390.3350219726562,
+    "y": 1730.635643005371,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "9a3783d0.0d525"
+        "56fbb125.4613b",
+        "409305d5.93be5c",
+        "e6c5f470.5c1408",
+        "74f0a419.baab7c",
+        "f5ec2256.55a71"
       ]
     ]
   },
   {
-    "id": "9a3783d0.0d525",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3313.532958984375,
-    "y": 1515.8335275650024,
-    "z": "afa42c56.2fe06",
-    "wires": [
-      [
-        "87437b42.24d3e8"
-      ]
-    ]
-  },
-  {
-    "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": 3515.5329971313477,
-    "y": 1516.4334478378296,
-    "z": "afa42c56.2fe06",
-    "wires": []
-  },
-  {
-    "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": 3110.0320568084717,
-    "y": 1553.333490371704,
-    "z": "afa42c56.2fe06",
-    "wires": [
-      [
-        "901583b2.3d45c"
-      ]
-    ]
-  },
-  {
-    "id": "901583b2.3d45c",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3314.0329971313477,
-    "y": 1553.3334422111511,
-    "z": "afa42c56.2fe06",
-    "wires": [
-      [
-        "3c3cbc3f.366104"
-      ]
-    ]
-  },
-  {
-    "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": 3509.033000946045,
-    "y": 1552.9334177970886,
-    "z": "afa42c56.2fe06",
-    "wires": []
-  },
-  {
-    "id": "3208baf8.6aed86",
+    "id": "53da0cfd.4e5c84",
     "type": "set",
     "name": "Add prop.spoke.route",
     "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.spokeRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n\n\n",
     "comments": "",
-    "x": 3417.533639907837,
-    "y": 2670.3345935344696,
-    "z": "afa42c56.2fe06",
+    "x": 3391.533639907837,
+    "y": 2639.3345935344696,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "723ddf07.218d1",
+    "id": "b99b3963.4b1368",
     "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": 366.3343048095703,
-    "y": 1127.3343391418457,
-    "z": "afa42c56.2fe06",
+    "x": 340.3343048095703,
+    "y": 1096.3343391418457,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "428d17cf.9d4528",
+    "id": "9692ac6c.5b398",
     "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": 1415.6672058105469,
-    "y": 189.30183696746826,
-    "z": "afa42c56.2fe06",
+    "x": 1389.6672058105469,
+    "y": 158.30183696746826,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "31785cb6.7e6854",
+    "id": "a88c4be0.5a96c8",
     "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": 1542.667236328125,
-    "y": 237.3018274307251,
-    "z": "afa42c56.2fe06",
+    "x": 1516.667236328125,
+    "y": 206.3018274307251,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "2398fd5d.dbac12",
-        "7edde1df.f81a4"
+        "43ba54c6.bea31c",
+        "b9e47095.da1a3"
       ]
     ]
   },
   {
-    "id": "8a7f6cb5.ac077",
+    "id": "fa697270.9a4c6",
     "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": 1767.0013885498047,
-    "y": 571.3021411895752,
-    "z": "afa42c56.2fe06",
+    "x": 1741.0013885498047,
+    "y": 540.3021411895752,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "3ba72ba0.13a9f4",
-        "b947c854.e35438"
+        "bc09ac7e.2dfa1",
+        "f0b156c6.5db3a8"
       ]
     ]
   },
   {
-    "id": "39b9e240.c55f5e",
+    "id": "9c710564.f70308",
     "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": 1744.0010375976562,
-    "y": 517.3020687103271,
-    "z": "afa42c56.2fe06",
+    "x": 1718.0010375976562,
+    "y": 486.30206871032715,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "e2c10566.d14818",
+    "id": "b113d667.018288",
     "type": "comment",
     "name": "full mesh do nothing",
     "info": "",
     "comments": "",
-    "x": 1578.667839050293,
-    "y": 728.3021068572998,
-    "z": "afa42c56.2fe06",
+    "x": 1552.667839050293,
+    "y": 697.3021068572998,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "3ed45cd4.e3df94",
+    "id": "9c493d3a.013fd",
     "type": "comment",
     "name": "hub-spoke",
     "info": "",
     "comments": "",
-    "x": 2579.6672401428223,
-    "y": 825.3019967079163,
-    "z": "afa42c56.2fe06",
+    "x": 2553.6672401428223,
+    "y": 794.3019967079163,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "9b080888.c9b298",
+    "id": "9540984f.e97fb8",
     "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": 2252.0003929138184,
-    "y": 976.3019919395447,
-    "z": "afa42c56.2fe06",
+    "x": 2226.0003929138184,
+    "y": 945.3019919395447,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ff59188.ff36ae",
+    "id": "b384d688.b2dd28",
     "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": 2383.000473022461,
-    "y": 1015.9686217308044,
-    "z": "afa42c56.2fe06",
+    "x": 2357.000473022461,
+    "y": 984.9686217308044,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "63613798.d70908",
-        "9fe7ff8.35548"
+        "7d6e3904.ff8ae8",
+        "b0148b51.89ec18"
       ]
     ]
   },
   {
-    "id": "a780d837.5bb548",
+    "id": "a06e1b02.e2dcb8",
     "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": 2433.504367828369,
-    "y": 1217.3058919906616,
-    "z": "afa42c56.2fe06",
+    "x": 2407.504367828369,
+    "y": 1186.3058919906616,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "fcb5aaf7.a56738",
+    "id": "5f595aa8.cf14c4",
     "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": 2549.5045013427734,
-    "y": 1254.3057832717896,
-    "z": "afa42c56.2fe06",
+    "x": 2523.5045013427734,
+    "y": 1223.3057832717896,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "aa2b8cd4.2f9ae",
-        "1bed61f6.90e36e"
+        "f944f364.78c47",
+        "e08d96d8.e1bd48"
       ]
     ]
   },
   {
-    "id": "472beb8.34ca814",
+    "id": "10c92564.7d8f7b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2313.5000648498535,
-    "y": 1139.8018560409546,
-    "z": "afa42c56.2fe06",
+    "x": 2287.5000648498535,
+    "y": 1108.8018560409546,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "79cfeb5f.61b2e4"
+        "2ed283b9.4ced6c"
       ]
     ]
   },
   {
-    "id": "6011fd41.335614",
+    "id": "d2d633b9.72ffd",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2319.500312805176,
-    "y": 1096.801947593689,
-    "z": "afa42c56.2fe06",
+    "x": 2293.500312805176,
+    "y": 1065.801947593689,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "890f782e.076f68"
+        "a9370615.1e0a18"
       ]
     ]
   },
   {
-    "id": "87284033.76d89",
+    "id": "c22c6bf7.654618",
     "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": 2894.5008697509766,
-    "y": 244.30177307128906,
-    "z": "afa42c56.2fe06",
+    "x": 2868.5008697509766,
+    "y": 213.30177307128906,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "73b90990.d19928"
+        "1e62939f.a940cc"
       ]
     ]
   },
   {
-    "id": "73b90990.d19928",
+    "id": "1e62939f.a940cc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3153.5011825561523,
-    "y": 243.3020887374878,
-    "z": "afa42c56.2fe06",
+    "x": 3127.5011825561523,
+    "y": 212.3020887374878,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "8cac5932.b8b208"
+        "6368cbef.0c0714"
       ]
     ]
   },
   {
-    "id": "8cac5932.b8b208",
+    "id": "6368cbef.0c0714",
     "type": "switchNode",
     "name": "switch Role",
     "xml": "<switch test=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].name == 'role'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3302.501194000244,
-    "y": 244.3019256591797,
-    "z": "afa42c56.2fe06",
+    "x": 3276.501194000244,
+    "y": 213.3019256591797,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "bf369f65.c443d"
+        "602b9a1d.1f8fa4"
       ]
     ]
   },
   {
-    "id": "9b7f20f8.db3b3",
+    "id": "9865389f.19f678",
     "type": "set",
     "name": "set prop.spoke.role",
     "xml": "<set>\n<parameter name='prop.spoke.role' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].value`' />\n",
     "comments": "",
-    "x": 3607.501754760742,
-    "y": 241.90183353424072,
-    "z": "afa42c56.2fe06",
+    "x": 3581.501754760742,
+    "y": 210.90183353424072,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "bf369f65.c443d",
+    "id": "602b9a1d.1f8fa4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3438.00101852417,
-    "y": 241.30176544189453,
-    "z": "afa42c56.2fe06",
+    "x": 3412.00101852417,
+    "y": 210.30176544189453,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "9b7f20f8.db3b3"
+        "9865389f.19f678"
       ]
     ]
   },
   {
-    "id": "8baae43.65cdc18",
+    "id": "c78c1bff.286648",
     "type": "switchNode",
     "name": "switch spoke",
     "xml": "<switch test=\"`$prop.spoke.role == 'spoke'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1330.000373840332,
-    "y": 388.301700592041,
-    "z": "afa42c56.2fe06",
+    "x": 1304.000373840332,
+    "y": 357.301700592041,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "b158c146.c1f85"
+        "45674b4e.4d0684"
       ]
     ]
   },
   {
-    "id": "b158c146.c1f85",
+    "id": "45674b4e.4d0684",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1471.000129699707,
-    "y": 389.30173778533936,
-    "z": "afa42c56.2fe06",
+    "x": 1445.000129699707,
+    "y": 358.30173778533936,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "67d378cf.68e458"
+        "44bfeb73.8a2794"
       ]
     ]
   },
   {
-    "id": "b0c4da2c.234108",
+    "id": "c6974a98.f8b038",
     "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": 1743.5006561279297,
-    "y": 443.3017330169678,
-    "z": "afa42c56.2fe06",
+    "x": 1717.5006561279297,
+    "y": 412.3017330169678,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "63ff4ec5.ab647"
+        "74ae021f.4e878c"
       ]
     ]
   },
   {
-    "id": "63ff4ec5.ab647",
+    "id": "74ae021f.4e878c",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2077.166847229004,
-    "y": 387.3016633987427,
-    "z": "afa42c56.2fe06",
+    "x": 2051.166847229004,
+    "y": 356.3016633987427,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "84784063.67ffb",
-        "341080b7.07512",
-        "ed155104.c2191"
+        "e5568bc9.6c4a18",
+        "10bef5c5.4c95ea",
+        "d2557f72.d615e"
       ]
     ]
   },
   {
-    "id": "84784063.67ffb",
+    "id": "e5568bc9.6c4a18",
     "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": 2348.1668853759766,
-    "y": 333.3025498390198,
-    "z": "afa42c56.2fe06",
+    "x": 2322.1668853759766,
+    "y": 302.3025498390198,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "126e021b.594fce"
+        "730af204.11fefc"
       ]
     ]
   },
   {
-    "id": "126e021b.594fce",
+    "id": "730af204.11fefc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2561.166648864746,
-    "y": 334.3025527000427,
-    "z": "afa42c56.2fe06",
+    "x": 2535.166648864746,
+    "y": 303.3025527000427,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "c1a0895d.a44898"
+        "90e7c80d.95a148"
       ]
     ]
   },
   {
-    "id": "c1a0895d.a44898",
+    "id": "90e7c80d.95a148",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2710.0003929138184,
-    "y": 336.3017420768738,
-    "z": "afa42c56.2fe06",
+    "x": 2684.0003929138184,
+    "y": 305.3017420768738,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "cad8cdd9.d6465"
+        "993b2158.a7204"
       ]
     ]
   },
   {
-    "id": "cad8cdd9.d6465",
+    "id": "993b2158.a7204",
     "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": 2983.000343322754,
-    "y": 334.6689600944519,
-    "z": "afa42c56.2fe06",
+    "x": 2957.000343322754,
+    "y": 303.6689600944519,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e45e8fbc.86968"
+        "a8fb6ac2.404148"
       ]
     ]
   },
   {
-    "id": "e45e8fbc.86968",
+    "id": "a8fb6ac2.404148",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3252.0012702941895,
-    "y": 333.66920614242554,
-    "z": "afa42c56.2fe06",
+    "x": 3226.0012702941895,
+    "y": 302.66920614242554,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "bc53f544.71b638",
-        "25d65cd3.81eaf4",
-        "af8fabf7.c19df8",
-        "97c92085.94f67"
+        "f56203d5.44648",
+        "844331fb.21709",
+        "c8a276bd.330448",
+        "878dc9b3.754498"
       ]
     ]
   },
   {
-    "id": "bc53f544.71b638",
+    "id": "f56203d5.44648",
     "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": 3495.0023040771484,
-    "y": 288.6697793006897,
-    "z": "afa42c56.2fe06",
+    "x": 3469.0023040771484,
+    "y": 257.6697793006897,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "de0d2806.856438"
+        "c1622f74.5acec"
       ]
     ]
   },
   {
-    "id": "de0d2806.856438",
+    "id": "c1622f74.5acec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3695.0020790100098,
-    "y": 288.6699414253235,
-    "z": "afa42c56.2fe06",
+    "x": 3669.0020790100098,
+    "y": 257.6699414253235,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "9a3c947a.1c5d88"
+        "484c0f29.65918"
       ]
     ]
   },
   {
-    "id": "9a3c947a.1c5d88",
+    "id": "484c0f29.65918",
     "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": 3922.002815246582,
-    "y": 290.2705235481262,
-    "z": "afa42c56.2fe06",
+    "x": 3896.002815246582,
+    "y": 259.2705235481262,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "67d378cf.68e458",
+    "id": "44bfeb73.8a2794",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1223.9694213867188,
-    "y": 699.2706489562988,
-    "z": "afa42c56.2fe06",
+    "x": 1197.9694213867188,
+    "y": 668.2706489562988,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "b0c4da2c.234108",
-        "39b9e240.c55f5e",
-        "8a7f6cb5.ac077",
-        "9ef76182.7b173",
-        "1fd45985.393f26",
-        "d058b4fc.a3d908",
-        "4a7f65c3.11a50c",
-        "86cead5c.3dd72"
+        "c6974a98.f8b038",
+        "9c710564.f70308",
+        "fa697270.9a4c6",
+        "c9fcea4f.295c68",
+        "f17464be.205b38",
+        "3aec24fb.014f5c",
+        "427fd71a.a641b8",
+        "3da7a5e7.865d8a"
       ]
     ]
   },
   {
-    "id": "341080b7.07512",
+    "id": "10bef5c5.4c95ea",
     "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": 2340.5003204345703,
-    "y": 407.3017544746399,
-    "z": "afa42c56.2fe06",
+    "x": 2314.5003204345703,
+    "y": 376.3017544746399,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "b16c0723.99d848"
+        "3b1b3b34.55a514"
       ]
     ]
   },
   {
-    "id": "b16c0723.99d848",
+    "id": "3b1b3b34.55a514",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2559.5000705718994,
-    "y": 408.30173921585083,
-    "z": "afa42c56.2fe06",
+    "x": 2533.5000705718994,
+    "y": 377.30173921585083,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "6b12cdd6.190a84"
+        "371f6a10.c50d56"
       ]
     ]
   },
   {
-    "id": "6b12cdd6.190a84",
+    "id": "371f6a10.c50d56",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2710.3340606689453,
-    "y": 414.3009305000305,
-    "z": "afa42c56.2fe06",
+    "x": 2684.3340606689453,
+    "y": 383.3009305000305,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "c142c3ae.d5baf"
+        "53996c8e.9b7f34"
       ]
     ]
   },
   {
-    "id": "c142c3ae.d5baf",
+    "id": "53996c8e.9b7f34",
     "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": 2969.334312438965,
-    "y": 416.66822576522827,
-    "z": "afa42c56.2fe06",
+    "x": 2943.334312438965,
+    "y": 385.66822576522827,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "6fd86632.b15c78"
+        "f263db9e.f44158"
       ]
     ]
   },
   {
-    "id": "6fd86632.b15c78",
+    "id": "f263db9e.f44158",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3255.334819793701,
-    "y": 449.66841077804565,
-    "z": "afa42c56.2fe06",
+    "x": 3229.334819793701,
+    "y": 418.66841077804565,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "4c164cba.1f51b4"
+        "5249df60.eaa65"
       ]
     ]
   },
   {
-    "id": "4c164cba.1f51b4",
+    "id": "5249df60.eaa65",
     "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": 3438.3357315063477,
-    "y": 449.66902112960815,
-    "z": "afa42c56.2fe06",
+    "x": 3412.3357315063477,
+    "y": 418.66902112960815,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "4e22d2eb.17a27c"
+        "78ddeb0.2bf8314"
       ]
     ]
   },
   {
-    "id": "4e22d2eb.17a27c",
+    "id": "78ddeb0.2bf8314",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3638.335506439209,
-    "y": 449.66918325424194,
-    "z": "afa42c56.2fe06",
+    "x": 3612.335506439209,
+    "y": 418.66918325424194,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "bda2d14d.2382d"
+        "842e3e5c.4cad"
       ]
     ]
   },
   {
-    "id": "bda2d14d.2382d",
+    "id": "842e3e5c.4cad",
     "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": 3833.3361892700195,
-    "y": 446.26976442337036,
-    "z": "afa42c56.2fe06",
+    "x": 3807.3361892700195,
+    "y": 415.26976442337036,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "ed155104.c2191",
+    "id": "d2557f72.d615e",
     "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": 2319.5004348754883,
-    "y": 468.30178594589233,
-    "z": "afa42c56.2fe06",
+    "x": 2293.5004348754883,
+    "y": 437.30178594589233,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "3684ce31.756aa2"
+        "1c713318.89265d"
       ]
     ]
   },
   {
-    "id": "3684ce31.756aa2",
+    "id": "1c713318.89265d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2553.500072479248,
-    "y": 469.3017258644104,
-    "z": "afa42c56.2fe06",
+    "x": 2527.500072479248,
+    "y": 438.3017258644104,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "379dde17.f5f7e2"
+        "ed702e21.07c0b"
       ]
     ]
   },
   {
-    "id": "379dde17.f5f7e2",
+    "id": "ed702e21.07c0b",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2705.3340606689453,
-    "y": 491.30096197128296,
-    "z": "afa42c56.2fe06",
+    "x": 2679.3340606689453,
+    "y": 460.30096197128296,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "54ff4036.7eef1",
-        "dc7900f6.c1794"
+        "8ec1a47c.55b508",
+        "68bdc58a.c36e2c"
       ]
     ]
   },
   {
-    "id": "54ff4036.7eef1",
+    "id": "8ec1a47c.55b508",
     "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": 2986.3338928222656,
-    "y": 490.668164730072,
-    "z": "afa42c56.2fe06",
+    "x": 2960.3338928222656,
+    "y": 459.668164730072,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "53c73c75.c0fe44"
+        "edd6a6a1.36e3f8"
       ]
     ]
   },
   {
-    "id": "53c73c75.c0fe44",
+    "id": "edd6a6a1.36e3f8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3255.334819793701,
-    "y": 489.66841077804565,
-    "z": "afa42c56.2fe06",
+    "x": 3229.334819793701,
+    "y": 458.66841077804565,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "1d2d8e3b.d07092",
-        "812b076f.3b7138",
-        "8b3ca259.e59f8"
+        "12472c4.5235bd4",
+        "96a23bd5.060968",
+        "af471c20.d9cb7"
       ]
     ]
   },
   {
-    "id": "1d2d8e3b.d07092",
+    "id": "12472c4.5235bd4",
     "type": "switchNode",
     "name": "switch siteId",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'siteId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3444.33602142334,
-    "y": 539.6690826416016,
-    "z": "afa42c56.2fe06",
+    "x": 3418.33602142334,
+    "y": 508.66908264160156,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "35fdfb9a.5d5ab4"
+        "3940a3b0.f06d3c"
       ]
     ]
   },
   {
-    "id": "35fdfb9a.5d5ab4",
+    "id": "3940a3b0.f06d3c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3644.3354988098145,
-    "y": 527.6691970825195,
-    "z": "afa42c56.2fe06",
+    "x": 3618.3354988098145,
+    "y": 496.66919708251953,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ea9da0a4.eb61c"
+        "bc674b05.78b928"
       ]
     ]
   },
   {
-    "id": "ea9da0a4.eb61c",
+    "id": "bc674b05.78b928",
     "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": 3837.336452484131,
-    "y": 534.2698273658752,
-    "z": "afa42c56.2fe06",
+    "x": 3811.336452484131,
+    "y": 503.26982736587524,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "25d65cd3.81eaf4",
+    "id": "844331fb.21709",
     "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": 3468.5,
-    "y": 325.3018355369568,
-    "z": "afa42c56.2fe06",
+    "x": 3442.5,
+    "y": 294.3018355369568,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "70f2426c.7fe2dc"
+        "6b71a698.d33fe8"
       ]
     ]
   },
   {
-    "id": "70f2426c.7fe2dc",
+    "id": "6b71a698.d33fe8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3698.5000038146973,
-    "y": 325.3019471168518,
-    "z": "afa42c56.2fe06",
+    "x": 3672.5000038146973,
+    "y": 294.3019471168518,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "2a2fa3c7.e081ac"
+        "92bbf4e4.47a9a8"
       ]
     ]
   },
   {
-    "id": "2a2fa3c7.e081ac",
+    "id": "92bbf4e4.47a9a8",
     "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": 3925.5007400512695,
-    "y": 326.90252923965454,
-    "z": "afa42c56.2fe06",
+    "x": 3899.5007400512695,
+    "y": 295.90252923965454,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "af8fabf7.c19df8",
+    "id": "c8a276bd.330448",
     "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": 3486.500160217285,
-    "y": 369.30178594589233,
-    "z": "afa42c56.2fe06",
+    "x": 3460.500160217285,
+    "y": 338.30178594589233,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "b8a267e9.b9ee48"
+        "adb74c6c.ec9a"
       ]
     ]
   },
   {
-    "id": "b8a267e9.b9ee48",
+    "id": "adb74c6c.ec9a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3686.4999351501465,
-    "y": 369.3019480705261,
-    "z": "afa42c56.2fe06",
+    "x": 3660.4999351501465,
+    "y": 338.3019480705261,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "1f49c17b.29132f"
+        "1ca4e423.ffe23c"
       ]
     ]
   },
   {
-    "id": "1f49c17b.29132f",
+    "id": "1ca4e423.ffe23c",
     "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": 3913.5006713867188,
-    "y": 370.90253019332886,
-    "z": "afa42c56.2fe06",
+    "x": 3887.5006713867188,
+    "y": 339.90253019332886,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "97c92085.94f67",
+    "id": "878dc9b3.754498",
     "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": 3466.499988555908,
-    "y": 408.30182218551636,
-    "z": "afa42c56.2fe06",
+    "x": 3440.499988555908,
+    "y": 377.30182218551636,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f16f752f.3e9e18"
+        "728cf41e.771a8c"
       ]
     ]
   },
   {
-    "id": "f16f752f.3e9e18",
+    "id": "728cf41e.771a8c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3690.4998168945312,
-    "y": 408.3019394874573,
-    "z": "afa42c56.2fe06",
+    "x": 3664.4998168945312,
+    "y": 377.3019394874573,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ca30b35f.a1be"
+        "dd2dd25f.6f587"
       ]
     ]
   },
   {
-    "id": "ca30b35f.a1be",
+    "id": "dd2dd25f.6f587",
     "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": 3917.5005531311035,
-    "y": 409.90252161026,
-    "z": "afa42c56.2fe06",
+    "x": 3891.5005531311035,
+    "y": 378.90252161026,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "88f8bb94.113e88",
+    "id": "ad0a3663.ab8598",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1033.999900817871,
-    "y": 267.5000419616699,
-    "z": "afa42c56.2fe06",
+    "x": 1007.9999008178711,
+    "y": 236.50004196166992,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "2cdd7d19.2083a2",
-        "428d17cf.9d4528",
-        "31785cb6.7e6854",
-        "8baae43.65cdc18"
+        "2acab811.c13ee8",
+        "9692ac6c.5b398",
+        "a88c4be0.5a96c8",
+        "c78c1bff.286648"
       ]
     ]
   },
   {
-    "id": "47687d06.0a1964",
+    "id": "688f910f.1fade",
     "type": "comment",
     "name": "get spoke device,site,wanport info",
     "info": "",
     "comments": "",
-    "x": 1790.96875,
-    "y": 390.96874713897705,
-    "z": "afa42c56.2fe06",
+    "x": 1764.96875,
+    "y": 359.96874713897705,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "c21c0002.43242",
+    "id": "74cacf6d.c151",
     "type": "comment",
     "name": "Add routes only on activation of spoke Attach site",
     "info": "",
     "comments": "",
-    "x": 1451.4999160766602,
-    "y": 334.00006103515625,
-    "z": "afa42c56.2fe06",
+    "x": 1425.4999160766602,
+    "y": 303.00006103515625,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "7b6f0604.c9da18",
+    "id": "3d6571cf.a0a37e",
     "type": "comment",
     "name": "Loop for all the hub allotted resources, get respective service data and get vnfs info",
     "info": "",
     "comments": "",
-    "x": 2207.5,
-    "y": 829.500057220459,
-    "z": "afa42c56.2fe06",
+    "x": 2181.5,
+    "y": 798.500057220459,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "d543abbf.21d958",
+    "id": "ee5b33c3.334cb",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2963.4997177124023,
-    "y": 1810.9999589920044,
-    "z": "afa42c56.2fe06",
+    "x": 2945.4998321533203,
+    "y": 1819.000135421753,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "a19625ef.be4768",
-        "450fbdd4.50bf64"
+        "c17add8f.67a28",
+        "229bba7c.508e96"
       ]
     ]
   },
   {
-    "id": "fc5d79c.538d088",
+    "id": "f3da0084.2ed3d",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3013.4997749328613,
-    "y": 1683.999843597412,
-    "z": "afa42c56.2fe06",
+    "x": 3012.4998321533203,
+    "y": 1715.0000114440918,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "29161345.19c04c"
+        "490623bf.f5be2c"
       ]
     ]
   },
   {
-    "id": "a19625ef.be4768",
+    "id": "c17add8f.67a28",
     "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": 3148.499641418457,
-    "y": 1821.9998016357422,
-    "z": "afa42c56.2fe06",
+    "x": 3122.499641418457,
+    "y": 1790.9998016357422,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "fce00f2c.408f7"
+        "dbd1bbe9.db4a58"
       ]
     ]
   },
   {
-    "id": "fce00f2c.408f7",
+    "id": "dbd1bbe9.db4a58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3299.500011444092,
-    "y": 1820.999984741211,
-    "z": "afa42c56.2fe06",
+    "x": 3273.500011444092,
+    "y": 1789.999984741211,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "a6e04d71.45ffd"
+        "5c117986.38cf28"
       ]
     ]
   },
   {
-    "id": "a6e04d71.45ffd",
+    "id": "5c117986.38cf28",
     "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": 3471.5000190734863,
-    "y": 1818.6005535125732,
-    "z": "afa42c56.2fe06",
+    "x": 3445.5000190734863,
+    "y": 1787.6005535125732,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "f1944c46.f8a7e",
+    "id": "74f0a419.baab7c",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2624.9997482299805,
-    "y": 2174.0004453659058,
-    "z": "afa42c56.2fe06",
+    "x": 2598.9997482299805,
+    "y": 2143.0004453659058,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "4a7669f9.690ed8",
-        "9523edcb.d7c9a"
+        "8a79d931.696778",
+        "c7717ba5.717ea8"
       ]
     ]
   },
   {
-    "id": "4a7669f9.690ed8",
+    "id": "8a79d931.696778",
     "type": "outcome",
     "name": "ActivateSDWANAttachmentInstance",
     "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 2895.0271530151367,
-    "y": 1985.0314779281616,
-    "z": "afa42c56.2fe06",
+    "x": 2869.0271530151367,
+    "y": 1954.0314779281616,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "5392f603.1e5608"
+        "c591ad14.b9dd7"
       ]
     ]
   },
   {
-    "id": "ed2e9b23.246118",
+    "id": "a7156e9f.23a1b",
     "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`\" />",
+    "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.onap.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.500099182129,
-    "y": 1914.0003824234009,
-    "z": "afa42c56.2fe06",
+    "x": 3457.500099182129,
+    "y": 1883.0003824234009,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e1bfc10d.7f44e",
-        "523fbf6b.72c95"
+        "3761bb2b.afc314",
+        "4ebe8079.3f11c"
       ]
     ]
   },
   {
-    "id": "523fbf6b.72c95",
+    "id": "4ebe8079.3f11c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3730.499927520752,
-    "y": 1893.0002145767212,
-    "z": "afa42c56.2fe06",
+    "x": 3704.499927520752,
+    "y": 1862.0002145767212,
+    "z": "ea31d3f9.c58ce",
     "wires": [
-      []
+      [
+        "78300110.b43b4"
+      ]
     ]
   },
   {
-    "id": "e1bfc10d.7f44e",
+    "id": "3761bb2b.afc314",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728.4996070861816,
-    "y": 1849.000205039978,
-    "z": "afa42c56.2fe06",
+    "x": 3702.4996070861816,
+    "y": 1818.000205039978,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "5684be77.d184a"
+        "722e84e9.8ab54c"
       ]
     ]
   },
   {
-    "id": "5684be77.d184a",
+    "id": "e4f1543b.8ca618",
     "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.5002937316895,
-    "y": 1847.0002880096436,
-    "z": "afa42c56.2fe06",
+    "x": 3980.500762939453,
+    "y": 1796.0005054473877,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "fc0a8ce8.4d15f",
+    "id": "54f01fb1.eab0c",
     "type": "set",
     "name": "Add prop.hub.route",
     "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n",
     "comments": "",
-    "x": 3418.8337020874023,
-    "y": 1884.666922569275,
-    "z": "afa42c56.2fe06",
+    "x": 3392.8337020874023,
+    "y": 1853.666922569275,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "4be3d8b3.562cb8",
+    "id": "b0e30676.c2a618",
     "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`\" />",
+    "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.onap.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": 3500.834144592285,
-    "y": 2119.6675004959106,
-    "z": "afa42c56.2fe06",
+    "x": 3474.834144592285,
+    "y": 2088.6675004959106,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "5f8c1bef.56c114",
-        "a3d1295e.fa6b28"
+        "ad299c2d.b630e",
+        "51decbd4.61a7c4"
       ]
     ]
   },
   {
-    "id": "a3d1295e.fa6b28",
+    "id": "51decbd4.61a7c4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3752.83424949646,
-    "y": 2107.667459964752,
-    "z": "afa42c56.2fe06",
+    "x": 3726.83424949646,
+    "y": 2076.667459964752,
+    "z": "ea31d3f9.c58ce",
     "wires": [
-      []
+      [
+        "b3f4e792.e33638"
+      ]
     ]
   },
   {
-    "id": "5f8c1bef.56c114",
+    "id": "ad299c2d.b630e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3750.8339290618896,
-    "y": 2063.667450428009,
-    "z": "afa42c56.2fe06",
+    "x": 3724.8339290618896,
+    "y": 2032.667450428009,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e475f129.f6d52"
+        "e6f4e702.6d5b68"
       ]
     ]
   },
   {
-    "id": "e475f129.f6d52",
+    "id": "c9cf02e0.97d29",
     "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": 3892.8346157073975,
-    "y": 2061.6675333976746,
-    "z": "afa42c56.2fe06",
+    "x": 3879.8350524902344,
+    "y": 1982.6677513122559,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "9b5e472e.7046c8",
+    "id": "2726f205.443f6e",
     "type": "set",
     "name": "Add prop.spoke.route",
     "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />                                                \n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n",
     "comments": "",
-    "x": 3441.6980171203613,
-    "y": 2082.3642127513885,
-    "z": "afa42c56.2fe06",
+    "x": 3415.6980171203613,
+    "y": 2051.3642127513885,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "f4ba3683.379f28",
+    "id": "72173b95.fc02b4",
     "type": "set",
     "name": "set  prop.underlay.routeIds",
     "xml": "<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<!--parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeSiteId' value='`$prop.spoke.siteId`' /-->\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$underlayHubResp.success[0].id`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$underlayspokeResp.success[0].id`' />\n\n\n\n",
     "comments": "",
-    "x": 3451.665542602539,
-    "y": 2242.0309886932373,
-    "z": "afa42c56.2fe06",
+    "x": 3425.665542602539,
+    "y": 2211.0309886932373,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "5392f603.1e5608",
+    "id": "c591ad14.b9dd7",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3130.999671936035,
-    "y": 1982.4999113082886,
-    "z": "afa42c56.2fe06",
+    "x": 3104.999671936035,
+    "y": 1951.4999113082886,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "fc0a8ce8.4d15f",
-        "9b5e472e.7046c8",
-        "f4ba3683.379f28",
-        "4be3d8b3.562cb8",
-        "ed2e9b23.246118",
-        "26c99249.a4074e",
-        "41b2e501.e4cadc",
-        "805d9d92.cb3bf",
-        "f41a7058.b220e",
-        "57accb29.01bb34"
+        "54f01fb1.eab0c",
+        "2726f205.443f6e",
+        "72173b95.fc02b4",
+        "b0e30676.c2a618",
+        "a7156e9f.23a1b",
+        "541b6902.dd6b58",
+        "77b69608.7345f8",
+        "75459c33.78c964",
+        "d5a685ee.a4f698",
+        "f073f95f.7848a8"
       ]
     ]
   },
   {
-    "id": "cf3f5a97.bb53e8",
+    "id": "58ea94fe.88fe4c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3162.9997749328613,
-    "y": 2624.5002613067627,
-    "z": "afa42c56.2fe06",
+    "x": 3136.9997749328613,
+    "y": 2593.5002613067627,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "45a08ea1.9e3d3",
-        "3208baf8.6aed86",
-        "33961398.8b885c",
-        "5e2b5a00.fe4964",
-        "3396ac88.cb4974",
-        "a8dab23b.85144",
-        "3c48a4f4.f048ec"
+        "31f4dc9.4459824",
+        "53da0cfd.4e5c84",
+        "7c9721cc.23414",
+        "bd1192a1.70e0b",
+        "de488f87.4a5ee",
+        "cc49685f.b2d5d8",
+        "7b57d512.398e6c"
       ]
     ]
   },
   {
-    "id": "9523edcb.d7c9a",
+    "id": "c7717ba5.717ea8",
     "type": "outcome",
     "name": "DeactivateSDWANAttachmentInstance",
     "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 2911.4998321533203,
-    "y": 2618.500072479248,
-    "z": "afa42c56.2fe06",
+    "x": 2885.4998321533203,
+    "y": 2587.500072479248,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "cf3f5a97.bb53e8"
+        "58ea94fe.88fe4c"
       ]
     ]
   },
   {
-    "id": "41b2e501.e4cadc",
+    "id": "77b69608.7345f8",
     "type": "set",
     "name": "Add sites to list and update length",
     "xml": "<set>\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteName' value='`$prop.hub.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteName' value='`$prop.spoke.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteId' value='`$prop.spoke.siteId`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
     "comments": "",
-    "x": 3456.0318298339844,
-    "y": 2367.0318689346313,
-    "z": "afa42c56.2fe06",
+    "x": 3430.0318298339844,
+    "y": 2336.0318689346313,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "84283d54.1b30c",
+    "id": "fd537752.3855d8",
     "type": "comment",
     "name": "save hubsiteIds and spoke siteIds for provision",
     "info": "",
     "comments": "",
-    "x": 3488.0322036743164,
-    "y": 2323.0317430496216,
-    "z": "afa42c56.2fe06",
+    "x": 3462.0322036743164,
+    "y": 2292.0317430496216,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "812b076f.3b7138",
+    "id": "96a23bd5.060968",
     "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": 3445.031005859375,
-    "y": 489.03125,
-    "z": "afa42c56.2fe06",
+    "x": 3419.031005859375,
+    "y": 458.03125,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e2b5302b.c9211"
+        "7dad2dd.add95d4"
       ]
     ]
   },
   {
-    "id": "e2b5302b.c9211",
+    "id": "7dad2dd.add95d4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3645.0307807922363,
-    "y": 489.0314121246338,
-    "z": "afa42c56.2fe06",
+    "x": 3619.0307807922363,
+    "y": 458.0314121246338,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "3a42d854.33d438"
+        "deeabd26.1be7b"
       ]
     ]
   },
   {
-    "id": "3a42d854.33d438",
+    "id": "deeabd26.1be7b",
     "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": 3833.0315856933594,
-    "y": 487.63202571868896,
-    "z": "afa42c56.2fe06",
+    "x": 3807.0315856933594,
+    "y": 456.63202571868896,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "450fbdd4.50bf64",
+    "id": "229bba7c.508e96",
     "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": 3147.0310287475586,
-    "y": 1788.5311088562012,
-    "z": "afa42c56.2fe06",
+    "x": 3121.0310287475586,
+    "y": 1757.5311088562012,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "7d26f71b.6a9a68"
+        "980f0d4f.cfeac"
       ]
     ]
   },
   {
-    "id": "7d26f71b.6a9a68",
+    "id": "980f0d4f.cfeac",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3298.0313987731934,
-    "y": 1787.53129196167,
-    "z": "afa42c56.2fe06",
+    "x": 3272.0313987731934,
+    "y": 1756.53129196167,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "570427f3.ac5a28"
+        "bc242aa.e7cd1d8"
       ]
     ]
   },
   {
-    "id": "570427f3.ac5a28",
+    "id": "bc242aa.e7cd1d8",
     "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": 3470.031406402588,
-    "y": 1785.1318607330322,
-    "z": "afa42c56.2fe06",
+    "x": 3444.031406402588,
+    "y": 1754.1318607330322,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "431fc2f2.17609c",
+    "id": "962ad5c3.0da1a8",
     "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": 470.03126525878906,
-    "y": 375.0312547683716,
-    "z": "afa42c56.2fe06",
+    "x": 444.03126525878906,
+    "y": 344.0312547683716,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "bebb2153.0e2a7",
+    "id": "ba15291d.217778",
     "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`\" />",
+    "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.onap.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": 822.0312957763672,
-    "y": 807.0314712524414,
-    "z": "afa42c56.2fe06",
+    "x": 796.0312957763672,
+    "y": 776.0314712524414,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e47835d0.8f5408",
-        "8e71b3d6.afc8d"
+        "863c45b0.87f298",
+        "e8831f50.130f7"
       ]
     ]
   },
   {
-    "id": "8e71b3d6.afc8d",
+    "id": "e8831f50.130f7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1086.0315551757812,
-    "y": 829.0315160751343,
-    "z": "afa42c56.2fe06",
+    "x": 1060.0315551757812,
+    "y": 798.0315160751343,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "e47835d0.8f5408",
+    "id": "863c45b0.87f298",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1087.0313415527344,
-    "y": 786.0314540863037,
-    "z": "afa42c56.2fe06",
+    "x": 1061.0313415527344,
+    "y": 755.0314540863037,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "610d5a0c.9e2794"
+        "f11e1d9d.f9f63"
       ]
     ]
   },
   {
-    "id": "610d5a0c.9e2794",
+    "id": "f11e1d9d.f9f63",
     "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": 1266.0318984985352,
-    "y": 784.0315053462982,
-    "z": "afa42c56.2fe06",
+    "x": 1206.0318641662598,
+    "y": 753.0314922332764,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "38f6b67d.380b9a",
+    "id": "da982ae7.c19088",
     "type": "for",
     "name": "for providx..prop.provision.siteIds[]",
     "xml": "<for index='providx' start='0' end='`$prop.provision.siteIds_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 463.0312957763672,
-    "y": 579.0312948226929,
-    "z": "afa42c56.2fe06",
+    "x": 437.0312957763672,
+    "y": 548.0312948226929,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "3da0634c.7d37dc"
+        "2d873e7f.4b1bc2"
       ]
     ]
   },
   {
-    "id": "3da0634c.7d37dc",
+    "id": "2d873e7f.4b1bc2",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 487.0313377380371,
-    "y": 789.031268119812,
-    "z": "afa42c56.2fe06",
+    "x": 461.0313377380371,
+    "y": 758.031268119812,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "89ba9fe.36f7b6",
-        "bebb2153.0e2a7",
-        "ae5d2651.0df3f8"
+        "50fee5f7.6d296c",
+        "ba15291d.217778",
+        "89a54eb6.e2142"
       ]
     ]
   },
   {
-    "id": "89ba9fe.36f7b6",
+    "id": "50fee5f7.6d296c",
     "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": 798.0339965820312,
-    "y": 665.6329832077026,
-    "z": "afa42c56.2fe06",
+    "x": 772.0339965820312,
+    "y": 634.6329832077026,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "ae5d2651.0df3f8",
+    "id": "89a54eb6.e2142",
     "type": "record",
     "name": "record provision url response to the file",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`'/opt/opendaylight/current/data/log/' + 'HUB-' + $prop.provision.hubSitename + '-SPOKE-' + $prop.provision.spokeSitename + '-provisionUrl'`\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value='`$provisionUrlRsp.success[0].url`'/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 794.0313720703125,
-    "y": 901.0313358306885,
-    "z": "afa42c56.2fe06",
+    "x": 768.0313720703125,
+    "y": 870.0313358306885,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "99b001da.0efb4",
+    "id": "94a7fcab.3f18",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2536.031482696533,
-    "y": 1056.0313262939453,
-    "z": "afa42c56.2fe06",
+    "x": 2510.031482696533,
+    "y": 1025.0313262939453,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "175772d7.f9d53d"
+        "e9ad6cc9.abb1"
       ]
     ]
   },
   {
-    "id": "e38b67ea.4c8758",
+    "id": "d063fbaf.bf9cb8",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2016.0311584472656,
-    "y": 619.0313091278076,
-    "z": "afa42c56.2fe06",
+    "x": 1990.0311584472656,
+    "y": 588.0313091278076,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "348ba1e1.19e85e"
+        "4b3c3b19.b12c44"
       ]
     ]
   },
   {
-    "id": "4ebf01e5.37d06",
+    "id": "a24202ba.c8c7c",
     "type": "block",
     "name": "block atmoic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1960.0313262939453,
-    "y": 710.0312175750732,
-    "z": "afa42c56.2fe06",
+    "x": 1934.0313262939453,
+    "y": 679.0312175750732,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "8d7971fd.c23e3",
-        "524b783f.8c1128"
+        "1134832c.af388d",
+        "e393fec8.f9974"
       ]
     ]
   },
   {
-    "id": "26c99249.a4074e",
+    "id": "541b6902.dd6b58",
     "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",
+    "x": 3455.0011596679688,
+    "y": 2247.250065803528,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "805d9d92.cb3bf",
+    "id": "75459c33.78c964",
     "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",
+    "x": 3438.5009002685547,
+    "y": 2371.2501611709595,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "dc7900f6.c1794",
+    "id": "68bdc58a.c36e2c",
     "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",
+    "x": 2878.7501907348633,
+    "y": 424.0000286102295,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "54fe9391.9e9afc",
+    "id": "8706bf22.e777d",
     "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",
+    "x": 1901.0006408691406,
+    "y": 1911.0003986358643,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "32bd7569.5de31a",
+    "id": "546d6174.f994f",
     "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",
+    "x": 448.9961242675781,
+    "y": 295.9961128234863,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "3396ac88.cb4974",
+    "id": "de488f87.4a5ee",
     "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",
+    "x": 3492.6630325317383,
+    "y": 2466.3295001983643,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "48bdd272.66024c"
+        "b94dca1b.799658"
       ]
     ]
   },
   {
-    "id": "48bdd272.66024c",
+    "id": "b94dca1b.799658",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3810.3297271728516,
-    "y": 2497.3295001983643,
-    "z": "afa42c56.2fe06",
+    "x": 3784.3297271728516,
+    "y": 2466.3295001983643,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "164a1404.cbc8dc"
+        "f30a5bcf.2eba98"
       ]
     ]
   },
   {
-    "id": "164a1404.cbc8dc",
+    "id": "f30a5bcf.2eba98",
     "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",
+    "x": 3973.3297424316406,
+    "y": 2466.3296632766724,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "beeec1da.addd9"
+        "9e731b50.667688"
       ]
     ]
   },
   {
-    "id": "beeec1da.addd9",
+    "id": "9e731b50.667688",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4170.329177856445,
-    "y": 2497.329662322998,
-    "z": "afa42c56.2fe06",
+    "x": 4144.329177856445,
+    "y": 2466.329662322998,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "8b49993a.fe8e88"
+        "34e4e4e1.bf23ec"
       ]
     ]
   },
   {
-    "id": "8b49993a.fe8e88",
+    "id": "34e4e4e1.bf23ec",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4324.329177856445,
-    "y": 2501.3296699523926,
-    "z": "afa42c56.2fe06",
+    "x": 4298.329177856445,
+    "y": 2470.3296699523926,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ef00b5c0.d59378"
+        "7f01b9d0.ef7bc8"
       ]
     ]
   },
   {
-    "id": "ef00b5c0.d59378",
+    "id": "7f01b9d0.ef7bc8",
     "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",
+    "x": 4384.32918548584,
+    "y": 2542.32967376709,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "8b3ca259.e59f8",
+    "id": "af471c20.d9cb7",
     "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",
+    "x": 3423.99609375,
+    "y": 562.6627197265625,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "90960264.013bb"
+        "3c3b3752.f46c08"
       ]
     ]
   },
   {
-    "id": "90960264.013bb",
+    "id": "3c3b3752.f46c08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3649.9955711364746,
-    "y": 581.6628341674805,
-    "z": "afa42c56.2fe06",
+    "x": 3623.9955711364746,
+    "y": 550.6628341674805,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "dec6d150.266b1"
+        "981ac32e.958e4"
       ]
     ]
   },
   {
-    "id": "f1e8e357.7d127",
+    "id": "a4a704fd.090458",
     "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",
+    "x": 3994.996971130371,
+    "y": 550.2635440826416,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "86cead5c.3dd72",
+    "id": "3da7a5e7.865d8a",
     "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",
+    "x": 1110.9963836669922,
+    "y": 2002.329628944397,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "d86f6d8b.19f1b",
-        "42a75c7f.9dc134"
+        "1f1cb6fc.4dc6b9",
+        "a206c36a.2d39f"
       ]
     ]
   },
   {
-    "id": "d86f6d8b.19f1b",
+    "id": "1f1cb6fc.4dc6b9",
     "type": "outcome",
     "name": "ActivateSDWANAttachmentInstance",
     "xml": "<outcome value='ActivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1400.9964294433594,
-    "y": 1988.329626083374,
-    "z": "afa42c56.2fe06",
+    "x": 1374.9964294433594,
+    "y": 1957.329626083374,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "1dbe9d9f.7f9c82"
+        "3f4012bd.4d4d2e"
       ]
     ]
   },
   {
-    "id": "1dbe9d9f.7f9c82",
+    "id": "3f4012bd.4d4d2e",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1642.9689407348633,
-    "y": 1984.7983770370483,
-    "z": "afa42c56.2fe06",
+    "x": 1616.9689407348633,
+    "y": 1953.7983770370483,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "54fe9391.9e9afc",
-        "5d55b77d.4fae98",
-        "59b1613.c1f67a",
-        "8abe0b00.ec56e8"
+        "8706bf22.e777d",
+        "cb472a7b.dc7d38",
+        "879af91.a400b08",
+        "93dcb194.e6988"
       ]
     ]
   },
   {
-    "id": "a9b02dc4.79bbe",
+    "id": "1834840f.e68edc",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1646.9689292907715,
-    "y": 2068.7985458374023,
-    "z": "afa42c56.2fe06",
+    "x": 1620.9689292907715,
+    "y": 2037.7985458374023,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "ae1dbfd0.9ebac"
+        "92497dd5.46538"
       ]
     ]
   },
   {
-    "id": "42a75c7f.9dc134",
+    "id": "a206c36a.2d39f",
     "type": "outcome",
     "name": "DeactivateSDWANAttachmentInstance",
     "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1398.4690704345703,
-    "y": 2070.7983827590942,
-    "z": "afa42c56.2fe06",
+    "x": 1372.4690704345703,
+    "y": 2039.7983827590942,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "a9b02dc4.79bbe"
+        "1834840f.e68edc"
       ]
     ]
   },
   {
-    "id": "ae1dbfd0.9ebac",
+    "id": "92497dd5.46538",
     "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",
+    "x": 1849.6626281738281,
+    "y": 2036.32963180542,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "4d624738.aa86f8",
+    "id": "9af7165e.2d5758",
     "type": "comment",
     "name": "Get route routes IDs",
     "info": "",
     "comments": "",
-    "x": 3418.3294982910156,
-    "y": 2458.6627368927,
-    "z": "afa42c56.2fe06",
+    "x": 3392.3294982910156,
+    "y": 2427.6627368927,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "5d55b77d.4fae98",
+    "id": "cb472a7b.dc7d38",
     "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",
+    "x": 1890.329574584961,
+    "y": 1985.662672996521,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "59b1613.c1f67a",
+    "id": "879af91.a400b08",
     "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",
+    "x": 1979.3294982910156,
+    "y": 1532.329444885254,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f4c8ed71.c2698"
+        "cdfd8790.f983d8"
       ]
     ]
   },
   {
-    "id": "3450a2a3.3f3b2e",
+    "id": "3e5fe1f4.4771be",
     "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",
+    "x": 2163.329833984375,
+    "y": 1665.9966478347778,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "5db41da3.1856f4",
+    "id": "328df7f4.d9d5f8",
     "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",
+    "x": 2173.3298263549805,
+    "y": 1618.6629858016968,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "f4c8ed71.c2698",
+    "id": "cdfd8790.f983d8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1912.329517364502,
-    "y": 1748.6627750396729,
-    "z": "afa42c56.2fe06",
+    "x": 1886.329517364502,
+    "y": 1717.6627750396729,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "5db41da3.1856f4",
-        "3450a2a3.3f3b2e",
-        "46517f63.3d70e",
-        "74bf87c6.f701b8",
-        "ec44da8a.7837c8",
-        "f31858ee.e326d8"
+        "328df7f4.d9d5f8",
+        "3e5fe1f4.4771be",
+        "413e65c4.2ce4ac",
+        "ce595947.f7b1e8",
+        "41c2276f.7ab7c8",
+        "a2941eac.dd47a"
       ]
     ]
   },
   {
-    "id": "46517f63.3d70e",
+    "id": "413e65c4.2ce4ac",
     "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",
+    "x": 2170.3295364379883,
+    "y": 1705.6628789901733,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "74bf87c6.f701b8",
+    "id": "ce595947.f7b1e8",
     "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",
+    "x": 2170.3295364379883,
+    "y": 1741.6628789901733,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "ec44da8a.7837c8",
+    "id": "41c2276f.7ab7c8",
     "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",
+    "x": 2163.3295364379883,
+    "y": 1781.9962530136108,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "f31858ee.e326d8",
+    "id": "a2941eac.dd47a",
     "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",
+    "x": 2166.329475402832,
+    "y": 1836.6627922058105,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "8abe0b00.ec56e8",
+    "id": "93dcb194.e6988",
     "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",
+    "x": 1883.3294982910156,
+    "y": 1473.6627759933472,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "dec6d150.266b1",
+    "id": "981ac32e.958e4",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3797.9963188171387,
-    "y": 627.9961318969727,
-    "z": "afa42c56.2fe06",
+    "x": 3771.9963188171387,
+    "y": 596.9961318969727,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "f1e8e357.7d127",
-        "38377ec9.53b982"
+        "a4a704fd.090458",
+        "474a807.5a3348"
       ]
     ]
   },
   {
-    "id": "38377ec9.53b982",
+    "id": "474a807.5a3348",
     "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",
+    "x": 3949.9963302612305,
+    "y": 616.9961318969727,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "3268a5b9.fb215a",
-        "c3ab3d57.d9ba"
+        "5c929964.4b8ce8",
+        "acedb986.795fa8"
       ]
     ]
   },
   {
-    "id": "c3ab3d57.d9ba",
+    "id": "acedb986.795fa8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4152.9963455200195,
-    "y": 628.9961309432983,
-    "z": "afa42c56.2fe06",
+    "x": 4126.9963455200195,
+    "y": 597.9961309432983,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "d7617cb0.7601e"
+        "96ac3ef1.0da81"
       ]
     ]
   },
   {
-    "id": "3268a5b9.fb215a",
+    "id": "5c929964.4b8ce8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4141.9963455200195,
-    "y": 676.996132850647,
-    "z": "afa42c56.2fe06",
+    "x": 4115.9963455200195,
+    "y": 645.996132850647,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "d317db0c.b51f88"
+        "90fc0aec.112218"
       ]
     ]
   },
   {
-    "id": "82fa522b.8f097",
+    "id": "62992e2c.a242f",
     "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",
+    "x": 5312.997211456299,
+    "y": 531.9963731765747,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "d317db0c.b51f88",
+    "id": "90fc0aec.112218",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4271.996349334717,
-    "y": 676.996132850647,
-    "z": "afa42c56.2fe06",
+    "x": 4245.996349334717,
+    "y": 645.996132850647,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "d7617cb0.7601e",
+    "id": "96ac3ef1.0da81",
     "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",
+    "x": 4272.996032714844,
+    "y": 595.9961309432983,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "bae53b24.86f3f8"
+        "94fe12e4.b3272"
       ]
     ]
   },
   {
-    "id": "bae53b24.86f3f8",
+    "id": "94fe12e4.b3272",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4477.329044342041,
-    "y": 623.9961318969727,
-    "z": "afa42c56.2fe06",
+    "x": 4451.329044342041,
+    "y": 592.9961318969727,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "95e8ce94.9a6d1"
+        "bc1b307a.e9066"
       ]
     ]
   },
   {
-    "id": "95e8ce94.9a6d1",
+    "id": "bc1b307a.e9066",
     "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",
+    "x": 4626.329055786133,
+    "y": 591.996129989624,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "17ee1f73.6ce3e1",
-        "32bb2edf.2bc022"
+        "479c7699.d03df8",
+        "992b4620.1b2238"
       ]
     ]
   },
   {
-    "id": "17ee1f73.6ce3e1",
+    "id": "479c7699.d03df8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4809.32905960083,
-    "y": 599.9961376190186,
-    "z": "afa42c56.2fe06",
+    "x": 4783.32905960083,
+    "y": 568.9961376190186,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "25d53393.ccdc7c"
+        "bee08918.a3dfe8"
       ]
     ]
   },
   {
-    "id": "32bb2edf.2bc022",
+    "id": "992b4620.1b2238",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4798.32905960083,
-    "y": 647.9961395263672,
-    "z": "afa42c56.2fe06",
+    "x": 4772.32905960083,
+    "y": 616.9961395263672,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "e299e773.789348"
+        "1506d77b.2e8159"
       ]
     ]
   },
   {
-    "id": "e299e773.789348",
+    "id": "1506d77b.2e8159",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4928.329063415527,
-    "y": 647.9961395263672,
-    "z": "afa42c56.2fe06",
+    "x": 4902.329063415527,
+    "y": 616.9961395263672,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "cee6dd44.82ca8",
+    "id": "16eea4b9.2fb1ab",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5131.661590576172,
-    "y": 578.9962916374207,
-    "z": "afa42c56.2fe06",
+    "x": 5105.661590576172,
+    "y": 547.9962916374207,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "82fa522b.8f097",
-        "e872fc0f.e3138"
+        "62992e2c.a242f",
+        "2107fdbe.561112"
       ]
     ]
   },
   {
-    "id": "e872fc0f.e3138",
+    "id": "2107fdbe.561112",
     "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",
+    "x": 5305.329250335693,
+    "y": 573.996169090271,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "25d53393.ccdc7c",
+    "id": "bee08918.a3dfe8",
     "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",
+    "x": 4981.663215637207,
+    "y": 449.9961624145508,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "1988903d.6e7c9",
-        "31c7868c.1d918a"
+        "17f5531.c69dcad",
+        "9cd3fd30.65304"
       ]
     ]
   },
   {
-    "id": "1988903d.6e7c9",
+    "id": "17f5531.c69dcad",
     "type": "outcome",
     "name": "3",
     "xml": "<outcome value='3'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5242.632148742676,
-    "y": 517.9648895263672,
-    "z": "afa42c56.2fe06",
+    "x": 5216.632148742676,
+    "y": 486.9648895263672,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "cee6dd44.82ca8"
+        "16eea4b9.2fb1ab"
       ]
     ]
   },
   {
-    "id": "31c7868c.1d918a",
+    "id": "9cd3fd30.65304",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5259.663074493408,
-    "y": 399.99610328674316,
-    "z": "afa42c56.2fe06",
+    "x": 5233.663074493408,
+    "y": 368.99610328674316,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       [
-        "c3b9df69.c6c78"
+        "ae2b29d0.cafa18"
       ]
     ]
   },
   {
-    "id": "c3b9df69.c6c78",
+    "id": "ae2b29d0.cafa18",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5420.66259765625,
-    "y": 439.99609375,
-    "z": "afa42c56.2fe06",
+    "x": 5394.66259765625,
+    "y": 408.99609375,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "2fd2f3c1.09b97c",
+    "id": "c6ccd14a.96548",
     "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",
+    "x": 2874.002540588379,
+    "y": 982.3028502464294,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "18ba51e1.01a3be",
+    "id": "92d1a6eb.dd91a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2886.0020484924316,
-    "y": 961.9692711830139,
-    "z": "afa42c56.2fe06",
+    "x": 2860.0020484924316,
+    "y": 930.9692711830139,
+    "z": "ea31d3f9.c58ce",
     "wires": [
       []
     ]
   },
   {
-    "id": "f41a7058.b220e",
+    "id": "d5a685ee.a4f698",
     "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",
+    "x": 3394.0038681030273,
+    "y": 1822.0039892196655,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "57accb29.01bb34",
+    "id": "f073f95f.7848a8",
     "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",
+    "x": 3409.004409790039,
+    "y": 2020.0039653778076,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "a8dab23b.85144",
+    "id": "cc49685f.b2d5d8",
     "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",
+    "x": 3425.3335723876953,
+    "y": 2496.000065803528,
+    "z": "ea31d3f9.c58ce",
     "wires": []
   },
   {
-    "id": "3c48a4f4.f048ec",
+    "id": "7b57d512.398e6c",
     "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",
+    "x": 3450.333251953125,
+    "y": 2608,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "ab1ef1f9.e54ea",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3461.0041694641113,
+    "y": 1227.5040493011475,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "564bf8e9.5ea9e8",
+        "273881de.ee082e"
+      ]
+    ]
+  },
+  {
+    "id": "896da4ec.a5e9f8",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3791.2541217803955,
+    "y": 1395.0040378570557,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "9ec9fc87.5d09e"
+      ]
+    ]
+  },
+  {
+    "id": "9ec9fc87.5d09e",
+    "type": "switchNode",
+    "name": "switch transportNetworkName==prop.spoke.transportNetworkName",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value == $prop.spoke.transportNetworkName`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4124.004144668579,
+    "y": 1397.004313468933,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "3f80722d.d94e9e"
+      ]
+    ]
+  },
+  {
+    "id": "3f80722d.d94e9e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3991.0055894851685,
+    "y": 1493.0042219161987,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "473f2da5.df7aa4"
+      ]
+    ]
+  },
+  {
+    "id": "473f2da5.df7aa4",
+    "type": "block",
+    "name": "block atmoic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4146.755597114563,
+    "y": 1485.0042219161987,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "662f75a8.5b0d6c",
+        "d2c57b63.a72078"
+      ]
+    ]
+  },
+  {
+    "id": "d2c57b63.a72078",
+    "type": "set",
+    "name": "set tmp.wanportvidx ",
+    "xml": "<set>\n<parameter name='tmp.wanportvidx' value='`$arvidx`' />\n\n",
+    "comments": "",
+    "x": 4324.2565660476685,
+    "y": 1461.004343032837,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "f5ec2256.55a71",
+    "type": "for",
+    "name": "for loop wanportvidx - Get wan port ID from servicedata",
+    "xml": "<for index=\"wportidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n    \n    \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2732.5042877197266,
+    "y": 1673.0043449401855,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "a355c702.37b978"
+      ]
+    ]
+  },
+  {
+    "id": "a355c702.37b978",
+    "type": "block",
+    "name": "block atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3035.5056915283203,
+    "y": 1631.004680633545,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "4841755.e7a768c",
+        "7ff6e951.a32b78",
+        "803020cc.5b481"
+      ]
+    ]
+  },
+  {
+    "id": "4841755.e7a768c",
+    "type": "switchNode",
+    "name": "switch wanPortId",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3234.8393783569336,
+    "y": 1588.0048933029175,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "2cb90465.e59cdc"
+      ]
+    ]
+  },
+  {
+    "id": "2cb90465.e59cdc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3395.8397064208984,
+    "y": 1589.00497341156,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "406b564f.be2668"
+      ]
+    ]
+  },
+  {
+    "id": "406b564f.be2668",
+    "type": "set",
+    "name": "set prop.hub.wanPortId",
+    "xml": "<set>\n<parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
+    "comments": "",
+    "x": 3585.8401679992676,
+    "y": 1588.6052494049072,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "7ff6e951.a32b78",
+    "type": "switchNode",
+    "name": "switch providerIpAddress",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3256.367862701416,
+    "y": 1625.2011981010437,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "de4c4cc0.abc22"
+      ]
+    ]
+  },
+  {
+    "id": "de4c4cc0.abc22",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3432.3688468933105,
+    "y": 1625.2013206481934,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "409dc8c5.eeb998"
+      ]
+    ]
+  },
+  {
+    "id": "409dc8c5.eeb998",
+    "type": "set",
+    "name": "set prop.hub.providerIpAddress",
+    "xml": "<set>\n<parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
+    "comments": "",
+    "x": 3634.368885040283,
+    "y": 1625.8012409210205,
+    "z": "ea31d3f9.c58ce",
     "wires": []
+  },
+  {
+    "id": "803020cc.5b481",
+    "type": "switchNode",
+    "name": "switch ipAddress",
+    "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3228.867944717407,
+    "y": 1662.701283454895,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "25fd164b.117a3a"
+      ]
+    ]
+  },
+  {
+    "id": "25fd164b.117a3a",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3432.868885040283,
+    "y": 1662.701235294342,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      [
+        "10522aa8.f003c5"
+      ]
+    ]
+  },
+  {
+    "id": "10522aa8.f003c5",
+    "type": "set",
+    "name": "set prop.hub.ipAddress",
+    "xml": "<set>\n<parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n",
+    "comments": "",
+    "x": 3627.8688888549805,
+    "y": 1662.3012108802795,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "722e84e9.8ab54c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3837.254180908203,
+    "y": 1815.2539224624634,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "78300110.b43b4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3849.25390625,
+    "y": 1859.25390625,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e6f4e702.6d5b68",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3860.2543621063232,
+    "y": 2026.2540483474731,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b3f4e792.e33638",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3861.254119873047,
+    "y": 2073.2540493011475,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7b4a5da7.783c64",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3852.2542991638184,
+    "y": 2554.0039710998535,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4079a316.d4531c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3853.254056930542,
+    "y": 2601.003972053528,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2a5c753b.10964a",
+    "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": 4005.336700439453,
+    "y": 2555.9710121154785,
+    "z": "ea31d3f9.c58ce",
+    "wires": []
+  },
+  {
+    "id": "ae6e8595.d05358",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3852.25390625,
+    "y": 2645.00390625,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a38da1c5.3c2df",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3853.2536640167236,
+    "y": 2692.0039072036743,
+    "z": "ea31d3f9.c58ce",
+    "wires": [
+      []
+    ]
   }
 ]