From: prakash.e <prakash.e@huawei.com>
Date: Fri, 10 May 2019 06:53:54 +0000 (+0530)
Subject: Fix SDWAN DG activate in SDNC startup
X-Git-Tag: 1.6.1~43
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=2d6bf950c57f5faac5795bfa5886ce49e35ade2d

Fix SDWAN DG activate in SDNC startup

1. SDWAN newly add vf-module-topology-operation DGs
   are added in graph.versions to activate during
   SDNC startup
2. Fixed SDWAN site and wan-port delete DGs by
   calling right DG to get parameters.

Change-Id: I34fa321e325d92b2a471bc9cd8ae499990ae37b8
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: b4f2903673c98cb12c99760c08a072340bfcfc08
---

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.json
index 4b4448bb..306983eb 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "187aa613.a5839a",
+        "id": "92d63018.76651",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -8,667 +8,667 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 235.00390625,
-        "y": 121.23810815811157,
-        "z": "e1fdfe1b.e244a",
+        "x": 188,
+        "y": 95.23810958862305,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "582fdd43.f9c334"
+                "d7e56420.878978"
             ]
         ]
     },
     {
-        "id": "582fdd43.f9c334",
+        "id": "d7e56420.878978",
         "type": "method",
         "name": "method sdwan-vf-operation-site-delete",
         "xml": "<method rpc='sdwan-vf-operation-site-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 246.71820068359375,
-        "y": 215.58634042739868,
-        "z": "e1fdfe1b.e244a",
+        "x": 199.71429443359375,
+        "y": 189.58634185791016,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "5b1517bd.e6d538"
+                "4894aec.737e25"
             ]
         ]
     },
     {
-        "id": "dd9a7d3b.c0b22",
+        "id": "a6d015c8.1ff688",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 155.71820068359375,
-        "y": 58.999998569488525,
-        "z": "e1fdfe1b.e244a",
+        "x": 108.71429443359375,
+        "y": 33,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "187aa613.a5839a"
+                "92d63018.76651"
             ]
         ]
     },
     {
-        "id": "5b1517bd.e6d538",
+        "id": "4894aec.737e25",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 263.38490295410156,
-        "y": 449.66671800613403,
-        "z": "e1fdfe1b.e244a",
+        "x": 216.38099670410156,
+        "y": 423.6667194366455,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "9241d723.4c1768",
-                "583bedbe.114ce4",
-                "530fc00e.364a7",
-                "6080131a.3dc0dc",
-                "e87fa266.b6e36",
-                "809305f5.00af78",
-                "35360c23.e7bca4",
-                "f2c5088e.cdf1f8",
-                "8e537e93.b1e07",
-                "c5084158.dcae4",
-                "a42b62f1.2ca2"
+                "a2b42b0.3b977d8",
+                "5900c7f7.5a9318",
+                "7c3f4054.5da9f",
+                "ea6eb721.d75c78",
+                "1845f5e.f859c0a",
+                "ac4ca98d.648748",
+                "3a7cc06a.e4a93",
+                "5b1cbd9a.fe2214",
+                "d3482d9.9c6a8d",
+                "47edd8f7.5e8f08",
+                "a33ffc8b.2c56d"
             ]
         ]
     },
     {
-        "id": "583bedbe.114ce4",
+        "id": "5900c7f7.5a9318",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 578.7495651245117,
-        "y": 295.2691397666931,
-        "z": "e1fdfe1b.e244a",
+        "x": 531.7456588745117,
+        "y": 269.2691411972046,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "54d8e288.9c571c"
+                "5c122dfc.571994"
             ]
         ]
     },
     {
-        "id": "9241d723.4c1768",
+        "id": "a2b42b0.3b977d8",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.7182197570801,
-        "y": 234.000009059906,
-        "z": "e1fdfe1b.e244a",
+        "x": 536.7143135070801,
+        "y": 208.00001049041748,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "deee2c29.49f92"
+                "800d9fa6.cc593"
             ]
         ]
     },
     {
-        "id": "deee2c29.49f92",
+        "id": "800d9fa6.cc593",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 763.7182006835938,
-        "y": 232.99999856948853,
-        "z": "e1fdfe1b.e244a",
+        "x": 716.7142944335938,
+        "y": 207,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "c9ce5d0a.f9326"
+                "21c67758.a01858"
             ]
         ]
     },
     {
-        "id": "c9ce5d0a.f9326",
+        "id": "21c67758.a01858",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 913.1469268798828,
-        "y": 234.14291620254517,
-        "z": "e1fdfe1b.e244a",
+        "x": 866.1430206298828,
+        "y": 208.14291763305664,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "54d8e288.9c571c",
+        "id": "5c122dfc.571994",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 801.7182159423828,
-        "y": 296.0000047683716,
-        "z": "e1fdfe1b.e244a",
+        "x": 754.7143096923828,
+        "y": 270.00000619888306,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "60ddf1fc.3523e"
+                "e74d8f35.4c893"
             ]
         ]
     },
     {
-        "id": "60ddf1fc.3523e",
+        "id": "e74d8f35.4c893",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1016.7182006835938,
-        "y": 293.9999985694885,
-        "z": "e1fdfe1b.e244a",
+        "x": 969.7142944335938,
+        "y": 268,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "3516b602.f2680a"
+                "18997aaf.50a2e5"
             ]
         ]
     },
     {
-        "id": "3516b602.f2680a",
+        "id": "18997aaf.50a2e5",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1180.7182006835938,
-        "y": 288.9999985694885,
-        "z": "e1fdfe1b.e244a",
+        "x": 1133.7142944335938,
+        "y": 263,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "530fc00e.364a7",
+        "id": "7c3f4054.5da9f",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.7182350158691,
-        "y": 372.00002336502075,
-        "z": "e1fdfe1b.e244a",
+        "x": 602.7143287658691,
+        "y": 346.0000247955322,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "8726f5fa.6a9e18",
-                "28d1ea9e.688d26",
-                "8ffcd1cb.2fcee"
+                "e9f1419b.38f9e",
+                "585f667a.9a7e28",
+                "ebd510e0.6ad12"
             ]
         ]
     },
     {
-        "id": "28d1ea9e.688d26",
+        "id": "585f667a.9a7e28",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 871.7182273864746,
-        "y": 406.0000329017639,
-        "z": "e1fdfe1b.e244a",
+        "x": 824.7143211364746,
+        "y": 380.0000343322754,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "ed85f484.f7f278"
+                "720f4f87.d051c"
             ]
         ]
     },
     {
-        "id": "8726f5fa.6a9e18",
+        "id": "e9f1419b.38f9e",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876.7182235717773,
-        "y": 353.0000319480896,
-        "z": "e1fdfe1b.e244a",
+        "x": 829.7143173217773,
+        "y": 327.0000333786011,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "ed85f484.f7f278"
+                "720f4f87.d051c"
             ]
         ]
     },
     {
-        "id": "ed85f484.f7f278",
+        "id": "720f4f87.d051c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1034.7182273864746,
-        "y": 366.0000329017639,
-        "z": "e1fdfe1b.e244a",
+        "x": 987.7143211364746,
+        "y": 340.0000343322754,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "8ffcd1cb.2fcee",
+        "id": "ebd510e0.6ad12",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 871.7182273864746,
-        "y": 467.0000329017639,
-        "z": "e1fdfe1b.e244a",
+        "x": 824.7143211364746,
+        "y": 441.0000343322754,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "340e8678.09189a"
+                "9a0e9dd2.18865"
             ]
         ]
     },
     {
-        "id": "806cc3c4.ab426",
+        "id": "9902fe02.18d86",
         "type": "set",
         "name": "set vf-module_length",
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
         "comments": "",
-        "x": 1225.7182426452637,
-        "y": 465.0000468492508,
-        "z": "e1fdfe1b.e244a",
+        "x": 1178.7143363952637,
+        "y": 439.00004827976227,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "340e8678.09189a",
+        "id": "9a0e9dd2.18865",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1032.7182731628418,
-        "y": 464.00002431869507,
-        "z": "e1fdfe1b.e244a",
+        "x": 985.7143669128418,
+        "y": 438.00002574920654,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "806cc3c4.ab426",
-                "f59f2884.04cee8"
+                "9902fe02.18d86",
+                "16260a2b.3eaaa6"
             ]
         ]
     },
     {
-        "id": "f59f2884.04cee8",
+        "id": "16260a2b.3eaaa6",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1244.7182121276855,
-        "y": 518.0000233650208,
-        "z": "e1fdfe1b.e244a",
+        "x": 1197.7143058776855,
+        "y": 492.0000247955322,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "2f51cfde.50b1e"
+                "88e5880a.11ce38"
             ]
         ]
     },
     {
-        "id": "2f51cfde.50b1e",
+        "id": "88e5880a.11ce38",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1487.7182273864746,
-        "y": 513.0000329017639,
-        "z": "e1fdfe1b.e244a",
+        "x": 1440.7143211364746,
+        "y": 487.0000343322754,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "b1049a4.b276d68"
+                "70d8d5dc.c5589c"
             ]
         ]
     },
     {
-        "id": "b1049a4.b276d68",
+        "id": "70d8d5dc.c5589c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1728.718355178833,
-        "y": 506.00003004074097,
-        "z": "e1fdfe1b.e244a",
+        "x": 1681.714448928833,
+        "y": 480.00003147125244,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "30dc082a.0a5cd8"
+                "edcff2.a0ee701"
             ]
         ]
     },
     {
-        "id": "30dc082a.0a5cd8",
+        "id": "edcff2.a0ee701",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1880.7183265686035,
-        "y": 508.00002336502075,
-        "z": "e1fdfe1b.e244a",
+        "x": 1833.7144203186035,
+        "y": 482.0000247955322,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "68ce9aa6.9cbee4",
-                "6fd91070.2784d",
-                "83965509.802248"
+                "3e47609d.a63df",
+                "9b88bd4a.a8923",
+                "e106d289.b1b46"
             ]
         ]
     },
     {
-        "id": "68ce9aa6.9cbee4",
+        "id": "3e47609d.a63df",
         "type": "set",
         "name": "set tmp.vidx and ctx.vnf-data",
         "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",
         "comments": "",
-        "x": 2102.7183265686035,
-        "y": 504.00002336502075,
-        "z": "e1fdfe1b.e244a",
+        "x": 2055.7144203186035,
+        "y": 478.0000247955322,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "6fd91070.2784d",
+        "id": "9b88bd4a.a8923",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
         "comments": "",
-        "x": 2108.7183265686035,
-        "y": 553.0000233650208,
-        "z": "e1fdfe1b.e244a",
+        "x": 2061.7144203186035,
+        "y": 527.0000247955322,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "83965509.802248",
+        "id": "e106d289.b1b46",
         "type": "call",
-        "name": "call sdwan-get-vf-module-device-param",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' >\n",
+        "name": "call sdwan-get-vf-module-site-param",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2136.718547821045,
-        "y": 601.0000290870667,
-        "z": "e1fdfe1b.e244a",
+        "x": 2089.714641571045,
+        "y": 575.0000305175781,
+        "z": "551c808f.bbd64",
         "wires": [
             []
         ]
     },
     {
-        "id": "6080131a.3dc0dc",
+        "id": "ea6eb721.d75c78",
         "type": "switchNode",
         "name": "switch tmp.vidx ",
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 588.7494468688965,
-        "y": 545.0161061286926,
-        "z": "e1fdfe1b.e244a",
+        "x": 541.7455406188965,
+        "y": 519.0161075592041,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "73f1e922.5bcb58"
+                "b4a5c77f.e6a8e8"
             ]
         ]
     },
     {
-        "id": "73f1e922.5bcb58",
+        "id": "b4a5c77f.e6a8e8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 736.1780891418457,
-        "y": 544.5875163078308,
-        "z": "e1fdfe1b.e244a",
+        "x": 689.1741828918457,
+        "y": 518.5875177383423,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "a8c19777.b80838"
+                "1bdd208b.11220f"
             ]
         ]
     },
     {
-        "id": "a8c19777.b80838",
+        "id": "1bdd208b.11220f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 885.6068153381348,
-        "y": 545.7304339408875,
-        "z": "e1fdfe1b.e244a",
+        "x": 838.6029090881348,
+        "y": 519.7304353713989,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "e87fa266.b6e36",
+        "id": "1845f5e.f859c0a",
         "type": "switchNode",
         "name": "switch vf-module-oper-status",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 633.047607421875,
-        "y": 615.3333115577698,
-        "z": "e1fdfe1b.e244a",
+        "x": 586.043701171875,
+        "y": 589.3333129882812,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "f563296b.c51508",
-                "5df5c282.7498ac"
+                "b4a1d75e.3ca968",
+                "3c274d12.c91802"
             ]
         ]
     },
     {
-        "id": "f563296b.c51508",
+        "id": "b4a1d75e.3ca968",
         "type": "outcome",
         "name": "outcome PendingDelete",
         "xml": "<outcome value='PendingDelete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 923.8808746337891,
-        "y": 619.4444346427917,
-        "z": "e1fdfe1b.e244a",
+        "x": 876.8769683837891,
+        "y": 593.4444360733032,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "def8fb03.8e15e8"
+                "c9fb09b5.340538"
             ]
         ]
     },
     {
-        "id": "5df5c282.7498ac",
+        "id": "3c274d12.c91802",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 890.8810119628906,
-        "y": 671.4444873332977,
-        "z": "e1fdfe1b.e244a",
+        "x": 843.8771057128906,
+        "y": 645.4444887638092,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "2bb9155.57a22ea"
+                "2fa34d4f.1b8342"
             ]
         ]
     },
     {
-        "id": "2bb9155.57a22ea",
+        "id": "2fa34d4f.1b8342",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
         "comments": "",
-        "x": 1050.3807792663574,
-        "y": 674.4444863796234,
-        "z": "e1fdfe1b.e244a",
+        "x": 1003.3768730163574,
+        "y": 648.4444878101349,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "def8fb03.8e15e8",
+        "id": "c9fb09b5.340538",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1121.1872749328613,
-        "y": 629.7695889472961,
-        "z": "e1fdfe1b.e244a",
+        "x": 1074.1833686828613,
+        "y": 603.7695903778076,
+        "z": "551c808f.bbd64",
         "wires": [
             []
         ]
     },
     {
-        "id": "a42b62f1.2ca2",
+        "id": "a33ffc8b.2c56d",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 611.1588096618652,
-        "y": 994.2221984863281,
-        "z": "e1fdfe1b.e244a",
+        "x": 564.1549034118652,
+        "y": 968.2221999168396,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "809305f5.00af78",
+        "id": "ac4ca98d.648748",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
         "comments": "",
-        "x": 607.2454776763916,
-        "y": 689.3333535194397,
-        "z": "e1fdfe1b.e244a",
+        "x": 560.2415714263916,
+        "y": 663.3333549499512,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "35360c23.e7bca4",
+        "id": "3a7cc06a.e4a93",
         "type": "for",
         "name": "for lidx..service-data.vf-modules.vf-module[]",
         "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 687.2453918457031,
-        "y": 740.3333554267883,
-        "z": "e1fdfe1b.e244a",
+        "x": 640.2414855957031,
+        "y": 714.3333568572998,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "37a5b897.303c08"
+                "95674187.09446"
             ]
         ]
     },
     {
-        "id": "f2c5088e.cdf1f8",
+        "id": "5b1cbd9a.fe2214",
         "type": "set",
         "name": "set new vnf length",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
         "comments": "",
-        "x": 611.3467636108398,
-        "y": 793.1375732421875,
-        "z": "e1fdfe1b.e244a",
+        "x": 564.3428573608398,
+        "y": 767.137574672699,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "8e537e93.b1e07",
+        "id": "d3482d9.9c6a8d",
         "type": "set",
         "name": "Remove vnf from ServiceData",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",
         "comments": "",
-        "x": 648.2454376220703,
-        "y": 843.3333582878113,
-        "z": "e1fdfe1b.e244a",
+        "x": 601.2415313720703,
+        "y": 817.3333597183228,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "37a5b897.303c08",
+        "id": "95674187.09446",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 947.24538230896,
-        "y": 747.3332152366638,
-        "z": "e1fdfe1b.e244a",
+        "x": 900.24147605896,
+        "y": 721.3332166671753,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "28df8155.45a17e"
+                "e3d25248.df60d"
             ]
         ]
     },
     {
-        "id": "b54d3819.c1f898",
+        "id": "52d4e995.bbf898",
         "type": "delete",
         "name": "delete site vf instance configuration in AAI",
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='site-resource' \n        key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 693.2457847595215,
-        "y": 941.59490442276,
-        "z": "e1fdfe1b.e244a",
+        "x": 646.2418785095215,
+        "y": 915.5949058532715,
+        "z": "551c808f.bbd64",
         "wires": [
             []
         ]
     },
     {
-        "id": "28df8155.45a17e",
+        "id": "e3d25248.df60d",
         "type": "switchNode",
         "name": "switch vnf-id found",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.vf-module-information.vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1133.245449066162,
-        "y": 747.3333759307861,
-        "z": "e1fdfe1b.e244a",
+        "x": 1086.241542816162,
+        "y": 721.3333773612976,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "b11e0659.68c598"
+                "47678fed.7b718"
             ]
         ]
     },
     {
-        "id": "b11e0659.68c598",
+        "id": "47678fed.7b718",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1302.2454566955566,
-        "y": 746.3332133293152,
-        "z": "e1fdfe1b.e244a",
+        "x": 1255.2415504455566,
+        "y": 720.3332147598267,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "8c9a4a2b.2a6988"
+                "c04d70ca.31b0d"
             ]
         ]
     },
     {
-        "id": "8c9a4a2b.2a6988",
+        "id": "c04d70ca.31b0d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1456.2452955245972,
-        "y": 738.3332142829895,
-        "z": "e1fdfe1b.e244a",
+        "x": 1409.2413892745972,
+        "y": 712.333215713501,
+        "z": "551c808f.bbd64",
         "wires": [
             [
-                "9c4fcf43.faebd",
-                "f51761cb.90c27"
+                "127fe12b.983b6f",
+                "2ec119fa.b900e6"
             ]
         ]
     },
     {
-        "id": "9c4fcf43.faebd",
+        "id": "127fe12b.983b6f",
         "type": "set",
         "name": "set  vnf data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\n",
         "comments": "",
-        "x": 1621.2453908920288,
-        "y": 713.3333697319031,
-        "z": "e1fdfe1b.e244a",
+        "x": 1574.2414846420288,
+        "y": 687.3333711624146,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "f51761cb.90c27",
+        "id": "2ec119fa.b900e6",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
         "comments": "",
-        "x": 1643.2453908920288,
-        "y": 769.333333492279,
-        "z": "e1fdfe1b.e244a",
+        "x": 1596.2414846420288,
+        "y": 743.3333349227905,
+        "z": "551c808f.bbd64",
         "wires": []
     },
     {
-        "id": "c5084158.dcae4",
+        "id": "47edd8f7.5e8f08",
         "type": "set",
         "name": "set vf-module-object-path",
         "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",
         "comments": "",
-        "x": 635.0476455688477,
-        "y": 888.6666932106018,
-        "z": "e1fdfe1b.e244a",
+        "x": 588.0437393188477,
+        "y": 862.6666946411133,
+        "z": "551c808f.bbd64",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.json
index d290e8e7..6918596a 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "4c9b7636.16d1a8",
+        "id": "108df9ad.e955a6",
         "type": "method",
         "name": "method sdwan-vf-operation-wanport-delete",
         "xml": "<method rpc='sdwan-vf-operation-wanport-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 227.01040649414062,
-        "y": 192.58634161949158,
-        "z": "fa825249.678d7",
+        "x": 188.71429443359375,
+        "y": 192.58645629882812,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "ef9a78fa.b0f5b8"
+                "f6ae267d.a135a8"
             ]
         ]
     },
     {
-        "id": "ae863831.900868",
+        "id": "91046601.99c4f8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -24,640 +24,640 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 215.29611206054688,
-        "y": 98.23810935020447,
-        "z": "fa825249.678d7",
+        "x": 177,
+        "y": 98.23822402954102,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "4c9b7636.16d1a8"
+                "108df9ad.e955a6"
             ]
         ]
     },
     {
-        "id": "3c4c41bd.66b0ee",
+        "id": "5961d5b2.76b41c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 136.01040649414062,
-        "y": 35.99999976158142,
-        "z": "fa825249.678d7",
+        "x": 97.71429443359375,
+        "y": 36.00011444091797,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "ae863831.900868"
+                "91046601.99c4f8"
             ]
         ]
     },
     {
-        "id": "ef9a78fa.b0f5b8",
+        "id": "f6ae267d.a135a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 246.67710876464844,
-        "y": 459.66673517227173,
-        "z": "fa825249.678d7",
+        "x": 208.38099670410156,
+        "y": 459.6668498516083,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "73502c25.0501b4",
-                "8ef64cba.b142",
-                "e7c6e1f4.291c4",
-                "5b7d49e0.41f2f8",
-                "8b01c2d1.84cd3",
-                "27503470.8bf84c",
-                "dce00f39.1d9f7",
-                "9d21b2cd.86c73",
-                "827a72ac.9aabf",
-                "67cd24d6.a0f83c",
-                "a35824b0.8bb6e8"
+                "d930c943.e6e998",
+                "8e7ede43.d475c",
+                "4ec60d6a.71f484",
+                "6a64350b.28076c",
+                "da14742e.a382e8",
+                "452859c9.e498f8",
+                "c7649fe7.d4fb9",
+                "9d43ca3e.815638",
+                "23273105.4d68be",
+                "7182ec74.f348c4",
+                "ebdf21b1.cc8c7"
             ]
         ]
     },
     {
-        "id": "8ef64cba.b142",
+        "id": "8e7ede43.d475c",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 559.0417709350586,
-        "y": 272.269140958786,
-        "z": "fa825249.678d7",
+        "x": 520.7456588745117,
+        "y": 272.26925563812256,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "11c14e91.a941a1"
+                "9e14817f.8f614"
             ]
         ]
     },
     {
-        "id": "73502c25.0501b4",
+        "id": "d930c943.e6e998",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 564.010425567627,
-        "y": 211.0000102519989,
-        "z": "fa825249.678d7",
+        "x": 525.7143135070801,
+        "y": 211.00012493133545,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "45acbb70.cf9d84"
+                "452f6a7.3541694"
             ]
         ]
     },
     {
-        "id": "45acbb70.cf9d84",
+        "id": "452f6a7.3541694",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 744.0104064941406,
-        "y": 209.99999976158142,
-        "z": "fa825249.678d7",
+        "x": 705.7142944335938,
+        "y": 210.00011444091797,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "1c305856.7d7878"
+                "25d0ddf2.3f4862"
             ]
         ]
     },
     {
-        "id": "1c305856.7d7878",
+        "id": "25d0ddf2.3f4862",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 893.4391326904297,
-        "y": 211.14291739463806,
-        "z": "fa825249.678d7",
+        "x": 855.1430206298828,
+        "y": 211.1430320739746,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "11c14e91.a941a1",
+        "id": "9e14817f.8f614",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 782.0104217529297,
-        "y": 273.0000059604645,
-        "z": "fa825249.678d7",
+        "x": 743.7143096923828,
+        "y": 273.000120639801,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "4a09a290.a75bbc"
+                "523175d4.98b7bc"
             ]
         ]
     },
     {
-        "id": "4a09a290.a75bbc",
+        "id": "523175d4.98b7bc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 997.0104064941406,
-        "y": 270.9999997615814,
-        "z": "fa825249.678d7",
+        "x": 958.7142944335938,
+        "y": 271.00011444091797,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "57c73c18.c834a4"
+                "a81758c8.bd7d68"
             ]
         ]
     },
     {
-        "id": "57c73c18.c834a4",
+        "id": "a81758c8.bd7d68",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1161.0104064941406,
-        "y": 265.9999997615814,
-        "z": "fa825249.678d7",
+        "x": 1122.7142944335938,
+        "y": 266.00011444091797,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "e7c6e1f4.291c4",
+        "id": "4ec60d6a.71f484",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 630.010440826416,
-        "y": 349.00002455711365,
-        "z": "fa825249.678d7",
+        "x": 591.7143287658691,
+        "y": 349.0001392364502,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "8cdd0772.dbdbf8",
-                "d22fa0c4.8a1a8",
-                "b6f26649.6b92a8"
+                "15b47ae.5174785",
+                "99344700.318bf8",
+                "fca663c0.b87bd"
             ]
         ]
     },
     {
-        "id": "d22fa0c4.8a1a8",
+        "id": "99344700.318bf8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 852.0104331970215,
-        "y": 383.0000340938568,
-        "z": "fa825249.678d7",
+        "x": 813.7143211364746,
+        "y": 383.00014877319336,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "1ebe6a81.7b0665"
+                "1da7bb0c.744515"
             ]
         ]
     },
     {
-        "id": "8cdd0772.dbdbf8",
+        "id": "15b47ae.5174785",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 857.0104293823242,
-        "y": 330.0000331401825,
-        "z": "fa825249.678d7",
+        "x": 818.7143173217773,
+        "y": 330.00014781951904,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "1ebe6a81.7b0665"
+                "1da7bb0c.744515"
             ]
         ]
     },
     {
-        "id": "1ebe6a81.7b0665",
+        "id": "1da7bb0c.744515",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1015.0104331970215,
-        "y": 343.0000340938568,
-        "z": "fa825249.678d7",
+        "x": 976.7143211364746,
+        "y": 343.00014877319336,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "b6f26649.6b92a8",
+        "id": "fca663c0.b87bd",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 852.0104331970215,
-        "y": 444.0000340938568,
-        "z": "fa825249.678d7",
+        "x": 813.7143211364746,
+        "y": 444.00014877319336,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "5d0462e8.482a9c"
+                "e8eea7a1.b01d68"
             ]
         ]
     },
     {
-        "id": "98248461.3994b8",
+        "id": "c4845e4b.47681",
         "type": "set",
         "name": "set vf-module_length",
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
         "comments": "",
-        "x": 1206.0104484558105,
-        "y": 442.0000480413437,
-        "z": "fa825249.678d7",
+        "x": 1167.7143363952637,
+        "y": 442.00016272068024,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "5d0462e8.482a9c",
+        "id": "e8eea7a1.b01d68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1013.0104789733887,
-        "y": 441.00002551078796,
-        "z": "fa825249.678d7",
+        "x": 974.7143669128418,
+        "y": 441.0001401901245,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "98248461.3994b8",
-                "bb5716e5.5eb1d8"
+                "c4845e4b.47681",
+                "5a93254.82122dc"
             ]
         ]
     },
     {
-        "id": "bb5716e5.5eb1d8",
+        "id": "5a93254.82122dc",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1225.0104179382324,
-        "y": 495.00002455711365,
-        "z": "fa825249.678d7",
+        "x": 1186.7143058776855,
+        "y": 495.0001392364502,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "56d74cea.fe48b4"
+                "aeb0ca88.3fa2d8"
             ]
         ]
     },
     {
-        "id": "56d74cea.fe48b4",
+        "id": "aeb0ca88.3fa2d8",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1468.0104331970215,
-        "y": 490.0000340938568,
-        "z": "fa825249.678d7",
+        "x": 1429.7143211364746,
+        "y": 490.00014877319336,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "2f21e786.1474c8"
+                "e81b9c86.1c484"
             ]
         ]
     },
     {
-        "id": "2f21e786.1474c8",
+        "id": "e81b9c86.1c484",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1709.0105609893799,
-        "y": 483.00003123283386,
-        "z": "fa825249.678d7",
+        "x": 1670.714448928833,
+        "y": 483.0001459121704,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "935557d5.b42b38"
+                "e2120549.90ce38"
             ]
         ]
     },
     {
-        "id": "935557d5.b42b38",
+        "id": "e2120549.90ce38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1861.0105323791504,
-        "y": 485.00002455711365,
-        "z": "fa825249.678d7",
+        "x": 1822.7144203186035,
+        "y": 485.0001392364502,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "b801dc09.3262a",
-                "fd33c1ac.d18c2",
-                "49806a1a.1b29c4"
+                "a9962147.95e54",
+                "a06c71d8.3073f",
+                "4f41068e.276488"
             ]
         ]
     },
     {
-        "id": "b801dc09.3262a",
+        "id": "a9962147.95e54",
         "type": "set",
         "name": "set tmp.vidx and ctx.vnf-data",
         "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",
         "comments": "",
-        "x": 2083.0105323791504,
-        "y": 481.00002455711365,
-        "z": "fa825249.678d7",
+        "x": 2044.7144203186035,
+        "y": 481.0001392364502,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "fd33c1ac.d18c2",
+        "id": "a06c71d8.3073f",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
         "comments": "",
-        "x": 2089.0105323791504,
-        "y": 530.0000245571136,
-        "z": "fa825249.678d7",
+        "x": 2050.7144203186035,
+        "y": 530.0001392364502,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "49806a1a.1b29c4",
+        "id": "4f41068e.276488",
         "type": "call",
-        "name": "call sdwan-get-vf-module-device-param",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' >\n",
+        "name": "call sdwan-get-wan-param",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2117.010753631592,
-        "y": 578.0000302791595,
-        "z": "fa825249.678d7",
+        "x": 2047.7146301269531,
+        "y": 577.0001640319824,
+        "z": "811cb3d0.df7",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b7d49e0.41f2f8",
+        "id": "6a64350b.28076c",
         "type": "switchNode",
         "name": "switch tmp.vidx ",
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 569.0416526794434,
-        "y": 522.0161073207855,
-        "z": "fa825249.678d7",
+        "x": 530.7455406188965,
+        "y": 522.0162220001221,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "93788503.77e6c8"
+                "81340348.a1108"
             ]
         ]
     },
     {
-        "id": "93788503.77e6c8",
+        "id": "81340348.a1108",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 716.4702949523926,
-        "y": 521.5875174999237,
-        "z": "fa825249.678d7",
+        "x": 678.1741828918457,
+        "y": 521.5876321792603,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "70fed172.85f44"
+                "11a722f5.6f62ed"
             ]
         ]
     },
     {
-        "id": "70fed172.85f44",
+        "id": "11a722f5.6f62ed",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 865.8990211486816,
-        "y": 522.7304351329803,
-        "z": "fa825249.678d7",
+        "x": 827.6029090881348,
+        "y": 522.7305498123169,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "8b01c2d1.84cd3",
+        "id": "da14742e.a382e8",
         "type": "switchNode",
         "name": "switch vf-module-oper-status",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 613.3398132324219,
-        "y": 592.3333127498627,
-        "z": "fa825249.678d7",
+        "x": 575.043701171875,
+        "y": 592.3334274291992,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "223c17b4.64b778",
-                "e9d52081.e76dc"
+                "f2a53e72.39754",
+                "a36c3118.17722"
             ]
         ]
     },
     {
-        "id": "223c17b4.64b778",
+        "id": "f2a53e72.39754",
         "type": "outcome",
         "name": "outcome PendingDelete",
         "xml": "<outcome value='PendingDelete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 904.1730804443359,
-        "y": 596.4444358348846,
-        "z": "fa825249.678d7",
+        "x": 865.8769683837891,
+        "y": 596.4445505142212,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "814b2c34.1fd7f"
+                "d03e05d1.e8c3f8"
             ]
         ]
     },
     {
-        "id": "e9d52081.e76dc",
+        "id": "a36c3118.17722",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 871.1732177734375,
-        "y": 648.4444885253906,
-        "z": "fa825249.678d7",
+        "x": 832.8771057128906,
+        "y": 648.4446032047272,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "714ed175.ddb84"
+                "9b8ea994.f38dc8"
             ]
         ]
     },
     {
-        "id": "714ed175.ddb84",
+        "id": "9b8ea994.f38dc8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
         "comments": "",
-        "x": 1030.6729850769043,
-        "y": 651.4444875717163,
-        "z": "fa825249.678d7",
+        "x": 992.3768730163574,
+        "y": 651.4446022510529,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "814b2c34.1fd7f",
+        "id": "d03e05d1.e8c3f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1101.4794807434082,
-        "y": 606.769590139389,
-        "z": "fa825249.678d7",
+        "x": 1063.1833686828613,
+        "y": 606.7697048187256,
+        "z": "811cb3d0.df7",
         "wires": [
             []
         ]
     },
     {
-        "id": "67cd24d6.a0f83c",
+        "id": "7182ec74.f348c4",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 562.031307220459,
-        "y": 966.0313129425049,
-        "z": "fa825249.678d7",
+        "x": 523.7351951599121,
+        "y": 966.0314276218414,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "27503470.8bf84c",
+        "id": "452859c9.e498f8",
         "type": "for",
         "name": "for lidx..service-data.vf-modules.vf-module[]",
         "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 644.1178894042969,
-        "y": 712.1424579620361,
-        "z": "fa825249.678d7",
+        "x": 605.82177734375,
+        "y": 712.1425726413727,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "666e6c4f.f97484"
+                "ae40c7e9.213d38"
             ]
         ]
     },
     {
-        "id": "dce00f39.1d9f7",
+        "id": "c7649fe7.d4fb9",
         "type": "set",
         "name": "set new vnf length",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
         "comments": "",
-        "x": 568.2192611694336,
-        "y": 764.9466757774353,
-        "z": "fa825249.678d7",
+        "x": 529.9231491088867,
+        "y": 764.9467904567719,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "9d21b2cd.86c73",
+        "id": "9d43ca3e.815638",
         "type": "set",
         "name": "Remove vnf from ServiceData",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",
         "comments": "",
-        "x": 605.1179351806641,
-        "y": 815.1424608230591,
-        "z": "fa825249.678d7",
+        "x": 566.8218231201172,
+        "y": 815.1425755023956,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "666e6c4f.f97484",
+        "id": "ae40c7e9.213d38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 904.1178798675537,
-        "y": 719.1423177719116,
-        "z": "fa825249.678d7",
+        "x": 865.8217678070068,
+        "y": 719.1424324512482,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "46998b08.18a904"
+                "e08d014a.44fec"
             ]
         ]
     },
     {
-        "id": "a35824b0.8bb6e8",
+        "id": "ebdf21b1.cc8c7",
         "type": "delete",
         "name": "delete wanport vf instance configuration in AAI",
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='site-resource' \n        key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 654.1183090209961,
-        "y": 906.4041156768799,
-        "z": "fa825249.678d7",
+        "x": 615.8221969604492,
+        "y": 906.4042303562164,
+        "z": "811cb3d0.df7",
         "wires": [
             []
         ]
     },
     {
-        "id": "46998b08.18a904",
+        "id": "e08d014a.44fec",
         "type": "switchNode",
         "name": "switch vnf-id found",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.vf-module-information.vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1090.1179466247559,
-        "y": 719.1424784660339,
-        "z": "fa825249.678d7",
+        "x": 1051.821834564209,
+        "y": 719.1425931453705,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "52431b6f.b34934"
+                "eabeafc3.ee56a"
             ]
         ]
     },
     {
-        "id": "52431b6f.b34934",
+        "id": "eabeafc3.ee56a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1259.1179542541504,
-        "y": 718.142315864563,
-        "z": "fa825249.678d7",
+        "x": 1220.8218421936035,
+        "y": 718.1424305438995,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "2b619a80.4a9f36"
+                "d4085bbc.a3d7c8"
             ]
         ]
     },
     {
-        "id": "2b619a80.4a9f36",
+        "id": "d4085bbc.a3d7c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1413.117793083191,
-        "y": 710.1423168182373,
-        "z": "fa825249.678d7",
+        "x": 1374.821681022644,
+        "y": 710.1424314975739,
+        "z": "811cb3d0.df7",
         "wires": [
             [
-                "466caa7f.55c334",
-                "921821fe.9836b"
+                "69725eb0.1ff91",
+                "c86d78ea.65d938"
             ]
         ]
     },
     {
-        "id": "466caa7f.55c334",
+        "id": "69725eb0.1ff91",
         "type": "set",
         "name": "set  vnf data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\n",
         "comments": "",
-        "x": 1578.1178884506226,
-        "y": 685.1424722671509,
-        "z": "fa825249.678d7",
+        "x": 1539.8217763900757,
+        "y": 685.1425869464874,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "921821fe.9836b",
+        "id": "c86d78ea.65d938",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
         "comments": "",
-        "x": 1600.1178884506226,
-        "y": 741.1424360275269,
-        "z": "fa825249.678d7",
+        "x": 1561.8217763900757,
+        "y": 741.1425507068634,
+        "z": "811cb3d0.df7",
         "wires": []
     },
     {
-        "id": "827a72ac.9aabf",
+        "id": "23273105.4d68be",
         "type": "set",
         "name": "set vf-module-object-path",
         "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",
         "comments": "",
-        "x": 591.9201431274414,
-        "y": 860.4757957458496,
-        "z": "fa825249.678d7",
+        "x": 553.6240310668945,
+        "y": 860.4759104251862,
+        "z": "811cb3d0.df7",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index a049e64e..065a656b 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -229,3 +229,29 @@ GENERIC-RESOURCE-API wan-connection-topology-operation-create ${project.version}
 GENERIC-RESOURCE-API wan-connection-topology-operation-activate ${project.version} sync
 GENERIC-RESOURCE-API wan-connection-topology-operation-deactivate ${project.version} sync
 GENERIC-RESOURCE-API wan-connection-topology-operation-delete ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-device-create ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-device-activate ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-device-deactivate ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-device-delete ${project.version} sync
+GENERIC-RESOURCE-API sdwan-get-vf-module-device-param  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-site-create  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-site-activate  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-site-deactivate  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-site-delete  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-get-vf-module-site-param  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-wanport-create  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-wanport-activate  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-wanport-deactivate  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-wanport-delete  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-get-wan-param  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-vpn-create  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-vpn-activate  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-vpn-deactivate  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-vpn-delete  ${project.version} sync
+GENERIC-RESOURCE-API validate-sdwan-vf-vpn-input-parameters  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-lanport-create  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-lanport-activate  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-lanport-deactivate  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-vf-operation-lanport-delete  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-get-vf-module-lanport-param  ${project.version} sync
+GENERIC-RESOURCE-API sdwan-bandwidth-policy-change  ${project.version} sync
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml
index 0c728d4b..a108518a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml
@@ -52,7 +52,7 @@
                                         <set>
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
                                         </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' ></call>
                                     </block>
                                 </outcome>
                             </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml
index 587f6cc0..710925da 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml
@@ -52,7 +52,7 @@
                                         <set>
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
                                         </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' ></call>
                                     </block>
                                 </outcome>
                             </switch>