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

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 587f6cc..710925d 100644 (file)
--- 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>\r
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\r
                                         </set>\r
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' ></call>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' ></call>\r
                                     </block>\r
                                 </outcome>\r
                             </switch>\r