From: shashikanth.vh <shashikanth.vh@huawei.com>
Date: Fri, 19 Apr 2019 07:53:39 +0000 (+0000)
Subject: SDWAN device oper status not updated in AAI
X-Git-Tag: 1.5.1~23^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=ac7aff096f2d605657aa57ece8d2bc8426354cbb

SDWAN device oper status not updated in AAI

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
---

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