SDWAN wan port activate DG 08/85908/2
authorshashikanth.vh <shashikanth.vh@huawei.com>
Sun, 21 Apr 2019 19:34:01 +0000 (01:04 +0530)
committerShashikanth VH <shashikanth.vh@huawei.com>
Wed, 24 Apr 2019 13:27:44 +0000 (13:27 +0000)
Fixed couple of issues
1.paramters update for static and dhcp scenarios
2.invalid key parameter used while updating to AAI
3.Removed unused and hardcoded nodes.

Change-Id: I08e98d09392c2094dfbe9eb7c6def14be03d76e0
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 99141d3dd9d62dc636f2b7cacc2dba5874c88611

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml

index bf765d8..380dfd0 100644 (file)
@@ -1,65 +1,59 @@
 [\r
     {\r
-        "id": "aa1b72bf.43103",\r
+        "id": "c035ec04.94486",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 394.03125,\r
-        "y": 423.0742139816284,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            [\r
-                "7552c12f.99edc",\r
-                "298f83f7.59d8fc",\r
-                "c6091bc8.bb5b78",\r
-                "6d78088c.cbfc88",\r
-                "e1a9bec.bd0de4",\r
-                "a2c6a4a4.2e00b8",\r
-                "c63182d3.fbcc4",\r
-                "409701be.1a03c",\r
-                "9e802733.d722c8",\r
-                "7362e1fa.b1592",\r
-                "46743c8f.b3fd84",\r
-                "8679bf14.4ac1",\r
-                "7f799175.fb047",\r
-                "131a2ffd.3a8e5",\r
-                "92451c4e.ffaad",\r
-                "a7fe1093.6d40a",\r
-                "e9b4c90b.c4ce98",\r
-                "7c031fb.d5948e",\r
-                "e28c61da.26a12",\r
-                "555b730f.2ad3ec",\r
-                "103790c7.a4e84f",\r
-                "726be50f.6f16fc",\r
-                "e2c4dac5.6f39e8",\r
-                "675842c8.f4343c",\r
-                "86ffb9d1.271bf8",\r
-                "7a2f98d7.5ecea8",\r
-                "83739943.858e68",\r
-                "93891afe.aeea78",\r
-                "bc9fd33d.1cf95"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "5ef2c8ad.bc5ff8",\r
+        "x": 412.03125,\r
+        "y": 401.0742133259773,\r
+        "z": "fe63ab05.2e2948",\r
+        "wires": [\r
+            [\r
+                "2c0218a8.7af2b8",\r
+                "1f6673b6.b9e2bc",\r
+                "6a69d786.6240c8",\r
+                "70fe077e.beb658",\r
+                "f695d756.f5bf88",\r
+                "6e84f4e0.63170c",\r
+                "c05b3e2e.c56c2",\r
+                "d49c55eb.f90268",\r
+                "80c1b0f1.09ead",\r
+                "875b58c1.722a88",\r
+                "80c24ef7.49b8c",\r
+                "c34bc647.720578",\r
+                "b10288cf.50b828",\r
+                "ebd64e1b.5f8b",\r
+                "fb9080f.263d28",\r
+                "1b602e84.4e29d1",\r
+                "13c3d9c7.d7be26",\r
+                "7cfc5672.5cd958",\r
+                "e3dbbb08.e38228",\r
+                "56d337a2.42bd48",\r
+                "ac8c0e0b.c16e8",\r
+                "b2116c6a.8c28d",\r
+                "373e5110.89b67e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "104d1a5d.263766",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 118.50391006469727,\r
-        "y": 72,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 136.50391006469727,\r
+        "y": 49.99999934434891,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "988b9fb.b96a56"\r
+                "f7c9184f.6b4338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "988b9fb.b96a56",\r
+        "id": "f7c9184f.6b4338",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 249.78960037231445,\r
-        "y": 121.23810863494873,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 267.78960037231445,\r
+        "y": 99.23810797929764,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "db46e718.9e34f8"\r
+                "3243adac.5d74d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db46e718.9e34f8",\r
+        "id": "3243adac.5d74d2",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-wanport-activate",\r
         "xml": "<method rpc='sdwan-vf-operation-wanport-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 252.9325294494629,\r
-        "y": 206.00003242492676,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 270.9325294494629,\r
+        "y": 184.00003176927567,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "aa1b72bf.43103"\r
+                "c035ec04.94486"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "298f83f7.59d8fc",\r
+        "id": "1f6673b6.b9e2bc",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 823.0351600646973,\r
-        "y": 221.07811641693115,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 732.0352430343628,\r
+        "y": 206.07812786102295,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "d5c2444e.40f148"\r
+                "5147dcf9.72e104"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5c2444e.40f148",\r
+        "id": "5147dcf9.72e104",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1075.0352516174316,\r
-        "y": 219.744779586792,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 984.0353345870972,\r
+        "y": 204.7447910308838,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "2d2f666f.01836a"\r
+                "9e1e4c5d.8f94b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cffa7667.9fa518",\r
+        "id": "e1cf115f.fb631",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1446.7017402648926,\r
-        "y": 221.74478244781494,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1355.701823234558,\r
+        "y": 206.74479389190674,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d2f666f.01836a",\r
+        "id": "9e1e4c5d.8f94b",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1293.3685684204102,\r
-        "y": 221.74476146697998,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1202.3686513900757,\r
+        "y": 206.74477291107178,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "cffa7667.9fa518"\r
+                "e1cf115f.fb631"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7552c12f.99edc",\r
+        "id": "2c0218a8.7af2b8",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 837.455753326416,\r
-        "y": 176.5819854736328,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 746.4558362960815,\r
+        "y": 161.5819969177246,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "3a4ab2c5.34288e"\r
+                "c03192e4.9b0ca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a4ab2c5.34288e",\r
+        "id": "c03192e4.9b0ca",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1024.1224327087402,\r
-        "y": 175.915283203125,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 933.1225156784058,\r
+        "y": 160.9152946472168,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "9c32c1a6.b8f8d"\r
+                "e59b1c5.c6419e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c32c1a6.b8f8d",\r
+        "id": "e59b1c5.c6419e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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=\"There are no VNFs in MD-SAL\" />\n",\r
         "comments": "",\r
-        "x": 1205.7890586853027,\r
-        "y": 175.915283203125,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1114.7891416549683,\r
+        "y": 160.9152946472168,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "90dd0a6d.b97718",\r
+        "id": "64462554.f87c5c",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1476.0351676940918,\r
-        "y": 391.0781068508513,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1385.0352506637573,\r
+        "y": 376.0781182949431,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "6395826d.fca69c"\r
+                "2b34d588.91d9ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9272b53d.a87e88",\r
+        "id": "4382a853.f690f8",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1984.3210220336914,\r
-        "y": 358.64962673187256,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1860.321159362793,\r
+        "y": 255.6496185963042,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "e056b855.39d1d8"\r
+                "a2ccd51e.6ab248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e4a72fa.4d4f3c",\r
+        "id": "2a399e1c.cfc832",\r
         "type": "set",\r
         "name": "set vf-module-length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 1462.6067924499512,\r
-        "y": 354.855993270874,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1371.6068754196167,\r
+        "y": 339.8560047149658,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f8dd3a29.d23a98",\r
+        "id": "a3a45f94.9b15b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1266.908187866211,\r
-        "y": 368.2368783657439,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1175.9082708358765,\r
+        "y": 353.2368898098357,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "90dd0a6d.b97718",\r
-                "7e4a72fa.4d4f3c",\r
-                "e9fcde91.f8ee4",\r
-                "15ae932b.8eaafd"\r
+                "64462554.f87c5c",\r
+                "2a399e1c.cfc832",\r
+                "da9e03c9.e0425",\r
+                "eaea3f61.2ed1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da9482b8.2c7db",\r
+        "id": "b2b8906.60ed47",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1122.5511436462402,\r
-        "y": 368.3003663723357,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1031.5512266159058,\r
+        "y": 353.3003778164275,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "f8dd3a29.d23a98"\r
+                "a3a45f94.9b15b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6091bc8.bb5b78",\r
+        "id": "6a69d786.6240c8",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 886.5511255264282,\r
-        "y": 295.3003787994385,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 795.5512084960938,\r
+        "y": 280.3003902435303,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "da9482b8.2c7db",\r
-                "75404cd4.467764",\r
-                "b9120614.fcff58"\r
+                "b2b8906.60ed47",\r
+                "fba84335.d8b1d",\r
+                "79ae37d1.662938"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75404cd4.467764",\r
+        "id": "fba84335.d8b1d",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1128.035161972046,\r
-        "y": 267.0781078338623,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1037.0352449417114,\r
+        "y": 252.0781192779541,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "73c9cf7f.c3fda"\r
+                "54644bad.709854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9120614.fcff58",\r
+        "id": "79ae37d1.662938",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1130.0663509368896,\r
-        "y": 304.10941886901855,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1039.0664339065552,\r
+        "y": 289.10943031311035,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "73c9cf7f.c3fda"\r
+                "54644bad.709854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73c9cf7f.c3fda",\r
+        "id": "54644bad.709854",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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=\"vf-module-operation-input.vf-module-request-input.vf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1287.8438663482666,\r
-        "y": 284.9983673095703,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1196.8439493179321,\r
+        "y": 269.9983787536621,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e056b855.39d1d8",\r
+        "id": "a2ccd51e.6ab248",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2188.0352630615234,\r
-        "y": 357.07813313556835,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2064.035400390625,\r
+        "y": 254.078125,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "3493694e.e41bb6"\r
+                "62040d29.f7cdb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3493694e.e41bb6",\r
+        "id": "62040d29.f7cdb4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2358.378559112549,\r
-        "y": 361.164268522989,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2234.3786964416504,\r
+        "y": 258.16426038742065,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "8b2508c0.364288",\r
-                "1dfeb945.730fd7",\r
-                "fe377f26.34769"\r
+                "fc1d3c79.aeeb2",\r
+                "6bcbedec.395b24",\r
+                "234f2dc2.1759a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b2508c0.364288",\r
+        "id": "fc1d3c79.aeeb2",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 2609.2652130126953,\r
-        "y": 331.50668144226074,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2490.2654457092285,\r
+        "y": 225.5066914265044,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1dfeb945.730fd7",\r
+        "id": "6bcbedec.395b24",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 2603.71150970459,\r
-        "y": 376.16432145191357,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2484.711742401123,\r
+        "y": 270.1643314361572,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "33f87d4b.131732",\r
+        "id": "d3ee2888.9d77a8",\r
         "type": "switchNode",\r
         "name": "switch ActivateSDWANDeviceInstance",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1783.5352668762207,\r
-        "y": 457.07813835144043,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1726.5354919433594,\r
+        "y": 330.0781478881836,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "19b41c70.4beab4"\r
+                "9fa9ec4f.79402"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19b41c70.4beab4",\r
+        "id": "9fa9ec4f.79402",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2012.5350151062012,\r
-        "y": 456.07811546325684,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1943.5350036621094,\r
+        "y": 327.078164100647,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "1a6abe61.332a02"\r
+                "77c02877.97d538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a6abe61.332a02",\r
+        "id": "77c02877.97d538",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1967.9479293823242,\r
-        "y": 518.0742564201355,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2084.9478454589844,\r
+        "y": 325.0742874145508,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "4f4f0899.d407e8"\r
+                "9f2a0eee.e853e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f4f0899.d407e8",\r
+        "id": "9f2a0eee.e853e",\r
         "type": "for",\r
         "name": "for loop didx - Get deviceId from servicedata",\r
         "xml": "<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2249.2816829681396,\r
-        "y": 528.0742769241333,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2138.2817993164062,\r
+        "y": 413.07432651519775,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "3ef068c9.f46d98"\r
+                "8e4c1426.0eb8f8",\r
+                "6f9f5d8c.8e78c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6395826d.fca69c",\r
+        "id": "2b34d588.91d9ba",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1777.5352249145508,\r
-        "y": 362.0781407649629,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1653.5353622436523,\r
+        "y": 259.07813262939453,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "9272b53d.a87e88"\r
+                "4382a853.f690f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c29879dc.c33238",\r
+        "id": "1577b943.bcf897",\r
         "type": "comment",\r
         "name": "Get devices",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1775.5351600646973,\r
-        "y": 427.07811641693115,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1650.5354309082031,\r
+        "y": 292.0781021118164,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e9fcde91.f8ee4",\r
+        "id": "da9e03c9.e0425",\r
         "type": "set",\r
         "name": "set prop.site.deviceId_length",\r
         "xml": "<set>\n<parameter name='prop.site.deviceId_length' value='0' />\n",\r
         "comments": "",\r
-        "x": 1489.0351600646973,\r
-        "y": 319.07811641693115,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1398.0352430343628,\r
+        "y": 304.07812786102295,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6d78088c.cbfc88",\r
+        "id": "70fe077e.beb658",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.0352058410645,\r
-        "y": 384.07812309265137,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 747.03528881073,\r
+        "y": 369.07813453674316,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "58514bba.536ea4",\r
+        "id": "6f9f5d8c.8e78c4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2548.281505584717,\r
-        "y": 522.0744781494141,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2389.281581878662,\r
+        "y": 358.07453441619873,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "6a60b8bf.296158"\r
+                "a8b37f6f.fba0e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a60b8bf.296158",\r
+        "id": "a8b37f6f.fba0e",\r
         "type": "switchNode",\r
         "name": "switch deviceId",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n    ",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].name == 'deviceId'`\">\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2708.2817611694336,\r
-        "y": 524.0743312835693,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2549.281837463379,\r
+        "y": 360.074387550354,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "6bb682b3.a31adc"\r
+                "87989e81.e2271"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bb682b3.a31adc",\r
+        "id": "87989e81.e2271",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2860.2819328308105,\r
-        "y": 523.0743312835693,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2701.282009124756,\r
+        "y": 359.074387550354,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "6989c0f.96b544"\r
+                "444a86d7.7e9688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6989c0f.96b544",\r
+        "id": "444a86d7.7e9688",\r
         "type": "set",\r
         "name": "set deviceId",\r
-        "xml": "<set>\n<parameter name='prop.site.deviceId[$prop.site.deviceId_length]' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$deviceidx].value`' />\n<parameter name='prop.site.deviceId_length' value='`$prop.site.deviceId_length + 1`' />\n",\r
+        "xml": "<set>\n<parameter name='prop.site.deviceId[$prop.site.deviceId_length]' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`' />\n<parameter name='prop.site.deviceId_length' value='`$prop.site.deviceId_length + 1`' />\n",\r
         "comments": "",\r
-        "x": 3000.281936645508,\r
-        "y": 522.6742858886719,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2841.282012939453,\r
+        "y": 358.67434215545654,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe377f26.34769",\r
+        "id": "234f2dc2.1759a2",\r
         "type": "call",\r
         "name": "call sdwan-get-wan-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2595.0079612731934,\r
-        "y": 423.00392010761425,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2476.0081939697266,\r
+        "y": 317.0039300918579,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "48f81161.66243",\r
+        "id": "384abebf.660182",\r
         "type": "switchNode",\r
         "name": "switch ActivateSiteInstance",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1763.507797241211,\r
-        "y": 565.7539291381836,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1658.5078411102295,\r
+        "y": 460.753945350647,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "c8d462fc.6ddb3"\r
+                "c09587b7.5f9cf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8d462fc.6ddb3",\r
+        "id": "c09587b7.5f9cf8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2005.5076446533203,\r
-        "y": 596.75390625,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1843.5077819824219,\r
+        "y": 459.75391483306885,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "92bd8825.90b9a8"\r
+                "5c175f4a.341cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92bd8825.90b9a8",\r
+        "id": "5c175f4a.341cd",\r
         "type": "set",\r
         "name": "set tmp.siteVidx",\r
         "xml": "<set>\n<parameter name='tmp.siteVidx' value='`$idx`' />\n<parameter name='ctx.site.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].`' />\n",\r
         "comments": "",\r
-        "x": 2228.237594604492,\r
-        "y": 624.1824264526367,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1999.237880706787,\r
+        "y": 459.1824731826782,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ef068c9.f46d98",\r
+        "id": "8e4c1426.0eb8f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2451.7578125,\r
-        "y": 617.0039043426514,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2407.7580223083496,\r
+        "y": 437.00396156311035,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "a2711e1c.d6e09",\r
-                "113b21af.23a45e"\r
+                "a980e0f8.0e044",\r
+                "83ba6051.514ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2711e1c.d6e09",\r
+        "id": "a980e0f8.0e044",\r
         "type": "switchNode",\r
         "name": "switch name (DeviceName)",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].name == 'name'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2677.425521850586,\r
-        "y": 618.3374032974243,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2633.4257316589355,\r
+        "y": 438.3374605178833,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "661373f5.be831c"\r
+                "6ce07c96.ec5694"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "661373f5.be831c",\r
+        "id": "6ce07c96.ec5694",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2879.426013946533,\r
-        "y": 612.3374633789062,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2835.426223754883,\r
+        "y": 432.33752059936523,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "e8b03259.bbcb"\r
+                "b284daf0.15c368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8b03259.bbcb",\r
+        "id": "b284daf0.15c368",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2697.7590560913086,\r
-        "y": 695.3374328613281,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2725.7590866088867,\r
+        "y": 532.3374004364014,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "4554c798.aa2dd8",\r
-                "bf88a576.7aa2c8"\r
+                "ff2db442.93cc88",\r
+                "d9c35361.4cae6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4554c798.aa2dd8",\r
+        "id": "ff2db442.93cc88",\r
         "type": "switchNode",\r
         "name": "switch deviceName match",\r
         "xml": "<switch test=\"`$prop.wan.deviceName == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`\">\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2903.42578125,\r
-        "y": 696.3374967575073,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2949.4259338378906,\r
+        "y": 553.3374767303467,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "8f8b4c45.50538"\r
+                "6c76f644.530508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f8b4c45.50538",\r
+        "id": "6c76f644.530508",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3086.7597618103027,\r
-        "y": 698.3375577926636,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3128.7598571777344,\r
+        "y": 552.3375368118286,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "b9108ee7.e5b06"\r
+                "4a207bb3.acbf84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9108ee7.e5b06",\r
+        "id": "4a207bb3.acbf84",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2986.0917205810547,\r
-        "y": 770.3373403549194,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2977.0919761657715,\r
+        "y": 622.3373546600342,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "4d1bca38.4b9934",\r
-                "ad38b737.99a528",\r
-                "d2df96f9.05ab08"\r
+                "23329d72.a46fe2",\r
+                "ec041845.3df8f8",\r
+                "350746df.c7aa7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad38b737.99a528",\r
+        "id": "ec041845.3df8f8",\r
         "type": "set",\r
         "name": "set tmp.devicevidx",\r
         "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$idx`' />\n\n",\r
         "comments": "",\r
-        "x": 3236.84765625,\r
-        "y": 891.0104351043701,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3227.847911834717,\r
+        "y": 743.0104494094849,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "26e95066.5bddc",\r
+        "id": "bbbb9202.35efa",\r
         "type": "switchNode",\r
         "name": "switch deviceId",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3535.515853881836,\r
-        "y": 831.677375793457,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3526.5161094665527,\r
+        "y": 683.6773900985718,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "1f6de92a.592947"\r
+                "9b825598.e065f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f6de92a.592947",\r
+        "id": "9b825598.e065f8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3688.5162239074707,\r
-        "y": 832.6774530410767,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3679.5164794921875,\r
+        "y": 684.6774673461914,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "49ba52e1.34347c"\r
+                "535441.d4b46bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49ba52e1.34347c",\r
+        "id": "535441.d4b46bc",\r
         "type": "set",\r
         "name": "set prop.wan.deviceId",\r
         "xml": "<set>\n<parameter name='prop.wan.deviceId' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$deviceidx].value`' />\n",\r
         "comments": "",\r
-        "x": 3857.516830444336,\r
-        "y": 831.2774877548218,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3848.5170860290527,\r
+        "y": 683.2775020599365,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d1bca38.4b9934",\r
+        "id": "23329d72.a46fe2",\r
         "type": "for",\r
         "name": "for loop deviceidx - Get deviceId from servicedata",\r
         "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`\">\n    \n    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3279.045753479004,\r
-        "y": 766.0417041778564,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3270.0460090637207,\r
+        "y": 618.0417184829712,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "9729ab27.7939b8"\r
+                "c7ebbbc9.4cdac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9729ab27.7939b8",\r
+        "id": "c7ebbbc9.4cdac8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3356.046485900879,\r
-        "y": 830.0418033599854,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3347.0467414855957,\r
+        "y": 682.0418176651001,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "26e95066.5bddc"\r
+                "bbbb9202.35efa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cd6d96e.5cd3a8",\r
+        "id": "9a0868fe.086fc8",\r
         "type": "comment",\r
         "name": "Get siteId from site resource created for this service",\r
         "info": "",\r
         "comments": "",\r
-        "x": 936.7578377723694,\r
-        "y": 440.0039186477661,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 845.7579207420349,\r
+        "y": 425.0039300918579,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e1a9bec.bd0de4",\r
+        "id": "f695d756.f5bf88",\r
         "type": "for",\r
         "name": "for loop sidx - Get siteId from servicedata",\r
-        "xml": "<for index=\"sidx\" start=\"0\" end=\"`$ctx.site.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`\">\n    \n    \n",\r
+        "xml": "<for index=\"sidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.siteVidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n    \n    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 899.7578353881836,\r
-        "y": 478.6705856323242,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 808.7579183578491,\r
+        "y": 463.670597076416,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "d8025975.c452c8"\r
+                "a691d394.7222c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8025975.c452c8",\r
+        "id": "a691d394.7222c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1161.7680282592773,\r
-        "y": 479.34741020202637,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1070.7681112289429,\r
+        "y": 464.34742164611816,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "7ae7755a.84d27c"\r
+                "49b25c34.232f54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ae7755a.84d27c",\r
+        "id": "49b25c34.232f54",\r
         "type": "switchNode",\r
         "name": "switch siteId",\r
         "xml": "<switch test=\"`$ctx.site.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1330.7581634521484,\r
-        "y": 479.67071628570557,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1239.758246421814,\r
+        "y": 464.67072772979736,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "6e34759a.33dd3c"\r
+                "e9f3d00d.b65c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e34759a.33dd3c",\r
+        "id": "e9f3d00d.b65c8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1264.7586250305176,\r
-        "y": 546.6707553863525,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1380.7587461471558,\r
+        "y": 465.6708056330681,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "4cc37cb0.d42884"\r
+                "40c977c1.d08e48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4cc37cb0.d42884",\r
+        "id": "40c977c1.d08e48",\r
         "type": "set",\r
         "name": "set prop.wan.siteId",\r
         "xml": "<set>\n<parameter name='prop.wan.siteId' value='`$ctx.site.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />\n\n\n",\r
         "comments": "",\r
-        "x": 1438.7585945129395,\r
-        "y": 543.2706317901611,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1545.7588033676147,\r
+        "y": 498.27067440748215,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83739943.858e68",\r
+        "id": "ac8c0e0b.c16e8",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 807.7578125,\r
-        "y": 654.7539043426514,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 783.7578811645508,\r
+        "y": 558.7539501190186,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "a8fa84ce.eb12f8",\r
-                "d18bc7f4.341358",\r
-                "3bf2ecab.90fcb4"\r
+                "c1fa285b.bc5508",\r
+                "80c1b9db.ee9048",\r
+                "b11a07e0.9253a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8fa84ce.eb12f8",\r
+        "id": "c1fa285b.bc5508",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1039.7578964233398,\r
-        "y": 618.753927230835,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1015.7579650878906,\r
+        "y": 522.7539730072021,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "9b3d8e62.faaef"\r
+                "ce2c3219.0bfd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d18bc7f4.341358",\r
+        "id": "80c1b9db.ee9048",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1042.248779296875,\r
-        "y": 654.3279638290405,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1018.2488479614258,\r
+        "y": 558.3280096054077,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "7795db23.93cf44"\r
+                "492200e7.6d98d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bf2ecab.90fcb4",\r
+        "id": "b11a07e0.9253a8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1037.581787109375,\r
-        "y": 690.661322593689,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1013.5818557739258,\r
+        "y": 594.6613683700562,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "dde2f622.170a38"\r
+                "8b634775.e65fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dde2f622.170a38",\r
+        "id": "8b634775.e65fc8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1191.3542785644531,\r
-        "y": 688.1004095077515,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1167.354347229004,\r
+        "y": 592.1004552841187,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7795db23.93cf44",\r
+        "id": "492200e7.6d98d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1187.8201751708984,\r
-        "y": 652.6136512756348,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1163.8202438354492,\r
+        "y": 556.613697052002,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b3d8e62.faaef",\r
+        "id": "ce2c3219.0bfd4",\r
         "type": "set",\r
         "name": "set controller data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
         "comments": "",\r
-        "x": 1195.2580108642578,\r
-        "y": 617.7538194656372,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1171.2580795288086,\r
+        "y": 521.7538652420044,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93891afe.aeea78",\r
+        "id": "b2116c6a.8c28d",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\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\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 822.2679443359375,\r
-        "y": 742.4309062957764,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 798.26806640625,\r
+        "y": 645.4309692382812,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "5c43c4aa.9264cc",\r
-                "33df2014.cd50d"\r
+                "4c685461.5dffec",\r
+                "d286ff7f.c649c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c43c4aa.9264cc",\r
+        "id": "4c685461.5dffec",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1057.2680702209473,\r
-        "y": 728.4308948516846,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1017.2681655883789,\r
+        "y": 633.4309549331665,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "28f385cf.49854a"\r
+                "f122de3.c7c352"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28f385cf.49854a",\r
+        "id": "f122de3.c7c352",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1199.2680778503418,\r
-        "y": 727.4308958053589,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1159.2681732177734,\r
+        "y": 632.4309558868408,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "112c2ecc.277fc1",\r
+        "id": "62588c42.e35064",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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 get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 1205.2680778503418,\r
-        "y": 764.8238840103149,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1165.2681732177734,\r
+        "y": 669.8239440917969,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "33df2014.cd50d",\r
+        "id": "d286ff7f.c649c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1056.5180702209473,\r
-        "y": 764.0738019943237,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1016.5181655883789,\r
+        "y": 669.0738620758057,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "112c2ecc.277fc1"\r
+                "62588c42.e35064"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc9fd33d.1cf95",\r
+        "id": "373e5110.89b67e",\r
         "type": "call",\r
         "name": "call sdwan-get-tenant-auth",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 797.2676391601562,\r
-        "y": 797.7639751434326,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "addc3c45.8b358",\r
-        "type": "comment",\r
-        "name": "Create port",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 1084.7578392028809,\r
-        "y": 826.2539043426514,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "7a2f98d7.5ecea8",\r
-        "type": "execute",\r
-        "name": "execute RestApiCallNode device port create",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\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=\"portResp\"/>\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`\" />",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 856.0918731689453,\r
-        "y": 883.8098802566528,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            [\r
-                "fd994a2a.92c728",\r
-                "92fe968a.87b558"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "92fe968a.87b558",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1105.091932296753,\r
-        "y": 859.8099217414856,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            [\r
-                "3a8360ac.8e93a"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fd994a2a.92c728",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1153.0919361114502,\r
-        "y": 897.8100881576538,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            [\r
-                "c9adde1d.a5805"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3a8360ac.8e93a",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "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 Create device port rest api\" />\n",\r
-        "comments": "",\r
-        "x": 1249.0922660827637,\r
-        "y": 858.8099212646484,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "c9adde1d.a5805",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1300.091947555542,\r
-        "y": 898.8099269866943,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 770.2677612304688,\r
+        "y": 688.7640700340271,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a2c6a4a4.2e00b8",\r
+        "id": "6e84f4e0.63170c",\r
         "type": "for",\r
         "name": "for loop idx - VF-module input parameters",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 861.4032020568848,\r
-        "y": 1001.4548950195312,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 811.4033203125,\r
+        "y": 731.4549427032471,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "925ea7f2.d972f8"\r
+                "740e16d5.3fe028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "925ea7f2.d972f8",\r
+        "id": "740e16d5.3fe028",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1105.2991561889648,\r
-        "y": 1000.3768668174744,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1039.2993125915527,\r
+        "y": 710.3769226074219,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "47d44aef.50cf54"\r
+                "2f0c006b.ded27"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47d44aef.50cf54",\r
+        "id": "2f0c006b.ded27",\r
         "type": "switchNode",\r
-        "name": "switch IPMode",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'IPMode'`\">\n",\r
+        "name": "switch portType",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portType'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1253.4164009094238,\r
-        "y": 1002.3503503799438,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1188.4164733886719,\r
+        "y": 713.350341796875,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "14cc8583.77380a"\r
+                "66262e7a.e2046"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14cc8583.77380a",\r
+        "id": "66262e7a.e2046",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1401.4163856506348,\r
-        "y": 999.3503150939941,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1335.4164791107178,\r
+        "y": 712.350341796875,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "1dbcdc9e.2ab813"\r
+                "62d59258.9c5bfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dbcdc9e.2ab813",\r
+        "id": "62d59258.9c5bfc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1562.4032516479492,\r
-        "y": 1001.2326736450195,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1477.4031982421875,\r
+        "y": 711.232666015625,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "193e5621.82d8aa",\r
-                "c01114ca.b0a928"\r
+                "5ec692b5.0b935c",\r
+                "b44ace5e.c0e25"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "193e5621.82d8aa",\r
+        "id": "5ec692b5.0b935c",\r
         "type": "switchNode",\r
         "name": "switch portType GE match",\r
-        "xml": "<switch test=\"`GE == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`\">\n\n\n",\r
+        "xml": "<switch test=\"`GE == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`\">\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1764.0699272155762,\r
-        "y": 1002.2327299118042,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1685.0698699951172,\r
+        "y": 684.232780456543,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "bc174d71.6f73c"\r
+                "c5b687f3.857b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc174d71.6f73c",\r
+        "id": "c5b687f3.857b88",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1949.4041366577148,\r
-        "y": 993.2328510284424,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1862.4041595458984,\r
+        "y": 685.232873916626,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "b0b3b2d7.c3aed"\r
+                "378cca9b.a5b416"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c01114ca.b0a928",\r
+        "id": "b44ace5e.c0e25",\r
         "type": "switchNode",\r
         "name": "switch portType LTE match",\r
-        "xml": "<switch test=\"`LTE == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`\">\n\n\n",\r
+        "xml": "<switch test=\"`LTE == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`\">\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1763.4032936096191,\r
-        "y": 1064.232717514038,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1687.403305053711,\r
+        "y": 744.2326622009277,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "acc83fa1.efe81"\r
+                "26e9f8af.0429a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "acc83fa1.efe81",\r
+        "id": "26e9f8af.0429a8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1964.4033832550049,\r
-        "y": 1068.2326908111572,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1865.4034271240234,\r
+        "y": 745.2326927185059,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "30dfd74d.405928"\r
+                "305bbeca.e00732"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e31d4c6.c361fb",\r
+        "id": "670bf5eb.ea088c",\r
         "type": "comment",\r
         "name": "set linkType as Ethernet",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2189.4034156799316,\r
-        "y": 946.2327260971069,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2521.403398513794,\r
+        "y": 676.2328190803528,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "60995785.6141d8",\r
+        "id": "b5df7be8.c4cd08",\r
         "type": "comment",\r
         "name": "set linkType as Cellular",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2200.625476837158,\r
-        "y": 1033.2326751947403,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2150.625801086426,\r
+        "y": 847.2327299118042,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86ffb9d1.271bf8",\r
+        "id": "48d30534.c6f1dc",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode device port create",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\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=\"portResp\"/>\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`\" />",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-port-ethernet.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\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=\"portResp\"/>\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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 877.5149421691895,\r
-        "y": 1130.7885818481445,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2273.5155029296875,\r
+        "y": 700.788872718811,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "fa0604ac.0f5bc8",\r
-                "2afd5b9a.0c9054"\r
+                "5041cf01.1a87f",\r
+                "98a7c6cb.bee538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2afd5b9a.0c9054",\r
+        "id": "98a7c6cb.bee538",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1126.515001296997,\r
-        "y": 1106.7886233329773,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2571.51513671875,\r
+        "y": 715.7888793945312,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "fd5d5c5b.4f78f"\r
+                "5dbd5d2b.58a3a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa0604ac.0f5bc8",\r
+        "id": "5041cf01.1a87f",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1126.515001296997,\r
-        "y": 1144.7887878417969,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2569.515333175659,\r
+        "y": 763.7890648841858,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "2654b242.f97d8e"\r
+                "f3695bfd.383518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd5d5c5b.4f78f",\r
+        "id": "5dbd5d2b.58a3a4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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 Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1270.5153350830078,\r
-        "y": 1105.7886228561401,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2715.5154705047607,\r
+        "y": 714.7888789176941,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2654b242.f97d8e",\r
+        "id": "f3695bfd.383518",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1273.5150127410889,\r
-        "y": 1145.7886266708374,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2716.515344619751,\r
+        "y": 764.7889037132263,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b0b3b2d7.c3aed",\r
+        "id": "2063a51e.4f858a",\r
         "type": "set",\r
         "name": "set prop.wan.linkType Ethernet",\r
         "xml": "<set>\n<parameter name='prop.wan.linkType' value=\"Ethernet\" />\n\n",\r
         "comments": "",\r
-        "x": 2176.1807975769043,\r
-        "y": 986.6770839691162,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2232.181255340576,\r
+        "y": 650.6770839691162,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30dfd74d.405928",\r
+        "id": "47db832a.5a4cfc",\r
         "type": "set",\r
         "name": "set prop.wan.linkType Cellular",\r
         "xml": "<set>\n<parameter name='prop.wan.linkType' value=\"Cellular\" />",\r
         "comments": "",\r
-        "x": 2186.1808433532715,\r
-        "y": 1066.6770544052124,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2223.1819915771484,\r
+        "y": 740.6773319244385,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e2c4dac5.6f39e8",\r
+        "id": "e3dbbb08.e38228",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode get transport network info",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\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=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"transportNetworksResp\"/>\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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 908.5352516174316,\r
-        "y": 1220.0782823562622,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 849.5352249145508,\r
+        "y": 865.0782594680786,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "7a45df8a.7903b",\r
-                "36ac3856.141338"\r
+                "a500d0ed.62c",\r
+                "861df4ee.035a68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "555b730f.2ad3ec",\r
+        "id": "762c61a4.e1eb1",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode wan port create",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\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=\"wanPortResp\"/>\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`\" />",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\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=\"wanPortResp\"/>\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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 881.5354232788086,\r
-        "y": 1604.078293800354,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2334.535400390625,\r
+        "y": 1095.078369140625,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "3f91502c.081fa",\r
-                "6ca447f7.7cb2c8"\r
+                "37c3fbe5.914474",\r
+                "6931e9af.4d41e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb6170fa.31a46",\r
+        "id": "5756eb85.eba0a4",\r
         "type": "set",\r
         "name": "set prop.wan.transportNetworkId",\r
         "xml": "<set>\n<parameter name='prop.wan.transportNetworkId' value='`$transportNetworksResp.data.transportNetworks[$tidx].id`' />\n",\r
         "comments": "",\r
-        "x": 1776.5262603759766,\r
-        "y": 1335.0683436393738,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1755.526222229004,\r
+        "y": 932.0683574676514,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "409701be.1a03c",\r
+        "id": "d49c55eb.f90268",\r
         "type": "execute",\r
         "name": "execute split ip and mask",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.wan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 828.5250358581543,\r
-        "y": 1396.4012417793274,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 773.5250129699707,\r
+        "y": 1045.4012684822083,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "33b19903.96b096",\r
-                "f243f0f3.7944c"\r
+                "383c4ac6.09fc66",\r
+                "8e012e1c.09a21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f243f0f3.7944c",\r
+        "id": "8e012e1c.09a21",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1029.5250549316406,\r
-        "y": 1374.4012331962585,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 974.525032043457,\r
+        "y": 1023.4012598991394,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "f9bdce70.a5d11"\r
+                "cb5fc8fa.fa8e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33b19903.96b096",\r
+        "id": "383c4ac6.09fc66",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1029.525058746338,\r
-        "y": 1415.4012370109558,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 974.5250358581543,\r
+        "y": 1064.4012637138367,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "7b17ef62.bca26"\r
+                "817fc6e4.b6fae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9bdce70.a5d11",\r
+        "id": "cb5fc8fa.fa8e98",\r
         "type": "set",\r
         "name": "set ipAddress prefixLength",\r
         "xml": "<set>\n<parameter name='prop.wan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.wan.prefixLength' value='`$ipandMask[1]`' />",\r
         "comments": "",\r
-        "x": 1226.525074005127,\r
-        "y": 1372.4012331962585,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1171.5250511169434,\r
+        "y": 1021.4012598991394,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7b17ef62.bca26",\r
+        "id": "817fc6e4.b6fae8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 1184.5250663757324,\r
-        "y": 1412.4012360572815,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1129.5250434875488,\r
+        "y": 1061.4012627601624,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5dfad1bf.4368f",\r
+        "id": "53cc9234.85a59c",\r
         "type": "switchNode",\r
         "name": "switch transportNetworkName same",\r
         "xml": "<switch test=\"`$transportNetworksResp.data.transportNetworks[$tidx].name == $prop.wan.transportNetworkName`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1364.5359382629395,\r
-        "y": 1287.7447051107883,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1305.5359115600586,\r
+        "y": 932.7446822226048,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "2b9a741b.c318cc"\r
+                "4fa94d3a.e537f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b9a741b.c318cc",\r
+        "id": "4fa94d3a.e537f4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1611.5355377197266,\r
-        "y": 1286.744643688202,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1552.5355110168457,\r
+        "y": 931.7446208000183,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "cb6170fa.31a46"\r
+                "5756eb85.eba0a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "844b5fe4.d3379",\r
+        "id": "98b0fb0a.11a348",\r
         "type": "set",\r
         "name": "set prop.wan.wanPortId",\r
         "xml": "<set>\n<parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 1538.859546661377,\r
-        "y": 1622.735113143921,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3017.859630584717,\r
+        "y": 1167.735188484192,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c63182d3.fbcc4",\r
+        "id": "c05b3e2e.c56c2",\r
         "type": "set",\r
         "name": "set prop.wan.devicePortId",\r
         "xml": "<set>\n<parameter name='prop.wan.devicePortId' value='`$portResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 823.526050567627,\r
-        "y": 1176.0681076049805,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 768.5259780883789,\r
+        "y": 813.0681133270264,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1467d26.a7bbb",\r
+        "id": "99969f83.61572",\r
         "type": "comment",\r
         "name": "Get network id",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1016.5349006652832,\r
-        "y": 1185.411289215088,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 957.5348739624023,\r
+        "y": 830.4112663269043,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4696daa4.7bc6d4",\r
+        "id": "27fc10fd.3b3f1",\r
         "type": "comment",\r
         "name": "Create wan port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 812.5349235534668,\r
-        "y": 1361.411374092102,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 757.5349006652832,\r
+        "y": 1010.4114007949829,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6ca447f7.7cb2c8",\r
+        "id": "6931e9af.4d41e8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1153.5351524353027,\r
-        "y": 1578.077886581421,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2632.5352363586426,\r
+        "y": 1123.077961921692,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "6062b706.984518"\r
+                "ae57ad7a.32b7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f91502c.081fa",\r
+        "id": "37c3fbe5.914474",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1151.5350723266602,\r
-        "y": 1625.078049659729,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2630.53515625,\r
+        "y": 1170.078125,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "9419758e.c47e08"\r
+                "a5479d2b.17725"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9419758e.c47e08",\r
+        "id": "a5479d2b.17725",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1320.5350799560547,\r
-        "y": 1625.0778864622116,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2799.5351638793945,\r
+        "y": 1170.0779618024826,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "844b5fe4.d3379"\r
+                "98b0fb0a.11a348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88101c47.a8c7e",\r
+        "id": "559ead8e.df65a4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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 Create wan port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1492.535488128662,\r
-        "y": 1579.0778856277466,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2971.535572052002,\r
+        "y": 1124.0779609680176,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "36ac3856.141338",\r
+        "id": "861df4ee.035a68",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1210.534755706787,\r
-        "y": 1199.0777764320374,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1151.5347290039062,\r
+        "y": 844.0777535438538,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "b8093d9a.685ef"\r
+                "adf44e66.a9236"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a45df8a.7903b",\r
+        "id": "a500d0ed.62c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1210.5347518920898,\r
-        "y": 1239.077941417694,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1151.534725189209,\r
+        "y": 884.0779185295105,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "f5cec88.5afd738"\r
+                "3bdf5a32.48ffc6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5cec88.5afd738",\r
+        "id": "3bdf5a32.48ffc6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1354.534767150879,\r
-        "y": 1238.077778339386,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1295.534740447998,\r
+        "y": 883.0777554512024,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b8093d9a.685ef",\r
+        "id": "adf44e66.a9236",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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 Get transport network info rest api\" />\n",\r
         "comments": "",\r
-        "x": 1352.5350875854492,\r
-        "y": 1198.0777764320374,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "86b35264.46fea",\r
-        "type": "comment",\r
-        "name": "TODO: split ip/mask",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 1225.5347061157227,\r
-        "y": 1334.5815052986145,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1293.5350608825684,\r
+        "y": 843.0777535438538,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "85c6d777.738908",\r
+        "id": "44741458.9316ac",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1114.5355415344238,\r
-        "y": 1286.411331653595,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1055.535514831543,\r
+        "y": 931.4113087654114,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "5dfad1bf.4368f"\r
+                "53cc9234.85a59c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "675842c8.f4343c",\r
+        "id": "56d337a2.42bd48",\r
         "type": "for",\r
         "name": "for loop tidx - Get transportNetwork ID",\r
         "xml": "<for index=\"tidx\" start=\"0\" end=\"`$transportNetworksResp.data.transportNetworks_length`\">\n    \n    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 870.5352210998535,\r
-        "y": 1289.411153793335,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 811.5351943969727,\r
+        "y": 934.4111309051514,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "85c6d777.738908"\r
+                "44741458.9316ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6062b706.984518",\r
+        "id": "ae57ad7a.32b7e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1313.5389022827148,\r
-        "y": 1576.5816287994385,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2792.5389862060547,\r
+        "y": 1121.5817041397095,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9e802733.d722c8",\r
+        "id": "80c1b0f1.09ead",\r
         "type": "for",\r
         "name": "for loop idx - VF-module input parameters",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 871.8372230529785,\r
-        "y": 1481.6666259765625,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 816.8372001647949,\r
+        "y": 1130.6666526794434,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "7d8af107.52b1d"\r
+                "df2b15e3.9b12e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d8af107.52b1d",\r
+        "id": "df2b15e3.9b12e8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1115.7331771850586,\r
-        "y": 1480.5885977745056,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1060.733154296875,\r
+        "y": 1129.5886244773865,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "58ac9d77.f3c914"\r
+                "e69d5573.0921e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58ac9d77.f3c914",\r
+        "id": "e69d5573.0921e8",\r
         "type": "switchNode",\r
         "name": "switch IPMode",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'IPMode'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1263.8504219055176,\r
-        "y": 1482.562081336975,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1208.850399017334,\r
+        "y": 1131.562108039856,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "463d34c6.f0572c"\r
+                "65d16ab9.689c24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "463d34c6.f0572c",\r
+        "id": "65d16ab9.689c24",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1411.8504066467285,\r
-        "y": 1479.5620460510254,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1356.850383758545,\r
+        "y": 1128.5620727539062,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "f6e7d7b8.9804f8"\r
+                "b02a711.92b019"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6e7d7b8.9804f8",\r
+        "id": "b02a711.92b019",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1568.8372230529785,\r
-        "y": 1481.4443969726562,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1513.837200164795,\r
+        "y": 1130.444423675537,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "7986250.a52d3dc",\r
-                "80947f3.e50c28"\r
+                "c4bd3155.18d9f",\r
+                "246c2fd8.8350c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7986250.a52d3dc",\r
+        "id": "c4bd3155.18d9f",\r
         "type": "switchNode",\r
         "name": "switch IPMode Static match",\r
         "xml": "<switch test=\"`Static == $prop.wan.IPMode`\">\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1774.50394821167,\r
-        "y": 1482.4444608688354,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1717.5041809082031,\r
+        "y": 1104.4446493983269,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "c5b82352.18946"\r
+                "62c11f1c.a8387"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80947f3.e50c28",\r
+        "id": "246c2fd8.8350c",\r
         "type": "switchNode",\r
         "name": "switch IPMode DHCP match",\r
         "xml": "<switch test=\"`DHCP == $prop.wan.IPMode`\">\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1773.837314605713,\r
-        "y": 1544.4444484710693,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1717.8373489379883,\r
+        "y": 1160.4445750117302,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "ca30d3ba.e4aa5"\r
+                "81f33bac.e89fe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8679bf14.4ac1",\r
+        "id": "c34bc647.720578",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 798.4032974243164,\r
-        "y": 2124.5665798187256,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 737.4032592773438,\r
+        "y": 1549.5665283203125,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7362e1fa.b1592",\r
+        "id": "875b58c1.722a88",\r
         "type": "set",\r
         "name": "set device PortId to service data",\r
         "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.wan.devicePortId`' />\n",\r
         "comments": "",\r
-        "x": 858.0597534179688,\r
-        "y": 1779.222749710083,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 777.0597534179688,\r
+        "y": 1174.2227783203125,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "726be50f.6f16fc",\r
+        "id": "7cfc5672.5cd958",\r
         "type": "update",\r
         "name": "update SDWAN wan port instance configuration in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $vf-module-topology-operation-input.vnf-information.vnf-id' >\n<parameter name=\"wan-port-config-id\" value=\"`$vf-module-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='Active' />\n<parameter name='device-port-id' value='`$prop.wan.devicePortId`' />\n<parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name=\"wan-port-config-id\" value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='device-port-id' value='`$prop.wan.devicePortId`' />\n<parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 925.7223663330078,\r
-        "y": 2090.3707427978516,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 854.7223510742188,\r
+        "y": 1493.3707275390625,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "46743c8f.b3fd84",\r
+        "id": "80c24ef7.49b8c",\r
         "type": "set",\r
         "name": "set wan portId to service data",\r
         "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='wanPortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.wan.wanPortId`' />\n",\r
         "comments": "",\r
-        "x": 864.0687103271484,\r
-        "y": 1869.4818668365479,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 783.0687103271484,\r
+        "y": 1264.4818954467773,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "35191a02.d89a16",\r
+        "id": "e72e5636.3932b8",\r
         "type": "set",\r
-        "name": "set ipAddress prefixLength",\r
-        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n<parameter name='prop.route.ipAddress' value=\"`$prop.wan.ipAddress`\" />\n\n",\r
+        "name": "set IP params",\r
+        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"prop.wan.ipAddress\" />\n<parameter name='prop.wan.providerIpAddress' value=\"prop.wan.provideripAddress\" />\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n<parameter name='prop.route.ipAddress' value=\"`$prop.wan.ipAddress`\" />\n\n",\r
         "comments": "",\r
-        "x": 2158.292377471924,\r
-        "y": 1476.8992538452148,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2257.29248046875,\r
+        "y": 1043.8992919921875,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "103790c7.a4e84f",\r
-        "type": "execute",\r
-        "name": "execute RestApiCallNode underlay route",\r
-        "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`\" />",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 894.6254920959473,\r
-        "y": 1719.8992919921875,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            [\r
-                "cb65e9dc.cb7d28",\r
-                "509b7bd.b23cb84"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "cb65e9dc.cb7d28",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1144.6253185272217,\r
-        "y": 1704.8995790481567,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            [\r
-                "aae088c9.6e82a8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "509b7bd.b23cb84",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1146.625638961792,\r
-        "y": 1748.8995885849,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            [\r
-                "537341f9.e0df6"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "aae088c9.6e82a8",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1290.209774017334,\r
-        "y": 1694.2653658390045,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "537341f9.e0df6",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1291.2095317840576,\r
-        "y": 1741.2653667926788,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "d38fbe54.6487b",\r
+        "id": "413a8e72.8c216",\r
         "type": "set",\r
-        "name": "set ipAddress prefixLength",\r
-        "xml": "<set>\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.ipAddress' value=\"\" />\n",\r
+        "name": "set IP params",\r
+        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",\r
         "comments": "",\r
-        "x": 2161.7539710998535,\r
-        "y": 1548.0000038146973,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2254.754150390625,\r
+        "y": 1158,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "15ae932b.8eaafd",\r
+        "id": "eaea3f61.2ed1c",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1469.5039100646973,\r
-        "y": 430,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1378.5039930343628,\r
+        "y": 415.0000114440918,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "33f87d4b.131732",\r
-                "48f81161.66243"\r
+                "d3ee2888.9d77a8",\r
+                "384abebf.660182"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "113b21af.23a45e",\r
+        "id": "83ba6051.514ec",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic-device-param.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"'service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].name'\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].name`'/>\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2628.8371620178223,\r
-        "y": 578,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2584.837371826172,\r
+        "y": 398.000057220459,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bf88a576.7aa2c8",\r
+        "id": "d9c35361.4cae6",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic-device-name.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"'prop.wan.deviceName'\"/>\n<parameter name=\"field3\" value='`$prop.wan.deviceName`'/>\n<parameter name=\"field4\" value=\"'service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value'\"/>\n<parameter name=\"field5\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`'/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2880.8371620178223,\r
-        "y": 661,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 2908.8371925354004,\r
+        "y": 497.99996757507324,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d2df96f9.05ab08",\r
+        "id": "350746df.c7aa7a",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic-last.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"'tmp.devicevidx'\"/>\n<parameter name=\"field3\" value='`$tmp.devicevidx`'/>\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3216.8371620178223,\r
-        "y": 930,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 3207.837417602539,\r
+        "y": 782.0000143051147,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c5b82352.18946",\r
+        "id": "62c11f1c.a8387",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1973.5039100646973,\r
-        "y": 1476.6666259765625,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1906.5040321350098,\r
+        "y": 1104.666739165783,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "35191a02.d89a16"\r
+                "a07e9d6c.b352"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca30d3ba.e4aa5",\r
+        "id": "81f33bac.e89fe8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1970.5039100646973,\r
-        "y": 1554.6666259765625,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 1905.5040283203125,\r
+        "y": 1158.6667429804802,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": [\r
             [\r
-                "d38fbe54.6487b"\r
+                "d91929ad.827e18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92451c4e.ffaad",\r
-        "type": "set",\r
-        "name": "hardcode device port resp",\r
-        "xml": "<set>\n<parameter name='portResp.success[0].id' value=\"12345\" />\n",\r
-        "comments": "",\r
-        "x": 806.5352172851562,\r
-        "y": 945.5313758850098,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "7f799175.fb047",\r
+        "id": "b10288cf.50b828",\r
         "type": "set",\r
         "name": "increment wan-port param length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />\n",\r
         "comments": "",\r
-        "x": 866.5351791381836,\r
-        "y": 1824.0313453674316,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 785.5351791381836,\r
+        "y": 1219.0313739776611,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "131a2ffd.3a8e5",\r
+        "id": "ebd64e1b.5f8b",\r
         "type": "set",\r
         "name": "increment wan-port param length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />\n",\r
         "comments": "",\r
-        "x": 874.5351791381836,\r
-        "y": 1909.0313472747803,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 793.5351791381836,\r
+        "y": 1304.0313758850098,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e9b4c90b.c4ce98",\r
+        "id": "1b602e84.4e29d1",\r
         "type": "set",\r
         "name": "set vf-module-id and vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 894.0352058410645,\r
-        "y": 2003.0313870636746,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 813.0351905822754,\r
+        "y": 1406.0313718048856,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c031fb.d5948e",\r
+        "id": "13c3d9c7.d7be26",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='Active' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
         "comments": "",\r
-        "x": 860.0352058410645,\r
-        "y": 2051.531388017349,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 779.0351905822754,\r
+        "y": 1454.5313727585599,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a7fe1093.6d40a",\r
+        "id": "fb9080f.263d28",\r
         "type": "set",\r
         "name": "copy input data in service-data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
         "comments": "",\r
-        "x": 858.0351600646973,\r
-        "y": 1955.2813415527344,\r
-        "z": "81e8e679.1e5f48",\r
+        "x": 777.0351448059082,\r
+        "y": 1358.2813262939453,\r
+        "z": "fe63ab05.2e2948",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7b8751b7.f6ba8",\r
-        "type": "set",\r
-        "name": "copy input data to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
-        "comments": "",\r
-        "x": 2064.0351600646973,\r
-        "y": 2255.03125,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": []\r
+        "id": "378cca9b.a5b416",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2008.0313453674316,\r
+        "y": 687.0313034057617,\r
+        "z": "fe63ab05.2e2948",\r
+        "wires": [\r
+            [\r
+                "2063a51e.4f858a",\r
+                "48d30534.c6f1dc"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "5ef5bb05.ba3244",\r
-        "type": "set",\r
-        "name": "set vf-module-id and vf-module-object-path",\r
-        "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
-        "comments": "",\r
-        "x": 2098.3383598327637,\r
-        "y": 2298.8343591690063,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": []\r
+        "id": "305bbeca.e00732",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2008.031234741211,\r
+        "y": 768.0313053131104,\r
+        "z": "fe63ab05.2e2948",\r
+        "wires": [\r
+            [\r
+                "47db832a.5a4cfc",\r
+                "82afc539.6a24f8"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "7b8dfcbe.827b44",\r
-        "type": "set",\r
-        "name": "set vf-module-level-oper-status",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='Active' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
+        "id": "82afc539.6a24f8",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode device port create",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-port-cellular.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\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=\"portResp\"/>\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`\" />",\r
         "comments": "",\r
-        "x": 2065.338394165039,\r
-        "y": 2337.8344264030457,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 2271.03125,\r
+        "y": 800.03125,\r
+        "z": "fe63ab05.2e2948",\r
+        "wires": [\r
+            [\r
+                "98a7c6cb.bee538",\r
+                "5041cf01.1a87f"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "e28c61da.26a12",\r
-        "type": "set",\r
-        "name": "hardcode port resp",\r
-        "xml": "<set>\n<parameter name='portResp.success[0].id' value=\"12345\" />\n",\r
+        "id": "a07e9d6c.b352",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2073,\r
+        "y": 1072,\r
+        "z": "fe63ab05.2e2948",\r
+        "wires": [\r
+            [\r
+                "e72e5636.3932b8",\r
+                "762c61a4.e1eb1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d91929ad.827e18",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2069,\r
+        "y": 1176,\r
+        "z": "fe63ab05.2e2948",\r
+        "wires": [\r
+            [\r
+                "413a8e72.8c216",\r
+                "9127fd6f.551ca"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9127fd6f.551ca",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode wan port create",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port-dhcp.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\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=\"wanPortResp\"/>\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`\" />",\r
         "comments": "",\r
-        "x": 779.5039901733398,\r
-        "y": 842.3333721160889,\r
-        "z": "81e8e679.1e5f48",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 2337,\r
+        "y": 1198,\r
+        "z": "fe63ab05.2e2948",\r
+        "wires": [\r
+            [\r
+                "6931e9af.4d41e8",\r
+                "37c3fbe5.914474"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index 95f8369..40b1896 100644 (file)
                                 <outcome value='true'>\r
                                     <block atomic="true">\r
                                         <for index="didx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`">\r
+                                            <block>\r
+                                                <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].name == 'deviceId'`">\r
+                                                    <outcome value='true'>\r
+                                                        <set>\r
+                                                            <parameter name='prop.site.deviceId[$prop.site.deviceId_length]' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`' />\r
+                                                            <parameter name='prop.site.deviceId_length' value='`$prop.site.deviceId_length + 1`' />\r
+                                                        </set>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </block>\r
                                             <block atomic="true">\r
                                                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
                                                     <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic-device-param.log"/>\r
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
-            <for index="sidx" start="0" end="`$ctx.site.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`">\r
+            <for index="sidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.siteVidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`">\r
                 <block atomic="true">\r
                     <switch test="`$ctx.site.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">\r
                         <outcome value='true'>\r
                 </outcome>\r
             </execute>\r
             <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>\r
-            <set>\r
-                <parameter name='portResp.success[0].id' value="12345" />\r
-            </set>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-port.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`" />\r
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="post"/>\r
-                <parameter name="responsePrefix" value="portResp"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error executing Create device port rest api" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-            </execute>\r
-            <set>\r
-                <parameter name='portResp.success[0].id' value="12345" />\r
-            </set>\r
             <for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`'>\r
                 <block>\r
-                    <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'IPMode'`">\r
+                    <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portType'`">\r
                         <outcome value='true'>\r
                             <block atomic="true">\r
-                                <switch test="`GE == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`">\r
+                                <switch test="`GE == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`">\r
                                     <outcome value='true'>\r
-                                        <set>\r
-                                            <parameter name='prop.wan.linkType' value="Ethernet" />\r
-                                        </set>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name='prop.wan.linkType' value="Ethernet" />\r
+                                            </set>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-port-ethernet.json'`" />\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`" />\r
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <parameter name="format" value="json"/>\r
+                                                <parameter name="httpMethod" value="post"/>\r
+                                                <parameter name="responsePrefix" value="portResp"/>\r
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                <outcome value='failure'>\r
+                                                    <return status='failure'>\r
+                                                        <parameter name='ack-final' value='Y'/>\r
+                                                        <parameter name="error-code" value="500" />\r
+                                                        <parameter name="error-message" value="Error executing Create device port rest api" />\r
+                                                    </return>\r
+                                                </outcome>\r
+                                                <outcome value='success'>\r
+                                                    <block atomic="true"></block>\r
+                                                </outcome>\r
+                                            </execute>\r
+                                        </block>\r
                                     </outcome>\r
                                 </switch>\r
-                                <switch test="`LTE == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`">\r
+                                <switch test="`LTE == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`">\r
                                     <outcome value='true'>\r
-                                        <set>\r
-                                            <parameter name='prop.wan.linkType' value="Cellular" />\r
-                                        </set>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name='prop.wan.linkType' value="Cellular" />\r
+                                            </set>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-port-cellular.json'`" />\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`" />\r
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <parameter name="format" value="json"/>\r
+                                                <parameter name="httpMethod" value="post"/>\r
+                                                <parameter name="responsePrefix" value="portResp"/>\r
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                <outcome value='failure'>\r
+                                                    <return status='failure'>\r
+                                                        <parameter name='ack-final' value='Y'/>\r
+                                                        <parameter name="error-code" value="500" />\r
+                                                        <parameter name="error-message" value="Error executing Create device port rest api" />\r
+                                                    </return>\r
+                                                </outcome>\r
+                                                <outcome value='success'>\r
+                                                    <block atomic="true"></block>\r
+                                                </outcome>\r
+                                            </execute>\r
+                                        </block>\r
                                     </outcome>\r
                                 </switch>\r
                             </block>\r
                     </switch>\r
                 </block>\r
             </for>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-port.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`" />\r
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="post"/>\r
-                <parameter name="responsePrefix" value="portResp"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error executing Create device port rest api" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-            </execute>\r
             <set>\r
                 <parameter name='prop.wan.devicePortId' value='`$portResp.success[0].id`' />\r
             </set>\r
                             <block atomic="true">\r
                                 <switch test="`Static == $prop.wan.IPMode`">\r
                                     <outcome value='true'>\r
-                                        <set>\r
-                                            <parameter name='prop.wan.ip-address' value="" />\r
-                                            <parameter name='prop.wan.prefixLength' value="" />\r
-                                            <parameter name='prop.wan.providerIpAddress' value="" />\r
-                                            <parameter name='prop.wan.IpMode' value="static" />\r
-                                            <parameter name='prop.route.nextHopType' value="ip-address" />\r
-                                            <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />\r
-                                        </set>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name='prop.wan.ip-address' value="prop.wan.ipAddress" />\r
+                                                <parameter name='prop.wan.providerIpAddress' value="prop.wan.provideripAddress" />\r
+                                                <parameter name='prop.wan.IpMode' value="static" />\r
+                                                <parameter name='prop.route.nextHopType' value="ip-address" />\r
+                                                <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />\r
+                                            </set>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`" />\r
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <parameter name="format" value="json"/>\r
+                                                <parameter name="httpMethod" value="post"/>\r
+                                                <parameter name="responsePrefix" value="wanPortResp"/>\r
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                <outcome value='failure'>\r
+                                                    <block atomic="true"></block>\r
+                                                </outcome>\r
+                                                <outcome value='success'>\r
+                                                    <block atomic="true">\r
+                                                        <set>\r
+                                                            <parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />\r
+                                                        </set>\r
+                                                    </block>\r
+                                                </outcome>\r
+                                            </execute>\r
+                                        </block>\r
                                     </outcome>\r
                                 </switch>\r
                                 <switch test="`DHCP == $prop.wan.IPMode`">\r
                                     <outcome value='true'>\r
-                                        <set>\r
-                                            <parameter name='prop.route.nextHopType' value="outbound-interface" />\r
-                                            <parameter name='prop.wan.IpMode' value="DHCP" />\r
-                                            <parameter name='prop.route.ipAddress' value="" />\r
-                                        </set>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name='prop.wan.ip-address' value="" />\r
+                                                <parameter name='prop.wan.prefixLength' value="" />\r
+                                                <parameter name='prop.wan.providerIpAddress' value="" />\r
+                                                <parameter name='prop.wan.IpMode' value="DHCP" />\r
+                                                <parameter name='prop.route.nextHopType' value="outbound-interface" />\r
+                                            </set>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-dhcp.json'`" />\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`" />\r
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <parameter name="format" value="json"/>\r
+                                                <parameter name="httpMethod" value="post"/>\r
+                                                <parameter name="responsePrefix" value="wanPortResp"/>\r
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                <outcome value='failure'>\r
+                                                    <block atomic="true"></block>\r
+                                                </outcome>\r
+                                                <outcome value='success'>\r
+                                                    <block atomic="true">\r
+                                                        <set>\r
+                                                            <parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />\r
+                                                        </set>\r
+                                                    </block>\r
+                                                </outcome>\r
+                                            </execute>\r
+                                        </block>\r
                                     </outcome>\r
                                 </switch>\r
                             </block>\r
                     </switch>\r
                 </block>\r
             </for>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`" />\r
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="post"/>\r
-                <parameter name="responsePrefix" value="wanPortResp"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <block atomic="true">\r
-                        <set>\r
-                            <parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />\r
-                        </set>\r
-                    </block>\r
-                </outcome>\r
-            </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-underlay.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`" />\r
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="post"/>\r
-                <parameter name="responsePrefix" value="underlayspokeResp"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <block></block>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <block></block>\r
-                </outcome>\r
-            </execute>\r
             <set>\r
                 <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.wan.devicePortId`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \r
-      key='wan-port-config.wan-port-config-id = $vf-module-topology-operation-input.vnf-information.vnf-id' >\r
-                <parameter name="wan-port-config-id" value="`$vf-module-topology-operation-input.vnf-information.vnf-id`" />\r
+      key='wan-port-config.wan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
+                <parameter name="wan-port-config-id" value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
                 <parameter name='operational-status' value='Active' />\r
                 <parameter name='device-port-id' value='`$prop.wan.devicePortId`' />\r
                 <parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />\r
-                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\r
-                <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\r
-                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\r
             </update>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r