From c85a0909e1b94a11627fdbba9cee2162659e5237 Mon Sep 17 00:00:00 2001
From: Lathish <lathishbabu.ganesan@est.tech>
Date: Tue, 18 Jun 2019 10:16:16 +0000
Subject: Added cvaas file name in Audit and Sync

Issue-ID: APPC-1590
Change-Id: I09345570fe6cd158102844070e62df7fb1a7aed9
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>
---
 .../APPC_method_Generic_Audit_2.0.0.json           |  981 ++++++++---------
 .../APPC_method_Generic_Sync_2.0.0.json            | 1127 ++++++++++----------
 2 files changed, 1067 insertions(+), 1041 deletions(-)

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
index 1cc18c216..ef430e2f0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "81a02ecc.e61b6",
+        "id": "a1ddbe8e.b4dbc",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 119.66666412353516,
+        "x": 79.9999008178711,
         "y": 84.08333426713943,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "98597336.3c647"
+                "e360e3ba.7207b"
             ]
         ]
     },
     {
-        "id": "98597336.3c647",
+        "id": "e360e3ba.7207b",
         "type": "service-logic",
         "name": "APPC 2.0.0",
         "module": "APPC",
@@ -22,1738 +22,1751 @@
         "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='APPC' version='2.0.0'>",
         "outputs": 1,
-        "x": 299.66666412353516,
+        "x": 259.9999008178711,
         "y": 84.08333426713943,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "3dddb84a.a123f8"
+                "58cb5c35.937564"
             ]
         ]
     },
     {
-        "id": "3dddb84a.a123f8",
+        "id": "58cb5c35.937564",
         "type": "method",
         "name": "Generic_Audit",
         "xml": "<method rpc='Generic_Audit' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 478.66666412353516,
+        "x": 438.9999008178711,
         "y": 84.08333426713943,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "d043d660.7cbce8"
+                "3ee4c4de.552a6c"
             ]
         ]
     },
     {
-        "id": "7490fc55.b23eb4",
+        "id": "e5f14ebc.cf689",
         "type": "get-resource",
         "name": "Retrieve current config details",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"SELECT service_description, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address , content FROM UPLOAD_CONFIG WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator='Current' AND (pending_delete IS NULL OR pending_delete != 'Y')\" pfx=\"currnt-config[]\">",
         "comments": "",
         "outputs": 1,
-        "x": 458.08617401123047,
+        "x": 418.4194107055664,
         "y": 480.8665657043457,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "dceb4c56.95345",
-                "a55ef9f.1845d08",
-                "7c43698a.2b9eb8"
+                "1ccf8df.0979972",
+                "610affd8.9bb53",
+                "8b38226c.79a46"
             ]
         ]
     },
     {
-        "id": "7c43698a.2b9eb8",
+        "id": "8b38226c.79a46",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 733.3759384155273,
+        "x": 693.7091751098633,
         "y": 418.58686447143555,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "90511868.d5a528"
+                "abda2920.c300c8"
             ]
         ]
     },
     {
-        "id": "dceb4c56.95345",
+        "id": "1ccf8df.0979972",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>",
         "comments": "",
         "outputs": 1,
-        "x": 740.3759994506836,
+        "x": 700.7092361450195,
         "y": 483.3646430969238,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "867bd8aa.3a55e8"
+                "7b5505bd.5ebf1c"
             ]
         ]
     },
     {
-        "id": "a55ef9f.1845d08",
+        "id": "610affd8.9bb53",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 672.5982284545898,
+        "x": 632.9314651489258,
         "y": 533.0313148498535,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "30e459ed.1b9986"
+                "e753f26f.d2196"
             ]
         ]
     },
     {
-        "id": "7eaffd91.5e2494",
+        "id": "dab5f775.0cca08",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1195.2260360717773,
+        "x": 1155.5592727661133,
         "y": 496.9629249572754,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "2bbc2c8c.227ae4",
+        "id": "26af193a.f9e9c6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
         "comments": "",
-        "x": 1189.986717224121,
+        "x": 1150.319953918457,
         "y": 542.1509742736816,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "2c17d4fd.27bcac",
+        "id": "350f2d92.f66c82",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Current configuration not found in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>",
         "comments": "",
-        "x": 1180.593650817871,
+        "x": 1140.926887512207,
         "y": 411.1424140930176,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "d4c8b998.7b4678",
+        "id": "ee2743b.75b01c",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Error while retrieving current configuration from the repository for the vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
-        "x": 1182.2346420288086,
+        "x": 1142.5678787231445,
         "y": 368.0569190979004,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "90511868.d5a528",
+        "id": "abda2920.c300c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 894.4568099975586,
+        "x": 854.7900466918945,
         "y": 417.4757499694824,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "d4c8b998.7b4678",
-                "7eaffd91.5e2494",
-                "2bbc2c8c.227ae4",
-                "ac51bff5.352e5"
+                "ee2743b.75b01c",
+                "dab5f775.0cca08",
+                "26af193a.f9e9c6",
+                "935be210.f0f08"
             ]
         ]
     },
     {
-        "id": "867bd8aa.3a55e8",
+        "id": "7b5505bd.5ebf1c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 905.0124130249023,
+        "x": 865.3456497192383,
         "y": 481.2535285949707,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "2c17d4fd.27bcac",
-                "7eaffd91.5e2494",
-                "2bbc2c8c.227ae4",
-                "ac51bff5.352e5"
+                "350f2d92.f66c82",
+                "dab5f775.0cca08",
+                "26af193a.f9e9c6",
+                "935be210.f0f08"
             ]
         ]
     },
     {
-        "id": "30e459ed.1b9986",
+        "id": "e753f26f.d2196",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 302.56404876708984,
+        "x": 262.8972854614258,
         "y": 631.1004371643066,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "b79fac1d.f13e1",
-                "925cca6f.85b738",
-                "a844b2a2.8681f",
-                "dda489b7.a7bc78"
+                "2e3b4165.4db5ce",
+                "b7a7699.00dfa98",
+                "1626d397.d2153c",
+                "a6de7f55.c8767"
             ]
         ]
     },
     {
-        "id": "b79fac1d.f13e1",
+        "id": "2e3b4165.4db5ce",
         "type": "for",
         "name": "for each current config",
         "xml": "<for index=\"i\" start=\"0\" end=\"`$currnt-config_length`\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 530.6324081420898,
+        "x": 490.9656448364258,
         "y": 631.4679908752441,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "67f30b25.070c24"
+                "a913817d.6bcd2"
             ]
         ]
     },
     {
-        "id": "eb62c9d8.e05988",
+        "id": "923b5cb7.14daa",
         "type": "set",
         "name": "Set context",
         "xml": "<set>\n<parameter name='service-description' value=\"`$currnt-config[$i].service-description`\" />\n<parameter name='vm-name' value=\"`$currnt-config[$i].vm-name`\" />\n<parameter name='vnf-type' value=\"`$currnt-config[$i].vnf-type`\" />\n<parameter name='vnfc-type' value=\"`$currnt-config[$i].vnfc-type`\" />\n<parameter name='host-ip-address' value=\"`$currnt-config[$i].host-ip-address`\" />\n<parameter name='vnf-name' value=\"`$currnt-config[$i].vnf-name`\" />\n<parameter name='current-config' value=\"`$currnt-config[$i].content`\" />\n\n",
         "comments": "",
-        "x": 806.4786605834961,
+        "x": 766.811897277832,
         "y": 609.6987953186035,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "c66c9b28.d58e38",
+        "id": "85a2a673.c02858",
         "type": "call",
         "name": "Call Retrieve running Config DG",
         "xml": "<call rpc='GetRunningConfig' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 857.4786605834961,
+        "x": 817.811897277832,
         "y": 666.6988258361816,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "e6375b8c.512fa8",
-                "b4636b56.55a038",
-                "67a55747.3e2588"
+                "fca04ba0.265568",
+                "cb616d3d.d9b89",
+                "56abf4c3.7ee71c"
             ]
         ]
     },
     {
-        "id": "67f30b25.070c24",
+        "id": "a913817d.6bcd2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 552.7863082885742,
+        "x": 513.1195449829102,
         "y": 729.6218299865723,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "eb62c9d8.e05988",
-                "c66c9b28.d58e38",
-                "1a5aec1c.ab3e44",
-                "58111dc9.5f25b4",
-                "b86d049a.13a1b8"
+                "923b5cb7.14daa",
+                "85a2a673.c02858",
+                "307b2e1.75460d2",
+                "95ad83d3.f3b54",
+                "2154ab83.cdf124"
             ]
         ]
     },
     {
-        "id": "e6375b8c.512fa8",
+        "id": "fca04ba0.265568",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1118.5898056030273,
+        "x": 1078.9230422973633,
         "y": 613.6987342834473,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "5a971e26.a7171"
+                "e5aeeef0.e2c5"
             ]
         ]
     },
     {
-        "id": "b4636b56.55a038",
+        "id": "cb616d3d.d9b89",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>",
         "comments": "",
         "outputs": 1,
-        "x": 1119.0341415405273,
+        "x": 1079.3673782348633,
         "y": 666.6988258361816,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "bd38a484.bd0a98"
+                "9b274c50.a8f86"
             ]
         ]
     },
     {
-        "id": "67a55747.3e2588",
+        "id": "56abf4c3.7ee71c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1123.1452865600586,
+        "x": 1083.4785232543945,
         "y": 710.8098487854004,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a971e26.a7171",
+        "id": "e5aeeef0.e2c5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1268.145408630371,
+        "x": 1228.478645324707,
         "y": 613.6987342834473,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "72158f5.d06fd7",
-                "580bd65f.53d9c8",
-                "c4fa8668.3392a8"
+                "4d152ac5.0528b4",
+                "37ea9168.fe717e",
+                "9154ada8.76482"
             ]
         ]
     },
     {
-        "id": "bd38a484.bd0a98",
+        "id": "9b274c50.a8f86",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1270.478660583496,
+        "x": 1230.811897277832,
         "y": 664.5876808166504,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "c433e537.6d3cf8",
-                "72158f5.d06fd7",
-                "580bd65f.53d9c8",
-                "c4fa8668.3392a8"
+                "18d6b2cd.a5875d",
+                "4d152ac5.0528b4",
+                "37ea9168.fe717e",
+                "9154ada8.76482"
             ]
         ]
     },
     {
-        "id": "c433e537.6d3cf8",
+        "id": "18d6b2cd.a5875d",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value='DG to retrieve running configuration not found'/>",
         "comments": "",
-        "x": 1512.7009506225586,
+        "x": 1473.0341873168945,
         "y": 639.5876808166504,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "580bd65f.53d9c8",
+        "id": "37ea9168.fe717e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
-        "x": 1534.5471725463867,
+        "x": 1494.8804092407227,
         "y": 884.4338417053223,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "72158f5.d06fd7",
+        "id": "4d152ac5.0528b4",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1548.5471420288086,
+        "x": 1508.8803787231445,
         "y": 806.4338111877441,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "752bb299.feb57c",
+        "id": "d60ca35a.103e9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 250.66664123535156,
+        "x": 210.9998779296875,
         "y": 412.99244117736816,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "7490fc55.b23eb4",
-                "7c0de445.f1cc6c"
+                "e5f14ebc.cf689",
+                "d628d5a8.790d88"
             ]
         ]
     },
     {
-        "id": "ac51bff5.352e5",
+        "id": "935be210.f0f08",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1153.3589096069336,
+        "x": 1113.6921463012695,
         "y": 454.77563858032227,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "c4fa8668.3392a8",
+        "id": "9154ada8.76482",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1493.024314880371,
+        "x": 1453.357551574707,
         "y": 765.1839942932129,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c0de445.f1cc6c",
+        "id": "d628d5a8.790d88",
         "type": "record",
         "name": "Log message",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Retrieving current configuration details from the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 440.08553314208984,
+        "x": 400.4187698364258,
         "y": 414.57805252075195,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "925cca6f.85b738",
+        "id": "b7a7699.00dfa98",
         "type": "record",
         "name": "Log message",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Audit action successful for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 524.6198310852051,
+        "x": 484.953067779541,
         "y": 1553.2725563049316,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "a844b2a2.8681f",
+        "id": "1626d397.d2153c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n",
         "comments": "",
-        "x": 502.4659614562988,
+        "x": 462.79919815063477,
         "y": 1623.2724342346191,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "a97ef4e9.131748",
+        "id": "ded62b87.362a18",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059.9563827514648,
+        "x": 1020.2896194458008,
         "y": 923.8037452697754,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "7f859626.3ecfd8"
+                "eb4e18fc.70c388"
             ]
         ]
     },
     {
-        "id": "8225d505.2c9498",
+        "id": "88ce9080.f34b2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>",
         "comments": "",
         "outputs": 1,
-        "x": 1063.9565048217773,
+        "x": 1024.2897415161133,
         "y": 978.5815773010254,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "bde3e23.e488b2"
+                "83889e3b.d981b"
             ]
         ]
     },
     {
-        "id": "57cfd6f7.764c38",
+        "id": "16e8c482.c9c08b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 926.1786422729492,
+        "x": 886.5118789672852,
         "y": 1035.2482738494873,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "fb928b6.eef3f78"
+                "12c57efb.ffcf31"
             ]
         ]
     },
     {
-        "id": "bde3e23.e488b2",
+        "id": "83889e3b.d981b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1348.5930557250977,
+        "x": 1308.9262924194336,
         "y": 974.4703979492188,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "1d860eb4.38f4b1",
-                "e4322d3b.8d1ab",
-                "9380a644.f57908",
-                "a832eaf1.bc4ea8"
+                "84021bda.055068",
+                "eb449bdc.564648",
+                "bb2ef69f.ddf888",
+                "c8155b31.362778"
             ]
         ]
     },
     {
-        "id": "7f859626.3ecfd8",
+        "id": "eb4e18fc.70c388",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1348.0373153686523,
+        "x": 1308.3705520629883,
         "y": 923.692569732666,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "e4322d3b.8d1ab",
-                "9380a644.f57908",
-                "a832eaf1.bc4ea8",
-                "1d860eb4.38f4b1"
+                "eb449bdc.564648",
+                "bb2ef69f.ddf888",
+                "c8155b31.362778",
+                "84021bda.055068"
             ]
         ]
     },
     {
-        "id": "1d860eb4.38f4b1",
+        "id": "84021bda.055068",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Error comparing current and running configuration for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n<parameter name='error-code' value='500'/>",
         "comments": "",
-        "x": 1638.1741561889648,
+        "x": 1598.5073928833008,
         "y": 973.3591957092285,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "fb928b6.eef3f78",
+        "id": "12c57efb.ffcf31",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$STATUS`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1053.6667098999023,
+        "x": 1013.9999465942383,
         "y": 1070.083408355713,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "8e39a0cd.ee399",
-                "d61b176c.169178",
-                "fd1426ee.97bc68"
+                "637073ec.0b4adc",
+                "cd1e01e3.d765a",
+                "2d3d7893.57f028"
             ]
         ]
     },
     {
-        "id": "8e39a0cd.ee399",
+        "id": "637073ec.0b4adc",
         "type": "success",
         "name": "no match",
         "xml": "<outcome value='FAILURE'>",
         "comments": "",
         "outputs": 1,
-        "x": 1209.6667098999023,
+        "x": 1169.9999465942383,
         "y": 1071.833408355713,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "328dd4e4.27801c"
+                "1ac2d8d7.d51727"
             ]
         ]
     },
     {
-        "id": "328dd4e4.27801c",
+        "id": "1ac2d8d7.d51727",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1372.666790008545,
+        "x": 1333.0000267028809,
         "y": 1085.0833568572998,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "e4322d3b.8d1ab",
-                "9380a644.f57908",
-                "a832eaf1.bc4ea8",
-                "764e8614.57f5c8",
-                "5aeed919.b83438",
-                "93ba279d.5bcbb8"
+                "eb449bdc.564648",
+                "bb2ef69f.ddf888",
+                "c8155b31.362778",
+                "adac14cd.cf8508",
+                "4c313bbb.12daa4",
+                "f034eb20.d93418"
             ]
         ]
     },
     {
-        "id": "77ff9a98.2bf224",
+        "id": "1fa684cd.087fcb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1353.6667098999023,
+        "x": 1313.9999465942383,
         "y": 1033.5833778381348,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "e4322d3b.8d1ab",
-                "9380a644.f57908",
-                "a832eaf1.bc4ea8",
-                "1d860eb4.38f4b1"
+                "eb449bdc.564648",
+                "bb2ef69f.ddf888",
+                "c8155b31.362778",
+                "84021bda.055068"
             ]
         ]
     },
     {
-        "id": "e4322d3b.8d1ab",
+        "id": "eb449bdc.564648",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$Error-Message`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1624.6667098999023,
+        "x": 1584.9999465942383,
         "y": 1100.083408355713,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "9380a644.f57908",
+        "id": "bb2ef69f.ddf888",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1645.5338973999023,
+        "x": 1605.8671340942383,
         "y": 1201.2707862854004,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "a832eaf1.bc4ea8",
+        "id": "c8155b31.362778",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value=\"`$error-code`\"/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
         "comments": "",
-        "x": 1715.2946853637695,
+        "x": 1675.6279220581055,
         "y": 1460.458869934082,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "1a5aec1c.ab3e44",
+        "id": "307b2e1.75460d2",
         "type": "execute",
         "name": "Compare",
         "xml": "<execute plugin='org.onap.sdnc.config.audit.node.CompareNode' method='compare' >\n<parameter name='sourceDataType' value=\"Current\" />\n<parameter name='sourceData' value=\"`$current-config`\" />\n<parameter name='targetDataType' value=\"Running\" />\n<parameter name='targetData' value=\"`$running-config.content`\" />\n<parameter name='compareDataType' value=\"`$protocol`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 769.6667098999023,
+        "x": 729.9999465942383,
         "y": 967.0834083557129,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "a97ef4e9.131748",
-                "8225d505.2c9498",
-                "57cfd6f7.764c38"
+                "ded62b87.362a18",
+                "88ce9080.f34b2",
+                "16e8c482.c9c08b"
             ]
         ]
     },
     {
-        "id": "764e8614.57f5c8",
+        "id": "adac14cd.cf8508",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`$Error-Message`\"/>\n<parameter name='error-code' value=\"`$Error-code`\"/>\n",
         "comments": "",
-        "x": 1637.6666793823242,
+        "x": 1597.9999160766602,
         "y": 1052.0833187103271,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "87b58856.047f68",
+        "id": "33b195c.1e94f6a",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Running configuration not found in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>",
         "comments": "",
-        "x": 1513.1740951538086,
+        "x": 1473.5073318481445,
         "y": 727.0833473205566,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "f549e445.f74888",
+        "id": "bc363e25.8693b",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Error while retrieving running configuration from the repository for the vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
-        "x": 1507.815086364746,
+        "x": 1468.148323059082,
         "y": 680.9978675842285,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "6cdf93fd.27cd0c",
+        "id": "b48ac617.5af2b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1274.037239074707,
+        "x": 1234.370475769043,
         "y": 747.416690826416,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "f549e445.f74888",
-                "c4fa8668.3392a8",
-                "72158f5.d06fd7",
-                "580bd65f.53d9c8",
-                "b79736f.f56eac8"
+                "bc363e25.8693b",
+                "9154ada8.76482",
+                "4d152ac5.0528b4",
+                "37ea9168.fe717e",
+                "fecad295.7952e"
             ]
         ]
     },
     {
-        "id": "cea9c726.916838",
+        "id": "77302eff.a2754",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1281.592903137207,
+        "x": 1241.926139831543,
         "y": 797.1944618225098,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "87b58856.047f68",
-                "c4fa8668.3392a8",
-                "72158f5.d06fd7",
-                "580bd65f.53d9c8",
-                "b79736f.f56eac8"
+                "33b195c.1e94f6a",
+                "9154ada8.76482",
+                "4d152ac5.0528b4",
+                "37ea9168.fe717e",
+                "fecad295.7952e"
             ]
         ]
     },
     {
-        "id": "183d6159.f57e3f",
+        "id": "94a66aae.a52098",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>",
         "comments": "",
         "outputs": 1,
-        "x": 1127.956428527832,
+        "x": 1088.289665222168,
         "y": 797.3055458068848,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "cea9c726.916838"
+                "77302eff.a2754"
             ]
         ]
     },
     {
-        "id": "4f9c33fe.ee7c6c",
+        "id": "e8cf6616.c9d7e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1128.9562454223633,
+        "x": 1089.2894821166992,
         "y": 749.5278053283691,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "6cdf93fd.27cd0c"
+                "b48ac617.5af2b8"
             ]
         ]
     },
     {
-        "id": "58111dc9.5f25b4",
+        "id": "95ad83d3.f3b54",
         "type": "get-resource",
         "name": "Retrieve Running config details DB",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\" SELECT upload_config_id, request_id, originator_id, service_description, action, upload_date, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, config_indicator, pending_delete ,content FROM UPLOAD_CONFIG WHERE UPLOAD_CONFIG_ID = $runningConfig.UPLOAD-CONFIG-ID\" pfx=\"running-config\" >",
         "comments": "",
         "outputs": 1,
-        "x": 865.6666488647461,
+        "x": 825.999885559082,
         "y": 793.8074684143066,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "183d6159.f57e3f",
-                "4f9c33fe.ee7c6c",
-                "5fa98c15.aa8b74"
+                "94a66aae.a52098",
+                "e8cf6616.c9d7e8",
+                "a961dda8.5cac1"
             ]
         ]
     },
     {
-        "id": "5fa98c15.aa8b74",
+        "id": "a961dda8.5cac1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126.6665115356445,
+        "x": 1086.9997482299805,
         "y": 847.0833778381348,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "d61b176c.169178",
+        "id": "cd1e01e3.d765a",
         "type": "success",
         "name": "match",
         "xml": "<outcome value='SUCCESS'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1202.6667175292969,
+        "x": 1162.9999542236328,
         "y": 1132.0834693908691,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "5584c2d4.ec7c8c"
+                "83de1abe.040b38"
             ]
         ]
     },
     {
-        "id": "fd1426ee.97bc68",
+        "id": "2d3d7893.57f028",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1213.6667098999023,
+        "x": 1173.9999465942383,
         "y": 1027.083408355713,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "77ff9a98.2bf224"
+                "1fa684cd.087fcb"
             ]
         ]
     },
     {
-        "id": "b86d049a.13a1b8",
+        "id": "2154ab83.cdf124",
         "type": "set",
         "name": "Set Running Config ID",
         "xml": "<set>\n<parameter name='output.payload.upload-config-id[$i]' value='`$runningConfig.UPLOAD-CONFIG-ID`' />",
         "comments": "",
-        "x": 845.7777938842773,
+        "x": 806.1110305786133,
         "y": 728.4167518615723,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "dda489b7.a7bc78",
+        "id": "a6de7f55.c8767",
         "type": "execute",
         "name": "Generate output payload",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
         "comments": "",
         "outputs": 1,
-        "x": 593.8887214660645,
+        "x": 554.2219581604004,
         "y": 1493.5281105041504,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "96b89330.eeb7f",
-                "23bea1a6.82114e",
-                "dabc8dd4.4c031"
+                "c8bfde9e.a1d36",
+                "310b3cbf.a449a4",
+                "765fe720.6093e8"
             ]
         ]
     },
     {
-        "id": "96b89330.eeb7f",
+        "id": "c8bfde9e.a1d36",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 823.888843536377,
+        "x": 784.2220802307129,
         "y": 1431.5280494689941,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "5584053a.68313c"
+                "e5b20e46.ff968"
             ]
         ]
     },
     {
-        "id": "23bea1a6.82114e",
+        "id": "310b3cbf.a449a4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.888843536377,
+        "x": 796.2220802307129,
         "y": 1494.5281105041504,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "5584053a.68313c"
+                "e5b20e46.ff968"
             ]
         ]
     },
     {
-        "id": "dabc8dd4.4c031",
+        "id": "765fe720.6093e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 830.8887214660645,
+        "x": 791.2219581604004,
         "y": 1558.5280494689941,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "5584053a.68313c",
+        "id": "e5b20e46.ff968",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1025.555591583252,
+        "x": 985.8888282775879,
         "y": 1494.5280494689941,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "2fc5495.ed614b6",
-                "34834985.8ba986"
+                "75e9aea.522415",
+                "96406c2d.55ca"
             ]
         ]
     },
     {
-        "id": "34834985.8ba986",
+        "id": "96406c2d.55ca",
         "type": "execute",
         "name": "Report error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1270.460132598877,
+        "x": 1230.793369293213,
         "y": 1496.9089088439941,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "2fc5495.ed614b6",
+        "id": "75e9aea.522415",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
-        "x": 1257.888599395752,
+        "x": 1218.221836090088,
         "y": 1549.0517311096191,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "5aeed919.b83438",
+        "id": "4c313bbb.12daa4",
         "type": "execute",
         "name": "Generate output payload",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
         "comments": "",
         "outputs": 1,
-        "x": 1674.3334579467773,
+        "x": 1634.6666946411133,
         "y": 1149.5278358459473,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "2f4b01d0.23640e",
-                "fc0cdc70.37ff2",
-                "bf7d7229.c2d58"
+                "257e1adc.fdbe36",
+                "d8b7ff64.191d5",
+                "5b624b4d.fc3df4"
             ]
         ]
     },
     {
-        "id": "2f4b01d0.23640e",
+        "id": "257e1adc.fdbe36",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1893.3335494995117,
+        "x": 1853.6667861938477,
         "y": 1115.527744293213,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "db92eec9.b5f62"
+                "cb5db291.4530d"
             ]
         ]
     },
     {
-        "id": "fc0cdc70.37ff2",
+        "id": "d8b7ff64.191d5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1895.3335494995117,
+        "x": 1855.6667861938477,
         "y": 1161.5278663635254,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "db92eec9.b5f62"
+                "cb5db291.4530d"
             ]
         ]
     },
     {
-        "id": "bf7d7229.c2d58",
+        "id": "5b624b4d.fc3df4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1895.3334579467773,
+        "x": 1855.6666946411133,
         "y": 1204.5277137756348,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "db92eec9.b5f62",
+        "id": "cb5db291.4530d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2088.0002975463867,
+        "x": 2048.3335342407227,
         "y": 1136.527744293213,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "e04cb8f.eb7b748",
-                "254d3066.a4bc5"
+                "6d13eafe.e967b4",
+                "d9656c92.dc555"
             ]
         ]
     },
     {
-        "id": "254d3066.a4bc5",
+        "id": "d9656c92.dc555",
         "type": "execute",
         "name": "Report error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2286.904960632324,
+        "x": 2247.23819732666,
         "y": 1093.908603668213,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "e04cb8f.eb7b748",
+        "id": "6d13eafe.e967b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
-        "x": 2263.333427429199,
+        "x": 2223.666664123535,
         "y": 1181.051670074463,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "b79736f.f56eac8",
+        "id": "fecad295.7952e",
         "type": "execute",
         "name": "Generate output payload",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
         "comments": "",
         "outputs": 1,
-        "x": 1561.1111373901367,
+        "x": 1521.4443740844727,
         "y": 843.416690826416,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "97850b52.a31cd8",
-                "41d36ebc.ba016",
-                "e6d25885.e4e788"
+                "e52576ee.12e928",
+                "abbae360.fedac",
+                "c1b8d91e.8d1f08"
             ]
         ]
     },
     {
-        "id": "97850b52.a31cd8",
+        "id": "e52576ee.12e928",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1805.111228942871,
+        "x": 1765.444465637207,
         "y": 809.4165992736816,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "847cbebd.ab185"
+                "3dd426b0.6e7f9a"
             ]
         ]
     },
     {
-        "id": "41d36ebc.ba016",
+        "id": "abbae360.fedac",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1807.111228942871,
+        "x": 1767.444465637207,
         "y": 855.4167213439941,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "847cbebd.ab185"
+                "3dd426b0.6e7f9a"
             ]
         ]
     },
     {
-        "id": "e6d25885.e4e788",
+        "id": "c1b8d91e.8d1f08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1807.1111373901367,
+        "x": 1767.4443740844727,
         "y": 898.4165687561035,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "847cbebd.ab185",
+        "id": "3dd426b0.6e7f9a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1999.777976989746,
+        "x": 1960.111213684082,
         "y": 830.4165992736816,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "e2703a71.5e2d08",
-                "7312ce6e.051b1"
+                "9e0c65c1.f52658",
+                "4311e57f.b7b7fc"
             ]
         ]
     },
     {
-        "id": "7312ce6e.051b1",
+        "id": "4311e57f.b7b7fc",
         "type": "execute",
         "name": "Report error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2198.6826400756836,
+        "x": 2159.0158767700195,
         "y": 787.7974586486816,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "e2703a71.5e2d08",
+        "id": "9e0c65c1.f52658",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
-        "x": 2175.1111068725586,
+        "x": 2135.4443435668945,
         "y": 874.9405250549316,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "5584c2d4.ec7c8c",
+        "id": "83de1abe.040b38",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$publish-config`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1240.1670684814453,
+        "x": 1200.5003051757812,
         "y": 1266.083574295044,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "b07cce86.c2267",
-                "54d48804.2f6488"
+                "3325f25e.bbe1de",
+                "53759dc7.c8e504"
             ]
         ]
     },
     {
-        "id": "b07cce86.c2267",
+        "id": "3325f25e.bbe1de",
         "type": "outcome",
         "name": "Outcome: y",
         "xml": "<outcome value='y'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1414.1669692993164,
+        "x": 1374.5002059936523,
         "y": 1246.7502841949463,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "93ba279d.5bcbb8"
+                "f034eb20.d93418"
             ]
         ]
     },
     {
-        "id": "54d48804.2f6488",
+        "id": "53759dc7.c8e504",
         "type": "outcome",
         "name": "Outcome: Y",
         "xml": "<outcome value='Y'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1411.0838241577148,
+        "x": 1371.4170608520508,
         "y": 1289.833547592163,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "93ba279d.5bcbb8"
+                "f034eb20.d93418"
             ]
         ]
     },
     {
-        "id": "93ba279d.5bcbb8",
+        "id": "f034eb20.d93418",
         "type": "execute",
         "name": "execute CvaasDataIntoContext",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/onap/appc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc001\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1769.583999633789,
+        "x": 1729.917236328125,
         "y": 1298.8338718414307,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "4f8601db.1cc81",
-                "d4ee7229.fae85"
+                "2dc87d1d.e4ec42",
+                "9c2781ef.7b76c"
             ]
         ]
     },
     {
-        "id": "4f8601db.1cc81",
+        "id": "2dc87d1d.e4ec42",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2036.8341751098633,
+        "x": 1997.1674118041992,
         "y": 1299.8340373039246,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "17c3243e.6f760c"
+                "2bb2bbf.8cebb44"
             ]
         ]
     },
     {
-        "id": "17c3243e.6f760c",
+        "id": "2bb2bbf.8cebb44",
         "type": "record",
         "name": "record cvass",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`$cvaas-file-name`\"/>\n<parameter name=\"record\" value=\"`$cvaas-file-content`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2219.349090576172,
+        "x": 2179.682327270508,
         "y": 1307.599196434021,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "1befff30.f1b281",
-                "e5a0a1ba.78591"
+                "c3b92bd9.d11c58",
+                "15fd09aa.e8d5e6"
             ]
         ]
     },
     {
-        "id": "1befff30.f1b281",
+        "id": "c3b92bd9.d11c58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2469.364891052246,
+        "x": 2429.698127746582,
         "y": 1320.3642568588257,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "d4049805.d34618"
+                "df60be12.6a8dc"
             ]
         ]
     },
     {
-        "id": "e5a0a1ba.78591",
+        "id": "15fd09aa.e8d5e6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2471.3645401000977,
+        "x": 2431.6977767944336,
         "y": 1369.364426612854,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "d4049805.d34618"
+                "df60be12.6a8dc"
             ]
         ]
     },
     {
-        "id": "d4049805.d34618",
+        "id": "df60be12.6a8dc",
         "type": "execute",
         "name": "execute CheckFileCreated",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='checkFileCreated' >\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2706.364604949951,
+        "x": 2666.697841644287,
         "y": 1343.3643054962158,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "8587844.5a70378",
-                "13a60653.f2418a"
+                "715eb9c.095cc48",
+                "63bca9ab.449bd8"
             ]
         ]
     },
     {
-        "id": "8587844.5a70378",
+        "id": "715eb9c.095cc48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2956.850357055664,
+        "x": 2917.18359375,
         "y": 1421.5993309020996,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
-            []
+            [
+                "6fcee7de.de7828"
+            ]
         ]
     },
     {
-        "id": "a89beb23.e0d968",
+        "id": "f6b4e65d.8d0ae8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3162.849021911621,
+        "x": 3123.182258605957,
         "y": 1374.5991201400757,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "6c7eaa88.024dc4",
-                "fd02487c.77b308",
-                "e5102b5c.3b53c8",
-                "45de7390.486dfc"
+                "2a3d85b8.0fa3aa",
+                "7a41fb4e.17abd4",
+                "f100d943.081e58",
+                "70a77eed.a48af"
             ]
         ]
     },
     {
-        "id": "6c7eaa88.024dc4",
+        "id": "2a3d85b8.0fa3aa",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Cvass file could not be created'`\"/>",
         "comments": "",
-        "x": 3427.404800415039,
+        "x": 3387.738037109375,
         "y": 1313.487928390503,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "fd02487c.77b308",
+        "id": "7a41fb4e.17abd4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$output.status.message`\"/>",
         "comments": "",
-        "x": 3404.251720428467,
+        "x": 3364.5849571228027,
         "y": 1498.3346118927002,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "e5102b5c.3b53c8",
+        "id": "f100d943.081e58",
         "type": "execute",
         "name": "OutputMessageBuilder",
         "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3436.0007400512695,
+        "x": 3396.3339767456055,
         "y": 1429.4880809783936,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "89703cbf.30313"
+                "1d26e12d.b1e68f"
             ]
         ]
     },
     {
-        "id": "89703cbf.30313",
+        "id": "1d26e12d.b1e68f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3634.1327743530273,
+        "x": 3594.4660110473633,
         "y": 1436.0382852554321,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "892031d3.9e1bd"
+                "1b0b05ef.3f8c1a"
             ]
         ]
     },
     {
-        "id": "892031d3.9e1bd",
+        "id": "1b0b05ef.3f8c1a",
         "type": "execute",
         "name": "Report error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3835.000331878662,
+        "x": 3795.333568572998,
         "y": 1436.4882678985596,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "45de7390.486dfc",
+        "id": "70a77eed.a48af",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3399.500015258789,
+        "x": 3359.833251953125,
         "y": 1378.4880485534668,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "d4ee7229.fae85",
+        "id": "9c2781ef.7b76c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2056.666831970215,
+        "x": 2017.0000686645508,
         "y": 1465.0834197998047,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "86d0a871.815158"
+                "19642735.be2e59"
             ]
         ]
     },
     {
-        "id": "a2c9685e.16d318",
+        "id": "e5da7612.d02468",
         "type": "execute",
         "name": "OutputMessageBuilder",
         "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2398.667205810547,
+        "x": 2359.000442504883,
         "y": 1463.083589553833,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "d7d7645d.5e76c8"
+                "eb347b25.a82bb8"
             ]
         ]
     },
     {
-        "id": "d7d7645d.5e76c8",
+        "id": "eb347b25.a82bb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2604.79891204834,
+        "x": 2565.132148742676,
         "y": 1463.6331634521484,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "80effa9c.33fce8"
+                "683bd4ce.43818c"
             ]
         ]
     },
     {
-        "id": "80effa9c.33fce8",
+        "id": "683bd4ce.43818c",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2812.7992248535156,
+        "x": 2773.1324615478516,
         "y": 1464.633376121521,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "86d0a871.815158",
+        "id": "19642735.be2e59",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2208.666831970215,
+        "x": 2169.000068664551,
         "y": 1465.0834197998047,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "a2c9685e.16d318",
-                "897e770a.605f58"
+                "e5da7612.d02468",
+                "494acc70.e0c374"
             ]
         ]
     },
     {
-        "id": "897e770a.605f58",
+        "id": "494acc70.e0c374",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$output.status.message`\"/>",
         "comments": "",
-        "x": 2371.666831970215,
+        "x": 2332.000068664551,
         "y": 1552.0834197998047,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "d043d660.7cbce8",
+        "id": "3ee4c4de.552a6c",
         "type": "execute",
         "name": "Set payload in Context",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 738.6666793823242,
+        "x": 698.9999160766602,
         "y": 86.75000667572021,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "3c42bbb1.da71f4",
-                "d63e629f.39f9",
-                "17b5a1dd.0754de",
-                "4fad0fe1.40343"
+                "2bd54371.cee8cc",
+                "7d717616.411948",
+                "6586784c.c25028",
+                "f62e2ddd.bc319"
             ]
         ]
     },
     {
-        "id": "d63e629f.39f9",
+        "id": "7d717616.411948",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1033.666648864746,
+        "x": 993.999885559082,
         "y": 20,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "51284245.e89c1c"
+                "f7494e55.6d52c"
             ]
         ]
     },
     {
-        "id": "17b5a1dd.0754de",
+        "id": "6586784c.c25028",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1034.666648864746,
+        "x": 994.999885559082,
         "y": 70,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "51284245.e89c1c"
+                "f7494e55.6d52c"
             ]
         ]
     },
     {
-        "id": "4fad0fe1.40343",
+        "id": "f62e2ddd.bc319",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1027.666648864746,
+        "x": 987.999885559082,
         "y": 125.00001525878906,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "51284245.e89c1c"
+                "f7494e55.6d52c"
             ]
         ]
     },
     {
-        "id": "3c42bbb1.da71f4",
+        "id": "2bd54371.cee8cc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1024.6667098999023,
+        "x": 984.9999465942383,
         "y": 180.7500114440918,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "752bb299.feb57c"
+                "d60ca35a.103e9"
             ]
         ]
     },
     {
-        "id": "51284245.e89c1c",
+        "id": "f7494e55.6d52c",
         "type": "block",
         "name": "block",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1241.3332901000977,
+        "x": 1201.6665267944336,
         "y": 113.00000190734863,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "41523e11.c90e9",
-                "a9abc91a.956e38"
+                "84b9c44.20c5f38",
+                "de964e04.35c45"
             ]
         ]
     },
     {
-        "id": "a9abc91a.956e38",
+        "id": "de964e04.35c45",
         "type": "execute",
         "name": "OutputMessageBuilder",
         "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1471.666358947754,
+        "x": 1431.9995956420898,
         "y": 64.88888740539551,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "10f72f11.953841"
+                "357e65c8.123b6a"
             ]
         ]
     },
     {
-        "id": "41523e11.c90e9",
+        "id": "84b9c44.20c5f38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
-        "x": 1438.6662368774414,
+        "x": 1398.9994735717773,
         "y": 113.52372932434082,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": []
     },
     {
-        "id": "10f72f11.953841",
+        "id": "357e65c8.123b6a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1679.7613906860352,
+        "x": 1640.094627380371,
         "y": 64.17462348937988,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "789d293f.1e9dc8"
+                "8396bb7d.c32218"
             ]
         ]
     },
     {
-        "id": "789d293f.1e9dc8",
+        "id": "8396bb7d.c32218",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1881.3329238891602,
+        "x": 1841.666160583496,
         "y": 63.88888740539551,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "13a60653.f2418a",
+        "id": "63bca9ab.449bd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3001.3334045410156,
+        "x": 2961.6666412353516,
         "y": 1327.9999796748161,
-        "z": "f16b4873.701568",
+        "z": "9f97f676.932c28",
         "wires": [
             [
-                "a89beb23.e0d968"
+                "f6b4e65d.8d0ae8"
             ]
         ]
+    },
+    {
+        "id": "6fcee7de.de7828",
+        "type": "set",
+        "name": "Set file name and path in output",
+        "xml": "<set>\n<parameter name='output-payload' value=\"`$cvaas-file-name`\" />\n\n",
+        "comments": "",
+        "x": 3095,
+        "y": 1459,
+        "z": "9f97f676.932c28",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
index 5befc7fd1..9e9225734 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "9c13e82a.387b38",
+        "id": "35d56edd.556ff2",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 131.66665649414062,
-        "y": 116.6666750907898,
-        "z": "214b12db.e4ae8e",
+        "x": 80,
+        "y": 127.66667747497559,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "c8696732.57b668"
+                "9320e525.c3f998"
             ]
         ]
     },
     {
-        "id": "c8696732.57b668",
+        "id": "9320e525.c3f998",
         "type": "service-logic",
         "name": "APPC 2.0.0",
         "module": "APPC",
@@ -22,1620 +22,1633 @@
         "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='APPC' version='2.0.0'>",
         "outputs": 1,
-        "x": 311.6666564941406,
-        "y": 116.6666750907898,
-        "z": "214b12db.e4ae8e",
+        "x": 260,
+        "y": 127.66667747497559,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "11c0a5be.fe5bfa"
+                "a30ec20c.53269"
             ]
         ]
     },
     {
-        "id": "11c0a5be.fe5bfa",
+        "id": "a30ec20c.53269",
         "type": "method",
         "name": "Sync",
         "xml": "<method rpc='Generic_Sync' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 490.6666564941406,
-        "y": 116.6666750907898,
-        "z": "214b12db.e4ae8e",
+        "x": 439,
+        "y": 127.66667747497559,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "cb484414.952458"
+                "b0c54ca6.32c8f"
             ]
         ]
     },
     {
-        "id": "9ec6a6d6.7a5678",
+        "id": "4318b4e7.29ff2c",
         "type": "get-resource",
         "name": "Retrieve current config details",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"SELECT service_description, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address FROM UPLOAD_CONFIG WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator='Current' AND (pending_delete IS NULL OR pending_delete != 'Y')\" pfx=\"currnt-config[]\">",
         "comments": "",
         "outputs": 1,
-        "x": 519.0861930847168,
-        "y": 437.4498953819275,
-        "z": "214b12db.e4ae8e",
+        "x": 467.4195365905762,
+        "y": 448.4498977661133,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "a4a4499.da795b8",
-                "d4b62675.cc3218",
-                "f40aff31.110c9"
+                "227095a5.c9dafa",
+                "7e1083df.7e343c",
+                "b31e7ca6.5dd62"
             ]
         ]
     },
     {
-        "id": "f40aff31.110c9",
+        "id": "b31e7ca6.5dd62",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 771.3759498596191,
-        "y": 365.17019033432007,
-        "z": "214b12db.e4ae8e",
+        "x": 719.7092933654785,
+        "y": 376.17019271850586,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "841d3cc6.f08c7"
+                "c54db122.f1bdd"
             ]
         ]
     },
     {
-        "id": "a4a4499.da795b8",
+        "id": "227095a5.c9dafa",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>",
         "comments": "",
         "outputs": 1,
-        "x": 776.3759956359863,
-        "y": 436.947970867157,
-        "z": "214b12db.e4ae8e",
+        "x": 724.7093391418457,
+        "y": 447.9479732513428,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "b9da4281.1adab"
+                "eb2c48fa.a7c658"
             ]
         ]
     },
     {
-        "id": "d4b62675.cc3218",
+        "id": "7e1083df.7e343c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 773.598217010498,
-        "y": 500.61465311050415,
-        "z": "214b12db.e4ae8e",
+        "x": 721.9315605163574,
+        "y": 511.61465549468994,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "88d88ec0.cbcfa"
+                "c1a3afdf.c2de6"
             ]
         ]
     },
     {
-        "id": "2a1906ba.c69e1a",
+        "id": "2e2a7ae5.665ae6",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1229.2260704040527,
-        "y": 539.5462489128113,
-        "z": "214b12db.e4ae8e",
+        "x": 1177.559413909912,
+        "y": 550.5462512969971,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2195ead0.db2c66",
+        "id": "9007b580.eac198",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
         "comments": "",
-        "x": 1207.9867248535156,
-        "y": 592.734308719635,
-        "z": "214b12db.e4ae8e",
+        "x": 1156.320068359375,
+        "y": 603.7343111038208,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "9e646937.3ed6a8",
+        "id": "73ed573.1f4b6a8",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Current configuration not found in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>",
         "comments": "",
-        "x": 1214.5936851501465,
-        "y": 436.7257466316223,
-        "z": "214b12db.e4ae8e",
+        "x": 1162.9270286560059,
+        "y": 447.7257490158081,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "88cf09de.c0d5e8",
+        "id": "5328cb88.d098f4",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Error while retrieving current configuration from the repository for the vnf-id : ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
-        "x": 1215.234661102295,
-        "y": 384.6402335166931,
-        "z": "214b12db.e4ae8e",
+        "x": 1163.5680046081543,
+        "y": 395.6402359008789,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "841d3cc6.f08c7",
+        "id": "c54db122.f1bdd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 932.456859588623,
-        "y": 365.05907678604126,
-        "z": "214b12db.e4ae8e",
+        "x": 880.7902030944824,
+        "y": 376.05907917022705,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "88cf09de.c0d5e8",
-                "2a1906ba.c69e1a",
-                "2195ead0.db2c66",
-                "1aa4df6e.f6da11"
+                "5328cb88.d098f4",
+                "2e2a7ae5.665ae6",
+                "9007b580.eac198",
+                "64419a64.e40664"
             ]
         ]
     },
     {
-        "id": "b9da4281.1adab",
+        "id": "eb2c48fa.a7c658",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 940.0124244689941,
-        "y": 436.8368649482727,
-        "z": "214b12db.e4ae8e",
+        "x": 888.3457679748535,
+        "y": 447.8368673324585,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "9e646937.3ed6a8",
-                "2a1906ba.c69e1a",
-                "2195ead0.db2c66",
-                "1aa4df6e.f6da11"
+                "73ed573.1f4b6a8",
+                "2e2a7ae5.665ae6",
+                "9007b580.eac198",
+                "64419a64.e40664"
             ]
         ]
     },
     {
-        "id": "88d88ec0.cbcfa",
+        "id": "c1a3afdf.c2de6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 409.5640525817871,
-        "y": 615.6837515830994,
-        "z": "214b12db.e4ae8e",
+        "x": 357.8973960876465,
+        "y": 626.6837539672852,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "7732a369.eb726c",
-                "4f4a7a36.c2a284",
-                "d5cea21b.c34aa",
-                "11dcb423.01808c",
-                "6d230a1.4a08cf4",
-                "855ad0e4.d405c",
-                "59566c79.8df204",
-                "872a0177.f9c8f",
-                "aa08d8db.e07148"
+                "81ea6b57.494798",
+                "744b525.0023dac",
+                "951d9112.06c0b",
+                "fbc00fa0.063ae",
+                "ee0117e2.6026d8",
+                "4ede78b6.eff5d8",
+                "5e7683fd.f5031c",
+                "c731f7af.6ad748",
+                "7dea580c.874e08"
             ]
         ]
     },
     {
-        "id": "7732a369.eb726c",
+        "id": "81ea6b57.494798",
         "type": "for",
         "name": "for each current config",
         "xml": "<for index=\"i\" start=\"0\" end=\"`$currnt-config_length`\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 657.6324729919434,
-        "y": 616.0513052940369,
-        "z": "214b12db.e4ae8e",
+        "x": 605.9658164978027,
+        "y": 627.0513076782227,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "842b0ba4.2b8248"
+                "fdaa0adf.1a6098"
             ]
         ]
     },
     {
-        "id": "ce31ce3d.765e7",
+        "id": "fc392a0.05288d8",
         "type": "set",
         "name": "Set context",
         "xml": "<set>\n<parameter name='service-description' value=\"`$currnt-config[$i].service-description`\" />\n<parameter name='vm-name' value=\"`$currnt-config[$i].vm-name`\" />\n<parameter name='vnf-type' value=\"`$currnt-config[$i].vnf-type`\" />\n<parameter name='vnfc-type' value=\"`$currnt-config[$i].vnfc-type`\" />\n<parameter name='host-ip-address' value=\"`$currnt-config[$i].host-ip-address`\" />\n<parameter name='vnf-name' value=\"`$currnt-config[$i].vnf-name`\" />\n",
         "comments": "",
-        "x": 1072.4787254333496,
-        "y": 616.2821097373962,
-        "z": "214b12db.e4ae8e",
+        "x": 1020.812068939209,
+        "y": 627.282112121582,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "9fe7ebb1.f6f948",
+        "id": "9de5d427.faf018",
         "type": "call",
         "name": "Call Retrieve running Config DG",
         "xml": "<call rpc='GetRunningConfig' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1104.4786949157715,
-        "y": 674.28204870224,
-        "z": "214b12db.e4ae8e",
+        "x": 1052.8120384216309,
+        "y": 685.2820510864258,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "cd269b5.a716568",
-                "4f80d854.e62828",
-                "83342c8c.51a98"
+                "6b547816.cbd968",
+                "8fd38e32.cb9ba",
+                "1a94c5fd.0beeaa"
             ]
         ]
     },
     {
-        "id": "842b0ba4.2b8248",
+        "id": "fdaa0adf.1a6098",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 852.7863121032715,
-        "y": 675.205144405365,
-        "z": "214b12db.e4ae8e",
+        "x": 801.1196556091309,
+        "y": 686.2051467895508,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "ce31ce3d.765e7",
-                "9fe7ebb1.f6f948",
-                "dd580aa1.a817c8",
-                "4c8c9a0.c6b3768"
+                "fc392a0.05288d8",
+                "9de5d427.faf018",
+                "bcd90e4b.7f94",
+                "f027fd8d.bf6e2"
             ]
         ]
     },
     {
-        "id": "cd269b5.a716568",
+        "id": "6b547816.cbd968",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1346.5898399353027,
-        "y": 623.2819828987122,
-        "z": "214b12db.e4ae8e",
+        "x": 1294.923183441162,
+        "y": 634.281985282898,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "7e006a6b.da6ef4"
+                "d4c553da.38154"
             ]
         ]
     },
     {
-        "id": "4f80d854.e62828",
+        "id": "8fd38e32.cb9ba",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>",
         "comments": "",
         "outputs": 1,
-        "x": 1358.034236907959,
-        "y": 676.28204870224,
-        "z": "214b12db.e4ae8e",
+        "x": 1306.3675804138184,
+        "y": 687.2820510864258,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "6c663e2f.d966d"
+                "c61de105.704af"
             ]
         ]
     },
     {
-        "id": "83342c8c.51a98",
+        "id": "1a94c5fd.0beeaa",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1368.1451988220215,
-        "y": 728.3930716514587,
-        "z": "214b12db.e4ae8e",
+        "x": 1316.4785423278809,
+        "y": 739.3930740356445,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f4a7a36.c2a284",
+        "id": "744b525.0023dac",
         "type": "update",
         "name": "Mark current configs as historic",
         "xml": "<update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' key=\"UPDATE UPLOAD_CONFIG SET config_indicator=null WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator='Current' AND (pending_delete IS NULL OR pending_delete != 'Y')\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 801.5814094543457,
-        "y": 1163.6410536766052,
-        "z": "214b12db.e4ae8e",
+        "x": 749.9147529602051,
+        "y": 1174.641056060791,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "25e5bfd2.2129e",
-                "baa57190.f5968"
+                "17e15f82.a4fe1",
+                "2e227dfa.a6b122"
             ]
         ]
     },
     {
-        "id": "d5cea21b.c34aa",
+        "id": "951d9112.06c0b",
         "type": "save",
         "name": "Store device config as 'Current'",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"INSERT INTO UPLOAD_CONFIG (request_id, originator_id, service_description, action, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, config_indicator, content) SELECT request_id, originator_id, service_description, action, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, 'Current', content FROM UPLOAD_CONFIG WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator = 'Running' AND (pending_delete IS NULL OR pending_delete != 'Y')\" force='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 795.196704864502,
-        "y": 1331.1795058250427,
-        "z": "214b12db.e4ae8e",
+        "x": 743.5300483703613,
+        "y": 1342.1795082092285,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "3111ae3b.b3f9e2",
-                "f1f93963.7ca2d8"
+                "26681729.38c0d8",
+                "275a4b6a.def254"
             ]
         ]
     },
     {
-        "id": "f1f93963.7ca2d8",
+        "id": "275a4b6a.def254",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1055.1968002319336,
-        "y": 1375.1795058250427,
-        "z": "214b12db.e4ae8e",
+        "x": 1003.530143737793,
+        "y": 1386.1795082092285,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3111ae3b.b3f9e2",
+        "id": "26681729.38c0d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1050.1968002319336,
-        "y": 1291.1795058250427,
-        "z": "214b12db.e4ae8e",
+        "x": 998.530143737793,
+        "y": 1302.1795082092285,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "f16ab34d.41c77"
+                "c45ebd14.9075"
             ]
         ]
     },
     {
-        "id": "25e5bfd2.2129e",
+        "id": "17e15f82.a4fe1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1060.581470489502,
-        "y": 1218.6410384178162,
-        "z": "214b12db.e4ae8e",
+        "x": 1008.9148139953613,
+        "y": 1229.641040802002,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "baa57190.f5968",
+        "id": "2e227dfa.a6b122",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1054.581470489502,
-        "y": 1162.6410536766052,
-        "z": "214b12db.e4ae8e",
+        "x": 1002.9148139953613,
+        "y": 1173.641056060791,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "62bc5493.c88cfc"
+                "69f40f74.76d5d"
             ]
         ]
     },
     {
-        "id": "7e006a6b.da6ef4",
+        "id": "d4c553da.38154",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1497.1454181671143,
-        "y": 623.2819752693176,
-        "z": "214b12db.e4ae8e",
+        "x": 1445.4787616729736,
+        "y": 634.2819776535034,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "f6c71fae.e8d17",
-                "a278106d.b2101",
-                "aac04b94.261c38",
-                "4b77bb4a.9f7014"
+                "9043a4d5.b9abb8",
+                "56af23a1.1e495c",
+                "7c8fa286.1aedcc",
+                "215b794c.dc2ae6"
             ]
         ]
     },
     {
-        "id": "f6c71fae.e8d17",
+        "id": "9043a4d5.b9abb8",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1804.7011909484863,
-        "y": 521.1709504127502,
-        "z": "214b12db.e4ae8e",
+        "x": 1753.0345344543457,
+        "y": 532.170952796936,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "6c663e2f.d966d",
+        "id": "c61de105.704af",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1510.4786949157715,
-        "y": 675.1709036827087,
-        "z": "214b12db.e4ae8e",
+        "x": 1458.8120384216309,
+        "y": 686.1709060668945,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "963a5bc6.b3e628",
-                "a278106d.b2101",
-                "aac04b94.261c38",
-                "4b77bb4a.9f7014"
+                "1619e281.78fead",
+                "56af23a1.1e495c",
+                "7c8fa286.1aedcc",
+                "215b794c.dc2ae6"
             ]
         ]
     },
     {
-        "id": "963a5bc6.b3e628",
+        "id": "1619e281.78fead",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value='DG to retrieve running configuration not found'/>",
         "comments": "",
-        "x": 1806.7012519836426,
-        "y": 570.1709456443787,
-        "z": "214b12db.e4ae8e",
+        "x": 1755.034595489502,
+        "y": 581.1709480285645,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "62bc5493.c88cfc",
+        "id": "69f40f74.76d5d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1223.359302520752,
-        "y": 1163.6410536766052,
-        "z": "214b12db.e4ae8e",
+        "x": 1171.6926460266113,
+        "y": 1174.641056060791,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "fca9379c.f1ba58",
-                "205f706d.16fb1",
-                "15018948.152e47",
-                "3521d3f3.e7bf6c",
-                "4d82212c.2ef21"
+                "2780fcb1.b2dc54",
+                "b681f73d.ed7208",
+                "7eff3aaa.405dd4",
+                "cf26e314.a91e9",
+                "6eab7d32.0710d4"
             ]
         ]
     },
     {
-        "id": "fca9379c.f1ba58",
+        "id": "2780fcb1.b2dc54",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Error while marking current configuration as historic in the repository for vnf-id:' + $input.action-identifiers.vnf-id`\" />\n",
         "comments": "",
-        "x": 1451.6924629211426,
-        "y": 1200.6411147117615,
-        "z": "214b12db.e4ae8e",
+        "x": 1400.025806427002,
+        "y": 1211.6411170959473,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "f16ab34d.41c77",
+        "id": "c45ebd14.9075",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1216.9744491577148,
-        "y": 1293.1795058250427,
-        "z": "214b12db.e4ae8e",
+        "x": 1165.3077926635742,
+        "y": 1304.1795082092285,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "4adc4f3b.17a16",
-                "205f706d.16fb1",
-                "15018948.152e47",
-                "3521d3f3.e7bf6c",
-                "4d82212c.2ef21"
+                "fa1abe33.8f01d",
+                "b681f73d.ed7208",
+                "7eff3aaa.405dd4",
+                "cf26e314.a91e9",
+                "6eab7d32.0710d4"
             ]
         ]
     },
     {
-        "id": "4adc4f3b.17a16",
+        "id": "fa1abe33.8f01d",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Error while storing the new current configuration in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\" />\n",
         "comments": "",
-        "x": 1443.529987335205,
-        "y": 1245.2907118797302,
-        "z": "214b12db.e4ae8e",
+        "x": 1391.8633308410645,
+        "y": 1256.290714263916,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "aac04b94.261c38",
+        "id": "7c8fa286.1aedcc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
-        "x": 1787.5473823547363,
-        "y": 713.0171122550964,
-        "z": "214b12db.e4ae8e",
+        "x": 1735.8807258605957,
+        "y": 724.0171146392822,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "a278106d.b2101",
+        "id": "56af23a1.1e495c",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1816.5474433898926,
-        "y": 663.0170950889587,
-        "z": "214b12db.e4ae8e",
+        "x": 1764.880786895752,
+        "y": 674.0170974731445,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "15018948.152e47",
+        "id": "7eff3aaa.405dd4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
-        "x": 1436.7608222961426,
-        "y": 1427.1369032859802,
-        "z": "214b12db.e4ae8e",
+        "x": 1385.094165802002,
+        "y": 1438.136905670166,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "205f706d.16fb1",
+        "id": "b681f73d.ed7208",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1461.7608222961426,
-        "y": 1337.1369032859802,
-        "z": "214b12db.e4ae8e",
+        "x": 1410.094165802002,
+        "y": 1348.136905670166,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "f5cfbdb3.30a63",
+        "id": "e0e46251.54b34",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 291.6666603088379,
-        "y": 343.57577085494995,
-        "z": "214b12db.e4ae8e",
+        "x": 240.00000381469727,
+        "y": 354.57577323913574,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "9ec6a6d6.7a5678",
-                "58cdab19.f47684"
+                "4318b4e7.29ff2c",
+                "e4e60415.52ec78"
             ]
         ]
     },
     {
-        "id": "1aa4df6e.f6da11",
+        "id": "64419a64.e40664",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1182.3589057922363,
-        "y": 491.3589644432068,
-        "z": "214b12db.e4ae8e",
+        "x": 1130.6922492980957,
+        "y": 502.3589668273926,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b77bb4a.9f7014",
+        "id": "215b794c.dc2ae6",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1778.0247383117676,
-        "y": 613.7672305107117,
-        "z": "214b12db.e4ae8e",
+        "x": 1726.358081817627,
+        "y": 624.7672328948975,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3521d3f3.e7bf6c",
+        "id": "cf26e314.a91e9",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1427.1704940795898,
-        "y": 1292.0814833641052,
-        "z": "214b12db.e4ae8e",
+        "x": 1375.5038375854492,
+        "y": 1303.081485748291,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "58cdab19.f47684",
+        "id": "e4e60415.52ec78",
         "type": "record",
         "name": "Log message",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Retrieving current configuration details from the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 481.0855522155762,
-        "y": 343.16138219833374,
-        "z": "214b12db.e4ae8e",
+        "x": 429.41889572143555,
+        "y": 354.16138458251953,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "11dcb423.01808c",
+        "id": "fbc00fa0.063ae",
         "type": "record",
         "name": "Log message",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Marking current configuration as historic in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.7780342102051,
-        "y": 1098.2382216453552,
-        "z": "214b12db.e4ae8e",
+        "x": 684.1113777160645,
+        "y": 1109.238224029541,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d230a1.4a08cf4",
+        "id": "ee0117e2.6026d8",
         "type": "record",
         "name": "Log message",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Storing device configuration as Current configuration in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 745.7009773254395,
-        "y": 1274.3923964500427,
-        "z": "214b12db.e4ae8e",
+        "x": 694.0343208312988,
+        "y": 1285.3923988342285,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "855ad0e4.d405c",
+        "id": "4ede78b6.eff5d8",
         "type": "record",
         "name": "Log message",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Current configuration marked as historic in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 748.6198616027832,
-        "y": 1218.4325575828552,
-        "z": "214b12db.e4ae8e",
+        "x": 696.9532051086426,
+        "y": 1229.432559967041,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "59566c79.8df204",
+        "id": "5e7683fd.f5031c",
         "type": "record",
         "name": "Log message",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Device configuration stored as Current configuration in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.6198616027832,
-        "y": 1387.8555312156677,
-        "z": "214b12db.e4ae8e",
+        "x": 683.9532051086426,
+        "y": 1398.8555335998535,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "872a0177.f9c8f",
+        "id": "c731f7af.6ad748",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n",
         "comments": "",
-        "x": 711.4660873413086,
-        "y": 1504.8555312156677,
-        "z": "214b12db.e4ae8e",
+        "x": 659.799430847168,
+        "y": 1515.8555335998535,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "dd580aa1.a817c8",
+        "id": "bcd90e4b.7f94",
         "type": "set",
         "name": "Set Running Config ID",
         "xml": "<set>\n<parameter name='output.payload.upload-config-id[$i]' value='`$runningConfig.UPLOAD-CONFIG-ID`' />\n\n",
         "comments": "",
-        "x": 1083.6667442321777,
-        "y": 733.0000834465027,
-        "z": "214b12db.e4ae8e",
+        "x": 1032.000087738037,
+        "y": 744.0000858306885,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "aa08d8db.e07148",
+        "id": "7dea580c.874e08",
         "type": "execute",
         "name": "Generate output payload",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
         "comments": "",
         "outputs": 1,
-        "x": 763.6667366027832,
-        "y": 1445.0000014305115,
-        "z": "214b12db.e4ae8e",
+        "x": 712.0000801086426,
+        "y": 1456.0000038146973,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "1639668d.25e0d9",
-                "264aed94.5a8e32",
-                "397802b1.358f0e"
+                "4622670e.dc8128",
+                "39689e06.081142",
+                "5ae4904c.01c94"
             ]
         ]
     },
     {
-        "id": "1639668d.25e0d9",
+        "id": "4622670e.dc8128",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1006.6668586730957,
-        "y": 1425.9999403953552,
-        "z": "214b12db.e4ae8e",
+        "x": 955.0002021789551,
+        "y": 1436.999942779541,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "a0b721e.ccba5e"
+                "73ff2021.72405"
             ]
         ]
     },
     {
-        "id": "264aed94.5a8e32",
+        "id": "39689e06.081142",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1008.6668586730957,
-        "y": 1471.0000014305115,
-        "z": "214b12db.e4ae8e",
+        "x": 957.0002021789551,
+        "y": 1482.0000038146973,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "a0b721e.ccba5e"
+                "73ff2021.72405"
             ]
         ]
     },
     {
-        "id": "397802b1.358f0e",
+        "id": "5ae4904c.01c94",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1011.6667366027832,
-        "y": 1521.9999403953552,
-        "z": "214b12db.e4ae8e",
+        "x": 960.0000801086426,
+        "y": 1532.999942779541,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a0b721e.ccba5e",
+        "id": "73ff2021.72405",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1206.3336067199707,
-        "y": 1482.9999403953552,
-        "z": "214b12db.e4ae8e",
+        "x": 1154.66695022583,
+        "y": 1493.999942779541,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "a2cf5226.8165",
-                "bd7acdda.91a63"
+                "5806ef0c.8527",
+                "ae17370e.6b10a8"
             ]
         ]
     },
     {
-        "id": "bd7acdda.91a63",
+        "id": "ae17370e.6b10a8",
         "type": "execute",
         "name": "Report error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1441.2381706237793,
-        "y": 1484.3807997703552,
-        "z": "214b12db.e4ae8e",
+        "x": 1389.5715141296387,
+        "y": 1495.380802154541,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2cf5226.8165",
+        "id": "5806ef0c.8527",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
-        "x": 1425.6666374206543,
-        "y": 1533.5236220359802,
-        "z": "214b12db.e4ae8e",
+        "x": 1373.9999809265137,
+        "y": 1544.523624420166,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "4d82212c.2ef21",
+        "id": "6eab7d32.0710d4",
         "type": "execute",
         "name": "Generate output payload",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
         "comments": "",
         "outputs": 1,
-        "x": 1493.8887519836426,
-        "y": 1385.0000014305115,
-        "z": "214b12db.e4ae8e",
+        "x": 1442.222095489502,
+        "y": 1396.0000038146973,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "425e2e54.04ff7",
-                "d2f01dc7.e5e29",
-                "481f9e71.90512"
+                "cefa73f0.e0fa9",
+                "fdcd02bb.3aebc",
+                "f66e958a.bd8c28"
             ]
         ]
     },
     {
-        "id": "425e2e54.04ff7",
+        "id": "cefa73f0.e0fa9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1740.8889350891113,
-        "y": 1332.9999403953552,
-        "z": "214b12db.e4ae8e",
+        "x": 1689.2222785949707,
+        "y": 1343.999942779541,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "62fbe5e0.d9cdcc"
+                "4dd161f.f82c6a"
             ]
         ]
     },
     {
-        "id": "d2f01dc7.e5e29",
+        "id": "fdcd02bb.3aebc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1731.8889961242676,
-        "y": 1386.0000014305115,
-        "z": "214b12db.e4ae8e",
+        "x": 1680.222339630127,
+        "y": 1397.0000038146973,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "62fbe5e0.d9cdcc"
+                "4dd161f.f82c6a"
             ]
         ]
     },
     {
-        "id": "481f9e71.90512",
+        "id": "f66e958a.bd8c28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1733.888874053955,
-        "y": 1435.9999403953552,
-        "z": "214b12db.e4ae8e",
+        "x": 1682.2222175598145,
+        "y": 1446.999942779541,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "62fbe5e0.d9cdcc",
+        "id": "4dd161f.f82c6a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1936.5558052062988,
-        "y": 1356.9999403953552,
-        "z": "214b12db.e4ae8e",
+        "x": 1884.8891487121582,
+        "y": 1367.999942779541,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "23d2ce67.52c4d2",
-                "49e01c1c.c64a44"
+                "de2ae2d8.42d41",
+                "b6e7d288.f168b"
             ]
         ]
     },
     {
-        "id": "49e01c1c.c64a44",
+        "id": "b6e7d288.f168b",
         "type": "execute",
         "name": "Report error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure while generating output payload JSON\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2165.460346221924,
-        "y": 1355.3807997703552,
-        "z": "214b12db.e4ae8e",
+        "x": 2113.793689727783,
+        "y": 1366.380802154541,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "23d2ce67.52c4d2",
+        "id": "de2ae2d8.42d41",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
-        "x": 2145.888813018799,
-        "y": 1416.5236220359802,
-        "z": "214b12db.e4ae8e",
+        "x": 2094.222156524658,
+        "y": 1427.523624420166,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "f6b28639.a1c3a8",
+        "id": "e8dacf00.46bb3",
         "type": "outcome",
         "name": "Outcome: y",
         "xml": "<outcome value='y'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1190.6666526794434,
-        "y": 808.1822867393494,
-        "z": "214b12db.e4ae8e",
+        "x": 1138.9999961853027,
+        "y": 819.1822891235352,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "60059d22.c2ba54"
+                "4e6ef2ad.d929cc"
             ]
         ]
     },
     {
-        "id": "4c8c9a0.c6b3768",
+        "id": "f027fd8d.bf6e2",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$publish-config`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1037.6666984558105,
-        "y": 799.5156636238098,
-        "z": "214b12db.e4ae8e",
+        "x": 986.0000419616699,
+        "y": 810.5156660079956,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "f6b28639.a1c3a8",
-                "6d199d17.82f204"
+                "e8dacf00.46bb3",
+                "6b676eed.721ac"
             ]
         ]
     },
     {
-        "id": "60059d22.c2ba54",
+        "id": "4e6ef2ad.d929cc",
         "type": "get-resource",
         "name": "Retrieve Running config details DB",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"SELECT upload_config_id, request_id, originator_id, service_description, action, upload_date, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, config_indicator, pending_delete ,content FROM UPLOAD_CONFIG WHERE upload_config_id = $runningConfig.UPLOAD-CONFIG-ID\" pfx=\"running-config\">",
         "comments": "",
         "outputs": 1,
-        "x": 1432.6667404174805,
-        "y": 829.1823210716248,
-        "z": "214b12db.e4ae8e",
+        "x": 1381.0000839233398,
+        "y": 840.1823234558105,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "cdc99515.922c58",
-                "9a6d5a51.faabc8",
-                "9034241c.159aa8"
+                "d2efccd9.7a49c",
+                "982aa155.93412",
+                "236a9877.9ff9e8"
             ]
         ]
     },
     {
-        "id": "cdc99515.922c58",
+        "id": "d2efccd9.7a49c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1690.6669082641602,
-        "y": 840.1825032234192,
-        "z": "214b12db.e4ae8e",
+        "x": 1639.0002517700195,
+        "y": 851.182505607605,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "7e300025.5253a"
+                "a68992e.c969b7"
             ]
         ]
     },
     {
-        "id": "7e300025.5253a",
+        "id": "a68992e.c969b7",
         "type": "execute",
         "name": "execute CvaasDataIntoContext",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/onap/appc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc01\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1943.9172744750977,
-        "y": 844.1830830574036,
-        "z": "214b12db.e4ae8e",
+        "x": 1892.250617980957,
+        "y": 855.1830854415894,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "eb8bab96.3c6e98",
-                "46abe9bb.2c0fd8",
-                "ce71ba2a.e1ce38"
+                "d232f215.99645",
+                "9deb3a3.ff8a4c8",
+                "11d59595.619e0a"
             ]
         ]
     },
     {
-        "id": "eb8bab96.3c6e98",
+        "id": "d232f215.99645",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2241.1673278808594,
-        "y": 965.1831040382385,
-        "z": "214b12db.e4ae8e",
+        "x": 2189.5006713867188,
+        "y": 976.1831064224243,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "694c898b.ddbd58"
+                "452d5078.5d4d4"
             ]
         ]
     },
     {
-        "id": "46abe9bb.2c0fd8",
+        "id": "9deb3a3.ff8a4c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2250.6669998168945,
-        "y": 861.1828625202179,
-        "z": "214b12db.e4ae8e",
+        "x": 2199.000343322754,
+        "y": 872.1828649044037,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "9fa2a21b.8af7c"
+                "909911d9.1269f"
             ]
         ]
     },
     {
-        "id": "ce71ba2a.e1ce38",
+        "id": "11d59595.619e0a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2257.667266845703,
-        "y": 913.1830716133118,
-        "z": "214b12db.e4ae8e",
+        "x": 2206.0006103515625,
+        "y": 924.1830739974976,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "9fa2a21b.8af7c"
+                "909911d9.1269f"
             ]
         ]
     },
     {
-        "id": "9034241c.159aa8",
+        "id": "236a9877.9ff9e8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>",
         "comments": "",
         "outputs": 1,
-        "x": 1524.9166564941406,
-        "y": 1005.182294845581,
-        "z": "214b12db.e4ae8e",
+        "x": 1473.25,
+        "y": 1016.1822972297668,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "567684cc.50b0dc"
+                "44c64695.3eb7a8"
             ]
         ]
     },
     {
-        "id": "9a6d5a51.faabc8",
+        "id": "982aa155.93412",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.9165420532227,
-        "y": 953.4044423103333,
-        "z": "214b12db.e4ae8e",
+        "x": 1470.249885559082,
+        "y": 964.404444694519,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "4bc0b87d.970378"
+                "96ad5e5c.43c89"
             ]
         ]
     },
     {
-        "id": "4bc0b87d.970378",
+        "id": "96ad5e5c.43c89",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1661.9975929260254,
-        "y": 955.2935299873352,
-        "z": "214b12db.e4ae8e",
+        "x": 1610.3309364318848,
+        "y": 966.293532371521,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "3ce78b3b.82fee4",
-                "ce132d3c.9e7bb",
-                "de31ac1.3cad05",
-                "ba52c35d.d0a18"
+                "28d8a6b4.76e62a",
+                "cb20b920.bfd4f8",
+                "29144389.de00ec",
+                "35d107d0.3f1b38"
             ]
         ]
     },
     {
-        "id": "567684cc.50b0dc",
+        "id": "44c64695.3eb7a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1661.553165435791,
-        "y": 1014.0713334083557,
-        "z": "214b12db.e4ae8e",
+        "x": 1609.8865089416504,
+        "y": 1025.0713357925415,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "ce132d3c.9e7bb",
-                "de31ac1.3cad05",
-                "ba52c35d.d0a18",
-                "956742c7.415fd"
+                "cb20b920.bfd4f8",
+                "29144389.de00ec",
+                "35d107d0.3f1b38",
+                "159b3cad.340f23"
             ]
         ]
     },
     {
-        "id": "ba52c35d.d0a18",
+        "id": "35d107d0.3f1b38",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1859.8998336791992,
-        "y": 1030.5936121940613,
-        "z": "214b12db.e4ae8e",
+        "x": 1808.2331771850586,
+        "y": 1041.593614578247,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3ce78b3b.82fee4",
+        "id": "28d8a6b4.76e62a",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Error while retrieving running configuration from the repository for the vnf-id : ' + $input.action-identifiers.vnf-id`\"/>\n",
         "comments": "",
-        "x": 1892.7756729125977,
-        "y": 930.875011920929,
-        "z": "214b12db.e4ae8e",
+        "x": 1841.109016418457,
+        "y": 941.8750143051147,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "6d199d17.82f204",
+        "id": "6b676eed.721ac",
         "type": "outcome",
         "name": "Outcome: Y",
         "xml": "<outcome value='Y'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.6667098999023,
-        "y": 860.1822571754456,
-        "z": "214b12db.e4ae8e",
+        "x": 1140.0000534057617,
+        "y": 871.1822595596313,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "60059d22.c2ba54"
+                "4e6ef2ad.d929cc"
             ]
         ]
     },
     {
-        "id": "956742c7.415fd",
+        "id": "159b3cad.340f23",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Running configuration not found in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>",
         "comments": "",
-        "x": 1891.1346130371094,
-        "y": 979.9603943824768,
-        "z": "214b12db.e4ae8e",
+        "x": 1839.4679565429688,
+        "y": 990.9603967666626,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "694c898b.ddbd58",
+        "id": "452d5078.5d4d4",
         "type": "record",
         "name": "record cvass",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`$cvaas-file-name`\"/>\n<parameter name=\"record\" value=\"`$cvaas-file-content`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2417.917697906494,
-        "y": 1007.1834092140198,
-        "z": "214b12db.e4ae8e",
+        "x": 2366.2510414123535,
+        "y": 1018.1834115982056,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "e96f6416.e57a18",
-                "9939c991.265c38"
+                "9fe61210.08148",
+                "7271adcb.041bd4"
             ]
         ]
     },
     {
-        "id": "900e8879.a7b3f8",
+        "id": "1274e286.72d73d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
-        "x": 2636.6667404174805,
-        "y": 938.7069244384766,
-        "z": "214b12db.e4ae8e",
+        "x": 2585.00008392334,
+        "y": 949.7069268226624,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "4c75663f.43f0d8",
+        "id": "30de08cf.de4518",
         "type": "execute",
         "name": "execute CheckFileCreated",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='checkFileCreated' >\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2490.933391571045,
-        "y": 1143.9486117362976,
-        "z": "214b12db.e4ae8e",
+        "x": 2439.2667350769043,
+        "y": 1154.9486141204834,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "a473caa6.56a5f8",
-                "18a86d58.a2caa3",
-                "3498054b.73705a"
+                "c1e58bc0.4313b8",
+                "3890419a.32b8be",
+                "d9dd7daa.a86c"
             ]
         ]
     },
     {
-        "id": "4f4d3434.694adc",
+        "id": "9f09897b.a7db48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2965.4338912963867,
-        "y": 1122.9491600990295,
-        "z": "214b12db.e4ae8e",
+        "x": 2913.767234802246,
+        "y": 1133.9491624832153,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "8b90be34.c5f61",
-                "cab8f54e.ec65e8",
-                "feccd180.68417",
-                "cd47c223.a0626"
+                "f6bf5ab2.da5a38",
+                "1977a606.1c193a",
+                "ed523909.dc6a08",
+                "4b8a38c7.4bd648"
             ]
         ]
     },
     {
-        "id": "8b90be34.c5f61",
+        "id": "f6bf5ab2.da5a38",
         "type": "set",
         "name": "Set error message",
         "xml": "<set>\n<parameter name='error-message' value=\"`'Cvass file could not be created'`\"/>",
         "comments": "",
-        "x": 3205.9892539978027,
-        "y": 1070.8379549980164,
-        "z": "214b12db.e4ae8e",
+        "x": 3154.322597503662,
+        "y": 1081.8379573822021,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "feccd180.68417",
+        "id": "ed523909.dc6a08",
         "type": "record",
         "name": "Log error",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3182.3132286071777,
-        "y": 1122.4345178604126,
-        "z": "214b12db.e4ae8e",
+        "x": 3130.646572113037,
+        "y": 1133.4345202445984,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "cab8f54e.ec65e8",
+        "id": "1977a606.1c193a",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3216.8359298706055,
-        "y": 1174.6844897270203,
-        "z": "214b12db.e4ae8e",
+        "x": 3165.169273376465,
+        "y": 1185.684492111206,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "18a86d58.a2caa3",
+        "id": "3890419a.32b8be",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2745.9338912963867,
-        "y": 1097.9491291046143,
-        "z": "214b12db.e4ae8e",
+        "x": 2694.267234802246,
+        "y": 1108.9491314888,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "4f4d3434.694adc"
+                "9f09897b.a7db48"
             ]
         ]
     },
     {
-        "id": "a473caa6.56a5f8",
+        "id": "c1e58bc0.4313b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2754.9335975646973,
-        "y": 1154.9489903450012,
-        "z": "214b12db.e4ae8e",
+        "x": 2703.2669410705566,
+        "y": 1165.948992729187,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "4f4d3434.694adc"
+                "9f09897b.a7db48"
             ]
         ]
     },
     {
-        "id": "3498054b.73705a",
+        "id": "d9dd7daa.a86c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2761.933582305908,
-        "y": 1207.9490694999695,
-        "z": "214b12db.e4ae8e",
+        "x": 2710.2669258117676,
+        "y": 1218.9490718841553,
+        "z": "345e0675.03d65a",
         "wires": [
-            []
+            [
+                "701c6d7f.148b54"
+            ]
         ]
     },
     {
-        "id": "9fa2a21b.8af7c",
+        "id": "909911d9.1269f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2456.3336868286133,
-        "y": 883.1828720569611,
-        "z": "214b12db.e4ae8e",
+        "x": 2404.6670303344727,
+        "y": 894.1828744411469,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "900e8879.a7b3f8",
-                "8652a63d.1ea618"
+                "1274e286.72d73d",
+                "8acb284.c9482d8"
             ]
         ]
     },
     {
-        "id": "8652a63d.1ea618",
+        "id": "8acb284.c9482d8",
         "type": "execute",
         "name": "Report error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Error while fetching cvass data\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2655.238349914551,
-        "y": 840.5637314319611,
-        "z": "214b12db.e4ae8e",
+        "x": 2603.57169342041,
+        "y": 851.5637338161469,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e96f6416.e57a18",
+        "id": "9fe61210.08148",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2254.933277130127,
-        "y": 1124.9486260414124,
-        "z": "214b12db.e4ae8e",
+        "x": 2203.2666206359863,
+        "y": 1135.9486284255981,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "4c75663f.43f0d8"
+                "30de08cf.de4518"
             ]
         ]
     },
     {
-        "id": "9939c991.265c38",
+        "id": "7271adcb.041bd4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2255.9330825805664,
-        "y": 1167.9487557411194,
-        "z": "214b12db.e4ae8e",
+        "x": 2204.266426086426,
+        "y": 1178.9487581253052,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "4c75663f.43f0d8"
+                "30de08cf.de4518"
             ]
         ]
     },
     {
-        "id": "de31ac1.3cad05",
+        "id": "29144389.de00ec",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
         "comments": "",
-        "x": 1875.5276527404785,
-        "y": 1128.9689564704895,
-        "z": "214b12db.e4ae8e",
+        "x": 1823.860996246338,
+        "y": 1139.9689588546753,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "ce132d3c.9e7bb",
+        "id": "cb20b920.bfd4f8",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$error-message`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1900.7669982910156,
-        "y": 1077.7808966636658,
-        "z": "214b12db.e4ae8e",
+        "x": 1849.100341796875,
+        "y": 1088.7808990478516,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "cb484414.952458",
+        "id": "b0c54ca6.32c8f",
         "type": "execute",
         "name": "Set payload in Context",
         "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 726.6667137145996,
-        "y": 116.74999856948853,
-        "z": "214b12db.e4ae8e",
+        "x": 675.000057220459,
+        "y": 127.75000095367432,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "b20f9d10.79243",
-                "c4b37771.d26c18",
-                "b02ba377.938ab",
-                "d871965c.fc6f98"
+                "65ac7a46.fe6254",
+                "143b4ae0.a8c9b5",
+                "d602f8e6.2356c8",
+                "909ca6a5.ba4eb8"
             ]
         ]
     },
     {
-        "id": "c4b37771.d26c18",
+        "id": "143b4ae0.a8c9b5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1016.6667289733887,
-        "y": 58.99999761581421,
-        "z": "214b12db.e4ae8e",
+        "x": 965.000072479248,
+        "y": 70,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "507fcd18.8ae1c4"
+                "4f500375.71fa1c"
             ]
         ]
     },
     {
-        "id": "b02ba377.938ab",
+        "id": "d602f8e6.2356c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1017.6667289733887,
-        "y": 108.99999761581421,
-        "z": "214b12db.e4ae8e",
+        "x": 966.000072479248,
+        "y": 120,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "507fcd18.8ae1c4"
+                "4f500375.71fa1c"
             ]
         ]
     },
     {
-        "id": "d871965c.fc6f98",
+        "id": "909ca6a5.ba4eb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1010.6667289733887,
-        "y": 164.00001287460327,
-        "z": "214b12db.e4ae8e",
+        "x": 959.000072479248,
+        "y": 175.00001525878906,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "507fcd18.8ae1c4"
+                "4f500375.71fa1c"
             ]
         ]
     },
     {
-        "id": "b20f9d10.79243",
+        "id": "65ac7a46.fe6254",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1007.6667900085449,
-        "y": 219.750009059906,
-        "z": "214b12db.e4ae8e",
+        "x": 956.0001335144043,
+        "y": 230.7500114440918,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "f5cfbdb3.30a63"
+                "e0e46251.54b34"
             ]
         ]
     },
     {
-        "id": "507fcd18.8ae1c4",
+        "id": "4f500375.71fa1c",
         "type": "block",
         "name": "block",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1224.3333702087402,
-        "y": 151.99999952316284,
-        "z": "214b12db.e4ae8e",
+        "x": 1172.6667137145996,
+        "y": 163.00000190734863,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "2a1493.66c87b6e",
-                "861e0870.0e6308"
+                "db8c64e7.8147d8",
+                "e772599b.34f928"
             ]
         ]
     },
     {
-        "id": "861e0870.0e6308",
+        "id": "e772599b.34f928",
         "type": "execute",
         "name": "OutputMessageBuilder",
         "xml": "<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name=\"event-message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1454.6664390563965,
-        "y": 103.88888502120972,
-        "z": "214b12db.e4ae8e",
+        "x": 1402.9997825622559,
+        "y": 114.88888740539551,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "b958118a.b4c35"
+                "ac15fd22.2ba62"
             ]
         ]
     },
     {
-        "id": "2a1493.66c87b6e",
+        "id": "db8c64e7.8147d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
         "comments": "",
-        "x": 1421.666316986084,
-        "y": 152.52372694015503,
-        "z": "214b12db.e4ae8e",
+        "x": 1369.9996604919434,
+        "y": 163.52372932434082,
+        "z": "345e0675.03d65a",
         "wires": []
     },
     {
-        "id": "b958118a.b4c35",
+        "id": "ac15fd22.2ba62",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1662.7614707946777,
-        "y": 103.17462110519409,
-        "z": "214b12db.e4ae8e",
+        "x": 1611.094814300537,
+        "y": 114.17462348937988,
+        "z": "345e0675.03d65a",
         "wires": [
             [
-                "61a0d1cf.928f8"
+                "84d461e7.16b32"
             ]
         ]
     },
     {
-        "id": "61a0d1cf.928f8",
+        "id": "84d461e7.16b32",
         "type": "execute",
         "name": "Report Error to DCAE",
         "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1864.3330039978027,
-        "y": 102.88888502120972,
-        "z": "214b12db.e4ae8e",
+        "x": 1812.666347503662,
+        "y": 113.88888740539551,
+        "z": "345e0675.03d65a",
         "wires": [
             []
         ]
     },
     {
-        "id": "cd47c223.a0626",
+        "id": "4b8a38c7.4bd648",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
         "comments": "",
-        "x": 3202.333251953125,
-        "y": 1273,
-        "z": "214b12db.e4ae8e",
+        "x": 3150.6665954589844,
+        "y": 1284.0000023841858,
+        "z": "345e0675.03d65a",
+        "wires": []
+    },
+    {
+        "id": "701c6d7f.148b54",
+        "type": "set",
+        "name": "Set file name and path in output",
+        "xml": "<set>\n<parameter name='output-payload' value=\"`$cvaas-file-name`\" />\n\n",
+        "comments": "",
+        "x": 2935,
+        "y": 1305,
+        "z": "345e0675.03d65a",
         "wires": []
     }
-]
+]
\ No newline at end of file
-- 
cgit 1.2.3-korg