SDWAN device oper status not updated in AAI 67/85767/1
authorshashikanth.vh <shashikanth.vh@huawei.com>
Fri, 19 Apr 2019 07:53:39 +0000 (07:53 +0000)
committershashikanth.vh <shashikanth.vh@huawei.com>
Fri, 19 Apr 2019 07:53:52 +0000 (07:53 +0000)
fixed few issues
1.calling sube DG sdwan-get-tenant-auth
not required
2.AAI device not updated with active on device activate

Change-Id: Ib782c0db8735c446b018412a0865df65ef55f10d
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 59e7b1c3ed08541fd712af64c897441306954c1d

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

index d02748c..4e36776 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "66d617ca.7974e8",\r
+        "id": "7366a05a.d05f2",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 166.00390625,\r
-        "y": 42.000000953674316,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 188.03125,\r
+        "y": 47.000000953674316,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "ec960184.8c747"\r
+                "e3bd5c4c.51008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec960184.8c747",\r
+        "id": "e3bd5c4c.51008",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 245.28961181640625,\r
-        "y": 104.23811054229736,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 267.31695556640625,\r
+        "y": 109.23811054229736,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "b566667e.9703e8"\r
+                "1596b30b.8477dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b566667e.9703e8",\r
+        "id": "1596b30b.8477dd",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-device-activate",\r
         "xml": "<method rpc='sdwan-vf-operation-device-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 257.00390625,\r
-        "y": 198.58634281158447,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 279.03125,\r
+        "y": 203.58634281158447,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "48de3c23.140fd4"\r
+                "f1b88e0f.347c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48de3c23.140fd4",\r
+        "id": "f1b88e0f.347c2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 243.6705780029297,\r
-        "y": 383.6667146682739,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 265.6979217529297,\r
+        "y": 388.6667146682739,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "9b8b15e3.9d27d8",\r
-                "22c945bf.bff90a",\r
-                "7a7ac9c1.d1c088",\r
-                "3bb5998d.d31786",\r
-                "6b9873c1.ed3cac",\r
-                "496cf1c2.09334",\r
-                "ab75124f.85f25",\r
-                "b9df134a.f3234",\r
-                "ad243b23.84cc68",\r
-                "d63a100a.4fb85",\r
-                "fba80bcb.537e38",\r
-                "45830f23.d0369",\r
-                "d2ac70a8.01bbc",\r
-                "104a605b.c517a",\r
-                "2b5c22d1.d99c1e",\r
-                "673290e1.c0902",\r
-                "4d09bded.34c944",\r
-                "d9f0bb67.a6d688"\r
+                "bfdad516.55b728",\r
+                "c5688842.c82648",\r
+                "43050414.43a59c",\r
+                "18e2b9c5.c15ab6",\r
+                "96bc0bad.d1b6d8",\r
+                "1fac2e8e.1cd261",\r
+                "ec973dfa.2bb02",\r
+                "c8253bec.651ed8",\r
+                "6a3f667b.faa1c8",\r
+                "6e068351.b1d5ac",\r
+                "bad73f6e.5a9bd",\r
+                "c48e860.5ae0278",\r
+                "eb6bd181.9cba1",\r
+                "dcfcf0d8.7769b",\r
+                "bb4fec85.4dd7b",\r
+                "79ce744.767cc8c",\r
+                "503505b2.fa936c",\r
+                "f2facc44.32ff4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22c945bf.bff90a",\r
+        "id": "c5688842.c82648",\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": 589.035270690918,\r
-        "y": 278.2691421508789,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 594.0626163482666,\r
+        "y": 256.26913380622864,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "936d4e00.f8f0f"\r
+                "30e4aafc.b14b26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b8b15e3.9d27d8",\r
+        "id": "bfdad516.55b728",\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": 594.0039253234863,\r
-        "y": 217.0000114440918,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 616.0312690734863,\r
+        "y": 222.0000114440918,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "e59760b9.c5416"\r
+                "46627c7a.59d634"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e59760b9.c5416",\r
+        "id": "46627c7a.59d634",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 774.00390625,\r
-        "y": 216.00000095367432,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 796.03125,\r
+        "y": 221.00000095367432,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "76bc4811.c948a8"\r
+                "b77e7e6.92ec98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76bc4811.c948a8",\r
+        "id": "b77e7e6.92ec98",\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": 923.4326324462891,\r
-        "y": 217.14291858673096,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 945.4599761962891,\r
+        "y": 222.14291858673096,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "936d4e00.f8f0f",\r
+        "id": "30e4aafc.b14b26",\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": 812.0039215087891,\r
-        "y": 279.0000071525574,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 817.0312671661377,\r
+        "y": 256.9999988079071,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "70d6072a.9e11d8"\r
+                "507916d8.8412f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70d6072a.9e11d8",\r
+        "id": "507916d8.8412f8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1027.00390625,\r
-        "y": 277.0000009536743,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1032.0312519073486,\r
+        "y": 254.99999260902405,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "ea0a9e13.79435"\r
+                "1abf62f5.2b1d9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea0a9e13.79435",\r
+        "id": "1abf62f5.2b1d9d",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1191.00390625,\r
-        "y": 272.0000009536743,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1196.0312519073486,\r
+        "y": 249.99999260902405,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a7ac9c1.d1c088",\r
+        "id": "43050414.43a59c",\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": 639.0039138793945,\r
-        "y": 349.99999141693115,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 661.0312576293945,\r
+        "y": 354.99999141693115,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "f88f2a92.99e738",\r
-                "cbbc80b7.cd82",\r
-                "d281c228.3bb21"\r
+                "e26b2607.2a2748",\r
+                "a2e81bf7.01bb98",\r
+                "41da8842.556048"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbbc80b7.cd82",\r
+        "id": "a2e81bf7.01bb98",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 861.00390625,\r
-        "y": 384.0000009536743,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 883.03125,\r
+        "y": 389.0000009536743,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "3e09921b.36399e"\r
+                "837a0388.6ec21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f88f2a92.99e738",\r
+        "id": "e26b2607.2a2748",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 866.0039024353027,\r
-        "y": 331,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 888.0312461853027,\r
+        "y": 336,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "3e09921b.36399e"\r
+                "837a0388.6ec21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e09921b.36399e",\r
+        "id": "837a0388.6ec21",\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": 1024.00390625,\r
-        "y": 344.0000009536743,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1046.03125,\r
+        "y": 349.0000009536743,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d281c228.3bb21",\r
+        "id": "41da8842.556048",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 861.00390625,\r
-        "y": 445.0000009536743,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 883.03125,\r
+        "y": 450.0000009536743,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "8e3c57a1.dadbf8"\r
+                "1f4e644a.d7030c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c0936c1.7617c8",\r
+        "id": "7a6fd972.23f808",\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": 1215.003921508789,\r
-        "y": 443.0000149011612,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1237.031265258789,\r
+        "y": 448.0000149011612,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8e3c57a1.dadbf8",\r
+        "id": "1f4e644a.d7030c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1022.0039520263672,\r
-        "y": 441.99999237060547,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1044.0312957763672,\r
+        "y": 446.99999237060547,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "8c0936c1.7617c8",\r
-                "28692055.9016f",\r
-                "a8eb8c24.f4a0f"\r
+                "7a6fd972.23f808",\r
+                "bc92f3b3.aa654",\r
+                "67e2e66a.9bd638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28692055.9016f",\r
+        "id": "bc92f3b3.aa654",\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": 1234.003890991211,\r
-        "y": 495.99999141693115,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1256.031234741211,\r
+        "y": 500.99999141693115,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "73f639ab.d244b8"\r
+                "af0c0219.f27c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73f639ab.d244b8",\r
+        "id": "af0c0219.f27c4",\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": 1477.00390625,\r
-        "y": 491.0000009536743,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1499.03125,\r
+        "y": 496.0000009536743,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "fdba254c.4c6898"\r
+                "c50413ad.70d3b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdba254c.4c6898",\r
+        "id": "c50413ad.70d3b",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1675.0039348602295,\r
-        "y": 478.00000762939453,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1697.0312786102295,\r
+        "y": 483.00000762939453,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "e324ecda.ee495"\r
+                "c8462944.d3d558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e324ecda.ee495",\r
+        "id": "c8462944.d3d558",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1827.00390625,\r
-        "y": 480.0000009536743,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1849.03125,\r
+        "y": 485.0000009536743,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "a7ad0572.bfda18",\r
-                "1d9eaeb3.112c31",\r
-                "96aaf259.9b5e1"\r
+                "e39cc1dd.da5e8",\r
+                "3673863c.1c835a",\r
+                "ccfc5c32.59e5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7ad0572.bfda18",\r
+        "id": "e39cc1dd.da5e8",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vf-module-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": 2076.004005432129,\r
-        "y": 474.0000033378601,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 2102.0314903259277,\r
+        "y": 413.0000123977661,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d9eaeb3.112c31",\r
+        "id": "3673863c.1c835a",\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": 2065.004005432129,\r
-        "y": 525.000036239624,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 2086.0313682556152,\r
+        "y": 474.0000581741333,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "96aaf259.9b5e1",\r
+        "id": "ccfc5c32.59e5f",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2096.0042114257812,\r
-        "y": 572.0000371932983,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 2118.0315475463867,\r
+        "y": 531.0000734329224,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6b9873c1.ed3cac",\r
-        "type": "record",\r
-        "name": "record",\r
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Provided alloted resource length\"/>\n<parameter name=\"field3\" value=\"'parameters length'\"/>\n<parameter name=\"field4\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'/>\n\n\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 554.0039806365967,\r
-        "y": 576.0000066757202,\r
-        "z": "487c8439.e79e0c",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "3bb5998d.d31786",\r
+        "id": "18e2b9c5.c15ab6",\r
         "type": "switchNode",\r
         "name": "switch tmp.vidx ",\r
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 578.0351257324219,\r
-        "y": 523.016074180603,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 598.0624961853027,\r
+        "y": 489.0160655975342,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "68156871.093ed8"\r
+                "8c2388b0.edeb08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68156871.093ed8",\r
+        "id": "8c2388b0.edeb08",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 725.4637680053711,\r
-        "y": 522.5874843597412,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 745.491138458252,\r
+        "y": 488.58747577667236,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "749cf44f.03bbfc"\r
+                "9db89e13.5611a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "749cf44f.03bbfc",\r
+        "id": "9db89e13.5611a",\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": 874.8924942016602,\r
-        "y": 523.7304019927979,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 894.919864654541,\r
+        "y": 489.730393409729,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9df134a.f3234",\r
+        "id": "ec973dfa.2bb02",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 585.0351448059082,\r
-        "y": 625.0160593986511,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 603.0625228881836,\r
+        "y": 535.016065120697,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa016c6e.8bda5",\r
+        "id": "c738eb6c.67a768",\r
         "type": "comment",\r
         "name": "make sure this VNF doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1307.4205932617188,\r
-        "y": 1212.2502059936523,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1343.4479675292969,\r
+        "y": 984.2502048015594,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b5c22d1.d99c1e",\r
+        "id": "eb6bd181.9cba1",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create Devcie Instance",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-device.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"deviceResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 673.0080718994141,\r
-        "y": 1216.424148797989,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 692.0354614257812,\r
+        "y": 990.4241485595703,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "9ca787d1.dfba38",\r
-                "a187483b.9fc538"\r
+                "5fa43c53.6045a4",\r
+                "6960119.9f640f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69b97572.5eed5c",\r
+        "id": "faa94bad.fa2558",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1074.6745147705078,\r
-        "y": 1186.3128004074097,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1110.701889038086,\r
+        "y": 958.3127992153168,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d59ec52f.21c8f8",\r
+        "id": "706df2c3.ee526c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Activate Device rest api\" />\n",\r
         "comments": "",\r
-        "x": 1076.1190948486328,\r
-        "y": 1236.868332862854,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1112.146469116211,\r
+        "y": 1008.8683316707611,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a187483b.9fc538",\r
+        "id": "6960119.9f640f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 923.1189384460449,\r
-        "y": 1239.8682870864868,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 959.146312713623,\r
+        "y": 1011.8682858943939,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "d59ec52f.21c8f8"\r
+                "706df2c3.ee526c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ca787d1.dfba38",\r
+        "id": "5fa43c53.6045a4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 922.5634536743164,\r
-        "y": 1183.5349988937378,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 958.5908279418945,\r
+        "y": 955.5349977016449,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "69b97572.5eed5c"\r
+                "faa94bad.fa2558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "104a605b.c517a",\r
-        "type": "call",\r
-        "name": "call sdwan-get-tenant-auth",\r
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 590.0001373291016,\r
-        "y": 1160.5913829803467,\r
-        "z": "487c8439.e79e0c",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "ab75124f.85f25",\r
+        "id": "1fac2e8e.1cd261",\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": 552.0041103363037,\r
-        "y": 1641.5002851486206,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 588.0314846038818,\r
+        "y": 1413.5002839565277,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "496cf1c2.09334",\r
+        "id": "96bc0bad.d1b6d8",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
         "comments": "",\r
-        "x": 597.3373680114746,\r
-        "y": 1531.8336429595947,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 633.3647422790527,\r
+        "y": 1303.8336417675018,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5763663a.274778",\r
+        "id": "503505b2.fa936c",\r
         "type": "save",\r
         "name": "update deviceInstance configuration in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='device-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<!--parameter name='device-id' value='`$deviceResp.success[0].id`' /-->\n<parameter name='operational-status' value='Active' />\n",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='device-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 632.6708755493164,\r
-        "y": 1584.722743988037,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 680.6982574462891,\r
+        "y": 1352.723069190979,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fba80bcb.537e38",\r
+        "id": "6e068351.b1d5ac",\r
         "type": "set",\r
         "name": "set deviceId to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value=\"deviceId\" />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$deviceResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 593.6709938049316,\r
-        "y": 1315.7538223266602,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 629.6983680725098,\r
+        "y": 1087.7538211345673,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad243b23.84cc68",\r
+        "id": "c8253bec.651ed8",\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": 576.0041046142578,\r
-        "y": 1474.2504119873047,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 612.0314788818359,\r
+        "y": 1246.2504107952118,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d9f0bb67.a6d688",\r
+        "id": "79ce744.767cc8c",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 620.0086822509766,\r
-        "y": 725.8936567306519,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 634.0360374450684,\r
+        "y": 583.8936786651611,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "24c130a1.06544",\r
-                "1c6d2fc3.9d47f",\r
-                "d711f941.efb278"\r
+                "27c395d1.cc99aa",\r
+                "a15c5f02.651f",\r
+                "8a9a7c18.8150d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24c130a1.06544",\r
+        "id": "27c395d1.cc99aa",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 865.008659362793,\r
-        "y": 668.8936103284359,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 856.0360660552979,\r
+        "y": 542.8936786651611,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "e6538e05.e2e95"\r
+                "fcc107ae.11a1d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c6d2fc3.9d47f",\r
+        "id": "a15c5f02.651f",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 868.499626159668,\r
-        "y": 716.4676459729671,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 859.5270328521729,\r
+        "y": 590.4677143096924,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "8c8ed57c.0ce668"\r
+                "a0280dad.4672"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d711f941.efb278",\r
+        "id": "8a9a7c18.8150d",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 863.832633972168,\r
-        "y": 757.8009589612484,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 854.8600406646729,\r
+        "y": 631.8010272979736,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "37c7dcba.fd9d34"\r
+                "59e30e0a.ba719"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6538e05.e2e95",\r
+        "id": "fcc107ae.11a1d8",\r
         "type": "set",\r
         "name": "set controller data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
         "comments": "",\r
-        "x": 1062.5087203979492,\r
-        "y": 656.8936103284359,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1053.536127090454,\r
+        "y": 530.8936786651611,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c8ed57c.0ce668",\r
+        "id": "a0280dad.4672",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1045.0710372924805,\r
-        "y": 704.7533820569515,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1036.0984439849854,\r
+        "y": 578.7534503936768,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37c7dcba.fd9d34",\r
+        "id": "59e30e0a.ba719",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1051.6051902770996,\r
-        "y": 753.24015173316,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1042.6325969696045,\r
+        "y": 627.2402200698853,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d09bded.34c944",\r
+        "id": "bb4fec85.4dd7b",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 628.008659362793,\r
-        "y": 833.893609046936,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 634.0360565185547,\r
+        "y": 691.8935861587524,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "68b0f825.949708",\r
-                "3ec68637.c0dbea"\r
+                "e3fdea02.bef5f8",\r
+                "510fc414.2ace1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68b0f825.949708",\r
+        "id": "e3fdea02.bef5f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 867.008731842041,\r
-        "y": 811.8936405181885,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 873.0361289978027,\r
+        "y": 669.8936176300049,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "ea7ef978.26d9b8"\r
+                "59b687d7.302ac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ec68637.c0dbea",\r
+        "id": "510fc414.2ace1c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 859.258731842041,\r
-        "y": 865.5365238189697,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 865.2861289978027,\r
+        "y": 723.5365009307861,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "6b38fd7f.9697a4"\r
+                "7a4deae6.6f0ce4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea7ef978.26d9b8",\r
+        "id": "59b687d7.302ac8",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1017.008659362793,\r
-        "y": 812.893609046936,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1023.0360565185547,\r
+        "y": 670.8935861587524,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6b38fd7f.9697a4",\r
+        "id": "7a4deae6.6f0ce4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 1012.008731842041,\r
-        "y": 865.286584854126,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1018.0361289978027,\r
+        "y": 723.2865619659424,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2ac70a8.01bbc",\r
+        "id": "c48e860.5ae0278",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 549.7587051391602,\r
-        "y": 1079.8937320709229,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 573.7860565185547,\r
+        "y": 900.8937749862671,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "c50d0af9.6eaaa8"\r
+                "bc9e7395.79f5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c50d0af9.6eaaa8",\r
+        "id": "bc9e7395.79f5e",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create network orchestration",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-network-orchestration.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"orchestration-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 868.2587966918945,\r
-        "y": 1082.8938932418823,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 892.2861480712891,\r
+        "y": 903.8939361572266,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "673290e1.c0902",\r
+        "id": "dcfcf0d8.7769b",\r
         "type": "get-resource",\r
         "name": "get-resource service-subscription",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 604.0802001953125,\r
-        "y": 984.5722246170044,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 628.107551574707,\r
+        "y": 805.5722675323486,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "3dede820.fe1e48",\r
-                "221b4119.4d74ce"\r
+                "1d2a1174.f60a5f",\r
+                "af67f570.499af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a417e40c.ac4638",\r
+        "id": "14d246ea.4d18f9",\r
         "type": "switchNode",\r
         "name": "switch temp-ub-sub-account-id",\r
         "xml": "<switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1016.0802917480469,\r
-        "y": 949.3223056793213,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1040.1076431274414,\r
+        "y": 770.3223485946655,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "d1aef225.461ff",\r
-                "30bdca8a.d90ec6"\r
+                "a01e54d0.c0ef88",\r
+                "8e84ac75.03435"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1aef225.461ff",\r
+        "id": "a01e54d0.c0ef88",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1208.794750213623,\r
-        "y": 923.322338104248,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1232.8221015930176,\r
+        "y": 744.3223810195923,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "b031c826.3fa048"\r
+                "5b46bfcb.e107"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30bdca8a.d90ec6",\r
+        "id": "8e84ac75.03435",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1209.080307006836,\r
-        "y": 978.3223094940186,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1233.1076583862305,\r
+        "y": 799.3223524093628,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "85a88d68.7da4e"\r
+                "f1e78a9c.989338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "927bbae7.3f69d8",\r
+        "id": "305c6a3e.5caf76",\r
         "type": "set",\r
         "name": "set prop.tenant-id",\r
         "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\n",\r
         "comments": "",\r
-        "x": 1456.5088996887207,\r
-        "y": 1063.4651098251343,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1480.5362510681152,\r
+        "y": 884.4651527404785,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b031c826.3fa048",\r
+        "id": "5b46bfcb.e107",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1348.2586479187012,\r
-        "y": 923.6436066627502,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1372.2859992980957,\r
+        "y": 744.6436495780945,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "e230776c.5a9d58",\r
-                "3aed4c7a.4aaa14",\r
-                "be32cece.2100a",\r
-                "e41ff38c.c7009",\r
-                "93c1362e.aa2c78",\r
-                "a9cddfc0.c31fc",\r
-                "7328f02d.f9128"\r
+                "e65ad869.b6a738",\r
+                "33daccfa.fa4ad4",\r
+                "a292b1f1.50e1",\r
+                "89d28fc6.070cc",\r
+                "5b1692a.ed07e6c",\r
+                "628cc8d7.dc94c8",\r
+                "306fdb54.fea144"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e41ff38c.c7009",\r
+        "id": "89d28fc6.070cc",\r
         "type": "set",\r
         "name": "set prop.customer-id",\r
         "xml": "<set>\n<parameter name='prop.customer-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.global-customer-id`' />\n",\r
         "comments": "",\r
-        "x": 1559.901756286621,\r
-        "y": 734.2151670455933,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1583.9291076660156,\r
+        "y": 555.2152099609375,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e230776c.5a9d58",\r
+        "id": "e65ad869.b6a738",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create tenant",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-tenant.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v2/baseservice/tenants'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1618.9015731811523,\r
-        "y": 864.7864580154419,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1642.9289245605469,\r
+        "y": 685.7865009307861,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3aed4c7a.4aaa14",\r
+        "id": "33daccfa.fa4ad4",\r
         "type": "set",\r
         "name": "set prop.tenant-id",\r
         "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />\n",\r
         "comments": "",\r
-        "x": 1561.7588653564453,\r
-        "y": 962.6436986923218,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1585.7862167358398,\r
+        "y": 783.643741607666,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "be32cece.2100a",\r
+        "id": "a292b1f1.50e1",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create tenant auth",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v2/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1637.2588348388672,\r
-        "y": 1013.3937277793884,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1661.2861862182617,\r
+        "y": 834.3937706947327,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "93c1362e.aa2c78",\r
+        "id": "5b1692a.ed07e6c",\r
         "type": "get-resource",\r
         "name": "update-resource customer-id in service-subscription",\r
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.global-customer-id'>\n<parameter name='temp-ub-sub-account-id' value='`$tenant-result.data.tenantId`' />\n<!--parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' /-->\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1660.1873016357422,\r
-        "y": 915.7865858078003,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1684.2146530151367,\r
+        "y": 736.7866287231445,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3dede820.fe1e48",\r
+        "id": "1d2a1174.f60a5f",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 814.5800628662109,\r
-        "y": 957.3182830810547,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 838.6074142456055,\r
+        "y": 778.3183259963989,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "a417e40c.ac4638"\r
+                "14d246ea.4d18f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "221b4119.4d74ce",\r
+        "id": "af67f570.499af8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 808.2586517333984,\r
-        "y": 1009.5325946807861,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 832.286003112793,\r
+        "y": 830.5326375961304,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "13b27219.75f72e"\r
+                "10c51d46.007b83"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13b27219.75f72e",\r
+        "id": "10c51d46.007b83",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 961.0086517333984,\r
-        "y": 1009.2826557159424,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 985.036003112793,\r
+        "y": 830.2826986312866,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "85a88d68.7da4e",\r
+        "id": "f1e78a9c.989338",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1267.7310638427734,\r
-        "y": 1061.4693012237549,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1291.758415222168,\r
+        "y": 882.4693441390991,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             [\r
-                "927bbae7.3f69d8",\r
-                "cc5300b4.c716d"\r
+                "305c6a3e.5caf76",\r
+                "f8f4d633.b36da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc5300b4.c716d",\r
+        "id": "f8f4d633.b36da8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create tenant auth",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v2/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1539.1596603393555,\r
-        "y": 1110.0407037734985,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1563.18701171875,\r
+        "y": 931.0407466888428,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a9cddfc0.c31fc",\r
+        "id": "628cc8d7.dc94c8",\r
         "type": "set",\r
         "name": "set prop.userAccount",\r
         "xml": "<set>\n<parameter name='prop.userAccount' value='`$tmp.userAccountEmail`' />\n<parameter name='prop.userEmail' value='`$tmp.userAccountEmail`' />",\r
         "comments": "",\r
-        "x": 1571.008659362793,\r
-        "y": 816.889702796936,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1595.0360107421875,\r
+        "y": 637.8897457122803,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7328f02d.f9128",\r
+        "id": "306fdb54.fea144",\r
         "type": "execute",\r
         "name": "execute concat customer-id and @test.com",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$prop.customer-id`'/>\n    <parameter name=\"outputPath\" value=\"tmp.userAccountEmail\"/>\n    <parameter name=\"target\" value=\"@test.com\"/>\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1635.0125350952148,\r
-        "y": 775.8936452865601,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1659.0398864746094,\r
+        "y": 596.8936882019043,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a8eb8c24.f4a0f",\r
+        "id": "67e2e66a.9bd638",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic1.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"vf-module-id-input\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`'/>\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1182.3333740234375,\r
-        "y": 378,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 1204.3607177734375,\r
+        "y": 383,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d63a100a.4fb85",\r
+        "id": "6a3f667b.faa1c8",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='Active' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",\r
         "comments": "",\r
-        "x": 597.0001373291016,\r
-        "y": 1410.3333740234375,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 633.0275115966797,\r
+        "y": 1182.3333728313446,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45830f23.d0369",\r
+        "id": "bad73f6e.5a9bd",\r
         "type": "set",\r
         "name": "increment param length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />\n",\r
         "comments": "",\r
-        "x": 580.0000553131104,\r
-        "y": 1360.0000801086426,\r
-        "z": "487c8439.e79e0c",\r
+        "x": 616.0274295806885,\r
+        "y": 1132.0000789165497,\r
+        "z": "b6c1c029.17cd1",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f2facc44.32ff4",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 605.0520858764648,\r
+        "y": 301.0312559604645,\r
+        "z": "b6c1c029.17cd1",\r
+        "wires": [\r
+            [\r
+                "4089ca12.07b054"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4089ca12.07b054",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 767.052131652832,\r
+        "y": 300.03125500679016,\r
+        "z": "b6c1c029.17cd1",\r
+        "wires": [\r
+            [\r
+                "3c7c191c.e210a6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3c7c191c.e210a6",\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 id not found in service-data\" />\n",\r
+        "comments": "",\r
+        "x": 916.3022232055664,\r
+        "y": 297.80913281440735,\r
+        "z": "b6c1c029.17cd1",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 3e57bbc..4bd3821 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <switch test='`$vnf-index`'>\r
+                <outcome value=''>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="vnf id not found in service-data" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value='0'>\r
                     <return status='failure'>\r
                     </return>\r
                 </outcome>\r
             </switch>\r
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>\r
-                <parameter name="field1" value="__TIMESTAMP__"/>\r
-                <parameter name="field2" value="Provided alloted resource length"/>\r
-                <parameter name="field3" value="'parameters length'"/>\r
-                <parameter name="field4" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'/>\r
-            </record>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
                     <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                 </execute>\r
             </block>\r
-            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-device.json'`" />\r
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`" />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\r
             </set>\r
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \r
+      key='device.device-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
+                <parameter name='device-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
+                <parameter name='operational-status' value='Active' />\r
+            </update>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r