From: vrvarma <vikas.varma@att.com>
Date: Wed, 11 Mar 2020 00:38:00 +0000 (-0400)
Subject: Removing unused DG files for appc
X-Git-Tag: 1.7.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc%2Fdeployment.git;a=commitdiff_plain;h=bfa787aece3df94e698ae27c24e12edfc3257340

Removing unused DG files for appc

Change-Id: I82d10e0c9d5559bd322e1575c8952155859d42ed
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: APPC-1834
---

diff --git a/platform-logic/appc/src/main/json/APPC_ansible-adapter-1.0.json b/platform-logic/appc/src/main/json/APPC_ansible-adapter-1.0.json
deleted file mode 100644
index 45ec5b9..0000000
--- a/platform-logic/appc/src/main/json/APPC_ansible-adapter-1.0.json
+++ /dev/null
@@ -1,230 +0,0 @@
-[
-  {
-    "id": "7bf7da57.3da1c4",
-    "type": "method",
-    "name": "ansible-adapter-1.0",
-    "xml": "<method rpc='ansible-adapter-1.0' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 364,
-    "y": 69,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "16608a2e.c8019e"
-      ]
-    ]
-  },
-  {
-    "id": "51e78fba.f0a328",
-    "type": "service-logic",
-    "name": "APPC 2.0.1",
-    "module": "APPC",
-    "version": "2.0.1",
-    "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.1'>",
-    "outputs": 1,
-    "x": 155,
-    "y": 147,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "7bf7da57.3da1c4"
-      ]
-    ]
-  },
-  {
-    "id": "8d1e806.c53808",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$org.onap.appc.adapter.ansible.message`' />",
-    "comments": "",
-    "x": 1122.142822265625,
-    "y": 67.99999237060547,
-    "z": "b542ee98.8e312",
-    "wires": []
-  },
-  {
-    "id": "16608a2e.c8019e",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.adapter.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$AgentUrl`'/>\n  <parameter name='User' value='`$User`'/>\n                        <parameter name='Password' value='`$Password`'/>\n                        <parameter name='LocalParameters' value='`$LocalParameters`'/>\n                        <parameter name='EnvParameters' value='`$EnvParameters`'/>\n                        <parameter name='FileParameters' value='`$FileParameters`'/>\n                        <parameter name='AutoNodeList' value='`$AutoNodeList`'/>\n                        <parameter name='NodeList' value='`$NodeList`'/>\n                        <parameter name='Timeout' value='`$Timeout`'/>\n                        <parameter name='Version' value='`$Version`'/>\n                        <parameter name='InventoryNames' value='`$InventoryNames`'/>\n                        <parameter name='PlaybookName' value='`$PlaybookName`'/>\n                        <parameter name='Action' value='`$Action`'/>\n                        <parameter name='vnfc-name' value='`$request-parameters.vnfc-name`'/>\n                        <parameter name='vnfc-type' value='`$request-parameters.vnfc-type`'/>\n                        <parameter name='vserver-id' value='`$request-parameters.vserver-id`'/>\n                        <parameter name='vf-module-id' value='`$request-parameters.vf-module-id`'/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 569,
-    "y": 67,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "d9cc3d9f.aac2d8",
-        "14bd2fff.6686e8"
-      ]
-    ]
-  },
-  {
-    "id": "ba12f2b.bdd719",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 359,
-    "y": 228,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "be58dd22.f76ca8",
-        "9a080acd.94f5a8"
-      ]
-    ]
-  },
-  {
-    "id": "be58dd22.f76ca8",
-    "type": "other",
-    "name": "outcome",
-    "xml": "<outcome value='500'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 546,
-    "y": 228,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "dae941c0.963348"
-      ]
-    ]
-  },
-  {
-    "id": "9a080acd.94f5a8",
-    "type": "other",
-    "name": "outcome",
-    "xml": "<outcome value='100'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 183,
-    "y": 316,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "9e3bd7b.ca9e528"
-      ]
-    ]
-  },
-  {
-    "id": "9e3bd7b.ca9e528",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.adapter.ansible.AnsibleAdapter' method='reqExecResult' >\n   <parameter name='message' value='`$org.onap.appc.adapter.ansible.message`'/>\n   <parameter name='code' value='$org.onap.appc.adapter.ansible.result.code`'/>\n   <parameter name='AgentUrl' value='`$AgentUrl`'/>\n   <parameter name='User' value='`$User`'/>\n   <parameter name='Password' value='`$Password`'/>\n   <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 361,
-    "y": 315,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "abbb14c.b93d5e8",
-        "976d4e79.c90208"
-      ]
-    ]
-  },
-  {
-    "id": "d9cc3d9f.aac2d8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 823,
-    "y": 68,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "8d1e806.c53808"
-      ]
-    ]
-  },
-  {
-    "id": "14bd2fff.6686e8",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 182,
-    "y": 229,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "ba12f2b.bdd719"
-      ]
-    ]
-  },
-  {
-    "id": "abbb14c.b93d5e8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 551,
-    "y": 316,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "dae941c0.963348"
-      ]
-    ]
-  },
-  {
-    "id": "976d4e79.c90208",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 549,
-    "y": 385,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "46cf1c4a.fd5ebc"
-      ]
-    ]
-  },
-  {
-    "id": "fd6d2e88.86c9a",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 133,
-    "y": 47,
-    "z": "b542ee98.8e312",
-    "wires": [
-      [
-        "51e78fba.f0a328"
-      ]
-    ]
-  },
-  {
-    "id": "dae941c0.963348",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.onap.appc.adapter.ansible.results`' />\n",
-    "comments": "",
-    "x": 1126.7855224609375,
-    "y": 328.2143249511719,
-    "z": "b542ee98.8e312",
-    "wires": []
-  },
-  {
-    "id": "46cf1c4a.fd5ebc",
-    "type": "set",
-    "name": "set",
-    "xml": "<set>\n<parameter name='output.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$org.onap.appc.adapter.ansible.results`'/>\n",
-    "comments": "",
-    "x": 1106.78564453125,
-    "y": 479.64276123046875,
-    "z": "b542ee98.8e312",
-    "wires": []
-  }
-]
\ No newline at end of file
diff --git a/platform-logic/appc/src/main/json/APPC_chef.json b/platform-logic/appc/src/main/json/APPC_chef.json
deleted file mode 100644
index 830000c..0000000
--- a/platform-logic/appc/src/main/json/APPC_chef.json
+++ /dev/null
@@ -1,614 +0,0 @@
-[{
-	"id": "335dc414.286014",
-	"type": "set",
-	"name": "chef server set",
-	"xml": "<set>\n<parameter name='chef-server-address' value='`$chef-server-address`' />\n<parameter name='chef-username' value='`$chef-username`' />\n<parameter name='chef-organization' value='`$chef-organization`'/>\n",
-	"comments": "",
-	"x": 404,
-	"y": 238.45454788208008,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "33bda605.955de2",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 218.54547882080078,
-	"y": 485,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["e8329217.2dc7c", "a40c3e36.fe8338"]
-	]
-}, {
-	"id": "e8329217.2dc7c",
-	"type": "execute",
-	"name": "Environment",
-	"xml": "<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcEnvironment' >\n<parameter name='organizations' value='`$chef-organization`'/> \n<parameter name='serverAddress' value='`$chef-server-address`'/> \n<parameter name='username' value='`$chef-username`'/> \n<parameter name='Environment' value='`$Environment`'/>",
-	"comments": "",
-	"outputs": 1,
-	"x": 409.9091262817383,
-	"y": 410.2727355957031,
-	"z": "49009b52.507ca4",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "b142240c.8ddff8",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 816.9091110229492,
-	"y": 408.7272605895996,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["bc8d5070.3d88b8", "10a16c52.ad032c"]
-	]
-}, {
-	"id": "bc8d5070.3d88b8",
-	"type": "execute",
-	"name": "VnfcNodeobjects",
-	"xml": "<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcNodeobjects' >\n<parameter name='organizations' value='`$chef-organization`'/> \n<parameter name='serverAddress' value='`$chef-server-address`'/> \n<parameter name='username' value='`$chef-username`'/> \n<parameter name='NodeList' value='`$NodeList`'/>\n<parameter name='Node' value='`$Node`'/>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1050.0908889770508,
-	"y": 367.00000381469727,
-	"z": "49009b52.507ca4",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "10a16c52.ad032c",
-	"type": "switchNode",
-	"name": "switch",
-	"xml": "<switch test='`$chefServerResult.code`'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1063.0908889770508,
-	"y": 471.00000381469727,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["f32d707f.bec0f", "1b80d2ba.806e35"]
-	]
-}, {
-	"id": "1b80d2ba.806e35",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='200'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1251.0908889770508,
-	"y": 454,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["4c00f500.6c661c"]
-	]
-}, {
-	"id": "f32d707f.bec0f",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1161.0908889770508,
-	"y": 587.0000038146973,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["2a7cac08.317dec"]
-	]
-}, {
-	"id": "43690b27.0ac9cc",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 1681.1819534301758,
-	"y": 199.09091186523438,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["f306ea50.b4f3e", "e4f71a52.e2d5e"]
-	]
-}, {
-	"id": "9082bb4a.80248",
-	"type": "execute",
-	"name": "checkPushJob",
-	"xml": "<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='checkPushJob' >\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='jobid' value='`$jobID`'/>\n\t<parameter name='retryTimes' value='`$retryTimes`'/>\n\t<parameter name='retryInterval' value='`$retryInterval`'/>",
-	"comments": "",
-	"outputs": 1,
-	"x": 2343.4543991088867,
-	"y": 729.9999265670776,
-	"z": "49009b52.507ca4",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "da225e9c.f12d08",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='201'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1878.0908279418945,
-	"y": 581.181770324707,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["53c3c4d6.42f5dc"]
-	]
-}, {
-	"id": "6ea6e2ea.488efc",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1881.181739807129,
-	"y": 426.9090461730957,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["6b2adbf9.afd184"]
-	]
-}, {
-	"id": "e4f71a52.e2d5e",
-	"type": "switchNode",
-	"name": "switch",
-	"xml": "<switch test='`$chefServerResult.code`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1720.3636283874512,
-	"y": 486.54542541503906,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["da225e9c.f12d08", "6ea6e2ea.488efc"]
-	]
-}, {
-	"id": "f306ea50.b4f3e",
-	"type": "execute",
-	"name": "pushJob",
-	"xml": "<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcPushJob'>\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='NodeList' value='`$NodeList`'/>\n\t<parameter name='CallbackCapable' value='`$CallbackCapable`'/>\n\t<parameter name='RequestId' value='`$RequestId`'/>\n\t<parameter name='CallbackUrl' value='`$CallbackUrl`'/>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1862.2727737426758,
-	"y": 181.6363525390625,
-	"z": "49009b52.507ca4",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "3276a7e.dac35d8",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 562.5454788208008,
-	"y": 589,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["7ded29ca.1fb8a8"]
-	]
-}, {
-	"id": "e66f2cd9.a34a6",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='200'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 577.5454788208008,
-	"y": 440,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["b142240c.8ddff8"]
-	]
-}, {
-	"id": "a40c3e36.fe8338",
-	"type": "switchNode",
-	"name": "switch",
-	"xml": "<switch test='`$chefServerResult.code`'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 380.36365509033203,
-	"y": 634.5454711914062,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["3276a7e.dac35d8", "e66f2cd9.a34a6", "5861ba34.9baf74"]
-	]
-}, {
-	"id": "2a7cac08.317dec",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$chefServerResult.message`' />\n",
-	"comments": "",
-	"x": 1335.0908889770508,
-	"y": 593.0000038146973,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "7ded29ca.1fb8a8",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$chefServerResult.message`' />\n",
-	"comments": "",
-	"x": 786.5454788208008,
-	"y": 598,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "5861ba34.9baf74",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='201'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 578.4545364379883,
-	"y": 509.272705078125,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["b142240c.8ddff8"]
-	]
-}, {
-	"id": "c573c0a2.f1b6a",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 93.54547882080078,
-	"y": 338,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["335dc414.286014", "33bda605.955de2"]
-	]
-}, {
-	"id": "6b2adbf9.afd184",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$chefServerResult.message`' />\n",
-	"comments": "",
-	"x": 2083.545478820801,
-	"y": 426,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "53c3c4d6.42f5dc",
-	"type": "switchNode",
-	"name": "switch",
-	"xml": "<switch test='`$CallbackCapable`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1953.5454788208008,
-	"y": 688,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["bddb192.207ca68", "e972395c.32322"]
-	]
-}, {
-	"id": "e972395c.32322",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2114.545478820801,
-	"y": 741,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["f0f202b3.e8ceb8"]
-	]
-}, {
-	"id": "bddb192.207ca68",
-	"type": "outcomeTrue",
-	"name": "outcome",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2117.636390686035,
-	"y": 586.7272758483887,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["51e8206a.a3d048"]
-	]
-}, {
-	"id": "51e8206a.a3d048",
-	"type": "returnSuccess",
-	"name": "return success",
-	"xml": "<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='chef success, waiting for callback' />",
-	"comments": "",
-	"x": 2300.545478820801,
-	"y": 588,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "ff3d4c52.b0f988",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='200'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2451.545478820801,
-	"y": 985,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["389afae5.2abcfe"]
-	]
-}, {
-	"id": "7430e7ad.b98db8",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2454.636390686035,
-	"y": 830.7272758483887,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["a7b69f75.49a23"]
-	]
-}, {
-	"id": "438453a1.a7dc6c",
-	"type": "switchNode",
-	"name": "switch",
-	"xml": "<switch test='`$chefServerResult.code`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2293.8182792663574,
-	"y": 890.363655090332,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["ff3d4c52.b0f988", "7430e7ad.b98db8"]
-	]
-}, {
-	"id": "a7b69f75.49a23",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$chefServerResult.message`' />",
-	"comments": "",
-	"x": 2673.909004211426,
-	"y": 782,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "719f95d6.241efc",
-	"type": "execute",
-	"name": "fetchResults",
-	"xml": "<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='fetchResults' >\n\t<parameter name='organizations' value='`$chef-organization`'/> \n\t<parameter name='serverAddress' value='`$chef-server-address`'/> \n\t<parameter name='username' value='`$chef-username`'/> \n\t<parameter name='NodeList' value='`$NodeList`'/>",
-	"comments": "",
-	"outputs": 1,
-	"x": 2978.727119445801,
-	"y": 1222.181884765625,
-	"z": "49009b52.507ca4",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "f0f202b3.e8ceb8",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 2117.5454788208003,
-	"y": 843.9999999999998,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["9082bb4a.80248", "438453a1.a7dc6c"]
-	]
-}, {
-	"id": "9636fbc0.374dc",
-	"type": "switchNode",
-	"name": "switch",
-	"xml": "<switch test='`$chefServerResult.code`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2965.5454788208012,
-	"y": 1366.0000000000002,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["23dc29f4.7deafe", "da18f68d.d8c4f"]
-	]
-}, {
-	"id": "da18f68d.d8c4f",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 3238.6363945007324,
-	"y": 1483.000029563904,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["9102124d.6d7118"]
-	]
-}, {
-	"id": "23dc29f4.7deafe",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='200'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 3239.727363586426,
-	"y": 1330.7272949218752,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["b38ba59b.7c553"]
-	]
-}, {
-	"id": "b38ba59b.7c553",
-	"type": "returnSuccess",
-	"name": "return success",
-	"xml": "<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='finish' />\n<parameter name='output.status.results' value='`$chefServerResult.message`' />",
-	"comments": "",
-	"x": 3467.909248352051,
-	"y": 1331.4545898437502,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "9102124d.6d7118",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n<parameter name='output.status.code' value='200' />\n<parameter name='output.status.message' value='`$chefServerResult.message`' />\n",
-	"comments": "",
-	"x": 3473.727363586426,
-	"y": 1491.7271728515625,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "310e4a28.127d5e",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 2815.545478820801,
-	"y": 1286,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["719f95d6.241efc", "9636fbc0.374dc"]
-	]
-}, {
-	"id": "389afae5.2abcfe",
-	"type": "switchNode",
-	"name": "switch",
-	"xml": "<switch test='`$GetOutputFlag`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2619.545478820801,
-	"y": 1064,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["cc456542.7b98f", "71db97e2.8ed32"]
-	]
-}, {
-	"id": "71db97e2.8ed32",
-	"type": "outcomeTrue",
-	"name": "outcome",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2818.6363945007324,
-	"y": 1121.0000295639038,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["310e4a28.127d5e"]
-	]
-}, {
-	"id": "cc456542.7b98f",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2821.727306365967,
-	"y": 966.7273054122925,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["47f523ab.f340ac"]
-	]
-}, {
-	"id": "47f523ab.f340ac",
-	"type": "returnSuccess",
-	"name": "return success",
-	"xml": "<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='`$chefServerResult.message`' />",
-	"comments": "",
-	"x": 3005.909248352051,
-	"y": 969.4545288085938,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "5bb7e566.448e74",
-	"type": "dgstart",
-	"name": "DGSTART",
-	"outputs": 1,
-	"x": 148.54547882080078,
-	"y": 81,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["21f2ae37.a3c3aa"]
-	]
-}, {
-	"id": "2a37ea50.e2ef2e",
-	"type": "method",
-	"name": "chef",
-	"xml": "<method rpc='chef' mode='sync'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 126.54547882080078,
-	"y": 242,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["c573c0a2.f1b6a"]
-	]
-}, {
-	"id": "4c00f500.6c661c",
-	"type": "switchNode",
-	"name": "switch",
-	"xml": "<switch test='`$PushJobFlag`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1356.5454788208008,
-	"y": 291,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["c0401b40.2f6d1", "8bba0e5b.35d44"]
-	]
-}, {
-	"id": "8bba0e5b.35d44",
-	"type": "other",
-	"name": "outcome",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1476.5454788208008,
-	"y": 348,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["815c41bc.e5c128"]
-	]
-}, {
-	"id": "c0401b40.2f6d1",
-	"type": "outcomeTrue",
-	"name": "outcome",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1479.6363906860352,
-	"y": 193.72727584838867,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["43690b27.0ac9cc"]
-	]
-}, {
-	"id": "815c41bc.e5c128",
-	"type": "returnSuccess",
-	"name": "return success",
-	"xml": "<return status='success'>\n<parameter name='output.status.code' value='400' />\n<parameter name='output.status.message' value='chef success, do not need push job ' />",
-	"comments": "",
-	"x": 1518.5454788208008,
-	"y": 468,
-	"z": "49009b52.507ca4",
-	"wires": []
-}, {
-	"id": "21f2ae37.a3c3aa",
-	"type": "service-logic",
-	"name": "APPC 3.0.0",
-	"module": "APPC",
-	"version": "3.0.0",
-	"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='3.0.0'>",
-	"outputs": 1,
-	"x": 147,
-	"y": 163,
-	"z": "49009b52.507ca4",
-	"wires": [
-		["2a37ea50.e2ef2e"]
-	]
-}]
\ No newline at end of file
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/ASDC-MESSAGE/ASDC-MESSAGE_2.0.1_method_configuration-document-request.json b/platform-logic/appc/src/main/json/dg-loader-dgs/ASDC-MESSAGE/ASDC-MESSAGE_2.0.1_method_configuration-document-request.json
deleted file mode 100644
index e5b54ac..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/ASDC-MESSAGE/ASDC-MESSAGE_2.0.1_method_configuration-document-request.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"16b56aca.921305","type":"dgstart","name":"DGSTART","outputs":1,"x":164,"y":68,"z":"c6a88251.aeda8","wires":[["dafab93e.ef6db8"]]},{"id":"71efd50a.f24eec","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":209,"y":199,"z":"c6a88251.aeda8","wires":[["7ab86011.58b3d","51012c63.b2c994","10cfc47.8fe793c","9b276109.1a9f8"]]},{"id":"d686b8ea.8264f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":575,"y":381,"z":"c6a88251.aeda8","wires":[["cce5b362.94661"]]},{"id":"5cf21fe6.ee98e","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"Unable to save ASDC artifact\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":948,"y":439,"z":"c6a88251.aeda8","wires":[]},{"id":"6a8fcfe.ea99b3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":280,"y":575,"z":"c6a88251.aeda8","wires":[["62a9108b.dca58"]]},{"id":"62a9108b.dca58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":438,"y":611,"z":"c6a88251.aeda8","wires":[["9ca441f6.58cd1","995305a7.07ec28","9d8a547b.b434f8"]]},{"id":"9d8a547b.b434f8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='200' />\n","comments":"","x":666,"y":733,"z":"c6a88251.aeda8","wires":[]},{"id":"dafab93e.ef6db8","type":"service-logic","name":"ASDC-MESSAGE 2.0.1","module":"ASDC-MESSAGE","version":"2.0.1","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='ASDC-MESSAGE' version='2.0.1'>","outputs":1,"x":386,"y":68,"z":"c6a88251.aeda8","wires":[["5cb3be39.2d283"]]},{"id":"5cb3be39.2d283","type":"method","name":"configuration-document-request","xml":"<method rpc='configuration-document-request' mode='sync'>\n","comments":"","outputs":1,"x":270,"y":129,"z":"c6a88251.aeda8","wires":[["71efd50a.f24eec"]]},{"id":"7ab86011.58b3d","type":"get-resource","name":"get-resource: asdc-reference SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT vnf_type, vnfc_type, file_category\n\t     FROM ASDC_REFERENCE\n         WHERE artifact_name = $configuration-document-request-input.document-parameters.artifact-name ;\"\n    force='true'\n\tpfx='asdc-reference'>\n","comments":"","outputs":1,"x":492,"y":192,"z":"c6a88251.aeda8","wires":[["3e5e30f7.7b527","3ce6e169.a2dc8e"]]},{"id":"9b276109.1a9f8","type":"save","name":"save asdc-file SQLResource","xml":"<save \tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey='INSERT INTO CONFIGFILES\n\t     SET data_source    = \"ASDC\",\n\t        vnf_type        =  $asdc-reference.vnf-type ,\n\t        vnfc_type       =  $asdc-reference.vnfc-type ,\n\t        file_category \t=  $asdc-reference.file-category ,\n\t        file_name       =  $configuration-document-request-input.document-parameters.artifact-name ,\n\t        file_content    =  $escapedData ;'\n\t    \tforce='true'\n\n  \tpfx='tmp.config-files'>\n","comments":"","outputs":1,"x":342,"y":389,"z":"c6a88251.aeda8","wires":[["d686b8ea.8264f8","6a8fcfe.ea99b3","de6d6715.fb9568"]]},{"id":"51012c63.b2c994","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"vnf-type\" value=\"`$asdc-reference.vnf-type`\"/>\n<parameter name=\"vnfc-type\" value=\"`$asdc-reference.vnfc-type`\"/>\n<parameter name=\"file-category\" value=\"`$asdc-reference.file-category`\"/>\n\n\n\n","comments":"","outputs":1,"x":378,"y":235,"z":"c6a88251.aeda8","wires":[[]]},{"id":"3e5e30f7.7b527","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":750,"y":157,"z":"c6a88251.aeda8","wires":[["568cd496.8a01fc"]]},{"id":"3ce6e169.a2dc8e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":758,"y":223,"z":"c6a88251.aeda8","wires":[["568cd496.8a01fc"]]},{"id":"d8e09650.bf1098","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"502\"/>\n\t<parameter name=\"error-message\" value=\"Unable to retrieve asdc_resource\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1226,"y":291,"z":"c6a88251.aeda8","wires":[]},{"id":"9ca441f6.58cd1","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"file-contents\" value=\"`$configuration-document-request-input.configuration-document-information.document-parameters[0].artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":643,"y":634,"z":"c6a88251.aeda8","wires":[[]]},{"id":"995305a7.07ec28","type":"set","name":"set deploy-ok","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_OK\" />\n","comments":"","outputs":1,"x":665,"y":681,"z":"c6a88251.aeda8","wires":[[]]},{"id":"cce5b362.94661","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":725,"y":406,"z":"c6a88251.aeda8","wires":[["21e0bdf3.1ca732","c27c40a2.ae31","5cf21fe6.ee98e"]]},{"id":"21e0bdf3.1ca732","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"error-code\" value=\"503\"/>\n\n","comments":"","outputs":1,"x":921,"y":324,"z":"c6a88251.aeda8","wires":[[]]},{"id":"c27c40a2.ae31","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","outputs":1,"x":954,"y":373,"z":"c6a88251.aeda8","wires":[[]]},{"id":"568cd496.8a01fc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":981,"y":166,"z":"c6a88251.aeda8","wires":[["a514a19d.1922e","f8fdb850.32b458","d8e09650.bf1098"]]},{"id":"a514a19d.1922e","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":1199,"y":140,"z":"c6a88251.aeda8","wires":[[]]},{"id":"f8fdb850.32b458","type":"set","name":"set: deploy-error-502","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"missing asdc_reference data for artifact-name\" />\n\n\n","comments":"","outputs":1,"x":1213,"y":195,"z":"c6a88251.aeda8","wires":[[]]},{"id":"de6d6715.fb9568","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":583,"y":440,"z":"c6a88251.aeda8","wires":[["cce5b362.94661"]]},{"id":"10cfc47.8fe793c","type":"configure","name":"configure: escapeSQL","xml":"<configure adaptor='org.onap.appc.ccadaptor.ConfigComponentAdaptor' key='escapeSql' >\n<parameter name=\"artifactContents\" value=\"`$configuration-document-request-input.document-parameters.artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":379,"y":286,"z":"c6a88251.aeda8","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/ASDC-MESSAGE/ASDC-MESSAGE_method_configuration-document-request_3.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/ASDC-MESSAGE/ASDC-MESSAGE_method_configuration-document-request_3.0.0.json
deleted file mode 100644
index 766a812..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/ASDC-MESSAGE/ASDC-MESSAGE_method_configuration-document-request_3.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"8f48883d.679f48","type":"dgstart","name":"DGSTART","outputs":1,"x":109,"y":43.99999713897705,"z":"28a80c95.6f39c4","wires":[["bd600a44.6c6cc8"]]},{"id":"24671a98.3cbfe6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":444.3333206176758,"y":121.88888263702393,"z":"28a80c95.6f39c4","wires":[["6952f2c1.c8768c"]]},{"id":"92cd7002.19f79","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":780.2222023010254,"y":449.11104583740234,"z":"28a80c95.6f39c4","wires":[["63034f6b.1ca7e"]]},{"id":"b2658f84.2d5dc","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"Unable to save ASDC artifact\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1154.444320678711,"y":396.3332395553589,"z":"28a80c95.6f39c4","wires":[]},{"id":"369d3bdf.5c54a4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":752.4444885253906,"y":625.7776575088501,"z":"28a80c95.6f39c4","wires":[["ed2c0654.f52c48"]]},{"id":"ed2c0654.f52c48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":955.1111526489258,"y":625.9999551773071,"z":"28a80c95.6f39c4","wires":[["8de31d68.7e5","7b65641b.dce5cc","4c10cb1c.481084"]]},{"id":"4c10cb1c.481084","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='200' />\n","comments":"","x":1158.000015258789,"y":665.8888864517212,"z":"28a80c95.6f39c4","wires":[]},{"id":"bd600a44.6c6cc8","type":"service-logic","name":"ASDC-MESSAGE 3.0.0","module":"ASDC-MESSAGE","version":"3.0.0","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='ASDC-MESSAGE' version='3.0.0'>","outputs":1,"x":368.1111297607422,"y":42,"z":"28a80c95.6f39c4","wires":[["86900238.26815"]]},{"id":"86900238.26815","type":"method","name":"configuration-document-request","xml":"<method rpc='configuration-document-request' mode='sync'>\n","comments":"","outputs":1,"x":179.77781677246094,"y":125.22222995758057,"z":"28a80c95.6f39c4","wires":[["24671a98.3cbfe6"]]},{"id":"6952f2c1.c8768c","type":"get-resource","name":"get-resource: asdc-reference SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT vnf_type, vnfc_type, file_category\n\t     FROM ASDC_REFERENCE\n         WHERE artifact_name = $configuration-document-request-input.document-parameters.artifact-name ;\"\n    force='true'\n\tpfx='asdc-reference'>\n","comments":"","outputs":1,"x":697.7777709960938,"y":72.33334350585938,"z":"28a80c95.6f39c4","wires":[["d72a70bd.4c03c","c2dec095.61d77","793fb24.a89de4c"]]},{"id":"e03ec3d2.d8db","type":"save","name":"save asdc-file SQLResource","xml":"<save \tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey='INSERT INTO ASDC_ARTIFACTS\n\t     SET service_uuid\t=  $configuration-document-request-input.document-parameters.service-uuid ,\n\t        distribution_id\t=  $configuration-document-request-input.document-parameters.distribution-id ,\n\t        service_name\t=  $configuration-document-request-input.document-parameters.service-name ,\n\t\tservice_description\t=  $configuration-document-request-input.document-parameters.service-description ,\n\t\tresource_uuid\t= $configuration-document-request-input.document-parameters.resource-uuid ,\n\t\tresource_instance_name\t= $configuration-document-request-input.document-parameters.resource-instance-name ,\n\t\tresource_name\t= $configuration-document-request-input.document-parameters.resource-name ,\n\t\tresource_version\t= $configuration-document-request-input.document-parameters.resource-version ,\n\t\tresource_type\t= $configuration-document-request-input.document-parameters.resource-type ,\n\t\tartifact_uuid\t= $configuration-document-request-input.document-parameters.artifact-uuid ,\n\t\tartifact_type\t= $configuration-document-request-input.document-parameters.artifact-type ,\n\t\tartifact_version\t= $configuration-document-request-input.document-parameters.artifact-version ,\n\t\tartifact_description\t= $configuration-document-request-input.document-parameters.artifact-description ,\n\t\tinternal_version\t= $asdc-artifacts.internalversion ,\n\t        artifact_name       =  $configuration-document-request-input.document-parameters.artifact-name ,\n\t        artifact_content    =  $convertconfig.escapeData ;'\n\t    \tforce='true'\n\n  \tpfx='tmp.asdc-artifacts'>\n","comments":"","outputs":1,"x":530.2777900695801,"y":516.6666259765625,"z":"28a80c95.6f39c4","wires":[["92cd7002.19f79","369d3bdf.5c54a4","65ec4b77.655924"]]},{"id":"d72a70bd.4c03c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":978.9999389648438,"y":63.888885498046875,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]},{"id":"c2dec095.61d77","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1021.6666870117188,"y":133,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]},{"id":"194d7eb0.2c5761","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"502\"/>\n\t<parameter name=\"error-message\" value=\"Unable to retrieve asdc_resource\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1337,"y":140.33334350585938,"z":"28a80c95.6f39c4","wires":[]},{"id":"8de31d68.7e5","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"file-contents\" value=\"`$configuration-document-request-input.configuration-document-information.document-parameters[0].artifact-contents`\"/>\n\n","comments":"","outputs":1,"x":1125.8889656066895,"y":566.6665868759155,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"7b65641b.dce5cc","type":"set","name":"set deploy-ok","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_OK\" />\n","comments":"","x":1150.2222366333008,"y":614.222170829773,"z":"28a80c95.6f39c4","wires":[]},{"id":"63034f6b.1ca7e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":926.9999694824219,"y":491.1109781265259,"z":"28a80c95.6f39c4","wires":[["d64e50ba.e5739","9b6e24b7.fdfe38","b2658f84.2d5dc"]]},{"id":"d64e50ba.e5739","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"error-code\" value=\"503\"/>\n\n","comments":"","outputs":1,"x":1147.4444198608398,"y":519.110951423645,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"9b6e24b7.fdfe38","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","x":1186.5553817749023,"y":459.22210597991943,"z":"28a80c95.6f39c4","wires":[]},{"id":"755c0ce1.265bd4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":1165.333251953125,"y":86.44444274902344,"z":"28a80c95.6f39c4","wires":[["1c294786.e44028","c0456dd5.b1e53","194d7eb0.2c5761"]]},{"id":"1c294786.e44028","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":1316.2220458984375,"y":20.888885498046875,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"c0456dd5.b1e53","type":"set","name":"set: deploy-error-502","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"missing asdc_reference data for artifact-name\" />\n\n\n","comments":"","x":1369.7779541015625,"y":84.22221374511719,"z":"28a80c95.6f39c4","wires":[]},{"id":"65ec4b77.655924","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":772.8888893127441,"y":541.9999313354492,"z":"28a80c95.6f39c4","wires":[["63034f6b.1ca7e"]]},{"id":"f952ccb7.2b199","type":"configure","name":"configure: escapeSQL","xml":"<execute plugin=\"org.onap.sdnc.config.generator.convert.ConvertNode\" method=\"escapeData\">\n<parameter name=\"unEscapeData\" value=\"`$configuration-document-request-input.document-parameters.artifact-contents`\" />\n<parameter name=\"dataType\" value=\"SQL\" />\n<parameter name=\"responsePrefix\" value=\"convertconfig\" />\n\n","comments":"","outputs":1,"x":190.22225952148438,"y":426.55548095703125,"z":"28a80c95.6f39c4","wires":[["19da8879.6b1b48","bacd2a00.1e76f8"]]},{"id":"793fb24.a89de4c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":155.11114501953125,"y":200.44439697265625,"z":"28a80c95.6f39c4","wires":[["2de3157d.970b2a"]]},{"id":"980f749f.5434b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":318.8888931274414,"y":336.33330821990967,"z":"28a80c95.6f39c4","wires":[["f952ccb7.2b199","1d3051dc.9282ce"]]},{"id":"c45cff68.8f337","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":318.88891220092773,"y":515.3332853317261,"z":"28a80c95.6f39c4","wires":[["e03ec3d2.d8db"]]},{"id":"1d3051dc.9282ce","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"error-code\" value=\"502\"/>","comments":"","outputs":1,"x":600.3333435058594,"y":284.99993896484375,"z":"28a80c95.6f39c4","wires":[[]]},{"id":"19da8879.6b1b48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":150.66671752929688,"y":514.5554780960083,"z":"28a80c95.6f39c4","wires":[["c45cff68.8f337"]]},{"id":"d5fde229.a1b3d","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"503\"/>\n\t<parameter name=\"error-message\" value=\"`$convertconfig.error-message`\"/>\n\t<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":922.0000038146973,"y":310.2221803665161,"z":"28a80c95.6f39c4","wires":[]},{"id":"bacd2a00.1e76f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":505.4444885253906,"y":397.7777404785156,"z":"28a80c95.6f39c4","wires":[["fbad77e5.29f018"]]},{"id":"fbad77e5.29f018","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n\n","atomic":"true","comments":"","outputs":1,"x":667.4444808959961,"y":354.4443893432617,"z":"28a80c95.6f39c4","wires":[["d5fde229.a1b3d","fb6cdc78.ae031"]]},{"id":"fb6cdc78.ae031","type":"set","name":"set deploy-error 503","xml":"<set>\n\t<parameter name=\"config-document-response.request-id\" value=\"`$configuration-document-request-input.request-information.request-id`\" />\n\t<parameter name=\"config-document-response.status\" value=\"DEPLOY_ERROR\" />\n\t<parameter name=\"config-document-response.error-reason\" value=\"failure to store artifact\" />\n\n","comments":"","x":952.4444808959961,"y":377.55552768707275,"z":"28a80c95.6f39c4","wires":[]},{"id":"2de3157d.970b2a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":362,"y":209,"z":"28a80c95.6f39c4","wires":[["f924ea07.11f418"]]},{"id":"f924ea07.11f418","type":"get-resource","name":"get-resource: Internal version SQLResource","xml":"<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"select IF(max(INTERNAL_VERSION)>0,max(INTERNAL_VERSION)+1,1) as internalversion\n\t     FROM ASDC_ARTIFACTS\n         WHERE ARTIFACT_NAME = $configuration-document-request-input.document-parameters.artifact-name ;\"\n    force='true'\n\tpfx='asdc-artifacts'>\n\n\n\n","comments":"","outputs":1,"x":648,"y":194,"z":"28a80c95.6f39c4","wires":[["20525a76.581316","26b20401.248fac"]]},{"id":"20525a76.581316","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":132,"y":323,"z":"28a80c95.6f39c4","wires":[["980f749f.5434b8"]]},{"id":"26b20401.248fac","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":983,"y":190,"z":"28a80c95.6f39c4","wires":[["755c0ce1.265bd4"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_audit-configuration-notification.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_audit-configuration-notification.json
deleted file mode 100644
index 02ee1ee..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_audit-configuration-notification.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"2bda9d8b.dc07e2","type":"comment","name":"Audit-CONFIGURATION-NOTIFICATION","info":"","comments":"","x":564,"y":76,"z":"50ed8660.c42b78","wires":[]},{"id":"cd1395d8.8212a8","type":"dgstart","name":"DGSTART","outputs":1,"x":117.66668701171875,"y":153.3333396911621,"z":"50ed8660.c42b78","wires":[["afc36e17.65732"]]},{"id":"afc36e17.65732","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":300.90484619140625,"y":151.8571319580078,"z":"50ed8660.c42b78","wires":[["ea11462.c33d1b8"]]},{"id":"ea11462.c33d1b8","type":"method","name":"method audit-configuration-notification","xml":"<method rpc='audit-configuration-notification' mode='sync'>\n","comments":"","outputs":1,"x":206.1429443359375,"y":249.66668701171875,"z":"50ed8660.c42b78","wires":[["59223239.da7a7c"]]},{"id":"60458f7.739457","type":"switchNode","name":"switch: service-instance-id already in config","xml":"<switch test=\"`$audit-configuration-notification-input.service-information.service-instance-id == $service-data.service-information.service-instance-id`\">","comments":"","outputs":1,"x":447.2699890136719,"y":391.5772399902344,"z":"50ed8660.c42b78","wires":[["bbb1f484.ce69c8","36057100.2e7c4"]]},{"id":"bbb1f484.ce69c8","type":"outcomeTrue","name":"outcome: true","xml":"<outcome value=\"true\">\n","outputs":1,"x":747.7777709960938,"y":374.08923149108887,"z":"50ed8660.c42b78","wires":[["edf93c4c.cc86e"]]},{"id":"36057100.2e7c4","type":"outcomeFalse","name":"outcome: false","xml":"<outcome value=\"false\">","comments":"","outputs":1,"x":748.1230773925781,"y":314.17259979248047,"z":"50ed8660.c42b78","wires":[["3ef9114.e12dcee"]]},{"id":"59223239.da7a7c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":123.5728988647461,"y":329.73309326171875,"z":"50ed8660.c42b78","wires":[["4b6ffd54.962d44","60458f7.739457","d2dc49b.c7bbab8"]]},{"id":"4b6ffd54.962d44","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"audit-configuration-notification\"/>\n<parameter name=\"field3\" value=\"`$audit-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"field4\" value=\"`$audit-configuration-notification-input.response-code`\"/>\n<parameter name=\"field5\" value=\"`$audit-configuration-notification-input.response-message`\"/>\n<parameter name=\"field6\" value=\"`$audit-configuration-notification-input.audit-config-results.audit-outcome`\"/>\n<parameter name=\"field7\" value=\"`$audit-configuration-notification-input.audit-config-results.applied-configuration`\"/>\n<parameter name=\"field8\" value=\"`$audit-configuration-notification-input.audit-config-results.running-configuration`\"/>\n\n<parameter name=\"field9\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field10\" value=\"`$service-configuration-notification-input.response-code`\"/>\n<parameter name=\"field11\" value=\"`$service-data.request-information.request-action`\"/>\n<parameter name=\"field12\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n<parameter name=\"field13\" value=\"`$audit-configuration-notification-input.svc-request-id`\"/>\n<parameter name=\"field14\" value=\"`$service-data.appc-request-header.svc-request-id`\"/>","comments":"","outputs":1,"x":336.7158203125,"y":345.0707702636719,"z":"50ed8660.c42b78","wires":[[]]},{"id":"fed84bfa.860428","type":"switchNode","name":"switch: response code Successful","xml":"<switch test=\"`$audit-configuration-notification-input.response-code`\">\n\n","comments":"","outputs":1,"x":401.3543395996094,"y":518.7619018554688,"z":"50ed8660.c42b78","wires":[["44285ae7.d087f4","bb9534d1.342908","275f0633.21aa6a"]]},{"id":"44285ae7.d087f4","type":"success","name":"outcome: Success","xml":"<outcome value=\"Success\">","comments":"","outputs":1,"x":340.92584228515625,"y":684.4285278320312,"z":"50ed8660.c42b78","wires":[["e2e6621b.15e89"]]},{"id":"275f0633.21aa6a","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":328,"y":971,"z":"50ed8660.c42b78","wires":[["c9c27153.50dbf"]]},{"id":"c9c27153.50dbf","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":513.1386108398438,"y":965.9999389648438,"z":"50ed8660.c42b78","wires":[["235a2caa.dc26a4","8de0308c.bebf5"]]},{"id":"235a2caa.dc26a4","type":"configure","name":"SDN_GP Asynch Notification","xml":"<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n","comments":"","outputs":1,"x":783.4718627929688,"y":917.1514892578125,"z":"50ed8660.c42b78","wires":[[]]},{"id":"8de0308c.bebf5","type":"returnFailure","name":"return: failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='`$audit-configuration-notification-input.response-code`'/>\n\t<parameter name='error-message' value='`$audit-configuration-notification-input.response-message`'/>\n\t<parameter name='internal-error' value='false' />","comments":"","x":742.3817749023438,"y":983.0717163085938,"z":"50ed8660.c42b78","wires":[]},{"id":"3ef9114.e12dcee","type":"returnFailure","name":"return: failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='1000'/>\n\t<parameter name='error-message' value='Service Instance Id not found'/>\n\t<parameter name='internal-error' value='true' />","comments":"","x":1004.6401977539062,"y":315.4285888671875,"z":"50ed8660.c42b78","wires":[]},{"id":"6fc2b7f7.95e328","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":1918.3543663024902,"y":4982.627190113068,"z":"50ed8660.c42b78","wires":[["a82156c3.c76cb8"]]},{"id":"616774e.572778c","type":"other","name":"outcome: ChangeLayer3ServiceActivateRequest","xml":"<outcome value=\"ChangeLayer3ServiceActivateRequest\">\n\n","outputs":1,"x":2063.2545433044434,"y":4819.393614768982,"z":"50ed8660.c42b78","wires":[["26825f6e.55fa2"]]},{"id":"f43f3748.859d08","type":"execute","name":"execute: EIPAM_UnassignIPAddress","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />","outputs":1,"x":2643.284980773926,"y":4735.545325279236,"z":"50ed8660.c42b78","wires":[[]]},{"id":"26825f6e.55fa2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2342.6183280944824,"y":4816.545227050781,"z":"50ed8660.c42b78","wires":[["f43f3748.859d08","afd3a555.be9328","3e70f431.74a58c","86c2f124.a637c","e06094ff.361828"]]},{"id":"86c2f124.a637c","type":"configure","name":"MSO Asynch Notification","xml":"<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"MSO\">\n      <parameter name=\"dummyparam\" value=\"test\"/>\n","outputs":1,"x":2613.2713928222656,"y":4886.871339797974,"z":"50ed8660.c42b78","wires":[[]]},{"id":"e06094ff.361828","type":"returnSuccess","name":"return success","xml":" <return status=\"success\">\n \n","x":2585.120918273926,"y":4934.317549705505,"z":"50ed8660.c42b78","wires":[]},{"id":"3e70f431.74a58c","type":"save","name":"save: order-status = Activated","xml":"<save plugin=\"com.att.sdnctl.sli.resource.mdsal.ConfigResource\" resource=\"service-data\">\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Activated\" />","outputs":1,"x":2627.1866760253906,"y":4833.433511734009,"z":"50ed8660.c42b78","wires":[[]]},{"id":"afd3a555.be9328","type":"set","name":"set: order-status = Activated","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Activated\" />","x":2619.559804916382,"y":4787.139886856079,"z":"50ed8660.c42b78","wires":[]},{"id":"a82156c3.c76cb8","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$service-data.request-information.request-action`'/>\n\t<parameter name='internal-error' value='true'/>\n \n","x":2231.4364824295044,"y":4984.090530395508,"z":"50ed8660.c42b78","wires":[]},{"id":"e2e6621b.15e89","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":569,"y":696,"z":"50ed8660.c42b78","wires":[["eb60f62e.2cf768","a7de75f9.c2b138","559ed45e.8ff51c","1698aac4.f2c905"]]},{"id":"a20c72ca.5e8dd","type":"set","name":"set Audit Config results","xml":"<set>\n<parameter name='service-data.' value='audit-configuration-notification-input.' />\n","comments":"","x":823,"y":588,"z":"50ed8660.c42b78","wires":[]},{"id":"eb60f62e.2cf768","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"audit-configuration-notification\"/>\n<parameter name=\"field3\" value=\"`$audit-configuration-notification-input.audit-config-results.audit-outcome`\"/>\n<parameter name=\"field4\" value=\"`$audit-configuration-notification-input.audit-config-results.running-configuration`\"/>\n<parameter name=\"field5\" value=\"`$audit-configuration-notification-input.svc-request-id`\"/>\n<parameter name=\"field6\" value=\"`$service-data.appc-request-header.svc-request-id`\"/>\n<parameter name=\"field7\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field8\" value=\"`$service-data.oper-status.last-order-status`\"/>\n\n","comments":"","outputs":1,"x":789,"y":645,"z":"50ed8660.c42b78","wires":[[]]},{"id":"d2dc49b.c7bbab8","type":"set","name":"set:service-data based on input","xml":"<set>\n<parameter name=\"service-data.appc-request-header.svc-request-id\" value=\"`$audit-configuration-notification-input.svc-request-id`\" />\n\n<!--\n<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$audit-configuration-notification-input.service-information.service-instance-id`\" />\n-->\n<parameter name=\"service-data.service-information.service-type\" value=\"`$audit-configuration-notification-input.service-information.service-type`\" />\n\t\n\n\t\n\t\n\t","comments":"","x":412,"y":298,"z":"50ed8660.c42b78","wires":[]},{"id":"bb9534d1.342908","type":"success","name":"outcome: SUCCESS","xml":"<outcome value=\"SUCCESS\">","comments":"","outputs":1,"x":334,"y":756,"z":"50ed8660.c42b78","wires":[["e2e6621b.15e89"]]},{"id":"5f69c5a2.065e0c","type":"set","name":"set: restore Order Status based on last-order-status","xml":"<set>\n<parameter name=\"service-data.oper-status.order-status\" value=\"`$service-data.oper-status.last-order-status`\" />\n\n","comments":"","x":925,"y":700,"z":"50ed8660.c42b78","wires":[]},{"id":"a7de75f9.c2b138","type":"configure","name":"SDN-GP Asynch Notification","xml":"<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n","comments":"","outputs":1,"x":852,"y":785,"z":"50ed8660.c42b78","wires":[[]]},{"id":"559ed45e.8ff51c","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n<parameter name='error-code' value='200'/>\n<parameter name='error-message' value='`$audit-configuration-notification-input.response-message`'/>\n \n","comments":"","x":815,"y":844,"z":"50ed8660.c42b78","wires":[]},{"id":"1698aac4.f2c905","type":"set","name":"set: last-sub-action-status","xml":"<set>\n<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"Success\" />\n\n","comments":"","x":847,"y":740,"z":"50ed8660.c42b78","wires":[]},{"id":"4cbbd319.e6526c","type":"comment","name":"Lastsubaction status set in Appc","info":"","comments":"","x":1059,"y":942,"z":"50ed8660.c42b78","wires":[]},{"id":"edf93c4c.cc86e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":926,"y":376,"z":"50ed8660.c42b78","wires":[["583ef652.3fb778","fed84bfa.860428"]]},{"id":"583ef652.3fb778","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":1187,"y":374,"z":"50ed8660.c42b78","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_audit-configuration-operation.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_audit-configuration-operation.json
deleted file mode 100644
index 10639c7..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_audit-configuration-operation.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"6295e18d.289b8","type":"dgstart","name":"DGSTART","outputs":1,"x":162,"y":124,"z":"22560c9c.507f14","wires":[["71e03392.dbcd8c"]]},{"id":"71e03392.dbcd8c","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":327.0000305175781,"y":127.33331298828125,"z":"22560c9c.507f14","wires":[["d8b42c68.f5ab3"]]},{"id":"d8b42c68.f5ab3","type":"method","name":"method audit-configuration-operation","xml":"<method rpc='audit-configuration-operation' mode='sync'>\n","comments":"","outputs":1,"x":582.6666870117188,"y":126.33331298828125,"z":"22560c9c.507f14","wires":[["d91d40bd.89138"]]},{"id":"6d141611.56d708","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$audit-configuration-operation-input.request-information.request-action`\">\n<!--\n leaf request-action {\n                type enumeration {\n                    enum \"VsbgServiceAuditRequest\";\n                }\n            }\n}\n-->\n\n","comments":"","outputs":1,"x":187.5,"y":433,"z":"22560c9c.507f14","wires":[["5f81be6d.88ffe","624313d9.5e1ccc"]]},{"id":"5f81be6d.88ffe","type":"outcome","name":"VsbgServiceAuditRequest","xml":"<outcome value='VsbgServiceAuditRequest'>","comments":"","outputs":1,"x":450.5,"y":425,"z":"22560c9c.507f14","wires":[["b7c64a6e.3b97a8"]]},{"id":"b7c64a6e.3b97a8","type":"switchNode","name":"switch: request-sub-action","xml":"<switch test=\"`$audit-configuration-operation-input.request-information.request-sub-action`\">\n","comments":"","outputs":1,"x":714.5,"y":428,"z":"22560c9c.507f14","wires":[["2c21f7b1.0224a8","3dc879b9.2a21a6","fb1f199e.1ee6b8"]]},{"id":"2c21f7b1.0224a8","type":"outcome","name":"AUDIT","xml":"<outcome value='AUDIT'>","comments":"","outputs":1,"x":936.5,"y":428,"z":"22560c9c.507f14","wires":[["b23ec1e7.d9a61"]]},{"id":"624313d9.5e1ccc","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":395.5,"y":490,"z":"22560c9c.507f14","wires":[["60490b53.5d2ee4"]]},{"id":"60490b53.5d2ee4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request-action not recognized'/>\n","comments":"","x":549.5509033203125,"y":491.8646240234375,"z":"22560c9c.507f14","wires":[]},{"id":"896948ef.2fe218","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n\t","comments":"","outputs":1,"x":1305,"y":658,"z":"22560c9c.507f14","wires":[["b0e4346e.d63768","cf246bec.706c08"]]},{"id":"3dc879b9.2a21a6","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":880.5,"y":606,"z":"22560c9c.507f14","wires":[["9d054a2c.f820a8"]]},{"id":"9d054a2c.f820a8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request-sub-action not recognized'/>\n","comments":"","x":1047.5,"y":608,"z":"22560c9c.507f14","wires":[]},{"id":"967eb60d.2ec408","type":"comment","name":"Audit-configuration-Operation","info":"","comments":"","x":1530,"y":67,"z":"22560c9c.507f14","wires":[]},{"id":"b0e4346e.d63768","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":1527,"y":621,"z":"22560c9c.507f14","wires":[["f35bfc8a.ba17b"]]},{"id":"f35bfc8a.ba17b","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<!-- error code & message provided by ncs-adaptor -->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1690.3331298828125,"y":615.6666259765625,"z":"22560c9c.507f14","wires":[]},{"id":"249d783.f996f88","type":"returnSuccess","name":"return success","xml":" <return status=\"success\">\n \n","comments":"","x":1699,"y":719,"z":"22560c9c.507f14","wires":[]},{"id":"b5c3e0b7.6e9cb","type":"set","name":"set Copy from input to Service-data","xml":"<set>\n<parameter name=\"service-data.\" value=\"audit-configuration-operation-input.\"/>\n\n","comments":"","x":1363,"y":502,"z":"22560c9c.507f14","wires":[]},{"id":"cf246bec.706c08","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1531,"y":713,"z":"22560c9c.507f14","wires":[["249d783.f996f88"]]},{"id":"4c8f0493.b0d5bc","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"audit-configuration-operation\"/>\n\n<parameter name=\"field3\" value=\"`$audit-configuration-operation-input.request-information.request-action`\"/>\n<parameter name=\"field4\" value=\"`$service-data.request-information.request-action`\"/>\n<parameter name=\"field5\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\"/>\n<parameter name=\"field6\" value=\"`$service-data.request-information.request-sub-action`\"/>\n<parameter name=\"field7\" value=\"`$audit-configuration-operation-input.service-information.service-instance-id`\"/>\n<parameter name=\"field8\" value=\"`$service-data.service-information.service-instance-id`\"/>\n","comments":"","outputs":1,"x":1278,"y":596,"z":"22560c9c.507f14","wires":[[]]},{"id":"441443b2.8ba20c","type":"GenericXML","name":"set: last-action, last-sub-action, last-svc-request-id, last-order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"VsbgServiceAuditRequest\" />\n\t<parameter name=\"service-data.oper-status.last-sub-action\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\" />\n\t<parameter name=\"service-data.oper-status.last-svc-request-id\" value=\"`$audit-configuration-operation-input.sdnc-request-header.svc-request-id`\" />\n\t<!-- Causes exception when set to Null\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\t-->\n","comments":"","outputs":1,"x":1458,"y":395.33331298828125,"z":"22560c9c.507f14","wires":[[]]},{"id":"b23ec1e7.d9a61","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1094,"y":426.33331298828125,"z":"22560c9c.507f14","wires":[["441443b2.8ba20c","b5c3e0b7.6e9cb","4c8f0493.b0d5bc","896948ef.2fe218","b74ead9c.3101a","db63f043.6eab3"]]},{"id":"e9f54ef7.3c4b3","type":"switchNode","name":"switch: service-instance-id  config == input","xml":"<switch test=\"`$audit-configuration-operation-input.service-information.service-instance-id == $service-data.service-information.service-instance-id`\">","comments":"","outputs":1,"x":560,"y":270.33331298828125,"z":"22560c9c.507f14","wires":[["fcc63e45.6168e","baaeb60.30b6648"]]},{"id":"fcc63e45.6168e","type":"outcomeFalse","name":"false","xml":"<outcome value=\"false\">","comments":"","outputs":1,"x":832,"y":206.33331298828125,"z":"22560c9c.507f14","wires":[["ba2ca0a6.b672c"]]},{"id":"ba2ca0a6.b672c","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"Service instance not found in config tree\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":993,"y":199.33331298828125,"z":"22560c9c.507f14","wires":[]},{"id":"baaeb60.30b6648","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":828,"y":273.33331298828125,"z":"22560c9c.507f14","wires":[[]]},{"id":"ace6f0cc.7ecce","type":"set","name":"set:service-data based on input","xml":"<set>\n\t\n\t<parameter name=\"service-data.request-information.request-id\" value=\"`$audit-configuration-operation-input.request-information.request-id`\" />\n\t<parameter name=\"service-data.request-information.notification-url\" value=\"`$audit-configuration-operation-input.request-information.notification-url`\" />\n\t<parameter name=\"service-data.request-information.request-action\" value=\"`$audit-configuration-operation-input.request-information.request-action`\" />\n\t<parameter name=\"service-data.request-information.source\" value=\"`$audit-configuration-operation-input.request-information.source`\" />\n\t<parameter name=\"service-data.request-information.order-number\" value=\"`$audit-configuration-operation-input.request-information.order-number`\" />\n\t<parameter name=\"service.request-information.order-version\" value=\"`$audit-configuration-operation-input.request-information.order-version`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-request-id\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-request-id`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-action\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-action`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-notification-url\" value=\"`$audit-configuration-operation-input.appc-request-header.svc-notification-url`\" />\n\t<!-- \n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$audit-configuration-operation-input.service-information.service-instance-id`\" />\n\t-->\n\t<parameter name=\"service-data.service-information.service-type\" value=\"`$audit-configuration-operation-input.service-information.service-type`\" />\n\t<parameter name=\"service-data.request-information.request-sub-action\" value=\"`$audit-configuration-operation-input.request-information.request-sub-action`\" />\n\n\t\n\t\n\t","comments":"","x":537,"y":183.3333282470703,"z":"22560c9c.507f14","wires":[]},{"id":"2806bcfa.2a9a64","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"service-configuration-operation\"/>\n<parameter name=\"field3\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n<parameter name=\"field4\" value=\"`$service-data.appc-request-header.svc-request-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field6\" value=\"`$service-data.request-information.request-id`\"/>\n<parameter name=\"field7\" value=\"`$service-data.request-information.request-action`\"/>\n<parameter name=\"field8\" value=\"`$service-data.request-information.source`\"/>\n<parameter name=\"field9\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field10\" value=\"`$service-data.service-information.service-type`\"/>\n<parameter name=\"field11\" value=\"`$service-data.request-information.request-sub-action`\"/>","comments":"","outputs":1,"x":458,"y":223.3333282470703,"z":"22560c9c.507f14","wires":[[]]},{"id":"d91d40bd.89138","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":232.5,"y":199,"z":"22560c9c.507f14","wires":[["ace6f0cc.7ecce","2806bcfa.2a9a64","a37c4df0.5c6a2"]]},{"id":"a37c4df0.5c6a2","type":"switchNode","name":"switch: last-sub-action-status","xml":"<switch test=\"`$service-data.oper-status.last-sub-action-status`\">\n","comments":"","outputs":1,"x":461,"y":326,"z":"22560c9c.507f14","wires":[["117b233.4c88cdd","d97589b.e4e1e78"]]},{"id":"117b233.4c88cdd","type":"outcome","name":"InProgress","xml":"<outcome value='InProgress'>","comments":"","outputs":1,"x":677,"y":319,"z":"22560c9c.507f14","wires":[["8850e7c6.f04338"]]},{"id":"8850e7c6.f04338","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":846,"y":317,"z":"22560c9c.507f14","wires":[["2a7366c4.037b4a","66448305.03e3cc","c09b7edb.44d67","6d141611.56d708"]]},{"id":"2a7366c4.037b4a","type":"set","name":"set: last-sub-action-status = InProgressTimeout","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgressTimeout\" />","comments":"","x":1139,"y":330,"z":"22560c9c.507f14","wires":[]},{"id":"d97589b.e4e1e78","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":673,"y":367,"z":"22560c9c.507f14","wires":[["6d141611.56d708"]]},{"id":"66448305.03e3cc","type":"execute","name":"execute getTimeDifference","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"getTimeDifference\">\n\t<parameter name=\"inDate\" value=\"`$service-data.oper-status.modify-timestamp`\"/>\n\t<parameter name=\"ctxTempVariable\" value=\"tmp.inprogress-time\"/>","comments":"","outputs":1,"x":1085,"y":248,"z":"22560c9c.507f14","wires":[[]]},{"id":"c09b7edb.44d67","type":"switchNode","name":"switch: tmp.inprogress-time > 6 min (360 seconds)","xml":"<switch test=\"`$tmp.inprogress-time > 360`\">","outputs":1,"x":1162,"y":287,"z":"22560c9c.507f14","wires":[["1349d992.d4dd66"]]},{"id":"1349d992.d4dd66","type":"outcomeFalse","name":"false ","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1462,"y":285,"z":"22560c9c.507f14","wires":[["7daebc71.51c9d4"]]},{"id":"7daebc71.51c9d4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Still processing your previous request.'/>","comments":"","x":1646,"y":282,"z":"22560c9c.507f14","wires":[]},{"id":"b74ead9c.3101a","type":"set","name":"set: last-sub-action-status = InProgress","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgress\" />","comments":"","x":1374,"y":548,"z":"22560c9c.507f14","wires":[]},{"id":"db63f043.6eab3","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":1366,"y":449,"z":"22560c9c.507f14","wires":[[]]},{"id":"fb1f199e.1ee6b8","type":"outcome","name":"GETRUNNINGCONFIG","xml":"<outcome value='GETRUNNINGCONFIG'>","comments":"","outputs":1,"x":982,"y":505,"z":"22560c9c.507f14","wires":[["b23ec1e7.d9a61"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_method_Generic_Evacuate_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_method_Generic_Evacuate_2.0.0.json
deleted file mode 100644
index 4defa76..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_method_Generic_Evacuate_2.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"a83fc34.6924bc","type":"dgstart","name":"DGSTART","outputs":1,"x":177,"y":100,"z":"f4cf2376.c92f4","wires":[["531a3928.a7bb9"]]},{"id":"531a3928.a7bb9","type":"service-logic","name":"Appc-API 2.0.0","module":"Appc-API","version":"2.0.0","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-API' version='2.0.0'>","outputs":1,"x":365,"y":101,"z":"f4cf2376.c92f4","wires":[["352baa79.80aee6"]]},{"id":"352baa79.80aee6","type":"method","name":"Generic_Evacuate","xml":"<method rpc='Generic_Evacuate' mode='sync'>\n","comments":"","outputs":1,"x":269,"y":231,"z":"f4cf2376.c92f4","wires":[["c748601f.21dab8"]]},{"id":"75bc6e9a.dd5c9","type":"execute","name":"execute: evacuate","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='evacuateServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.onap.appc.tenant.id\" value=\"`$tenant-id`\" />\n<parameter name=\"org.onap.appc.rebuildvm\" value=\"`$rebuild-vm`\" />\n<parameter name=\"org.onap.appc.targethost.id\" value=\"`$targethost-id`\" />\n\n","comments":"","outputs":1,"x":411,"y":523,"z":"f4cf2376.c92f4","wires":[["eb6db261.bc7b28","47819cc2.30deac"]]},{"id":"eb6db261.bc7b28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":601,"y":571,"z":"f4cf2376.c92f4","wires":[["97cc1ef3.9ec4f"]]},{"id":"47819cc2.30deac","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":591,"y":462,"z":"f4cf2376.c92f4","wires":[["b00d6f4f.ffcb88"]]},{"id":"9b05722c.840468","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1095,"y":501,"z":"f4cf2376.c92f4","wires":[]},{"id":"b00d6f4f.ffcb88","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":753,"y":462,"z":"f4cf2376.c92f4","wires":[]},{"id":"c748601f.21dab8","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />\n","comments":"","outputs":1,"x":293,"y":350,"z":"f4cf2376.c92f4","wires":[["75fbe835.95b8a8","b3f66172.ffd75"]]},{"id":"75fbe835.95b8a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":229,"y":523,"z":"f4cf2376.c92f4","wires":[["75bc6e9a.dd5c9"]]},{"id":"b3f66172.ffd75","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":526,"y":287,"z":"f4cf2376.c92f4","wires":[["53bd08e0.7b10f"]]},{"id":"53bd08e0.7b10f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":711,"y":287,"z":"f4cf2376.c92f4","wires":[]},{"id":"97cc1ef3.9ec4f","type":"switchNode","name":"switch","xml":"<switch test='`$EVACUATE_STATUS`'>\n","comments":"","outputs":1,"x":755,"y":571,"z":"f4cf2376.c92f4","wires":[["6c8bad6c.9d4904","629304e4.1ee93c"]]},{"id":"6c8bad6c.9d4904","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":922,"y":502,"z":"f4cf2376.c92f4","wires":[["9b05722c.840468"]]},{"id":"629304e4.1ee93c","type":"outcome","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":922,"y":637,"z":"f4cf2376.c92f4","wires":[["8fdc00fc.50b118"]]},{"id":"be82d5f2.b11a9","type":"set","name":"set output message","xml":"<set>\n<parameter name='output.status.message' value=\"`$error-message`\" />\n","comments":"","x":1253,"y":636,"z":"f4cf2376.c92f4","wires":[]},{"id":"8fdc00fc.50b118","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1067,"y":636,"z":"f4cf2376.c92f4","wires":[["be82d5f2.b11a9","eca3cbfd.19b238"]]},{"id":"eca3cbfd.19b238","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1241,"y":697,"z":"f4cf2376.c92f4","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-activate.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-activate.json
deleted file mode 100644
index 15f5960..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-activate.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"b7ddcc21.7450f8","type":"comment","name":"Service-Configuration-Activate","info":"","comments":"","x":1004.75,"y":44,"z":"f00ee083.799bc","wires":[]},{"id":"6190e20.7a54fa","type":"dgstart","name":"DGSTART","outputs":1,"x":132.5,"y":92.1111068725586,"z":"f00ee083.799bc","wires":[["2058c9b5.b7deb6"]]},{"id":"2058c9b5.b7deb6","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":283.6667022705078,"y":92.77776336669922,"z":"f00ee083.799bc","wires":[["4a5c6156.ae9748"]]},{"id":"4a5c6156.ae9748","type":"method","name":"method service-configuration-activate","xml":"<method rpc='service-configuration-activate' mode='sync'>\n","comments":"","outputs":1,"x":539.0000305175781,"y":92.44442749023438,"z":"f00ee083.799bc","wires":[["ae76d72a.cd9fa8"]]},{"id":"c16f0bac.54ec08","type":"switchNode","name":"switch: order-status","xml":"<switch test=\"`$service-data.oper-status.order-status`\">\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Reserved\";\n\t\tenum \"Activated\";\n\t\tenum \"PendingDelete\";\n\t\tenum \"RequestFailed\";\n\t\tenum \"InProgressTimeout\";\n\t\tenum \"InProgress\";\n\t\tenum \"PendingActivate\";\n\t}\n}\n-->","comments":"","outputs":1,"x":146.76312255859375,"y":288.3101501464844,"z":"f00ee083.799bc","wires":[["d1c8c56d.d2c3c8","45617b36.27072c","9d92c880.b8ace8","99c2a412.526c98"]]},{"id":"d1c8c56d.d2c3c8","type":"outcome","name":"Reserved","xml":"<outcome value='Reserved'>","comments":"","outputs":1,"x":352.9147033691406,"y":338.154296875,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]},{"id":"5b9c2108.22ff08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":540.9318237304688,"y":302.6607666015625,"z":"f00ee083.799bc","wires":[["8ff99d13.048668","9f7cc348.9044a","d5e2186e.f0d268","5396ee77.430da8","7e50854b.88cc3c","24aaef83.aeb2d8","db59e9a7.81ab18"]]},{"id":"9f7cc348.9044a","type":"set","name":"set: maintinance-indicator = N","xml":"<set>\n\t<parameter name='service-data.oper-status.maintenance-indicator' value='N' />","comments":"","x":807.69384765625,"y":514.8492431640625,"z":"f00ee083.799bc","wires":[]},{"id":"c5dfc2e0.a31f88","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":939.60693359375,"y":597.1112060546875,"z":"f00ee083.799bc","wires":[["7ab0628e.874b74"]]},{"id":"7ab0628e.874b74","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1134.6068115234375,"y":596.1112060546875,"z":"f00ee083.799bc","wires":[["7c81a934.5f99d","e378e2b2.661aa8"]]},{"id":"45617b36.27072c","type":"other","name":"Other","xml":"<outcome value='Other'>\n\n<!-- null, PendingActivate, Activated, Audited -->","comments":"","outputs":1,"x":238.27389526367188,"y":806.9207153320312,"z":"f00ee083.799bc","wires":[["bd4cd955.3ff1b"]]},{"id":"8ff99d13.048668","type":"set","name":"set: last-sub-action-status = InProgress","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgress\" />","comments":"","x":827.9404296875,"y":335.44451904296875,"z":"f00ee083.799bc","wires":[]},{"id":"d5e2186e.f0d268","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":821.7498779296875,"y":387,"z":"f00ee083.799bc","wires":[[]]},{"id":"bd4cd955.3ff1b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid Order Status State'/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":427.08331298828125,"y":803.3333129882812,"z":"f00ee083.799bc","wires":[]},{"id":"c03d84f0.eb0e78","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"Service instance not found in config tree\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":729.27392578125,"y":152.46835327148438,"z":"f00ee083.799bc","wires":[]},{"id":"59d25bd8.67e904","type":"outcomeFalse","name":"false","xml":"<outcome value=\"false\">","comments":"","outputs":1,"x":550.083251953125,"y":150.66664123535156,"z":"f00ee083.799bc","wires":[["c03d84f0.eb0e78"]]},{"id":"13043f4e.308b39","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":544.4165649414062,"y":194.00001525878906,"z":"f00ee083.799bc","wires":[["c16f0bac.54ec08"]]},{"id":"ae76d72a.cd9fa8","type":"switchNode","name":"switch: service-instance-id  config == input","xml":"<switch test=\"`$service-configuration-operation-input.service-information.service-instance-id == $service-data.service-information.service-instance-id`\">","comments":"","outputs":1,"x":206.74984741210938,"y":169.99998474121094,"z":"f00ee083.799bc","wires":[["59d25bd8.67e904","13043f4e.308b39"]]},{"id":"5396ee77.430da8","type":"save","name":"save: modify-timestamp","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource\" resource=\"service-data\">\n\t\t<parameter name=\"service-data.oper-status.modify-timestamp\" value=\"`$service-data.oper-status.modify-timestamp`\" />","comments":"","outputs":1,"x":783.75,"y":450,"z":"f00ee083.799bc","wires":[[]]},{"id":"391458f8.3734d8","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":936.7498779296875,"y":864,"z":"f00ee083.799bc","wires":[["230778fb.d3aa48"]]},{"id":"230778fb.d3aa48","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1139.41650390625,"y":861.3333740234375,"z":"f00ee083.799bc","wires":[["669f2807.a376","f3bf236d.1c5ee8"]]},{"id":"669f2807.a376","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1445.7498779296875,"y":970,"z":"f00ee083.799bc","wires":[]},{"id":"beaa19db.1d003","type":"comment","name":"OrderStatus null - NO prepare done","info":"","comments":"","x":144,"y":873,"z":"f00ee083.799bc","wires":[]},{"id":"4afdefcb.ed7e5","type":"set","name":"set: order-status = RequestFailed","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"RequestFailed\" />","comments":"","x":1529.7498779296875,"y":548,"z":"f00ee083.799bc","wires":[]},{"id":"7e50854b.88cc3c","type":"GenericXML","name":"set: last-action, last-sub-action, last-svc-request-id, last-order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"VsbgServiceActivateRequest\" />\n\t<parameter name=\"service-data.oper-status.last-sub-action\" value=\"`$service-configuration-operation-input.request-information.request-sub-action`\" />\n\t<parameter name=\"service-data.oper-status.last-svc-request-id\" value=\"`$service-configuration-operation-input.sdnc-request-header.svc-request-id`\" />\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\n","comments":"","outputs":1,"x":906.7498779296875,"y":280,"z":"f00ee083.799bc","wires":[[]]},{"id":"4d7aca93.0251cc","type":"set","name":"set: order-status = PendingActivate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingActivate\" />","comments":"","x":1499.7498779296875,"y":851,"z":"f00ee083.799bc","wires":[]},{"id":"96545374.14f618","type":"comment","name":"Only Need Service_instance_id from input","info":"","comments":"","x":1184.5,"y":367,"z":"f00ee083.799bc","wires":[]},{"id":"24aaef83.aeb2d8","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"activate\"/>\n\t\n\n\t","comments":"","outputs":1,"x":671.75,"y":626,"z":"f00ee083.799bc","wires":[["c5dfc2e0.a31f88","391458f8.3734d8"]]},{"id":"db59e9a7.81ab18","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"service-configuration-operation:Activate:Before Calling ConfigAdaptor\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":734.5,"y":568,"z":"f00ee083.799bc","wires":[[]]},{"id":"7c81a934.5f99d","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"service-configuration-operation:Activate:After Calling ConfigAdaptor:Failure\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":1439.5,"y":507,"z":"f00ee083.799bc","wires":[[]]},{"id":"f3bf236d.1c5ee8","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"service-configuration-operation:Activate:After Calling ConfigAdaptor:Success\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$service-data.vnf-config-information.vnf-type`\"/>\n<parameter name=\"field7\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n\n\n","comments":"","outputs":1,"x":1416.5,"y":791,"z":"f00ee083.799bc","wires":[[]]},{"id":"9d92c880.b8ace8","type":"outcome","name":"RequestFailed","xml":"<outcome value='RequestFailed'>","comments":"","outputs":1,"x":361.75,"y":275,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]},{"id":"77ba363f.3bc7d8","type":"outcome","name":"InProgressTimeout","xml":"<outcome value='InProgressTimeout'>","comments":"","outputs":1,"x":382.75,"y":471,"z":"f00ee083.799bc","wires":[[]]},{"id":"97f847f7.7c233","type":"set","name":"set: last-sub-action-status = RequestFailed","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"RequestFailed\" />","comments":"","x":1556.75,"y":592,"z":"f00ee083.799bc","wires":[]},{"id":"bfd9b6ea.7f73c8","type":"comment","name":"LastSubAction status set on Notification","info":"","comments":"","x":1890.75,"y":590,"z":"f00ee083.799bc","wires":[]},{"id":"2e268fc9.50fa08","type":"comment","name":"Set Order Status on Notification","info":"","comments":"","x":1706.75,"y":761,"z":"f00ee083.799bc","wires":[]},{"id":"e378e2b2.661aa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1463.75,"y":645,"z":"f00ee083.799bc","wires":[]},{"id":"99c2a412.526c98","type":"outcome","name":"PendingActivate","xml":"<outcome value='PendingActivate'>","comments":"","outputs":1,"x":351.75,"y":391,"z":"f00ee083.799bc","wires":[["5b9c2108.22ff08"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-backup.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-backup.json
deleted file mode 100644
index 0234000..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-backup.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"72300b6a.d66304","type":"comment","name":"Service-Configuration-Backup","info":"","comments":"","x":1466.25,"y":116,"z":"37e3acc8.561634","wires":[]},{"id":"6f0f1b54.abf674","type":"dgstart","name":"DGSTART","outputs":1,"x":85.5,"y":124.1111068725586,"z":"37e3acc8.561634","wires":[["3306295a.100926"]]},{"id":"3306295a.100926","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":254.6667022705078,"y":121.77776336669922,"z":"37e3acc8.561634","wires":[["a625e1b7.68491"]]},{"id":"a625e1b7.68491","type":"method","name":"method service-configuration-backup","xml":"<method rpc='service-configuration-backup' mode='sync'>\n","comments":"","outputs":1,"x":514.0000305175781,"y":116.44442749023438,"z":"37e3acc8.561634","wires":[["7cce1009.b1969"]]},{"id":"50956db6.420d34","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$service-data.backup-information.service-instance-id`\"/>\n<parameter name=\"SERVICEDATAFILENAME\" value=\"`$service-data.backup-information.file-name`\"/>\n<parameter name=\"field4\" value=\"`$service-data.backup-information.file-type`\"/>\n<parameter name=\"field5\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\"/>\n<parameter name=\"INPUTFILENAME\" value=\"`$service-configuration-operation-input.backup-information.file-name`\"/>\n<parameter name=\"field7\" value=\"`$service-configuration-operation-input.backup-information.file-type`\"/>\n<parameter name=\"field8\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n<parameter name=\"field9\" value=\"`$service-data.vnf-config-information.vnf-host-ip-address`\"/>\n<parameter name=\"field10\" value=\"`$service-configuration-operation-input.appc-request-header.svc-action`\"/>\n<parameter name=\"field11\" value=\"`$service-configuration-operation-input.vnf-config-information.vnf-host-ip-address`\"/>\n","comments":"","outputs":1,"x":265.7498779296875,"y":381,"z":"37e3acc8.561634","wires":[[]]},{"id":"792c5a95.fa7b24","type":"GenericXML","name":"set: backup information and host IP","xml":"<set>\n\t<parameter name=\"service-data.backup-information.file-type\" value=\"`$service-configuration-operation-input.backup-information.file-type`\" />\n\t\n\t<parameter name=\"service-data.backup-information.file-name\" value=\"`$service-configuration-operation-input.backup-information.file-name`\" />\n\t\n\t<parameter name=\"service-data.backup-information.service-instance-id\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\" />\n\t<parameter name=\"service-data.vnf-config-information.vnf-host-ip-address\" value=\"`$service-configuration-operation-input.vnf-config-information.vnf-host-ip-address`\" />\n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$service-configuration-operation-input.backup-information.service-instance-id`\"/>\n\t<parameter name=\"service-data.vnf-config-information.vendor\" value=\"`$service-configuration-operation-input.vnf-config-information.vendor`\" />\n\t\n\t\n\n","comments":"","outputs":1,"x":356,"y":339,"z":"37e3acc8.561634","wires":[[]]},{"id":"a358039.b124","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"`$service-data.appc-request-header.svc-action`\"/>\n\t\n\n\t","comments":"","outputs":1,"x":170,"y":1066,"z":"37e3acc8.561634","wires":[["cb278383.f55b3","640f72bc.e9135c"]]},{"id":"cb278383.f55b3","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":434,"y":1070,"z":"37e3acc8.561634","wires":[["92a5a578.2184b8"]]},{"id":"640f72bc.e9135c","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":430,"y":1187,"z":"37e3acc8.561634","wires":[["31cc3939.22b816"]]},{"id":"31cc3939.22b816","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":640,"y":1190,"z":"37e3acc8.561634","wires":[]},{"id":"92a5a578.2184b8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":623,"y":1073,"z":"37e3acc8.561634","wires":[]},{"id":"ed24f120.cf4c8","type":"get-resource","name":"get-resource: A&AI Data","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-operation-input.service-information.service-instance-id\" pfx=\"tmp.aai-data\" >\n\n","comments":"","outputs":1,"x":821.5,"y":468,"z":"37e3acc8.561634","wires":[["2291f352.f5521c","4f2eb8f2.d537d8","448baa3.3f7e954"]]},{"id":"544d666.8d42598","type":"GenericXML","name":"set: last-action, last-sub-action, last-svc-request-id, last-order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"VsbgServiceBackupRequest\" />\n\t<parameter name=\"service-data.oper-status.last-sub-action\" value=\"`$service-configuration-operation-input.request-information.request-sub-action`\" />\n\t<parameter name=\"service-data.oper-status.last-svc-request-id\" value=\"`$service-configuration-operation-input.sdnc-request-header.svc-request-id`\" />\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\n","comments":"","outputs":1,"x":456.5,"y":426,"z":"37e3acc8.561634","wires":[[]]},{"id":"973644f5.342df8","type":"switchNode","name":"switch: request-sub-action","xml":"<switch test=\"`$service-configuration-operation-input.request-information.request-sub-action`\">\n<!--\n leaf request-sub-action {\n                type enumeration {\n                    enum \"PREPARE\";\n                    enum \"ACTIVATE\";\n                }\n            }\n} \n-->","comments":"","outputs":1,"x":116.5,"y":645,"z":"37e3acc8.561634","wires":[["f556e104.4b20b","6709c25e.a37b9c"]]},{"id":"f556e104.4b20b","type":"other","name":"RESTOREBACKUP","xml":"<outcome value='RESTOREBACKUP'>","comments":"","outputs":1,"x":350.5,"y":626,"z":"37e3acc8.561634","wires":[["dd64e29e.a7665"]]},{"id":"172a6471.dec2ec","type":"switchNode","name":"switch: A&AI Prov Status","xml":"<switch test=\"`$tmp.aai-data.prov-status`\">\n\n","comments":"","outputs":1,"x":1174.5,"y":733,"z":"37e3acc8.561634","wires":[["359f8600.44336a","7eaece51.99dc2","6d8cd7bb.309a78","7d475d2b.45f914"]]},{"id":"6709c25e.a37b9c","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":325.5,"y":688,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"9af828ad.bb9858","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"The SBG is in service and the configuration cannot be restored back to the initial configuration.The SBG should be put in a maintenance state before restoring.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1613.5,"y":747,"z":"37e3acc8.561634","wires":[]},{"id":"359f8600.44336a","type":"other","name":"PROV","xml":"<outcome value='PROV'>","comments":"","outputs":1,"x":1434.5,"y":749,"z":"37e3acc8.561634","wires":[["9af828ad.bb9858"]]},{"id":"7eaece51.99dc2","type":"other","name":"PREPROV","xml":"<outcome value='PREPROV'>","comments":"","outputs":1,"x":1445.5,"y":798,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"6d8cd7bb.309a78","type":"other","name":"NVTPROV","xml":"<outcome value='NVTPROV'>","comments":"","outputs":1,"x":1450.5,"y":851,"z":"37e3acc8.561634","wires":[["a358039.b124"]]},{"id":"7d475d2b.45f914","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1461.5,"y":904,"z":"37e3acc8.561634","wires":[["f2f5f030.526eb"]]},{"id":"f2f5f030.526eb","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"`'Restore configuration is not allowed. SBG Status is' + $tmp.aai-data.prov-status`\"/>\n\n<!--\n<parameter name=\"error-message\" value=\"Restore configuration is not allowed. Invalid A&AI Status\"/>\n-->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1634.5,"y":903,"z":"37e3acc8.561634","wires":[]},{"id":"7cce1009.b1969","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":67.5,"y":206,"z":"37e3acc8.561634","wires":[["50956db6.420d34","544d666.8d42598","5ea37258.1f5a0c","ed61d3df.d15ae","973644f5.342df8","792c5a95.fa7b24"]]},{"id":"5ea37258.1f5a0c","type":"set","name":"set: last-sub-action-status = InProgress","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgress\" />","comments":"","x":364.5,"y":469,"z":"37e3acc8.561634","wires":[]},{"id":"ed61d3df.d15ae","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":368.5,"y":516,"z":"37e3acc8.561634","wires":[[]]},{"id":"dd64e29e.a7665","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":571.5,"y":568,"z":"37e3acc8.561634","wires":[["ed24f120.cf4c8"]]},{"id":"4cc5dcc9.9cef84","type":"switchNode","name":"switch: A&AI In-Maint","xml":"<switch test=\"`$tmp.aai-data.in-maint`\">\n\n","comments":"","outputs":1,"x":1167.5,"y":654,"z":"37e3acc8.561634","wires":[["a0194efc.a2f1f"]]},{"id":"2291f352.f5521c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1048.5,"y":467,"z":"37e3acc8.561634","wires":[["685cea94.e1a364"]]},{"id":"4f2eb8f2.d537d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1044.5,"y":511,"z":"37e3acc8.561634","wires":[["e6099183.cff0e"]]},{"id":"685cea94.e1a364","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"SBG not found in A&amp;AI.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1243.5,"y":463,"z":"37e3acc8.561634","wires":[]},{"id":"a0194efc.a2f1f","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1346.5,"y":654,"z":"37e3acc8.561634","wires":[["13a83c58.fc2154"]]},{"id":"13a83c58.fc2154","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"404\"/>\n\t<parameter name=\"error-message\" value=\"The SBG is in service and the configuration cannot be restored back to the initial configuration.The SBG should be put in a maintenance state before restoring.\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1513.5,"y":653,"z":"37e3acc8.561634","wires":[]},{"id":"448baa3.3f7e954","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":776.5,"y":580,"z":"37e3acc8.561634","wires":[["1bc02fac.ed8ea"]]},{"id":"1bc02fac.ed8ea","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":944.5,"y":581,"z":"37e3acc8.561634","wires":[["4cc5dcc9.9cef84","172a6471.dec2ec","3b0ebd45.85a932"]]},{"id":"3b0ebd45.85a932","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"PROVSTATUS\" value=\"`$tmp.aai-data.prov-status`\"/>\n<parameter name=\"INMAINT\" value=\"`$tmp.aai-data.in-maint`\"/>\n\n\n","comments":"","outputs":1,"x":1133.5,"y":579,"z":"37e3acc8.561634","wires":[[]]},{"id":"e6099183.cff0e","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"405\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.aai-data.error.message + '.Response code:' + $tmp.aai-data.error.http.response-code`\"/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1234,"y":511,"z":"37e3acc8.561634","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-notification.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-notification.json
deleted file mode 100644
index aefe7e7..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-notification.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"d5b20eaa.df2d7","type":"comment","name":"Service-CONFIGURATION-NOTIFICATION","info":"","comments":"","x":787,"y":49,"z":"c2935c8.a850aa","wires":[]},{"id":"356bcada.a54386","type":"dgstart","name":"DGSTART","outputs":1,"x":96.7618408203125,"y":128.47621154785156,"z":"c2935c8.a850aa","wires":[["ebc2ed13.350ea"]]},{"id":"ebc2ed13.350ea","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":255,"y":129,"z":"c2935c8.a850aa","wires":[["a0592e1a.4e8a6"]]},{"id":"a0592e1a.4e8a6","type":"method","name":"method service-configuration-notification","xml":"<method rpc='service-configuration-notification' mode='sync'>\n","comments":"","outputs":1,"x":542.2380981445312,"y":125.80955505371094,"z":"c2935c8.a850aa","wires":[["31f55649.21899a"]]},{"id":"a6521c1b.8f751","type":"switchNode","name":"switch: service-instance-id already in config","xml":"<switch test=\"`$service-configuration-notification-input.service-information.service-instance-id == $service-data.service-information.service-instance-id`\">","comments":"","outputs":1,"x":367.3651123046875,"y":288.7200927734375,"z":"c2935c8.a850aa","wires":[["377966de.f0066a","447b2d6b.ec5a84"]]},{"id":"377966de.f0066a","type":"outcomeTrue","name":"outcome: true","xml":"<outcome value=\"true\">\n","outputs":1,"x":672.8729553222656,"y":273.23211669921875,"z":"c2935c8.a850aa","wires":[["d76b0bb4.11c118"]]},{"id":"447b2d6b.ec5a84","type":"outcomeFalse","name":"outcome: false","xml":"<outcome value=\"false\">","comments":"","outputs":1,"x":689.2182006835938,"y":179.3154754638672,"z":"c2935c8.a850aa","wires":[["4501a9b5.00b638"]]},{"id":"31f55649.21899a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":91.66802978515625,"y":197.87596130371094,"z":"c2935c8.a850aa","wires":[["d8530e1f.2b615","a6521c1b.8f751","16e0fd48.3fe683"]]},{"id":"d8530e1f.2b615","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.response-code`\"/>\n<parameter name=\"field4\" value=\"`$service-configuration-notification-input.response-message`\"/>\n<parameter name=\"field5\" value=\"`$service-configuration-notification-input.svc-request-id`\"/>\n\n\n<parameter name=\"field6\" value=\"`$service-configuration-notification-input.service-information.service-type`\"/>\n<parameter name=\"field7\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field8\" value=\"`$service-data.appc-request-header.svc-request-id`\"/>\n\n<!--\n<parameter name=\"field2\" value=\"service-configuration-notification\"/>\n<parameter name=\"field3\" value=\"`$service-data.service-information.service-instance-id`\"/>\n<parameter name=\"field4\" value=\"`$service-configuration-notification-input.response-code`\"/>\n<parameter name=\"field5\" value=\"`$service-data.request-information.request-action`\"/>\n<parameter name=\"field6\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n-->","comments":"","outputs":1,"x":289.81097412109375,"y":240.21363830566406,"z":"c2935c8.a850aa","wires":[[]]},{"id":"c7db723d.34c11","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":345.1700744628906,"y":504.00897216796875,"z":"c2935c8.a850aa","wires":[["bbe81125.eaf2d","8db26529.f57d68","d6aa913e.989d","12f56193.76876e"]]},{"id":"b3a1b84b.43c738","type":"switchNode","name":"switch: response code ","xml":"<switch test=\"`$service-configuration-notification-input.response-code`\">\n\n","comments":"","outputs":1,"x":177.44949340820312,"y":400.90478515625,"z":"c2935c8.a850aa","wires":[["c9771646.384a68","f8b4f8ca.d7ca88"]]},{"id":"c9771646.384a68","type":"success","name":"outcome: Success","xml":"<outcome value=\"Success\">","comments":"","outputs":1,"x":128.02099609375,"y":503.57139587402344,"z":"c2935c8.a850aa","wires":[["c7db723d.34c11"]]},{"id":"f8b4f8ca.d7ca88","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":103.44949340820312,"y":922,"z":"c2935c8.a850aa","wires":[["3e2f33dd.6a236c"]]},{"id":"490e75b4.a0784c","type":"set","name":"set: order-status = Activated and A&AI Status =NVTPROV/CONFIGURED","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Activated\" />\n\t<parameter name=\"tmp.aai-prov-status\" value=\"NVTPROV\" />\n\t<parameter name=\"tmp.aai-orch-status\" value=\"CONFIGURED\" />","comments":"","x":1355.2830810546875,"y":351.3018798828125,"z":"c2935c8.a850aa","wires":[]},{"id":"3e2f33dd.6a236c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":314.58807373046875,"y":918.9999389648438,"z":"c2935c8.a850aa","wires":[["1f7fafba.0add2","b94ddf6d.56216"]]},{"id":"b94ddf6d.56216","type":"configure","name":"SDN_GP Asynch Notification","xml":"<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n","comments":"","outputs":1,"x":672.9213256835938,"y":890.1514892578125,"z":"c2935c8.a850aa","wires":[[]]},{"id":"1f7fafba.0add2","type":"returnFailure","name":"return: failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='`$service-configuration-notification-input.response-code`'/>\n\t<parameter name='error-message' value='`$service-configuration-notification-input.response-message`'/>\n\t<parameter name='internal-error' value='false' />","comments":"","x":613.8312377929688,"y":932.0717163085938,"z":"c2935c8.a850aa","wires":[]},{"id":"4501a9b5.00b638","type":"returnFailure","name":"return: failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='1000'/>\n\t<parameter name='error-message' value='Service Instance Id not found'/>\n\t<parameter name='internal-error' value='true' />","comments":"","x":900.7353820800781,"y":178.5714569091797,"z":"c2935c8.a850aa","wires":[]},{"id":"ab4826ec.3cd828","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":2149.3543663024902,"y":5396.627190113068,"z":"c2935c8.a850aa","wires":[["8984c5a6.ec0fe8"]]},{"id":"9f2faf6c.89703","type":"other","name":"outcome: ChangeLayer3ServiceActivateRequest","xml":"<outcome value=\"ChangeLayer3ServiceActivateRequest\">\n\n","outputs":1,"x":2294.2545433044434,"y":5233.393614768982,"z":"c2935c8.a850aa","wires":[["ede4a3de.8f776"]]},{"id":"7b44beed.e0798","type":"execute","name":"execute: EIPAM_UnassignIPAddress","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />","outputs":1,"x":2874.284980773926,"y":5149.545325279236,"z":"c2935c8.a850aa","wires":[[]]},{"id":"ede4a3de.8f776","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2573.6183280944824,"y":5230.545227050781,"z":"c2935c8.a850aa","wires":[["7b44beed.e0798","3e190cb9.7f1f94","84da06b9.4d6678","d6d749b0.cfeac8","ef33ba15.3b9758"]]},{"id":"d6d749b0.cfeac8","type":"configure","name":"MSO Asynch Notification","xml":"<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"MSO\">\n      <parameter name=\"dummyparam\" value=\"test\"/>\n","outputs":1,"x":2844.2713928222656,"y":5300.871339797974,"z":"c2935c8.a850aa","wires":[[]]},{"id":"ef33ba15.3b9758","type":"returnSuccess","name":"return success","xml":" <return status=\"success\">\n \n","x":2816.120918273926,"y":5348.317549705505,"z":"c2935c8.a850aa","wires":[]},{"id":"84da06b9.4d6678","type":"save","name":"save: order-status = Activated","xml":"<save plugin=\"com.att.sdnctl.sli.resource.mdsal.ConfigResource\" resource=\"service-data\">\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Activated\" />","outputs":1,"x":2858.1866760253906,"y":5247.433511734009,"z":"c2935c8.a850aa","wires":[[]]},{"id":"3e190cb9.7f1f94","type":"set","name":"set: order-status = Activated","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Activated\" />","x":2850.559804916382,"y":5201.139886856079,"z":"c2935c8.a850aa","wires":[]},{"id":"8984c5a6.ec0fe8","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$service-data.request-information.request-action`'/>\n\t<parameter name='internal-error' value='true'/>\n \n","x":2462.4364824295044,"y":5398.090530395508,"z":"c2935c8.a850aa","wires":[]},{"id":"bbe81125.eaf2d","type":"configure","name":"SDN_GP Asynch Notification","xml":"<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>","comments":"","outputs":1,"x":827.0951843261719,"y":784.1428833007812,"z":"c2935c8.a850aa","wires":[[]]},{"id":"16e0fd48.3fe683","type":"set","name":"set:service-data based on input","xml":"<set>\n<parameter name=\"service-data.appc-request-header.svc-request-id\" value=\"`$service-configuration-notification-input.svc-request-id`\" />\n\n<!--\n<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\" />\n-->\n<parameter name=\"service-data.service-information.service-type\" value=\"`$service-configuration-notification-input.service-information.service-type`\" />\n\t\n\n\t\n\t\n\t","comments":"","x":371,"y":197,"z":"c2935c8.a850aa","wires":[]},{"id":"8db26529.f57d68","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n<parameter name='error-code' value='200'/>\n<parameter name='error-message' value='`$service-configuration-notification-input.response-message`'/>\n \n","comments":"","x":789.9494934082031,"y":857,"z":"c2935c8.a850aa","wires":[]},{"id":"d6aa913e.989d","type":"switchNode","name":"switch: last-sub-action","xml":"<switch test=\"`$service-data.oper-status.last-sub-action`\">\n","comments":"","outputs":1,"x":586.4494934082031,"y":506,"z":"c2935c8.a850aa","wires":[["ab5c4a39.56b068","2952075e.f8cb78"]]},{"id":"ab5c4a39.56b068","type":"success","name":"outcome: ACTIVATE","xml":"<outcome value=\"ACTIVATE\">","comments":"","outputs":1,"x":825.4494934082031,"y":479,"z":"c2935c8.a850aa","wires":[["54aa365b.8a9b88"]]},{"id":"2952075e.f8cb78","type":"success","name":"outcome: RESTOREBACKUP","xml":"<outcome value=\"RESTOREBACKUP\">","comments":"","outputs":1,"x":832.4494934082031,"y":613,"z":"c2935c8.a850aa","wires":[["9e497ad3.6c9b08"]]},{"id":"54aa365b.8a9b88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1027.4494934082031,"y":478,"z":"c2935c8.a850aa","wires":[["490e75b4.a0784c","6ebffec.ea695"]]},{"id":"9e497ad3.6c9b08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1058.4494934082031,"y":617,"z":"c2935c8.a850aa","wires":[["27b70ff2.42077"]]},{"id":"c7e2d0f5.74988","type":"set","name":"set: A&AI Prov Status to PREPROV/UNCONFIGURED","xml":"<set>\n\t<parameter name=\"tmp.aai-prov-status\" value=\"PREPROV\" />\n\t<parameter name=\"tmp.aai-orch-status\" value=\"UNCONFIGURED\" />","comments":"","x":2179.449493408203,"y":538,"z":"c2935c8.a850aa","wires":[]},{"id":"27b70ff2.42077","type":"switchNode","name":"switch: backup-information.file-type","xml":"<switch test=\"`$service-data.backup-information.file-type`\">\n","comments":"","outputs":1,"x":1316.4494934082031,"y":620,"z":"c2935c8.a850aa","wires":[["36ce6a3d.01f3c6","bb6e3f9f.c5558"]]},{"id":"36ce6a3d.01f3c6","type":"success","name":"outcome: InitialConfig","xml":"<outcome value=\"InitialConfig\">","comments":"","outputs":1,"x":1611.4494934082031,"y":593,"z":"c2935c8.a850aa","wires":[["1393e777.b727f9"]]},{"id":"bb6e3f9f.c5558","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":1606.4494934082031,"y":668,"z":"c2935c8.a850aa","wires":[["691391c0.2a05a"]]},{"id":"8fec3fe2.7fe13","type":"call","name":"call: update A&AI","xml":"<call module=\"Appc-API\" rpc=\"update-aai\" mode=\"sync\">","comments":"","outputs":1,"x":2043.449462890625,"y":422,"z":"c2935c8.a850aa","wires":[[]]},{"id":"1393e777.b727f9","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1830.4494934082031,"y":593,"z":"c2935c8.a850aa","wires":[["c7e2d0f5.74988","17a25d0e.4b5ca3","c10e674c.dfbc08","6d36bcf0.c8a684"]]},{"id":"17a25d0e.4b5ca3","type":"call","name":"call: update A&AI for restore","xml":"<call module=\"Appc-API\" rpc=\"update-aai-sbg\" mode=\"sync\">","comments":"","outputs":1,"x":2114.449462890625,"y":724,"z":"c2935c8.a850aa","wires":[[]]},{"id":"691391c0.2a05a","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Backup Config=Downloaded Config, it is assumed that the status in AnAI is NVTPROV so no update is necessary\"/>\n\n\n","comments":"","outputs":1,"x":1806.4495239257812,"y":664,"z":"c2935c8.a850aa","wires":[[]]},{"id":"4eb6e037.dbaf5","type":"set","name":"set: order-status = Reserved ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Reserved\" />\n","comments":"","x":2816.449493408203,"y":585,"z":"c2935c8.a850aa","wires":[]},{"id":"c10e674c.dfbc08","type":"switchNode","name":"switch: order-status","xml":"<switch test=\"`$service-data.oper-status.order-status`\">\n<!--\nleaf order-status { \n\ttype enumeration { \n\t\tenum \"Reserved\";\n\t\tenum \"Activated\";\n\t\tenum \"PendingDelete\";\n\t\tenum \"RequestFailed\";\n\t\tenum \"InProgressTimeout\";\n\t\tenum \"InProgress\";\n\t} \n} \n-->","comments":"","outputs":1,"x":2132.449493408203,"y":586,"z":"c2935c8.a850aa","wires":[["913bd3d3.04dad","92ac0814.df8778"]]},{"id":"913bd3d3.04dad","type":"success","name":"outcome: Activated","xml":"<outcome value=\"Activated\">","comments":"","outputs":1,"x":2366.449493408203,"y":583,"z":"c2935c8.a850aa","wires":[["436e6ada.44f7b4"]]},{"id":"436e6ada.44f7b4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2566.449493408203,"y":582,"z":"c2935c8.a850aa","wires":[["4eb6e037.dbaf5","888848fc.c44698"]]},{"id":"65fee45.b12251c","type":"comment","name":"Lastsubactionstatus updated in Appc","info":"","comments":"","x":1445.449462890625,"y":276,"z":"c2935c8.a850aa","wires":[]},{"id":"12f56193.76876e","type":"set","name":"set: last-sub-action-status","xml":"<set>\n<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"Success\" />\n\n","comments":"","x":821.4494934082031,"y":730,"z":"c2935c8.a850aa","wires":[]},{"id":"b0f15339.b347b","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Dont update Order Status\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n\n\n","comments":"","outputs":1,"x":2730.449493408203,"y":717,"z":"c2935c8.a850aa","wires":[[]]},{"id":"92ac0814.df8778","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":2362.449493408203,"y":720,"z":"c2935c8.a850aa","wires":[["be0c9c33.2fb04"]]},{"id":"3fdf2b46.361354","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":1104.4494934082031,"y":270,"z":"c2935c8.a850aa","wires":[[]]},{"id":"d76b0bb4.11c118","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":842.4494934082031,"y":272,"z":"c2935c8.a850aa","wires":[["3fdf2b46.361354","b3a1b84b.43c738"]]},{"id":"888848fc.c44698","type":"set","name":"set: last-order-status ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />","comments":"","x":2792.449493408203,"y":530,"z":"c2935c8.a850aa","wires":[]},{"id":"be0c9c33.2fb04","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2542.449493408203,"y":720,"z":"c2935c8.a850aa","wires":[["b0f15339.b347b"]]},{"id":"6d36bcf0.c8a684","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"CALLING AAIUPDATE\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n\n\n","comments":"","outputs":1,"x":2109.4495239257812,"y":654,"z":"c2935c8.a850aa","wires":[[]]},{"id":"6ebffec.ea695","type":"switchNode","name":"switch: update-configuration","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration_length`\">\n","comments":"","outputs":1,"x":1292,"y":422,"z":"c2935c8.a850aa","wires":[["9cf5bbff.14b8e8","47a88695.0e6938","65a8c6df.0c6b58"]]},{"id":"9cf5bbff.14b8e8","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1519,"y":425,"z":"c2935c8.a850aa","wires":[["505e7219.efb9dc"]]},{"id":"505e7219.efb9dc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1817,"y":425,"z":"c2935c8.a850aa","wires":[["8fec3fe2.7fe13"]]},{"id":"47a88695.0e6938","type":"success","name":"outcome: Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":1525,"y":522,"z":"c2935c8.a850aa","wires":[["1e1d5f8c.03063"]]},{"id":"1e1d5f8c.03063","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Configuration populated\"/>\n<parameter name=\"UPDATECONFIGLEN\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration_length`\"/>\n\n\n","comments":"","outputs":1,"x":1696,"y":523,"z":"c2935c8.a850aa","wires":[[]]},{"id":"65a8c6df.0c6b58","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1554,"y":468,"z":"c2935c8.a850aa","wires":[["505e7219.efb9dc"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-operation.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-operation.json
deleted file mode 100644
index d8b29da..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-operation.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"b3509dbf.084df","type":"comment","name":"service-configuration-operation","info":"","comments":"","x":1233.3332824707031,"y":125.33335876464844,"z":"57f142c6.1f478c","wires":[]},{"id":"337f0433.e9ec7c","type":"dgstart","name":"DGSTART","outputs":1,"x":93.66665649414062,"y":99.66668701171875,"z":"57f142c6.1f478c","wires":[["d12b2f59.1acc5"]]},{"id":"d12b2f59.1acc5","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":274.66668701171875,"y":99,"z":"57f142c6.1f478c","wires":[["99a183f8.1b55b"]]},{"id":"99a183f8.1b55b","type":"method","name":"method service-configuration-operation","xml":"<method rpc='service-configuration-operation' mode='sync'>\n","comments":"","outputs":1,"x":549.3333435058594,"y":104.00001525878906,"z":"57f142c6.1f478c","wires":[["da27abb6.e9a128"]]},{"id":"2c3a60cb.7af1c","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$service-configuration-operation-input.request-information.request-action`\">\n<!--\n leaf request-action {\n                type enumeration {\n                    enum \"VsbgServiceActivateRequest\";\n                }\n            }\n}\n-->\n\n","comments":"","outputs":1,"x":159.83340454101562,"y":663.0000305175781,"z":"57f142c6.1f478c","wires":[["ce54964e.79ea38","fe8b9eb9.73ad2","78d15bd7.84caa4"]]},{"id":"ce54964e.79ea38","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":381.1743469238281,"y":1447.136474609375,"z":"57f142c6.1f478c","wires":[["f098f080.0fb19"]]},{"id":"fe8b9eb9.73ad2","type":"outcome","name":"VsbgServiceActivateRequest","xml":"<outcome value='VsbgServiceActivateRequest'>","comments":"","outputs":1,"x":477.8334655761719,"y":646.416748046875,"z":"57f142c6.1f478c","wires":[["fa999334.02fee"]]},{"id":"f098f080.0fb19","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='req-action not recognized'/>\n","comments":"","x":571.2252502441406,"y":1447.0010986328125,"z":"57f142c6.1f478c","wires":[]},{"id":"87a37d2a.6ca3e","type":"call","name":"call: service-configuration-activate","xml":"<call module=\"Appc-API\" rpc=\"service-configuration-activate\" mode=\"sync\">","comments":"","outputs":1,"x":1874.4999084472656,"y":637.4166259765625,"z":"57f142c6.1f478c","wires":[[]]},{"id":"fa999334.02fee","type":"switchNode","name":"switch: request-sub-action","xml":"<switch test=\"`$service-configuration-operation-input.request-information.request-sub-action`\">\n<!--\n leaf request-sub-action {\n                type enumeration {\n                    enum \"PREPARE\";\n                    enum \"ACTIVATE\";\n                }\n            }\n} \n-->","comments":"","outputs":1,"x":761.1110534667969,"y":645.2222900390625,"z":"57f142c6.1f478c","wires":[["100480f1.8fdcef","1ab975fc.edd7ca","7c055852.c45578"]]},{"id":"100480f1.8fdcef","type":"outcome","name":"PREPARE","xml":"<outcome value='PREPARE'>","comments":"","outputs":1,"x":994.3333435058594,"y":406.666748046875,"z":"57f142c6.1f478c","wires":[["cc499bb2.e44078"]]},{"id":"1ab975fc.edd7ca","type":"other","name":"ACTIVATE","xml":"<outcome value='ACTIVATE'>","comments":"","outputs":1,"x":1025.6663513183594,"y":629.6666259765625,"z":"57f142c6.1f478c","wires":[["21e1499f.20daa6"]]},{"id":"d36bac8b.003aa","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"service-configuration-operation\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-operation-input.appc-request-header.svc-action`\"/>\n<parameter name=\"field4\" value=\"`$service-configuration-operation-input.appc-request-header.svc-request-id`\"/>\n<parameter name=\"field5\" value=\"`$service-configuration-operation-input.service-information.service-instance-id`\"/>\n<parameter name=\"field6\" value=\"`$service-configuration-operation-input.request-information.request-id`\"/>\n<parameter name=\"field7\" value=\"`$service-configuration-operation-input.request-information.request-action`\"/>\n<parameter name=\"field8\" value=\"`$service-configuration-operation-input.request-information.source`\"/>\n<parameter name=\"field9\" value=\"`$service-configuration-operation-input.service-information.service-instance-id`\"/>\n<parameter name=\"field10\" value=\"`$service-configuration-operation-input.service-information.service-type`\"/>\n<parameter name=\"field11\" value=\"`$service-configuration-operation-input.request-information.request-sub-action`\"/>","comments":"","outputs":1,"x":264.6667175292969,"y":213.33335876464844,"z":"57f142c6.1f478c","wires":[[]]},{"id":"da27abb6.e9a128","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":77,"y":204.33335876464844,"z":"57f142c6.1f478c","wires":[["d36bac8b.003aa","50935a83.2d88f4","fad64f0.0ca0eb"]]},{"id":"50935a83.2d88f4","type":"set","name":"set:service-data based on input: request-id ,svc-request-id  & service-type","xml":"<set>\n\t\n\t<parameter name=\"service-data.request-information.request-id\" value=\"`$service-configuration-operation-input.request-information.request-id`\" />\n\t<parameter name=\"service-data.request-information.notification-url\" value=\"`$service-configuration-operation-input.request-information.notification-url`\" />\n\t<parameter name=\"service-data.request-information.request-action\" value=\"`$service-configuration-operation-input.request-information.request-action`\" />\n\t<parameter name=\"service-data.request-information.source\" value=\"`$service-configuration-operation-input.request-information.source`\" />\n\t<parameter name=\"service-data.request-information.order-number\" value=\"`$service-configuration-operation-input.request-information.order-number`\" />\n\t<parameter name=\"service.request-information.order-version\" value=\"`$service-configuration-operation-input.request-information.order-version`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-request-id\" value=\"`$service-configuration-operation-input.appc-request-header.svc-request-id`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-action\" value=\"`$service-configuration-operation-input.appc-request-header.svc-action`\" />\n\t<parameter name=\"service-data.appc-request-header.svc-notification-url\" value=\"`$service-configuration-operation-input.appc-request-header.svc-notification-url`\" />\n\t<!-- \n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$service-configuration-operation-input.service-information.service-instance-id`\" />\n\t-->\n\t<parameter name=\"service-data.service-information.service-type\" value=\"`$service-configuration-operation-input.service-information.service-type`\" />\n\t<parameter name=\"service-data.request-information.request-sub-action\" value=\"`$service-configuration-operation-input.request-information.request-sub-action`\" />\n\n\t\n\t<!-- set service-data based on input only for Prepare\n\t<parameter name=\"service-data.\" value=\"`$service-configuration-operation-input.`\" />\n\t-->\n\t","comments":"","x":470.3333435058594,"y":178.00003051757812,"z":"57f142c6.1f478c","wires":[]},{"id":"e1359cee.43a9f","type":"call","name":"call: service-configuration-prepare","xml":"<call module=\"Appc-API\" rpc=\"service-configuration-prepare\" mode=\"sync\">","comments":"","outputs":1,"x":1868.8332824707031,"y":399.3333740234375,"z":"57f142c6.1f478c","wires":[[]]},{"id":"1a154772.444899","type":"call","name":"call: service-configuration-backup","xml":"<call module=\"Appc-API\" rpc=\"service-configuration-backup\" mode=\"sync\">","comments":"","outputs":1,"x":1895.8332824707031,"y":1118.3333129882812,"z":"57f142c6.1f478c","wires":[[]]},{"id":"fad64f0.0ca0eb","type":"switchNode","name":"switch: last-sub-action-status","xml":"<switch test=\"`$service-data.oper-status.last-sub-action-status`\">\n","comments":"","outputs":1,"x":332.8333435058594,"y":257.33335876464844,"z":"57f142c6.1f478c","wires":[["a0cc216d.461e7","17e973e8.0fc1ac"]]},{"id":"a0cc216d.461e7","type":"outcome","name":"InProgress","xml":"<outcome value='InProgress'>","comments":"","outputs":1,"x":556.8333435058594,"y":257.33335876464844,"z":"57f142c6.1f478c","wires":[["c17c511.dddb7b"]]},{"id":"c17c511.dddb7b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":725.8333435058594,"y":255.33335876464844,"z":"57f142c6.1f478c","wires":[["db7678e6.fdbd48","2bea4db9.267f82","8ea5da83.26cac8","2c3a60cb.7af1c"]]},{"id":"db7678e6.fdbd48","type":"execute","name":"execute getTimeDifference","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"getTimeDifference\">\n\t<parameter name=\"inDate\" value=\"`$service-data.oper-status.modify-timestamp`\"/>\n\t<parameter name=\"ctxTempVariable\" value=\"tmp.inprogress-time\"/>","comments":"","outputs":1,"x":950.8333435058594,"y":172.33335876464844,"z":"57f142c6.1f478c","wires":[[]]},{"id":"2bea4db9.267f82","type":"switchNode","name":"switch: tmp.inprogress-time > 6 min (360 seconds)","xml":"<switch test=\"`$tmp.inprogress-time > 360`\">","comments":"","outputs":1,"x":1035.8333435058594,"y":217.33335876464844,"z":"57f142c6.1f478c","wires":[["79a11948.fe39d8"]]},{"id":"8ea5da83.26cac8","type":"set","name":"set: last-sub-action-status = InProgressTimeout","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgressTimeout\" />","comments":"","x":1018.8333435058594,"y":268.33335876464844,"z":"57f142c6.1f478c","wires":[]},{"id":"79a11948.fe39d8","type":"outcomeFalse","name":"false ","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1319.8333435058594,"y":214.33335876464844,"z":"57f142c6.1f478c","wires":[["a7a2d095.18535"]]},{"id":"a7a2d095.18535","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Still processing your previous request.'/>","comments":"","x":1488.8333435058594,"y":214.33335876464844,"z":"57f142c6.1f478c","wires":[]},{"id":"17e973e8.0fc1ac","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":552.8333435058594,"y":305.33335876464844,"z":"57f142c6.1f478c","wires":[["2c3a60cb.7af1c"]]},{"id":"78d15bd7.84caa4","type":"outcome","name":"VsbgServiceBackupRequest","xml":"<outcome value='VsbgServiceBackupRequest'>","comments":"","outputs":1,"x":430.8333435058594,"y":1239.3333740234375,"z":"57f142c6.1f478c","wires":[["ea4d78dd.6dcd78"]]},{"id":"ea4d78dd.6dcd78","type":"switchNode","name":"switch: request-sub-action","xml":"<switch test=\"`$service-configuration-operation-input.request-information.request-sub-action`\">\n<!--\n leaf request-sub-action {\n                type enumeration {\n                    enum \"PREPARE\";\n                    enum \"ACTIVATE\";\n                }\n            }\n} \n-->","comments":"","outputs":1,"x":708.8333435058594,"y":1233.3333740234375,"z":"57f142c6.1f478c","wires":[["84453abd.a768b8","28792623.ef98aa","9787f6e7.6ccf78"]]},{"id":"98a0765b.ccc488","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='req-sub-action not recognized'/>\n","comments":"","x":1231.8333435058594,"y":946.3333740234375,"z":"57f142c6.1f478c","wires":[]},{"id":"7c055852.c45578","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":994.8333435058594,"y":948.3333740234375,"z":"57f142c6.1f478c","wires":[["98a0765b.ccc488"]]},{"id":"84453abd.a768b8","type":"outcome","name":"BACKUP","xml":"<outcome value='BACKUP'>","comments":"","outputs":1,"x":961.8333435058594,"y":1162.3333740234375,"z":"57f142c6.1f478c","wires":[["958a3503.5b2248"]]},{"id":"9787f6e7.6ccf78","type":"other","name":"RESTOREBACKUP","xml":"<outcome value='RESTOREBACKUP'>","comments":"","outputs":1,"x":993.8333435058594,"y":1301.3333740234375,"z":"57f142c6.1f478c","wires":[["424610c8.86c17"]]},{"id":"28792623.ef98aa","type":"other","name":"DELETEBACKUP","xml":"<outcome value='DELETEBACKUP'>","comments":"","outputs":1,"x":987.8333435058594,"y":1226.3333740234375,"z":"57f142c6.1f478c","wires":[["958a3503.5b2248"]]},{"id":"cc499bb2.e44078","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1196.8334045410156,"y":404,"z":"57f142c6.1f478c","wires":[["5a5419b8.fc9918","31add50b.19bf1a"]]},{"id":"5a5419b8.fc9918","type":"switchNode","name":"switch: vnf-type","xml":"<switch test=\"`$vnf-type`\">\n\n\n\n","comments":"","outputs":1,"x":1390.8333740234375,"y":445.99998474121094,"z":"57f142c6.1f478c","wires":[["1e58ebd8.081eb4","954b003f.67029","9a9bdf49.8ba78"]]},{"id":"91388dfc.6747d","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1616.8334045410156,"y":530,"z":"57f142c6.1f478c","wires":[["24a0fbd6.988d54"]]},{"id":"24a0fbd6.988d54","type":"call","name":"call: service-configuration-prepare-sbc","xml":"<call module=\"Appc-API\" rpc=\"service-configuration-prepare-sbc\" mode=\"sync\">","comments":"","outputs":1,"x":1865.8334045410156,"y":531,"z":"57f142c6.1f478c","wires":[[]]},{"id":"21e1499f.20daa6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1200.8334045410156,"y":632,"z":"57f142c6.1f478c","wires":[["e4abddd7.b20bb","644356b8.a81388"]]},{"id":"e4abddd7.b20bb","type":"switchNode","name":"switch: vnf-type","xml":"<switch test=\"`$vnf-type`\">\n\n\n","comments":"","outputs":1,"x":1407.8333740234375,"y":687.9999847412109,"z":"57f142c6.1f478c","wires":[["a8bcf335.4b6e2","2095438c.a75e9c","bb4c3fe0.cf855"]]},{"id":"b625abfb.61b5b8","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1612.8334045410156,"y":865,"z":"57f142c6.1f478c","wires":[["8f4ded84.df145"]]},{"id":"8f4ded84.df145","type":"call","name":"call: service-configuration-activate-sbc","xml":"<call module=\"Appc-API\" rpc=\"service-configuration-activate-sbc\" mode=\"sync\">","comments":"","outputs":1,"x":1870.8334045410156,"y":865,"z":"57f142c6.1f478c","wires":[[]]},{"id":"5ed23ab3.8f89b4","type":"switchNode","name":"switch: vnf-type","xml":"<switch test=\"`$service-configuration-operation-input.vnf-config-information.vnf-type`\">\n\n\n","comments":"","outputs":1,"x":1426.8333435058594,"y":1180,"z":"57f142c6.1f478c","wires":[["9e313562.3da0e8","e1d6aa6b.f84178","90f39d1d.80f2e","49273b18.628b74"]]},{"id":"9e313562.3da0e8","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1603.8334045410156,"y":1225.9999389648438,"z":"57f142c6.1f478c","wires":[["cacc58e7.d542e8"]]},{"id":"cacc58e7.d542e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='req-sub-action not recognized'/>\n","comments":"","x":1767.8334045410156,"y":1226.9999389648438,"z":"57f142c6.1f478c","wires":[]},{"id":"958a3503.5b2248","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1164.8333435058594,"y":1182,"z":"57f142c6.1f478c","wires":[["5ed23ab3.8f89b4","74cd7b8e.ce5be4"]]},{"id":"424610c8.86c17","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1201.8333435058594,"y":1301,"z":"57f142c6.1f478c","wires":[["71166b82.41c6b4","12ceb3cb.d87cac"]]},{"id":"71166b82.41c6b4","type":"switchNode","name":"switch: vnf-type","xml":"<switch test=\"`$service-configuration-operation-input.vnf-config-information.vnf-type`\">\n\n\n","comments":"","outputs":1,"x":1403.8333740234375,"y":1401.999984741211,"z":"57f142c6.1f478c","wires":[["5c593415.be3a7c","e4202ecb.1ac4c","ee07041c.0ca338","817e32b6.557fd"]]},{"id":"9f48a4dd.288c18","type":"other","name":"ISBC","xml":"<outcome value='ISBC'>","comments":"","outputs":1,"x":1610.8334045410156,"y":1359.9999389648438,"z":"57f142c6.1f478c","wires":[["cf377cc7.2c72f"]]},{"id":"5c593415.be3a7c","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1593.8334045410156,"y":1592.9999389648438,"z":"57f142c6.1f478c","wires":[["e23a5427.dc90c8"]]},{"id":"912b075b.2b9118","type":"call","name":"call: service-configuration-backup","xml":"<call module=\"Appc-API\" rpc=\"service-configuration-backup\" mode=\"sync\">","comments":"","outputs":1,"x":1862.8334045410156,"y":1496.9999389648438,"z":"57f142c6.1f478c","wires":[[]]},{"id":"cf377cc7.2c72f","type":"call","name":"call: service-configuration-restorebkup-sbc","xml":"<call module=\"Appc-API\" rpc=\"service-configuration-restorebkup-sbc\" mode=\"sync\">","comments":"","outputs":1,"x":1987.8334045410156,"y":1357.9999389648438,"z":"57f142c6.1f478c","wires":[[]]},{"id":"e0db2af5.61e098","type":"comment","name":"Use vnftype from config tree","info":"","comments":"","x":1106.8334045410156,"y":586,"z":"57f142c6.1f478c","wires":[]},{"id":"a8bcf335.4b6e2","type":"outcome","name":"N-SBG","xml":"<outcome value='N-SBG'>\n","comments":"","outputs":1,"x":1616.5499572753906,"y":602.8833618164062,"z":"57f142c6.1f478c","wires":[["87a37d2a.6ca3e"]]},{"id":"6947ff76.6c01d","type":"outcome","name":"TSBC","xml":"<outcome value='TSBC'>\n","comments":"","outputs":1,"x":1612,"y":1316.3333587646484,"z":"57f142c6.1f478c","wires":[["cf377cc7.2c72f"]]},{"id":"31add50b.19bf1a","type":"set","name":"set VNF-Type","xml":"<set>\n<parameter name=\"vnf-type\" value=\"`$service-configuration-operation-input.vnf-config-parameters-list.vnf-config-parameters[0].vnf-type`\" />\n\t\n","comments":"","x":1403,"y":374.33335876464844,"z":"57f142c6.1f478c","wires":[]},{"id":"644356b8.a81388","type":"set","name":"set VNF-Type","xml":"<set>\n<parameter name=\"vnf-type\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[0].vnf-type`\" />\n\t\n","comments":"","x":1424,"y":596.3333587646484,"z":"57f142c6.1f478c","wires":[]},{"id":"74cd7b8e.ce5be4","type":"set","name":"set VNF-Type","xml":"<set>\n<parameter name=\"vnf-type\" value=\"`$service-configuration-operation-input.vnf-config-information.vnf-type`\" />\n\t\n","comments":"","x":1421,"y":1112.3333587646484,"z":"57f142c6.1f478c","wires":[]},{"id":"12ceb3cb.d87cac","type":"set","name":"set VNF-Type","xml":"<set>\n<parameter name=\"vnf-type\" value=\"`$service-configuration-operation-input.vnf-config-information.vnf-type`\" />\n\t\n","comments":"","x":1410,"y":1300.3333587646484,"z":"57f142c6.1f478c","wires":[]},{"id":"e4202ecb.1ac4c","type":"outcome","name":"N-SBG","xml":"<outcome value='N-SBG'>\n","comments":"","outputs":1,"x":1611.6666564941406,"y":1457.6666870117188,"z":"57f142c6.1f478c","wires":[["912b075b.2b9118"]]},{"id":"e23a5427.dc90c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='req-sub-action not recognized'/>\n","comments":"","x":1767.6666564941406,"y":1592.6666870117188,"z":"57f142c6.1f478c","wires":[]},{"id":"1e58ebd8.081eb4","type":"other","name":"A-SBG","xml":"<outcome value='A-SBG'>","comments":"","outputs":1,"x":1613.6666564941406,"y":401.66668701171875,"z":"57f142c6.1f478c","wires":[["e1359cee.43a9f"]]},{"id":"9a9bdf49.8ba78","type":"other","name":"N-SBG","xml":"<outcome value='N-SBG'>","comments":"","outputs":1,"x":1615.6666564941406,"y":358.66668701171875,"z":"57f142c6.1f478c","wires":[["e1359cee.43a9f"]]},{"id":"954b003f.67029","type":"other","name":"T-SBG","xml":"<outcome value='T-SBG'>","comments":"","outputs":1,"x":1614.6666564941406,"y":447.66668701171875,"z":"57f142c6.1f478c","wires":[["e1359cee.43a9f"]]},{"id":"2095438c.a75e9c","type":"other","name":"A-SBG","xml":"<outcome value='A-SBG'>","comments":"","outputs":1,"x":1614.6666564941406,"y":640.6666870117188,"z":"57f142c6.1f478c","wires":[["87a37d2a.6ca3e"]]},{"id":"bb4c3fe0.cf855","type":"other","name":"T-SBG","xml":"<outcome value='T-SBG'>","comments":"","outputs":1,"x":1614.6666564941406,"y":687.6666870117188,"z":"57f142c6.1f478c","wires":[["87a37d2a.6ca3e"]]},{"id":"e1d6aa6b.f84178","type":"outcome","name":"N-SBG","xml":"<outcome value='N-SBG'>\n","comments":"","outputs":1,"x":1608.6666564941406,"y":1066.6666870117188,"z":"57f142c6.1f478c","wires":[["1a154772.444899"]]},{"id":"90f39d1d.80f2e","type":"other","name":"A-SBG","xml":"<outcome value='A-SBG'>","comments":"","outputs":1,"x":1609.6666564941406,"y":1107.6666870117188,"z":"57f142c6.1f478c","wires":[["1a154772.444899"]]},{"id":"49273b18.628b74","type":"other","name":"T-SBG","xml":"<outcome value='T-SBG'>","comments":"","outputs":1,"x":1610.6666564941406,"y":1152.6666870117188,"z":"57f142c6.1f478c","wires":[["1a154772.444899"]]},{"id":"a9b42c2b.83b31","type":"outcome","name":"vDBE-V","xml":"<outcome value='vDBE-V'>\n","comments":"","outputs":1,"x":1615.6666564941406,"y":737.6666870117188,"z":"57f142c6.1f478c","wires":[["c5f4780c.2868d8"]]},{"id":"c1b3fa8.0bc5e08","type":"other","name":"vDBE-I","xml":"<outcome value='vDBE-I'>","comments":"","outputs":1,"x":1614.6666564941406,"y":776.6666870117188,"z":"57f142c6.1f478c","wires":[["c5f4780c.2868d8"]]},{"id":"c8dfc4c3.d05048","type":"other","name":"vDBE-P","xml":"<outcome value='vDBE-P'>","comments":"","outputs":1,"x":1610.6666564941406,"y":821.6666870117188,"z":"57f142c6.1f478c","wires":[["c5f4780c.2868d8"]]},{"id":"c5f4780c.2868d8","type":"call","name":"call: service-configuration-activate-vdbe","xml":"<call module=\"Appc-API\" rpc=\"service-configuration-activate-vdbe\" mode=\"sync\">","comments":"","outputs":1,"x":1906.6666564941406,"y":771.6666870117188,"z":"57f142c6.1f478c","wires":[[]]},{"id":"ee07041c.0ca338","type":"other","name":"A-SBG","xml":"<outcome value='A-SBG'>","comments":"","outputs":1,"x":1607.6666564941406,"y":1500.6666870117188,"z":"57f142c6.1f478c","wires":[["912b075b.2b9118"]]},{"id":"817e32b6.557fd","type":"other","name":"T-SBG","xml":"<outcome value='T-SBG'>","comments":"","outputs":1,"x":1610.6666564941406,"y":1536.6666870117188,"z":"57f142c6.1f478c","wires":[["912b075b.2b9118"]]},{"id":"2dd38ed4.235162","type":"outcome","name":"vUSP - Metaswitch vSBC","xml":"<outcome value='vUSP - Metaswitch vSBC'>\n","comments":"","outputs":1,"x":1662.6666564941406,"y":1403.6666870117188,"z":"57f142c6.1f478c","wires":[["cf377cc7.2c72f"]]},{"id":"c7742018.c7acd","type":"comment","name":"Keep only SBG Flow","info":"","comments":"","x":1800,"y":311,"z":"57f142c6.1f478c","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-prepare.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-prepare.json
deleted file mode 100644
index d413a72..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_service-configuration-prepare.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"6ce8b23c.6622bc","type":"comment","name":"IF NCS success, all can fail and we still return success","info":"","x":2710.476806640625,"y":1298.6689453125,"z":"9633ac01.1c873","wires":[]},{"id":"176fa587.64801a","type":"comment","name":"IF NCS success, all can fail and we still return success","info":"","x":3402.651191711426,"y":715.9393172264099,"z":"9633ac01.1c873","wires":[]},{"id":"cdb39a50.0e04e8","type":"comment","name":"Used for Cancel, disconnect","info":"","x":3131.91357421875,"y":1137.333251953125,"z":"9633ac01.1c873","wires":[]},{"id":"22d49eda.3a5e82","type":"comment","name":"Service-Configuration-Prepare","info":"","comments":"","x":576.75,"y":25,"z":"9633ac01.1c873","wires":[]},{"id":"7f2c4f0f.b4df9","type":"dgstart","name":"DGSTART","outputs":1,"x":102,"y":99.1111068725586,"z":"9633ac01.1c873","wires":[["3f18b239.d3494e"]]},{"id":"3f18b239.d3494e","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":259.66668701171875,"y":97.77776336669922,"z":"9633ac01.1c873","wires":[["fd14a489.4c1158"]]},{"id":"fd14a489.4c1158","type":"method","name":"method service-configuration-prepare","xml":"<method rpc='service-configuration-prepare' mode='sync'>\n","comments":"","outputs":1,"x":507,"y":104.44442749023438,"z":"9633ac01.1c873","wires":[["4b7f48e1.29b478"]]},{"id":"4b7f48e1.29b478","type":"switchNode","name":"switch: order-status","xml":"<switch test=\"`$service-data.oper-status.order-status`\">\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Reserved\";\n\t\tenum \"Activated\";\n\t\tenum \"PendingDelete\";\n\t\tenum \"RequestFailed\";\n\t\tenum \"InProgressTimeout\";\n\t\tenum \"InProgress\";\n\t}\n}\n-->","comments":"","outputs":1,"x":135.25,"y":187.31015014648438,"z":"9633ac01.1c873","wires":[["a2d91a.3cdbf6e8","21c383a7.69136c","1d1d1f1f.1fcae1","9a4d7636.b60368","ea79ba30.614648"]]},{"id":"1d1d1f1f.1fcae1","type":"outcome","name":"RequestFailed","xml":"<outcome value='RequestFailed'>","comments":"","outputs":1,"x":398.7848205566406,"y":272.3448486328125,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"a2d91a.3cdbf6e8","type":"outcome","name":"Reserved","xml":"<outcome value='Reserved'>","comments":"","outputs":1,"x":390.9147033691406,"y":221.154296875,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"37764947.e60ce6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":612.931884765625,"y":207.66079711914062,"z":"9633ac01.1c873","wires":[["2b276628.d6c4ba","a87cb168.0c421","a899e50f.59e928","9f955bc.fe03ba8","4eb7d82e.78eb68","abd61b38.bbefe8","806b14e0.e3f2d8"]]},{"id":"4eb7d82e.78eb68","type":"configure","name":"configure: ConfigComponentAdaptor","xml":"<configure adaptor=\"org.onap.appc.ccadaptor.ConfigComponentAdaptor\" key=\"dummy\">\n\t<parameter name=\"action\" value=\"prepare\"/>\n\t\n\n\t","comments":"","outputs":1,"x":933.3130493164062,"y":653.2779541015625,"z":"9633ac01.1c873","wires":[["c19ff3d7.54cf2","f045d778.2bf8e8"]]},{"id":"2b276628.d6c4ba","type":"set","name":"set: maintinance-indicator = N","xml":"<set>\n\t<parameter name='service-data.oper-status.maintenance-indicator' value='N' />","comments":"","x":902.6939086914062,"y":545.8492431640625,"z":"9633ac01.1c873","wires":[]},{"id":"c19ff3d7.54cf2","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":1173.6070556640625,"y":569.1112060546875,"z":"9633ac01.1c873","wires":[["733e8f0a.db9e5"]]},{"id":"b28d79c6.26f198","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<!-- error code & message provided by ncs-adaptor -->\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":1571.940185546875,"y":500.77783203125,"z":"9633ac01.1c873","wires":[]},{"id":"733e8f0a.db9e5","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1346.60693359375,"y":556.1112060546875,"z":"9633ac01.1c873","wires":[["b28d79c6.26f198","7b6460f9.47c97"]]},{"id":"9a4d7636.b60368","type":"other","name":"Other","xml":"<outcome value='Other'>\n\n<!-- Audited, PendingActivate, Activated, other -->\n<!-- Audit is allowed only after Activate -->","comments":"","outputs":1,"x":369.2738952636719,"y":703.9207153320312,"z":"9633ac01.1c873","wires":[["7a642d2c.3f9d14"]]},{"id":"a899e50f.59e928","type":"set","name":"set: last-sub-action-status = InProgress","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"InProgress\" />","comments":"","x":921.9404296875,"y":392.44451904296875,"z":"9633ac01.1c873","wires":[]},{"id":"a87cb168.0c421","type":"execute","name":"execute: setTime(modify-timestamp)","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>","comments":"","outputs":1,"x":914.7498779296875,"y":494,"z":"9633ac01.1c873","wires":[[]]},{"id":"7a642d2c.3f9d14","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid Order Status State'/>\n\t<parameter name='ack-final' value='Y'/>","comments":"","x":596.0833129882812,"y":704.3333129882812,"z":"9633ac01.1c873","wires":[]},{"id":"21c383a7.69136c","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","outputs":1,"x":409.75,"y":173,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"f045d778.2bf8e8","type":"failure","name":"success","xml":"<outcome value='success'>","comments":"","outputs":1,"x":1173.7498779296875,"y":698,"z":"9633ac01.1c873","wires":[["657c1712.60d3f8"]]},{"id":"657c1712.60d3f8","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1366.4166259765625,"y":628.3333740234375,"z":"9633ac01.1c873","wires":[["35a34d7c.e7dea2","ab3dbd3e.dadbd","1f374bb.3fed3b4","52652755.f025f8"]]},{"id":"35a34d7c.e7dea2","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1599.7498779296875,"y":794,"z":"9633ac01.1c873","wires":[]},{"id":"806b14e0.e3f2d8","type":"GenericXML","name":"set: last-action, last-sub-action, last-svc-request-id, last-order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"VsbgServiceActivateRequest\" />\n\t<parameter name=\"service-data.oper-status.last-sub-action\" value=\"`$service-configuration-operation-input.request-information.request-sub-action`\" />\n\t<parameter name=\"service-data.oper-status.last-svc-request-id\" value=\"`$service-configuration-operation-input.sdnc-request-header.svc-request-id`\" />\n\t<!-- Setting this to null seems to be failing\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\" />\n\t-->\n","comments":"","outputs":1,"x":996.7498779296875,"y":156,"z":"9633ac01.1c873","wires":[[]]},{"id":"ab3dbd3e.dadbd","type":"set","name":"set: order-status = Reserved","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Reserved\" />","comments":"","x":1629.75,"y":659,"z":"9633ac01.1c873","wires":[]},{"id":"9f955bc.fe03ba8","type":"set","name":"set Copy from input to Service-data","xml":"<set>\n<parameter name=\"service-data.\" value=\"service-configuration-operation-input.\"/>\n\n","comments":"","x":895.75,"y":271,"z":"9633ac01.1c873","wires":[]},{"id":"1f374bb.3fed3b4","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"service-configuration-operation:Prepare:After Calling ConfigAdaptor:Success\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n\n\n","comments":"","outputs":1,"x":1569.75,"y":602,"z":"9633ac01.1c873","wires":[[]]},{"id":"7b6460f9.47c97","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"service-configuration-operation:Prepare:After Calling ConfigAdaptor:Failure\"/>\n<parameter name=\"field3\" value=\"`$service-data.oper-status.order-status`\"/>\n<parameter name=\"field4\" value=\"`$service-data.service-information.service-instance-id`\"/>\n\n\n","comments":"","outputs":1,"x":1552.75,"y":380,"z":"9633ac01.1c873","wires":[[]]},{"id":"128e76b6.814b29","type":"comment","name":"Failed prepares are not saved in Config Tree","info":"","comments":"","x":1860.75,"y":496,"z":"9633ac01.1c873","wires":[]},{"id":"52652755.f025f8","type":"set","name":"set: last-sub-action-status = Success","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-sub-action-status\" value=\"Success\" />","comments":"","x":1668.5,"y":719,"z":"9633ac01.1c873","wires":[]},{"id":"ea79ba30.614648","type":"outcome","name":"Activated","xml":"<outcome value='Activated'>","comments":"","outputs":1,"x":387.5,"y":330,"z":"9633ac01.1c873","wires":[["37764947.e60ce6"]]},{"id":"abd61b38.bbefe8","type":"switchNode","name":"switch: update-configuration","xml":"<switch test=\"`$service-configuration-operation-input.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration_length`\">\n","comments":"","outputs":1,"x":848.5,"y":69,"z":"9633ac01.1c873","wires":[["a9cb27b6.b38238","99f8115d.6be47"]]},{"id":"a9cb27b6.b38238","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1085.5,"y":71,"z":"9633ac01.1c873","wires":[["131554ac.7778fb"]]},{"id":"f0f0e9e5.ffc3b8","type":"comment","name":"New Start Prepare","info":"","comments":"","x":1077.5,"y":30,"z":"9633ac01.1c873","wires":[]},{"id":"131554ac.7778fb","type":"block","name":"block : atomic","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1275.5,"y":70,"z":"9633ac01.1c873","wires":[["f8d7c48f.cf07a8"]]},{"id":"f8d7c48f.cf07a8","type":"set","name":"Clear Service Data VNF Parameters List","xml":"<set>\n     <parameter name=\"service-data.vnf-config-parameters-list.\" value=\"\" />\n\n","comments":"","x":1537.5,"y":72,"z":"9633ac01.1c873","wires":[]},{"id":"99f8115d.6be47","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1054.5,"y":116,"z":"9633ac01.1c873","wires":[["131554ac.7778fb"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-aai-sbg.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-aai-sbg.json
deleted file mode 100644
index fd66649..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-aai-sbg.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"934ee5c1.ed026","type":"dgstart","name":"DGSTART","outputs":1,"x":209.88333129882812,"y":102.88333129882812,"z":"51183e72.be2d18","wires":[["fd1d6346.a4f578"]]},{"id":"fd1d6346.a4f578","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":382.0500183105469,"y":100.54998779296875,"z":"51183e72.be2d18","wires":[["89009f89.dec4f"]]},{"id":"89009f89.dec4f","type":"method","name":"method update-aai-sbg","xml":"<method rpc='update-aai-sbg' mode='sync'>\n","comments":"","outputs":1,"x":608.3833923339844,"y":97.2166519165039,"z":"51183e72.be2d18","wires":[["2759b8e1.1e787"]]},{"id":"e67da642.e668e8","type":"get-resource","name":"get-resource: A&AI Data for VNF","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-notification-input.service-information.service-instance-id\" pfx=\"tmp.aai-data-vnf\" >\n\n\n","comments":"","outputs":1,"x":547.8833312988281,"y":489.8833312988281,"z":"51183e72.be2d18","wires":[["fcbbc896.fdb958","93ee0e04.43d5e","59a4d66a.fc329"]]},{"id":"2759b8e1.1e787","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":221.88333129882812,"y":447.772216796875,"z":"51183e72.be2d18","wires":[["7d7db087.62a4d","81e07f1f.fa7d5","e67da642.e668e8"]]},{"id":"6a5df891.756878","type":"save","name":"update: A&AI ( VNF)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $tmp.aai-data-vnf.vnf-id\" force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n\t","comments":"","outputs":1,"x":1175.8833312988281,"y":554.8833312988281,"z":"51183e72.be2d18","wires":[["b0d535db.58fd8"]]},{"id":"b0d535db.58fd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1380.8833312988281,"y":554.8833312988281,"z":"51183e72.be2d18","wires":[["48f5b2f2.8d33a4"]]},{"id":"fcbbc896.fdb958","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":812.8833312988281,"y":272.772216796875,"z":"51183e72.be2d18","wires":[["55cd3331.f4719c"]]},{"id":"59a4d66a.fc329","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":807.8833312988281,"y":419.772216796875,"z":"51183e72.be2d18","wires":[["be26fd.216171"]]},{"id":"55cd3331.f4719c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":992.8833312988281,"y":269.772216796875,"z":"51183e72.be2d18","wires":[["97afe3e.6d45e2","2669d4e7.6bbd74"]]},{"id":"2669d4e7.6bbd74","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $error-message`\"/>","comments":"","x":1242.8833312988281,"y":293.772216796875,"z":"51183e72.be2d18","wires":[]},{"id":"97afe3e.6d45e2","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1192.8833312988281,"y":220.772216796875,"z":"51183e72.be2d18","wires":[[]]},{"id":"7d7db087.62a4d","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"CALLING Get fOR SERVICEINSTANCEID\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n","comments":"","outputs":1,"x":461.8833312988281,"y":411.772216796875,"z":"51183e72.be2d18","wires":[[]]},{"id":"93ee0e04.43d5e","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":806.8833312988281,"y":535.8833312988281,"z":"51183e72.be2d18","wires":[["db96e9ae.c9a468"]]},{"id":"db96e9ae.c9a468","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":969.8833312988281,"y":535.8833312988281,"z":"51183e72.be2d18","wires":[["6a5df891.756878","4d1f5900.c09c1","f05d5abf.7be1b","bc824889.58ce48"]]},{"id":"4d1f5900.c09c1","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"VNFID\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n<parameter name=\"RELATIONSHIPLEN\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\"/>\n<parameter name=\"RELATIONSHIPVALUE\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\"/>\n","comments":"","outputs":1,"x":1141.8833312988281,"y":506.88330078125,"z":"51183e72.be2d18","wires":[[]]},{"id":"48f5b2f2.8d33a4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1551.8833312988281,"y":551.8833312988281,"z":"51183e72.be2d18","wires":[["7b9ada6b.ea15b4","bb08d771.8208c8"]]},{"id":"7b9ada6b.ea15b4","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vnf.vnf-id + '.' + $error-message`\"/>","comments":"","x":1812.8833312988281,"y":559.8833312988281,"z":"51183e72.be2d18","wires":[]},{"id":"bb08d771.8208c8","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":1740.8833312988281,"y":510.88330078125,"z":"51183e72.be2d18","wires":[[]]},{"id":"81e07f1f.fa7d5","type":"set","name":"set: Append to response-message","xml":"<set>\n\t  <parameter name=\"response-message\" value=\"`$error-message + '.' + $response-message`\"/>","comments":"","x":530.8833312988281,"y":582.7722473144531,"z":"51183e72.be2d18","wires":[]},{"id":"be26fd.216171","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":973.8833312988281,"y":421.8833312988281,"z":"51183e72.be2d18","wires":[["ec7fb69b.7e148","691d3d4e.256624"]]},{"id":"ec7fb69b.7e148","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"ErrorMessage\" value=\"`$tmp.aai-data-vnf.error-message`\"/>\n<parameter name=\"HTTP Code\" value=\"`$tmp.aai-data-vnf.error.http.response-code`\"/>","comments":"","outputs":1,"x":1142.8833312988281,"y":385.8833312988281,"z":"51183e72.be2d18","wires":[[]]},{"id":"691d3d4e.256624","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $tmp.aai-data-vnf.error-message + '.HTTP Code:' + $tmp.aai-data-vnf.error.http.response-code + '.' + $error-message `\"/>\n","comments":"","x":1204.8833312988281,"y":437.8833312988281,"z":"51183e72.be2d18","wires":[]},{"id":"f05d5abf.7be1b","type":"call","name":"call: update-vserver-info","xml":"<call module=\"Appc-API\" rpc=\"update-vserver-info\" mode=\"sync\">","comments":"","outputs":1,"x":1182.8833312988281,"y":604.9944152832031,"z":"51183e72.be2d18","wires":[[]]},{"id":"bc824889.58ce48","type":"call","name":"call: update-vnfc-info","xml":"<call module=\"Appc-API\" rpc=\"update-vnfc-info\" mode=\"sync\">","comments":"","outputs":1,"x":1158.8833312988281,"y":656.9944152832031,"z":"51183e72.be2d18","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-aai.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-aai.json
deleted file mode 100644
index b3fd85f..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-aai.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"c0f51dc8.101b5","type":"dgstart","name":"DGSTART","outputs":1,"x":121.88333129882812,"y":66.88333129882812,"z":"f4b8442.0fb85b8","wires":[["5b4f1a30.f05d0c"]]},{"id":"5b4f1a30.f05d0c","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":282.0500183105469,"y":68.54998779296875,"z":"f4b8442.0fb85b8","wires":[["772060.d25c87a"]]},{"id":"772060.d25c87a","type":"method","name":"method update-aai","xml":"<method rpc='update-aai' mode='sync'>\n","comments":"","outputs":1,"x":474.3833923339844,"y":70.2166519165039,"z":"f4b8442.0fb85b8","wires":[["467329f1.60b6d8"]]},{"id":"8f46f427.916b28","type":"get-resource","name":"get-resource: A&AI Data for VNF","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-name = $service-configuration-notification-input.service-information.service-instance-id\" pfx=\"tmp.aai-data-vnf\" >\n\n\n","comments":"","outputs":1,"x":407.8833312988281,"y":171.772216796875,"z":"f4b8442.0fb85b8","wires":[["44304e59.3bc55","2f765229.4761fe","6ecd659b.76cea4"]]},{"id":"3d2bf799.9f116","type":"get-resource","name":"get-resource: A&AI Data for VM Name","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" key=\"vserver.vserver-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name\" pfx=\"tmp.aai-data-vm\" >\n\n","comments":"","outputs":1,"x":1504.8833312988281,"y":465.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b245605.84f748","27de335a.86c014","5e5954df.b3da24"]]},{"id":"22c57ca4.f5ae0c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":644.8833312988281,"y":414.7722473144531,"z":"f4b8442.0fb85b8","wires":[["13419e55.a341c2"]]},{"id":"24deeccb.be1d7c","type":"get-resource","name":"get-resource: A&AI Data for VM Name","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" key=\"vserver.vserver-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name\" pfx=\"tmp.aai-data-vm\" >\n\n\n","comments":"","outputs":1,"x":1395.8833312988281,"y":1069.7722473144531,"z":"f4b8442.0fb85b8","wires":[["4e85a946.01f12","6c8fb30.49c2b4c","143f5af6.ccb0d5"]]},{"id":"b14ec23a.f5b1c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":646.8833312988281,"y":975.7722473144531,"z":"f4b8442.0fb85b8","wires":[["2200faf8.6ff19e"]]},{"id":"467329f1.60b6d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":130.88333129882812,"y":129.772216796875,"z":"f4b8442.0fb85b8","wires":[["8f46f427.916b28","60b5221b.b51ed4","bf464434.9b9188","a0358bc1.4f2e98","78560055.675858"]]},{"id":"fc179dae.0a925","type":"save","name":"update: A&AI ( VNF)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $tmp.aai-data-vnf.vnf-id\" force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n\t","comments":"","outputs":1,"x":980.8833312988281,"y":252.77224731445312,"z":"f4b8442.0fb85b8","wires":[["ade15db9.d9e358"]]},{"id":"ade15db9.d9e358","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1153.8833312988281,"y":254.77224731445312,"z":"f4b8442.0fb85b8","wires":[["57d1d045.81e0e8"]]},{"id":"29bfefae.5a7748","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = 'att-aic' AND\ncloud-region.cloud-region-id = $tmp.aai-data-vm.cloud-region-id\"\nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n","comments":"","outputs":1,"x":1986.8833312988281,"y":541.772216796875,"z":"f4b8442.0fb85b8","wires":[["dfd718cc.1c6ab"]]},{"id":"dfd718cc.1c6ab","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2166.883331298828,"y":538.772216796875,"z":"f4b8442.0fb85b8","wires":[["4de83cd2.84ecac"]]},{"id":"a34e98d9.f45ed8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2017.8833312988281,"y":1128.7722473144531,"z":"f4b8442.0fb85b8","wires":[["4983c83b.88014"]]},{"id":"58ca3986.4a71d8","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = $tmp.aai-data-vm.cloud-owner AND\ncloud-region.cloud-region-id = $tmp.aai-data-vm.cloud-region-id\"\nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>","comments":"","outputs":1,"x":1833.3833312988281,"y":1132.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a34e98d9.f45ed8"]]},{"id":"28bcdf63.918a08","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":2163.883331298828,"y":362.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"9b245605.84f748","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1793.8833312988281,"y":386.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b6cab7d.997098"]]},{"id":"27de335a.86c014","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1767.8833312988281,"y":461.772216796875,"z":"f4b8442.0fb85b8","wires":[["9b6cab7d.997098"]]},{"id":"9b6cab7d.997098","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1971.8833312988281,"y":424.772216796875,"z":"f4b8442.0fb85b8","wires":[["28bcdf63.918a08","5311e5a9.4fa464"]]},{"id":"a6d2ceb6.01d71","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":2006.8833312988281,"y":988.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"4e85a946.01f12","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1649.8833312988281,"y":993.7722473144531,"z":"f4b8442.0fb85b8","wires":[["178c51ad.e112ae"]]},{"id":"6c8fb30.49c2b4c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1651.8833312988281,"y":1063.7722473144531,"z":"f4b8442.0fb85b8","wires":[["178c51ad.e112ae"]]},{"id":"178c51ad.e112ae","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1834.8833312988281,"y":1006.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a6d2ceb6.01d71","c946205b.f6ca3"]]},{"id":"6ecd659b.76cea4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":701.8833312988281,"y":80.772216796875,"z":"f4b8442.0fb85b8","wires":[["ff266133.3d2d18"]]},{"id":"44304e59.3bc55","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":645.8833312988281,"y":148.772216796875,"z":"f4b8442.0fb85b8","wires":[["f043b65d.df114"]]},{"id":"ff266133.3d2d18","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":863.8833312988281,"y":66.772216796875,"z":"f4b8442.0fb85b8","wires":[["f67029f1.15e53","9155ecda.9c9088"]]},{"id":"9155ecda.9c9088","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $error-message`\"/>","comments":"","x":1151.8833312988281,"y":90.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"f67029f1.15e53","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1066.8833312988281,"y":51.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"5311e5a9.4fa464","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name + '.' + $error-message`\"/>","comments":"","x":2222.883331298828,"y":422.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"66e5357a.c3e564","type":"for","name":"for: vnf-config-parameters-list","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\">","comments":"","outputs":1,"x":414.8833312988281,"y":414.7722473144531,"z":"f4b8442.0fb85b8","wires":[["22c57ca4.f5ae0c"]]},{"id":"f013923f.8ff4c8","type":"for","name":"for: vnf-config-parameters-list","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\" >","comments":"","outputs":1,"x":416.8833312988281,"y":973.7722473144531,"z":"f4b8442.0fb85b8","wires":[["b14ec23a.f5b1c8"]]},{"id":"c7ca81f5.584878","type":"for","name":"for: vnf-config-parameters-list.system-controller","xml":"<for index=\"j\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller_length`\" >","comments":"","outputs":1,"x":911.8833312988281,"y":536.7722473144531,"z":"f4b8442.0fb85b8","wires":[["267d83bc.359cd4"]]},{"id":"f6bd5a4d.edb528","type":"for","name":"for: vnf-config-parameters-list.payload","xml":"<for index=\"j\" start=\"0\" end=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload_length`\" >","comments":"","outputs":1,"x":864.8833312988281,"y":1074.7722473144531,"z":"f4b8442.0fb85b8","wires":[["32cf2348.780e2c"]]},{"id":"267d83bc.359cd4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1216.8833312988281,"y":536.7722473144531,"z":"f4b8442.0fb85b8","wires":[["ca00e322.7a457","3d2bf799.9f116"]]},{"id":"ca00e322.7a457","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n<parameter name=\"VMNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vm-name`\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.backup-information.service-instance-id`\"/>","comments":"","outputs":1,"x":1402.8833312988281,"y":416.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"6cf10415.3db5f4","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n<parameter name=\"VMNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n\n","comments":"","outputs":1,"x":1325.8833312988281,"y":1011.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"32cf2348.780e2c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1133.8833312988281,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[["6cf10415.3db5f4","24deeccb.be1d7c"]]},{"id":"dc845fa1.861eb","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"SYSCONTRVSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n\n<parameter name=\"SYSCONTRLTENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"SYSCONTRLCLOUDREGION\" value=\"`$tmp.aai-data-vm.cloud-region-id`\"/>\n<parameter name=\"SYSCONTRLCLOUDOWNER\" value=\"`$tmp.aai-data-vm.cloud-owner`\"/>","comments":"","outputs":1,"x":1980.8833312988281,"y":496.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"be3a649.92a8298","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"PAYLDVSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n\n<parameter name=\"PAYLDTENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"PAYLDCLOUDREGION\" value=\"`$tmp.aai-data-vm.cloud-region-id`\"/>","comments":"","outputs":1,"x":1809.8833312988281,"y":1073.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"60b5221b.b51ed4","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"CALLING Get fOR SERVICEINSTANCEID\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n","comments":"","outputs":1,"x":334.8833312988281,"y":126.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f765229.4761fe","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":644.8833312988281,"y":196.77224731445312,"z":"f4b8442.0fb85b8","wires":[["e003b6d1.c077e8"]]},{"id":"e003b6d1.c077e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":792.8833312988281,"y":200.77224731445312,"z":"f4b8442.0fb85b8","wires":[["fc179dae.0a925","5bfbd468.92001c"]]},{"id":"5e5954df.b3da24","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1643.8833312988281,"y":518.7722778320312,"z":"f4b8442.0fb85b8","wires":[["2654c4ca.7ead04"]]},{"id":"143f5af6.ccb0d5","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1452.8833312988281,"y":1141.7722473144531,"z":"f4b8442.0fb85b8","wires":[["a50cc54f.09ab9"]]},{"id":"2654c4ca.7ead04","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1799.8833312988281,"y":515.7722778320312,"z":"f4b8442.0fb85b8","wires":[["dc845fa1.861eb","29bfefae.5a7748","8496bab.f61c148"]]},{"id":"a50cc54f.09ab9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1621.8833312988281,"y":1134.7722473144531,"z":"f4b8442.0fb85b8","wires":[["be3a649.92a8298","58ca3986.4a71d8","ead40740.d1b23"]]},{"id":"5bfbd468.92001c","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"VNFID\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":957.8833312988281,"y":205.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"57d1d045.81e0e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1306.8833312988281,"y":256.7722473144531,"z":"f4b8442.0fb85b8","wires":[["477e8b0f.ff62c4","c9598522.b5021"]]},{"id":"477e8b0f.ff62c4","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vnf.vnf-id + '.' + $error-message`\"/>","comments":"","x":1531.8833312988281,"y":272.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"4de83cd2.84ecac","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2321.883331298828,"y":534.772216796875,"z":"f4b8442.0fb85b8","wires":[["7c7c5c09.263cc4","8f9d540b.6eaf78"]]},{"id":"7c7c5c09.263cc4","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2579.883331298828,"y":526.772216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"c946205b.f6ca3","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name + '.' + $error-message`\"/>","comments":"","x":2063.883331298828,"y":1040.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"4983c83b.88014","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2172.883331298828,"y":1128.7722473144531,"z":"f4b8442.0fb85b8","wires":[["2fd2a1ea.86ecc6","33e73c2c.e10484"]]},{"id":"2fd2a1ea.86ecc6","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2431.883331298828,"y":1134.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"c9598522.b5021","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$tmp.aai-data-vnf.vnf-id`\"/>\n\n","comments":"","outputs":1,"x":1455.8833312988281,"y":213.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"8f9d540b.6eaf78","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n\n","comments":"","outputs":1,"x":2521.883331298828,"y":461.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"33e73c2c.e10484","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2372.883331298828,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"bf464434.9b9188","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"RETURNED RESPONSEMESSAGE\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n<parameter name=\"ERRORMSG\" value=\"`$error-message`\"/>\n\n","comments":"","outputs":1,"x":184.88333129882812,"y":1151.7722473144531,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"a0358bc1.4f2e98","type":"set","name":"set: Append to response-message","xml":"<set>\n\t  <parameter name=\"response-message\" value=\"`$error-message + '.' + $response-message`\"/>","comments":"","x":323.8833312988281,"y":1079.7722473144531,"z":"f4b8442.0fb85b8","wires":[]},{"id":"8496bab.f61c148","type":"get-resource","name":"get-resource: A&AI Data for VNFC Name ","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" key=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name\" pfx=\"tmp.aai-data-vnfc\" >\n\n\n","comments":"","outputs":1,"x":1325.8833312988281,"y":727.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c81a3f16.23e79","8ac07d6d.14c18","41789484.81275c"]]},{"id":"c81a3f16.23e79","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1613.8833312988281,"y":727.8833312988281,"z":"f4b8442.0fb85b8","wires":[["b0afd80f.959b8"]]},{"id":"8ac07d6d.14c18","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1613.8833312988281,"y":771.8833312988281,"z":"f4b8442.0fb85b8","wires":[["7ee37ca7.a378d4"]]},{"id":"41789484.81275c","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1574.8833312988281,"y":843.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2e5147af.8c502"]]},{"id":"7ee37ca7.a378d4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1785.8833312988281,"y":772.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2310ad0.71ba6d4","2f6809a1.5e9c2e"]]},{"id":"2310ad0.71ba6d4","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":1958.8833312988281,"y":773.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f6809a1.5e9c2e","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2035.8833312988281,"y":825.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"85ceea54.89cff8","type":"save","name":"update: A&AI VNFC","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name and \nvserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND\ncloud-region.cloud-owner = $tmp.aai-data-vm.cloud-owner AND\ncloud-region.region-id = $tmp.aai-data-vm.cloud-region-id \"  \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>\n","comments":"","outputs":1,"x":1972.8833312988281,"y":884.8833312988281,"z":"f4b8442.0fb85b8","wires":[["a8b24e73.4ee988"]]},{"id":"a8b24e73.4ee988","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2157.883331298828,"y":882.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c879f837.bac108"]]},{"id":"c879f837.bac108","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2316.883331298828,"y":881.8833312988281,"z":"f4b8442.0fb85b8","wires":[["556dfd9c.657114","b3f09d6d.b550b8"]]},{"id":"556dfd9c.657114","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2482.883331298828,"y":874.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"b3f09d6d.b550b8","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2550.883331298828,"y":949.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"2e5147af.8c502","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1741.8833312988281,"y":850.8833312988281,"z":"f4b8442.0fb85b8","wires":[["85ceea54.89cff8"]]},{"id":"b0afd80f.959b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1777.8833312988281,"y":729.8833312988281,"z":"f4b8442.0fb85b8","wires":[["49a48a4e.19f34c"]]},{"id":"ead40740.d1b23","type":"get-resource","name":"get-resource: A&AI Data for VNFC Name ","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" key=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name\" pfx=\"tmp.aai-data-vnfc\" >\n\n\n","comments":"","outputs":1,"x":1336.8833312988281,"y":1266.8833312988281,"z":"f4b8442.0fb85b8","wires":[["549cc3e0.c9dea4","5258b27.a79774c","6ccdd521.4c3d74"]]},{"id":"549cc3e0.c9dea4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1659.8833312988281,"y":1210.8833312988281,"z":"f4b8442.0fb85b8","wires":[["4ac698fc.12ef8"]]},{"id":"4ac698fc.12ef8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1828.8833312988281,"y":1211.8833312988281,"z":"f4b8442.0fb85b8","wires":[["9cd69d90.4ab5e","ab0a4f4f.4f2b6","368e0e52.df43ea","823a01a9.fa859"]]},{"id":"5258b27.a79774c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1325.8833312988281,"y":1681.88330078125,"z":"f4b8442.0fb85b8","wires":[["37e6ac9f.881974"]]},{"id":"37e6ac9f.881974","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1493.3833312988281,"y":1672.38330078125,"z":"f4b8442.0fb85b8","wires":[["a5e4a430.a1dae8","ba1f3312.90a09"]]},{"id":"a5e4a430.a1dae8","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Get AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":1683.8833312988281,"y":1647.1334228515625,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"ba1f3312.90a09","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":1747.8833312988281,"y":1709.6334228515625,"z":"f4b8442.0fb85b8","wires":[]},{"id":"6ccdd521.4c3d74","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1271.8833312988281,"y":1772.88330078125,"z":"f4b8442.0fb85b8","wires":[["3f437625.64f4a2"]]},{"id":"3f437625.64f4a2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1432.8833312988281,"y":1769.88330078125,"z":"f4b8442.0fb85b8","wires":[["c322e2ca.cc10c8"]]},{"id":"c322e2ca.cc10c8","type":"save","name":"update: A&AI  VNFC","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name and \nvserver.vserver-id = $tmp.aai-data-vm.vserver-id AND \ntenant.tenant-id = $tmp.aai-data-vm.tenant-id AND \ncloud-region.region-id = $tmp.aai-data-vm.cloud-region-id \"  \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>","comments":"","outputs":1,"x":1651.6333312988281,"y":1766.38330078125,"z":"f4b8442.0fb85b8","wires":[["f36135db.fdc948"]]},{"id":"f36135db.fdc948","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1842.8833312988281,"y":1758.88330078125,"z":"f4b8442.0fb85b8","wires":[["92615a3d.bc7a9"]]},{"id":"92615a3d.bc7a9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2014.6333312988281,"y":1761.3834228515625,"z":"f4b8442.0fb85b8","wires":[["cb2d609f.88cab","94b652f5.e7a418"]]},{"id":"cb2d609f.88cab","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$tmp.aai-data-vm.vserver-id`\"/>\n<parameter name=\"TENANTID\" value=\"`$tmp.aai-data-vm.tenant-id`\"/>\n<parameter name=\"VNFCNAME\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2225.883331298828,"y":1757.8834533691406,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"94b652f5.e7a418","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + ' and ' + $tmp.aai-data-vm.vserver-id + ' and ' + $tmp.aai-data-vm.tenant-id + '.' + $error-message`\"/>","comments":"","x":2279.883331298828,"y":1818.63330078125,"z":"f4b8442.0fb85b8","wires":[]},{"id":"37dca69b.66ac62","type":"save","name":"save Put VNFC","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vnfc' key='vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name' force='true' pfx='tmp.vnfc-payload'>\n<parameter name='nfc-naming-code' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-function-code`'/>\n<parameter name='nfc-function' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-type`'/>\n<parameter name='prov-status' value='`$tmp.aai-prov-status`'/>\n<parameter name='orchestration-status' value='`$tmp.aai-orch-status`'/>\n<parameter name='group-notation' value='`$tmp.group-notation`'/>\n<parameter name='in-maint' value = 'false'/>\n<parameter name='is-closed-loop' value = 'false'/>\n\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vserver\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\"   value=\"vserver.vserver-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vm.vserver-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\"   value=\"tenant.tenant-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value='`$tmp.aai-data-vm.tenant-id`'/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\"   value=\"cloud-region.cloud-owner\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"att-aic\"/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-key\"   value=\"cloud-region.cloud-region-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-value\" value='`$tmp.aai-data-vm.cloud-region-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\"   value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].related-to\" value=\"vf-module\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-key\"   value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-key\"   value=\"vf-module.vf-module-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-value\" value='`$tmp.vf-module-id`'/>\n\n","comments":"","outputs":1,"x":1819.8833312988281,"y":1568.772216796875,"z":"f4b8442.0fb85b8","wires":[["15433db9.df194a"]]},{"id":"15433db9.df194a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2012.3833312988281,"y":1569.272216796875,"z":"f4b8442.0fb85b8","wires":[["b83ce7.4ec9b318"]]},{"id":"b83ce7.4ec9b318","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2178.633331298828,"y":1571.772216796875,"z":"f4b8442.0fb85b8","wires":[["c4e01cc9.cc4588","2f357b42.686584"]]},{"id":"c4e01cc9.cc4588","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Insert to AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2383.133331298828,"y":1543.272216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2f357b42.686584","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Insert to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2447.133331298828,"y":1608.272216796875,"z":"f4b8442.0fb85b8","wires":[]},{"id":"847918b3.b0aa9","type":"save","name":"save Put VNFC","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vnfc' key='vnfc.vnfc-name = $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name' force='true' pfx='tmp.vnfc-sys-controller'>\n<parameter name='nfc-naming-code' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-function-code`'/>\n<parameter name='nfc-function' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-type`'/>\n<parameter name='prov-status' value='`$tmp.aai-prov-status`'/>\n<parameter name='orchestration-status' value='`$tmp.aai-orch-status`'/>\n<parameter name='in-maint' value = 'false'/>\n<parameter name='is-closed-loop' value = 'false'/>\n<parameter name='ipaddress-v4-oam-vip' value='`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].ipaddress-v4-oam-vip`'/>\n\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vserver\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\"   value=\"vserver.vserver-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vm.vserver-id`'/>\n\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\"   value=\"tenant.tenant-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value='`$tmp.aai-data-vm.tenant-id`'/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\"   value=\"cloud-region.cloud-owner\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"att-aic\"/>\n\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-key\"   value=\"cloud-region.cloud-region-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[3].relationship-value\" value='`$tmp.aai-data-vm.cloud-region-id`'/>\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\"   value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].related-to\" value=\"vf-module\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-key\"   value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[0].relationship-value\" value='`$tmp.aai-data-vnf.vnf-id`'/>\n\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-key\"   value=\"vf-module.vf-module-id\" />\n<parameter name=\"relationship-list.relationship[2].relationship-data[1].relationship-value\" value='`$tmp.vf-module-id`'/>\n\n\n\n\n","comments":"","outputs":1,"x":2108.883331298828,"y":719.88330078125,"z":"f4b8442.0fb85b8","wires":[["b3c3c3d0.4d379"]]},{"id":"b3c3c3d0.4d379","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2279.883331298828,"y":722.88330078125,"z":"f4b8442.0fb85b8","wires":[["86981ca7.0f486"]]},{"id":"86981ca7.0f486","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2429.883331298828,"y":725.88330078125,"z":"f4b8442.0fb85b8","wires":[["fb7984a3.2a359","473192dd.1f183c"]]},{"id":"fb7984a3.2a359","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Insert to AnAI Request Failed\"/>\n<parameter name=\"field3\" value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name`\"/>\n\n","comments":"","outputs":1,"x":2636.883331298828,"y":716.88330078125,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"473192dd.1f183c","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Insert to A&amp;AI Failed for ' + $service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller[$j].vnfc-name + '.' + $error-message`\"/>","comments":"","x":2607.883331298828,"y":776.88330078125,"z":"f4b8442.0fb85b8","wires":[]},{"id":"78560055.675858","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters_length`\">","comments":"","outputs":1,"x":427.8833312988281,"y":308.8833312988281,"z":"f4b8442.0fb85b8","wires":[["cdd9fcc9.e2fd58","8cd6d147.ae0218","34c2463.cf0b8ba"]]},{"id":"cdd9fcc9.e2fd58","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":700.8833312988281,"y":262.8833312988281,"z":"f4b8442.0fb85b8","wires":[["42a9f090.5576b"]]},{"id":"8cd6d147.ae0218","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":692.8833312988281,"y":305.8833312988281,"z":"f4b8442.0fb85b8","wires":[["42a9f090.5576b"]]},{"id":"42a9f090.5576b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":901.8833312988281,"y":323.8833312988281,"z":"f4b8442.0fb85b8","wires":[["fac19019.555ba","69639e79.b60028"]]},{"id":"13419e55.a341c2","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].system-controller_length`\">","comments":"","outputs":1,"x":892.8833312988281,"y":417.8833312988281,"z":"f4b8442.0fb85b8","wires":[["2b70f3b6.70ab34","1cfb5f7f.146ea9","4bbed44c.48958c"]]},{"id":"2b70f3b6.70ab34","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1177.8833312988281,"y":397.8833312988281,"z":"f4b8442.0fb85b8","wires":[["dfc67bfa.c70f28"]]},{"id":"1cfb5f7f.146ea9","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":433.8833312988281,"z":"f4b8442.0fb85b8","wires":[["dfc67bfa.c70f28"]]},{"id":"dfc67bfa.c70f28","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1383.8833312988281,"y":341.8833312988281,"z":"f4b8442.0fb85b8","wires":[["38f7f12.d30130e","538b5769.d570d"]]},{"id":"38f7f12.d30130e","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"System Controller VM and VNFC data not in config tree\"/>\n\n\n","comments":"","outputs":1,"x":1548.8833312988281,"y":362.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"2200faf8.6ff19e","type":"switchNode","name":"switch: vnf config parameters length","xml":"<switch test=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload_length`\">","comments":"","outputs":1,"x":913.8833312988281,"y":931.8833312988281,"z":"f4b8442.0fb85b8","wires":[["578b3fc6.dfebe","ab715923.f11558","4ea5e5a.72a741c"]]},{"id":"578b3fc6.dfebe","type":"other","name":"outcome: Length=0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1186.8833312988281,"y":843.8833312988281,"z":"f4b8442.0fb85b8","wires":[["3426556e.ca5e6a"]]},{"id":"ab715923.f11558","type":"other","name":"outcome: NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":896.8833312988281,"z":"f4b8442.0fb85b8","wires":[["3426556e.ca5e6a"]]},{"id":"3426556e.ca5e6a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1370.8833312988281,"y":867.8833312988281,"z":"f4b8442.0fb85b8","wires":[["f79a2016.ec9188","a39acb97.4339d8"]]},{"id":"f79a2016.ec9188","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Payload VM and VNFC data not in config tree\"/>\n\n\n","comments":"","outputs":1,"x":1550.8833312988281,"y":940.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"fac19019.555ba","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"RETURNED RESPONSEMESSAGE\"/>\n<parameter name=\"RESPONSEMSG\" value=\"`$response-message`\"/>\n<parameter name=\"ERRORMSG\" value=\"`$error-message`\"/>\n<parameter name=\"field3\" value=\"VM and VNFC data not in config tree.Stop the flow\"/>\n\n","comments":"","outputs":1,"x":1085.8833312988281,"y":355.8833312988281,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"f043b65d.df114","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":811.8833312988281,"y":150.88333129882812,"z":"f4b8442.0fb85b8","wires":[["7133566.c86f728","e6574c9f.d7f28"]]},{"id":"7133566.c86f728","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n<parameter name=\"ErrorMessage\" value=\"`$tmp.aai-data-vnf.error-message`\"/>\n<parameter name=\"HTTP Code\" value=\"`$tmp.aai-data-vnf.error.http.response-code`\"/>","comments":"","outputs":1,"x":984.8833312988281,"y":128.88333129882812,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"e6574c9f.d7f28","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $service-configuration-notification-input.service-information.service-instance-id + '.' + $tmp.aai-data-vnf.error-message + '.HTTP Code:' + $tmp.aai-data-vnf.error.http.response-code + '.' + $error-message `\"/>\n","comments":"","x":1042.8833312988281,"y":166.88333129882812,"z":"f4b8442.0fb85b8","wires":[]},{"id":"69639e79.b60028","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1143.8833312988281,"y":310.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"538b5769.d570d","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'System Controller VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1616.8833312988281,"y":320.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"a39acb97.4339d8","type":"set","name":"set: Append to error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Payload VM and VNFC Data not found in config tree.' + $error-message `\"/>\n","comments":"","x":1618.8833312988281,"y":892.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"34c2463.cf0b8ba","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":685.8833312988281,"y":351.8833312988281,"z":"f4b8442.0fb85b8","wires":[["ae635f4d.64e9d8"]]},{"id":"ae635f4d.64e9d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":164.88333129882812,"y":414.8833312988281,"z":"f4b8442.0fb85b8","wires":[["66e5357a.c3e564","f013923f.8ff4c8"]]},{"id":"4bbed44c.48958c","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1175.8833312988281,"y":476.8833312988281,"z":"f4b8442.0fb85b8","wires":[["753d2624.a03b78"]]},{"id":"753d2624.a03b78","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":637.8833312988281,"y":536.8833312988281,"z":"f4b8442.0fb85b8","wires":[["c7ca81f5.584878"]]},{"id":"4ea5e5a.72a741c","type":"other","name":"outcome: Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1176.8833312988281,"y":948.8833312988281,"z":"f4b8442.0fb85b8","wires":[["9c636d62.83d92"]]},{"id":"9c636d62.83d92","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1080.8833312988281,"y":995.8833312988281,"z":"f4b8442.0fb85b8","wires":[["f6bd5a4d.edb528"]]},{"id":"ab0a4f4f.4f2b6","type":"switchNode","name":"Check Odd or Even VM Name","xml":"<switch test=\"`((( $tmp.vm_last_number / 2 ) * 2 ) == $tmp.vm_last_number )`\">\n","comments":"","outputs":1,"x":2131.1332092285156,"y":1283.3833312988281,"z":"f4b8442.0fb85b8","wires":[["43163cb2.20f664","62bb1ac8.becec4"]]},{"id":"9cd69d90.4ab5e","type":"set","name":"Set VM Name & Mated Pair","xml":"<set>\n<parameter name ='tmp.vm-name' value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name`\"/>\n<parameter name ='tmp.vm-name-length' value=\"`length($service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].vm-name)`\"/>\n<parameter name='tmp.mated-pair-number' value=\"`$service-data.vnf-config-parameters-list.vnf-config-parameters[$i].payload[$j].mated-pair-number`\"/>\n\n\n","comments":"","x":2116.133087158203,"y":1179.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"96796fac.e80f8","type":"set","name":"Set Even Group Notation","xml":"<set>\n<parameter name='tmp.group-notation' value=\"`$tmp.odd-group-notation`\"/>\n","comments":"","x":2600.383331298828,"y":1306.8833312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"43163cb2.20f664","type":"outcomeFalse","name":"Odd Pair","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2393.133331298828,"y":1216.8833312988281,"z":"f4b8442.0fb85b8","wires":[["5da8532.413e72c"]]},{"id":"62bb1ac8.becec4","type":"other","name":"Even Pair","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2396.883331298828,"y":1306.8833312988281,"z":"f4b8442.0fb85b8","wires":[["96796fac.e80f8"]]},{"id":"5da8532.413e72c","type":"set","name":"Set Odd Group Notation","xml":"<set>\n<parameter name='tmp.odd-group-notation' value=\"`$tmp.mated-pair-number`\"/>\n<parameter name='tmp.group-notation' value=\"`$tmp.mated-pair-number`\"/>\n","comments":"","x":2586.883331298828,"y":1215.6333312988281,"z":"f4b8442.0fb85b8","wires":[]},{"id":"368e0e52.df43ea","type":"set","name":"Get VM Name last digit","xml":"<set>\n<parameter name='tmp.vm_last_number' value='`substr($tmp.vm-name, $tmp.vm-name-length - 1, $tmp.vm-name-length)`' />\n","comments":"","x":2100.5162658691406,"y":1232.5166320800781,"z":"f4b8442.0fb85b8","wires":[]},{"id":"49a48a4e.19f34c","type":"call","name":"call: GetVfModuleInfo","xml":"<call module=\"APPC\" rpc=\"GetVfModuleInfo\" mode=\"sync\">","comments":"","outputs":1,"x":1694.8833312988281,"y":633.772216796875,"z":"f4b8442.0fb85b8","wires":[["8bed42ae.eb616"]]},{"id":"8bed42ae.eb616","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1867.8833312988281,"y":634.772216796875,"z":"f4b8442.0fb85b8","wires":[["3a57ec9f.7eae7c"]]},{"id":"3a57ec9f.7eae7c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2021.8833312988281,"y":635.772216796875,"z":"f4b8442.0fb85b8","wires":[["7166bf9.bf9e3c"]]},{"id":"7166bf9.bf9e3c","type":"switchNode","name":"switch: tmp.vf-module-id","xml":"<switch test=\"`$tmp.vf-module-id`\">","comments":"","outputs":1,"x":2234.883331298828,"y":624.772216796875,"z":"f4b8442.0fb85b8","wires":[["7d0fbd67.81486c","39dae372.2d7164"]]},{"id":"7d0fbd67.81486c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2436.883331298828,"y":625.772216796875,"z":"f4b8442.0fb85b8","wires":[["78903187.23f99"]]},{"id":"78903187.23f99","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2589.883331298828,"y":624.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"39dae372.2d7164","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2299.883331298828,"y":666.772216796875,"z":"f4b8442.0fb85b8","wires":[["847918b3.b0aa9"]]},{"id":"823a01a9.fa859","type":"call","name":"call: GetVfModuleInfo","xml":"<call module=\"APPC\" rpc=\"GetVfModuleInfo\" mode=\"sync\">","comments":"","outputs":1,"x":2034.8833312988281,"y":1374.772216796875,"z":"f4b8442.0fb85b8","wires":[["9376c1dd.d71158","b37aa195.39825"]]},{"id":"9376c1dd.d71158","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2236.883331298828,"y":1369.772216796875,"z":"f4b8442.0fb85b8","wires":[["db84adc3.3cb7b"]]},{"id":"db84adc3.3cb7b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2394.883331298828,"y":1369.772216796875,"z":"f4b8442.0fb85b8","wires":[["1a92d485.722c43"]]},{"id":"1a92d485.722c43","type":"switchNode","name":"switch: tmp.vf-module-id","xml":"<switch test=\"`$tmp.vf-module-id`\">","comments":"","outputs":1,"x":2611.883331298828,"y":1372.772216796875,"z":"f4b8442.0fb85b8","wires":[["46fe9440.3d5704"]]},{"id":"1f39adc9.664c52","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2588.883331298828,"y":1432.772216796875,"z":"f4b8442.0fb85b8","wires":[[]]},{"id":"46fe9440.3d5704","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2421.883331298828,"y":1430.772216796875,"z":"f4b8442.0fb85b8","wires":[["1f39adc9.664c52"]]},{"id":"b37aa195.39825","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2242.883331298828,"y":1461.772216796875,"z":"f4b8442.0fb85b8","wires":[["37dca69b.66ac62"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-vnfc-info.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-vnfc-info.json
deleted file mode 100644
index 89623f3..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-vnfc-info.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"ca99a786.1adf8","type":"get-resource","name":"get-resource: A&AI Data for VServer","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $aaiinfo[$k].vserverid AND \ntenant.tenant-id = $aaiinfo[$k].tenantid AND\ncloud-region.cloud-owner = $aaiinfo[$k].cloudowner AND\ncloud-region.cloud-region-id = $aaiinfo[$k].cloudregionid\"\npfx=\"tmp.vserver\" >\n\n","comments":"","outputs":1,"x":709.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["fde2a23.0ae856","2217ca10.f4dbfe","45df48e.32abe38"]]},{"id":"68770954.89e85","type":"dgstart","name":"DGSTART","outputs":1,"x":204.88330078125,"y":92,"z":"c52d74c3.6a173","wires":[["57a94af7.1d52e4"]]},{"id":"57a94af7.1d52e4","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":375.88330078125,"y":92,"z":"c52d74c3.6a173","wires":[["d80de510.a9535"]]},{"id":"d80de510.a9535","type":"method","name":"method update-vnfc-info","xml":"<method rpc='update-vnfc-info' mode='sync'>\n","comments":"","outputs":1,"x":593.88330078125,"y":91,"z":"c52d74c3.6a173","wires":[["36ef9227.2f9f7e"]]},{"id":"36ef9227.2f9f7e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":213.88330078125,"y":173,"z":"c52d74c3.6a173","wires":[["e4367acb.1fb978","ec095f59.d1d65"]]},{"id":"e4367acb.1fb978","type":"set","name":"set vnfclistlen=0","xml":"<set>\n<parameter name='vnfclistlen' value='0' />\n","comments":"","x":411.88330078125,"y":173,"z":"c52d74c3.6a173","wires":[]},{"id":"ec095f59.d1d65","type":"for","name":"for: ...aaiinfo[]","xml":"<for atomic=\"true\" index=\"k\" start=\"0\" end=\"`$listlen`\" >","comments":"","outputs":1,"x":243.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["6b34e3c9.27ea34"]]},{"id":"6b34e3c9.27ea34","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":447.88330078125,"y":246,"z":"c52d74c3.6a173","wires":[["ca99a786.1adf8"]]},{"id":"fde2a23.0ae856","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":972.88330078125,"y":204,"z":"c52d74c3.6a173","wires":[["d8eb874c.b59238"]]},{"id":"2217ca10.f4dbfe","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":954.88330078125,"y":266,"z":"c52d74c3.6a173","wires":[["d8eb874c.b59238"]]},{"id":"45df48e.32abe38","type":"failure","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":197.88330078125,"y":365,"z":"c52d74c3.6a173","wires":[["9c9021bc.b88fa8"]]},{"id":"d8eb874c.b59238","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1132.88330078125,"y":235,"z":"c52d74c3.6a173","wires":[["4590c797.1fa088","aed133a2.2225f8"]]},{"id":"9c9021bc.b88fa8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":367.88330078125,"y":363,"z":"c52d74c3.6a173","wires":[["5baeb97d.8be528"]]},{"id":"5baeb97d.8be528","type":"switchNode","name":"switch: relationship length","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship_length`\">","comments":"","outputs":1,"x":614.88330078125,"y":360,"z":"c52d74c3.6a173","wires":[["6c48093.1fa56f8","a039aec1.91e03"]]},{"id":"a039aec1.91e03","type":"other","name":"Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":170.88330078125,"y":474,"z":"c52d74c3.6a173","wires":[["b8d7820d.5420b"]]},{"id":"6c48093.1fa56f8","type":"outcome","name":"NULL","xml":"<outcome value=\"\">","comments":"","outputs":1,"x":859.88330078125,"y":364,"z":"c52d74c3.6a173","wires":[["6cb2d58.62be52c"]]},{"id":"6cb2d58.62be52c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1022.88330078125,"y":366,"z":"c52d74c3.6a173","wires":[[]]},{"id":"b8d7820d.5420b","type":"for","name":"for: ...relationship[]","xml":"<for atomic=\"true\" index=\"i\" start=\"0\" end=\"`$tmp.vserver.relationship-list.relationship_length`\" >","comments":"","outputs":1,"x":333.88330078125,"y":476,"z":"c52d74c3.6a173","wires":[["584bee63.5ef69"]]},{"id":"a801b938.dfe4","type":"switchNode","name":"switch: ...related-to","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship[$i].related-to`\">","comments":"","outputs":1,"x":438.88330078125,"y":538,"z":"c52d74c3.6a173","wires":[["f69424a2.0350d"]]},{"id":"f69424a2.0350d","type":"outcome","name":"vnfc","xml":"<outcome value=\"vnfc\">","comments":"","outputs":1,"x":628.88330078125,"y":535,"z":"c52d74c3.6a173","wires":[["e43d220d.0c97f"]]},{"id":"e43d220d.0c97f","type":"for","name":"for: ...relationship-data[]","xml":"<for atomic=\"true\" index=\"j\" start=\"0\" end=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data_length`\" >","comments":"","outputs":1,"x":832.88330078125,"y":528,"z":"c52d74c3.6a173","wires":[["5f70befc.28273"]]},{"id":"5f70befc.28273","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":227.88330078125,"y":631,"z":"c52d74c3.6a173","wires":[["b03df48b.fe3f4"]]},{"id":"b03df48b.fe3f4","type":"switchNode","name":"switch: ...relationship-key","xml":"<switch test=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-key`\">","comments":"","outputs":1,"x":450.88330078125,"y":631,"z":"c52d74c3.6a173","wires":[["d0c0b651.ef1c58"]]},{"id":"d0c0b651.ef1c58","type":"outcome","name":"vnfc-name","xml":"<outcome value=\"vnfc.vnfc-name\">","comments":"","outputs":1,"x":658.88330078125,"y":630,"z":"c52d74c3.6a173","wires":[["b7f0009.11cd18"]]},{"id":"584bee63.5ef69","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":221.88330078125,"y":543,"z":"c52d74c3.6a173","wires":[["a801b938.dfe4"]]},{"id":"aed133a2.2225f8","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Get from A&amp;AI Failed for ' + $aaiinfo[$k].vserverid  + '.' + $error-message`\"/>","comments":"","x":1372.88330078125,"y":256,"z":"c52d74c3.6a173","wires":[]},{"id":"4590c797.1fa088","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Get Request to AnAI Failed\"/>\n<parameter name=\"field3\" value=\"`$service-configuration-notification-input.service-information.service-instance-id`\"/>\n\n","comments":"","outputs":1,"x":1301.88330078125,"y":187,"z":"c52d74c3.6a173","wires":[[]]},{"id":"44fa882d.37258","type":"save","name":"update: A&AI  VNFC","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vnfc\" \nkey=\"vnfc.vnfc-name = $tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-value and \nvserver.vserver-id = $aaiinfo[$k].vserverid AND \ntenant.tenant-id = $aaiinfo[$k].tenantid AND \ncloud-region.region-id = $aaiinfo[$k].cloudregionid \"  \nforce=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.aai-orch-status`\"/>","comments":"","outputs":1,"x":1056.88330078125,"y":636,"z":"c52d74c3.6a173","wires":[["ac6f0c46.257ed8"]]},{"id":"ac6f0c46.257ed8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1239.88330078125,"y":637,"z":"c52d74c3.6a173","wires":[["51900e55.4456b"]]},{"id":"51900e55.4456b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1398.88330078125,"y":639,"z":"c52d74c3.6a173","wires":[["bf4d5312.a11fc","42ec4cbb.ffb7ec"]]},{"id":"bf4d5312.a11fc","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VNFCNAME\" value=\"`$vnfcinfo[$vnfclistlen].vnfcname`\"/>\n<parameter name=\"VSERVERID\" value=\"`$vnfcinfo[$vnfclistlen].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$vnfcinfo[$vnfclistlen].tenantid`\"/>\n\n","comments":"","outputs":1,"x":1581.88330078125,"y":596,"z":"c52d74c3.6a173","wires":[[]]},{"id":"42ec4cbb.ffb7ec","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for VNFC ' + $vnfcinfo[$vnfclistlen].vnfcname + '.' + $error-message`\"/>","comments":"","x":1643.88330078125,"y":668,"z":"c52d74c3.6a173","wires":[]},{"id":"b7f0009.11cd18","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":834.88330078125,"y":632,"z":"c52d74c3.6a173","wires":[["44fa882d.37258","6309de41.c6ea18"]]},{"id":"6309de41.c6ea18","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"VNFCNAME\" value=\"`$tmp.vserver.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\"/>\n<parameter name=\"VSERVERID\" value=\"`$aaiinfo[$k].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$k].tenantid`\"/>\n<parameter name=\"CLOUDOWNER\" value=\"`$aaiinfo[$k].cloudowner`\"/>\n<parameter name=\"CLOUDREGIONID\" value=\"`$aaiinfo[$k].cloudregionid`\"/>\n","comments":"","outputs":1,"x":1027.88330078125,"y":581,"z":"c52d74c3.6a173","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-vserver-info.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-vserver-info.json
deleted file mode 100644
index bc1d49d..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Appc-API/Appc-API_update-vserver-info.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"fb57c265.1ba01","type":"dgstart","name":"DGSTART","outputs":1,"x":219,"y":54,"z":"7ec136e2.e63208","wires":[["185188b4.36cb77"]]},{"id":"185188b4.36cb77","type":"service-logic","name":"Appc-API 4.0.0","module":"Appc-API","version":"4.0.0","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-API' version='4.0.0'>","outputs":1,"x":390,"y":52,"z":"7ec136e2.e63208","wires":[["d3b34772.6e59f8"]]},{"id":"d3b34772.6e59f8","type":"method","name":"method update-vserver-info","xml":"<method rpc='update-vserver-info' mode='sync'>\n","comments":"","outputs":1,"x":618,"y":54,"z":"7ec136e2.e63208","wires":[["531cec36.49f504"]]},{"id":"531cec36.49f504","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":208,"y":108,"z":"7ec136e2.e63208","wires":[["875b1407.c421d8","41c061d8.a53ca","73a4109.f924ef"]]},{"id":"875b1407.c421d8","type":"set","name":"set listlen=0","xml":"<set>\n<parameter name='listlen' value='0' />\n","comments":"","x":386,"y":110,"z":"7ec136e2.e63208","wires":[]},{"id":"41c061d8.a53ca","type":"switchNode","name":"switch: relationship length","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\">","comments":"","outputs":1,"x":240,"y":182,"z":"7ec136e2.e63208","wires":[["abcca544.fa55e8","4d4625e4.11b96c"]]},{"id":"4d4625e4.11b96c","type":"other","name":"Other","xml":"<outcome value=\"Other\">","comments":"","outputs":1,"x":441,"y":263,"z":"7ec136e2.e63208","wires":[["782291d7.96aa1"]]},{"id":"abcca544.fa55e8","type":"outcome","name":"NULL","xml":"<outcome value=\"\">","comments":"","outputs":1,"x":448,"y":181,"z":"7ec136e2.e63208","wires":[["53fc41ee.f2a9f"]]},{"id":"53fc41ee.f2a9f","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":584,"y":180,"z":"7ec136e2.e63208","wires":[["f7e3690.45d8a98"]]},{"id":"4d016af.3128194","type":"for","name":"for: ...relationship[]","xml":"<for atomic=\"true\" index=\"i\" start=\"0\" end=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\" >","comments":"","outputs":1,"x":779,"y":269,"z":"7ec136e2.e63208","wires":[["1a71448.22d60bc"]]},{"id":"9b3225cd.90bf18","type":"switchNode","name":"switch: ...related-to","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].related-to`\">","comments":"","outputs":1,"x":651,"y":343,"z":"7ec136e2.e63208","wires":[["df84265d.f084a8"]]},{"id":"df84265d.f084a8","type":"outcome","name":"vserver","xml":"<outcome value=\"vserver\">","comments":"","outputs":1,"x":376,"y":433,"z":"7ec136e2.e63208","wires":[["53e2f95c.eafab8"]]},{"id":"96f6935c.60847","type":"for","name":"for: ...relationship-data[]","xml":"<for atomic=\"true\" index=\"j\" start=\"0\" end=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data_length`\" >","comments":"","outputs":1,"x":774,"y":429,"z":"7ec136e2.e63208","wires":[["f4ad596a.fd0f58"]]},{"id":"7255506e.be107","type":"switchNode","name":"switch: ...relationship-key","xml":"<switch test=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-key`\">","comments":"","outputs":1,"x":1281,"y":406,"z":"7ec136e2.e63208","wires":[["93748d51.43dc5","d91de34.d004d2","8770a1e7.506fc","205912c3.6a437e"]]},{"id":"93748d51.43dc5","type":"outcome","name":"vserver-id","xml":"<outcome value=\"vserver.vserver-id\">","comments":"","outputs":1,"x":1515.5,"y":340,"z":"7ec136e2.e63208","wires":[["a9a68c63.9d993"]]},{"id":"d91de34.d004d2","type":"outcome","name":"tenant-id","xml":"<outcome value=\"tenant.tenant-id\">","comments":"","outputs":1,"x":1509,"y":413,"z":"7ec136e2.e63208","wires":[["bcb84af7.25e408"]]},{"id":"8770a1e7.506fc","type":"outcome","name":"cloud-owner","xml":"<outcome value=\"cloud-region.cloud-owner\">","comments":"","outputs":1,"x":1518,"y":502,"z":"7ec136e2.e63208","wires":[["b647ebc2.e53768"]]},{"id":"205912c3.6a437e","type":"outcome","name":"cloud-region-id","xml":"<outcome value=\"cloud-region.cloud-region-id\">","comments":"","outputs":1,"x":1518,"y":591,"z":"7ec136e2.e63208","wires":[["14d7bb26.c3cfd5"]]},{"id":"a9a68c63.9d993","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1698,"y":339,"z":"7ec136e2.e63208","wires":[["699f0edf.474f4"]]},{"id":"bcb84af7.25e408","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1699,"y":413,"z":"7ec136e2.e63208","wires":[["cb69969f.96fd98"]]},{"id":"b647ebc2.e53768","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1711,"y":503,"z":"7ec136e2.e63208","wires":[["1fc1517e.50999f"]]},{"id":"14d7bb26.c3cfd5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1719,"y":582,"z":"7ec136e2.e63208","wires":[["c95c710e.e3083"]]},{"id":"699f0edf.474f4","type":"set","name":"set vserverid","xml":"<set>\n<parameter name=\"aaiinfo[$listlen].vserverid\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />\n","comments":"","x":1940,"y":346,"z":"7ec136e2.e63208","wires":[]},{"id":"cb69969f.96fd98","type":"set","name":"set tenantid","xml":"<set>\n<parameter name='aaiinfo[$listlen].tenantid' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1947,"y":413,"z":"7ec136e2.e63208","wires":[]},{"id":"1fc1517e.50999f","type":"set","name":"set cloudowner","xml":"<set>\n<parameter name='aaiinfo[$listlen].cloudowner' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1946,"y":498,"z":"7ec136e2.e63208","wires":[]},{"id":"c95c710e.e3083","type":"set","name":"set cloudregion","xml":"<set>\n<parameter name='aaiinfo[$listlen].cloudregionid' value='`$tmp.aai-data-vnf.relationship-list.relationship[$i].relationship-data[$j].relationship-value`' />\n","comments":"","x":1933,"y":571,"z":"7ec136e2.e63208","wires":[]},{"id":"f4ad596a.fd0f58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":994,"y":430,"z":"7ec136e2.e63208","wires":[["7255506e.be107"]]},{"id":"6ede6908.924968","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"VSERVERID\" value=\"`$aaiinfo[$listlen].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$listlen].tenantid`\"/>\n<parameter name=\"CLOUDOWNER\" value=\"`$aaiinfo[$listlen].cloudowner`\"/>\n<parameter name=\"CLOUDREGIONID\" value=\"`$aaiinfo[$listlen].cloudregionid`\"/>\n","comments":"","outputs":1,"x":740,"y":590,"z":"7ec136e2.e63208","wires":[[]]},{"id":"f7e3690.45d8a98","type":"set","name":"set listlen=0","xml":"<set>\n<parameter name='listlen' value='0' />\n","comments":"","x":736,"y":177,"z":"7ec136e2.e63208","wires":[]},{"id":"9efd4b8.e1f9eb8","type":"set","name":"increment listlen","xml":"<set>\n\t<parameter name='listlen' value='`$listlen + 1`' />\n\n","comments":"","x":763,"y":778,"z":"7ec136e2.e63208","wires":[]},{"id":"8701a0e1.96a92","type":"save","name":"update: A&AI ( VM)","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"vserver\" \nkey=\"vserver.vserver-id = $aaiinfo[$listlen].vserverid AND \ntenant.tenant-id = $aaiinfo[$listlen].tenantid AND\ncloud-region.cloud-owner = $aaiinfo[$listlen].cloudowner AND\ncloud-region.cloud-region-id = $aaiinfo[$listlen].cloudregionid\"\n force=\"true\" local-only=\"false\" pfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"prov-status\" value=\"`$tmp.aai-prov-status`\"/>\n","comments":"","outputs":1,"x":769.5,"y":654,"z":"7ec136e2.e63208","wires":[["37951ea8.1137b2"]]},{"id":"37951ea8.1137b2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":963.5,"y":654,"z":"7ec136e2.e63208","wires":[["b793f606.57c9d8"]]},{"id":"b793f606.57c9d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1132.5,"y":655,"z":"7ec136e2.e63208","wires":[["40a42380.b197ac","e7af383f.fc57f8"]]},{"id":"40a42380.b197ac","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Update Request to AnAI Failed\"/>\n<parameter name=\"VSERVERID\" value=\"`$aaiinfo[$i].vserverid`\"/>\n<parameter name=\"TENANTID\" value=\"`$aaiinfo[$i].tenantid`\"/>\n\n","comments":"","outputs":1,"x":1331.5,"y":635,"z":"7ec136e2.e63208","wires":[[]]},{"id":"e7af383f.fc57f8","type":"set","name":"set: Append to error message","xml":"<set>\n\t  <parameter name=\"error-message\" value=\"`'Update to A&amp;AI Failed for ' + $aaiinfo[$i].vserverid + ' and ' + $aaiinfo[$i].tenantid + '.' + $error-message`\"/>","comments":"","x":1406.5,"y":696,"z":"7ec136e2.e63208","wires":[]},{"id":"53e2f95c.eafab8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":552,"y":431,"z":"7ec136e2.e63208","wires":[["96f6935c.60847","8701a0e1.96a92","9efd4b8.e1f9eb8","6ede6908.924968"]]},{"id":"782291d7.96aa1","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":599,"y":267,"z":"7ec136e2.e63208","wires":[["4d016af.3128194"]]},{"id":"1a71448.22d60bc","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":453,"y":343,"z":"7ec136e2.e63208","wires":[["9b3225cd.90bf18"]]},{"id":"73a4109.f924ef","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"RELATIONSHIPLEN\" value=\"`$tmp.aai-data-vnf.relationship-list.relationship_length`\"/>\n\n","comments":"","outputs":1,"x":375,"y":145,"z":"7ec136e2.e63208","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Rollback.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Rollback.json
deleted file mode 100644
index f0c0bd3..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Rollback.json
+++ /dev/null
@@ -1,577 +0,0 @@
-[
-  {
-    "id": "5e8f7716.499198",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 555,
-    "y": 396.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "4b22d8a1.f3d148"
-      ]
-    ]
-  },
-  {
-    "id": "145d561d.5cc62a",
-    "type": "execute",
-    "name": "execute_getVNF_Hierarchy",
-    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 318,
-    "y": 396.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "5e8f7716.499198",
-        "bb8a0f0f.b2fe4",
-        "a25b25dc.c0a438"
-      ]
-    ]
-  },
-  {
-    "id": "4b22d8a1.f3d148",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$getVnfHierarchy_result`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 692.0000610351562,
-    "y": 396.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "25fd98ba.13e158",
-        "606b452c.8152dc"
-      ]
-    ]
-  },
-  {
-    "id": "bb8a0f0f.b2fe4",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 848,
-    "y": 235.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "c13d50ec.a9c2"
-      ]
-    ]
-  },
-  {
-    "id": "a25b25dc.c0a438",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 863,
-    "y": 155.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "c13d50ec.a9c2"
-      ]
-    ]
-  },
-  {
-    "id": "6d026903.3c9f08",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 318.66668701171875,
-    "y": 319.4444417953491,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "145d561d.5cc62a"
-      ]
-    ]
-  },
-  {
-    "id": "25fd98ba.13e158",
-    "type": "outcome",
-    "name": "SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 657,
-    "y": 563.5555562973022,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "7d6b675f.944888"
-      ]
-    ]
-  },
-  {
-    "id": "606b452c.8152dc",
-    "type": "outcome",
-    "name": "FAILURE",
-    "xml": "<outcome value='FAILURE'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 860,
-    "y": 325.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "c13d50ec.a9c2"
-      ]
-    ]
-  },
-  {
-    "id": "c13d50ec.a9c2",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1045,
-    "y": 269.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "6b85300.44ae5d",
-        "b50265a4.9ec658",
-        "ff92154a.222ad8"
-      ]
-    ]
-  },
-  {
-    "id": "f205d4a8.a6d008",
-    "type": "execute",
-    "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 273.6666564941406,
-    "y": 255.44444179534912,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "6d026903.3c9f08",
-        "d9efdcd7.d999"
-      ]
-    ]
-  },
-  {
-    "id": "7d6b675f.944888",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$VNF.VMCount`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 803.0000305175781,
-    "y": 563.5555562973022,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "b3dc1924.975c18",
-        "61b52cec.5b91d4"
-      ]
-    ]
-  },
-  {
-    "id": "6b85300.44ae5d",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1308,
-    "y": 205.55555725097656,
-    "z": "75a9f4e5.a1649c",
-    "wires": []
-  },
-  {
-    "id": "b50265a4.9ec658",
-    "type": "execute",
-    "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1315,
-    "y": 91.55555725097656,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d9efdcd7.d999",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 529.6666870117188,
-    "y": 196.44444179534912,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b3dc1924.975c18",
-    "type": "other",
-    "name": "outcome_0",
-    "xml": "<outcome value='0'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 881,
-    "y": 481.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "7edbf7e6.e29b28"
-      ]
-    ]
-  },
-  {
-    "id": "61b52cec.5b91d4",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 865,
-    "y": 652.5555562973022,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "1afd140e.b8e10c"
-      ]
-    ]
-  },
-  {
-    "id": "7edbf7e6.e29b28",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1002,
-    "y": 405.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "ce24c821.4cd8e8",
-        "c6500acc.d09d98",
-        "f9c012e3.68717"
-      ]
-    ]
-  },
-  {
-    "id": "1afd140e.b8e10c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>\n",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1016.0000610351562,
-    "y": 653.5556173324585,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "e690e466.a45438"
-      ]
-    ]
-  },
-  {
-    "id": "ce24c821.4cd8e8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1230,
-    "y": 496.5555419921875,
-    "z": "75a9f4e5.a1649c",
-    "wires": []
-  },
-  {
-    "id": "c6500acc.d09d98",
-    "type": "execute",
-    "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1260,
-    "y": 347.55555629730225,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "e690e466.a45438",
-    "type": "execute",
-    "name": "execute_RollbackStack",
-    "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restoreStack' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$input.identity-url`\" />\n <parameter name=\"org.onap.appc.stack.id\" value =\"`$VNF.heat-stack-id`\" />\n <parameter name=\"org.onap.appc.snapshot.id\" value=\"`$input.snapshot-id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1235,
-    "y": 653.5555562973022,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "755e1d66.83efb4",
-        "99ec0c41.3c7b8",
-        "e20a4882.f1ee38"
-      ]
-    ]
-  },
-  {
-    "id": "755e1d66.83efb4",
-    "type": "outcome",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1383,
-    "y": 751.5555419921875,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "2d2f9438.4676ec"
-      ]
-    ]
-  },
-  {
-    "id": "99ec0c41.3c7b8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1378,
-    "y": 560.5555562973022,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "4ef40628.63bd68"
-      ]
-    ]
-  },
-  {
-    "id": "e20a4882.f1ee38",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1434,
-    "y": 653.5556783676147,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "4ef40628.63bd68"
-      ]
-    ]
-  },
-  {
-    "id": "290b41b8.e128ee",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>",
-    "comments": "",
-    "x": 1813.4285888671875,
-    "y": 800.126953125,
-    "z": "75a9f4e5.a1649c",
-    "wires": []
-  },
-  {
-    "id": "4ef40628.63bd68",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1627.4285888671875,
-    "y": 653.6983785629272,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "da2d458c.b135f8",
-        "57c76a69.3aba64",
-        "c1763a92.eaaf28"
-      ]
-    ]
-  },
-  {
-    "id": "da2d458c.b135f8",
-    "type": "execute",
-    "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Error occured during rollback Stack '+$VNF.heat-stack-id + ' to snapshot ' + $snapshot-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured during rollback Stack '+$VNF.heat-stack-id + ' to snapshot ' + $snapshot-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1888,
-    "y": 520.5555419921875,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "4571b850.f77f68"
-      ]
-    ]
-  },
-  {
-    "id": "57c76a69.3aba64",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1877,
-    "y": 648.5555419921875,
-    "z": "75a9f4e5.a1649c",
-    "wires": []
-  },
-  {
-    "id": "4571b850.f77f68",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2111.666748046875,
-    "y": 494.888916015625,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "7068b4fa.7f618c",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 111.66665649414062,
-    "y": 20,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "3f3fa052.71537"
-      ]
-    ]
-  },
-  {
-    "id": "3f3fa052.71537",
-    "type": "service-logic",
-    "name": "APPC-API 2.0.0.0",
-    "module": "APPC-API",
-    "version": "2.0.0.0",
-    "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-API' version='2.0.0.0'>",
-    "outputs": 1,
-    "x": 145.66665649414062,
-    "y": 114,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "90f1096d.987a68"
-      ]
-    ]
-  },
-  {
-    "id": "90f1096d.987a68",
-    "type": "method",
-    "name": "VNF_Rollback",
-    "xml": "<method rpc='VNF_Rollback' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 145.66665649414062,
-    "y": 187,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "f205d4a8.a6d008"
-      ]
-    ]
-  },
-  {
-    "id": "ff92154a.222ad8",
-    "type": "execute",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"Exception in getting VNF Hierachy\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1331,
-    "y": 150,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f9c012e3.68717",
-    "type": "execute",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"VM Count is 0\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1257,
-    "y": 424,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "c1763a92.eaaf28",
-    "type": "execute",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`'Error occured during rollback Stack '+$VNF.heat-stack-id + ' to snapshot ' + $snapshot-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1904,
-    "y": 586,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2d2f9438.4676ec",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1567,
-    "y": 754,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      [
-        "290b41b8.e128ee",
-        "b75c6c94.830d4"
-      ]
-    ]
-  },
-  {
-    "id": "b75c6c94.830d4",
-    "type": "execute",
-    "name": "Set success code and message",
-    "xml": "<set>\n<parameter name='error-code' value='400'/>\n<parameter name='error-message' value=\"Success\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1833,
-    "y": 731,
-    "z": "75a9f4e5.a1649c",
-    "wires": [
-      []
-    ]
-  }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Snapshot.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Snapshot.json
deleted file mode 100644
index e60606d..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0.0_method_VNF_Snapshot.json
+++ /dev/null
@@ -1,588 +0,0 @@
-[
-  {
-    "id": "ff6e6220.ef272",
-    "type": "comment",
-    "name": "Fetch all VMs and VNFCs from AA&I for given VNF_ID",
-    "info": "",
-    "comments": "",
-    "x": 259.75,
-    "y": 590.9999923706055,
-    "z": "17bb73d2.dd297c",
-    "wires": []
-  },
-  {
-    "id": "66552f09.5bfb9",
-    "type": "method",
-    "name": "Generic_Snapshot_1610",
-    "xml": "<method rpc='VNF_Snapshot' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 233.25001525878906,
-    "y": 308,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "5e66c189.09a2d"
-      ]
-    ]
-  },
-  {
-    "id": "1ee152f2.68166d",
-    "type": "service-logic",
-    "name": "APPC-API 2.0.0.0",
-    "module": "APPC-API",
-    "version": "2.0.0.0",
-    "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-API' version='2.0.0.0'>",
-    "outputs": 1,
-    "x": 233.25001525878906,
-    "y": 235,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "66552f09.5bfb9"
-      ]
-    ]
-  },
-  {
-    "id": "bc49eb6a.380068",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 199.25001525878906,
-    "y": 141,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "1ee152f2.68166d"
-      ]
-    ]
-  },
-  {
-    "id": "af0a8fe0.da1b7",
-    "type": "execute",
-    "name": "execute_getVNF_Hierarchy",
-    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 233.25001525878906,
-    "y": 537,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "12d4d1c5.960c3e",
-        "7e33d3b6.7154dc",
-        "90b99458.d8a878"
-      ]
-    ]
-  },
-  {
-    "id": "12d4d1c5.960c3e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 470.25001525878906,
-    "y": 537,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "39db95fa.9b98fa"
-      ]
-    ]
-  },
-  {
-    "id": "d5a8df0e.172fc",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>\n",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 931.2500762939453,
-    "y": 794.0000610351562,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "3b9af4e2.33c62c"
-      ]
-    ]
-  },
-  {
-    "id": "7e33d3b6.7154dc",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 763.2500152587891,
-    "y": 376,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "b1613d32.71d45"
-      ]
-    ]
-  },
-  {
-    "id": "5928eca4.e76c24",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1259.2500228881836,
-    "y": 428.99999618530273,
-    "z": "17bb73d2.dd297c",
-    "wires": []
-  },
-  {
-    "id": "b017daad.296d58",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$VNF.VMCount`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 718.2500457763672,
-    "y": 704,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "74042ec0.4106",
-        "ae5fd24a.9b418"
-      ]
-    ]
-  },
-  {
-    "id": "74042ec0.4106",
-    "type": "other",
-    "name": "outcome_0",
-    "xml": "<outcome value='0'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 796.2500152587891,
-    "y": 622,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "eb4eeb9.a81d318"
-      ]
-    ]
-  },
-  {
-    "id": "ae5fd24a.9b418",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 780.2500152587891,
-    "y": 793,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "d5a8df0e.172fc"
-      ]
-    ]
-  },
-  {
-    "id": "39db95fa.9b98fa",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$getVnfHierarchy_result`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 607.2500762939453,
-    "y": 537,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "dc55fcb7.a5b3c",
-        "d75a8b25.9fe778"
-      ]
-    ]
-  },
-  {
-    "id": "dc55fcb7.a5b3c",
-    "type": "outcome",
-    "name": "SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 572.2500152587891,
-    "y": 704,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "b017daad.296d58"
-      ]
-    ]
-  },
-  {
-    "id": "d75a8b25.9fe778",
-    "type": "outcome",
-    "name": "FAILURE",
-    "xml": "<outcome value='FAILURE'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 775.2500152587891,
-    "y": 466,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "b1613d32.71d45"
-      ]
-    ]
-  },
-  {
-    "id": "36ef2784.6cc318",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1163.2500457763672,
-    "y": 594,
-    "z": "17bb73d2.dd297c",
-    "wires": []
-  },
-  {
-    "id": "b1613d32.71d45",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 972.2500610351562,
-    "y": 377.00000381469727,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "5928eca4.e76c24",
-        "e2eaef09.070be",
-        "fd0a971.5208268"
-      ]
-    ]
-  },
-  {
-    "id": "e2eaef09.070be",
-    "type": "execute",
-    "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1229.250015258789,
-    "y": 307,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "eb4eeb9.a81d318",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 917.2500152587891,
-    "y": 546,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "36ef2784.6cc318",
-        "bf7f84ce.5a7938",
-        "bdcf415a.45ed5"
-      ]
-    ]
-  },
-  {
-    "id": "bf7f84ce.5a7938",
-    "type": "execute",
-    "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1233.250015258789,
-    "y": 477.00002002716064,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "3b9af4e2.33c62c",
-    "type": "execute",
-    "name": "execute_SnapshotStack",
-    "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='snapshotStack' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$input.identity-url`\" />\n <parameter name=\"org.onap.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1150.250015258789,
-    "y": 794,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "2b3d7e9b.51bbe2",
-        "88b7c652.0ec9d8",
-        "2497760f.ec3caa"
-      ]
-    ]
-  },
-  {
-    "id": "2b3d7e9b.51bbe2",
-    "type": "outcome",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1311.250015258789,
-    "y": 895,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "81c1ec58.459ae"
-      ]
-    ]
-  },
-  {
-    "id": "88b7c652.0ec9d8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1293.250015258789,
-    "y": 701,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "f66b9736.cfaab8"
-      ]
-    ]
-  },
-  {
-    "id": "f66b9736.cfaab8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1542.6786041259766,
-    "y": 794.142822265625,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "8a2adc3b.adcda",
-        "32071474.80d0fc",
-        "eae86873.6b23d8"
-      ]
-    ]
-  },
-  {
-    "id": "8a2adc3b.adcda",
-    "type": "execute",
-    "name": "execute_SendUEBEvent",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Error occured during snapshot of Stack '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured during snapshot of Stack '+$VNF.heat-stack-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1817.250015258789,
-    "y": 712,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "a58ca5df.f45298"
-      ]
-    ]
-  },
-  {
-    "id": "a58ca5df.f45298",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2013.9168434143066,
-    "y": 712.333381652832,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2497760f.ec3caa",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1349.250015258789,
-    "y": 794.0001220703125,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "f66b9736.cfaab8"
-      ]
-    ]
-  },
-  {
-    "id": "90b99458.d8a878",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 778.2500152587891,
-    "y": 296,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "b1613d32.71d45"
-      ]
-    ]
-  },
-  {
-    "id": "32071474.80d0fc",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1782.2499923706055,
-    "y": 831.0000247955322,
-    "z": "17bb73d2.dd297c",
-    "wires": []
-  },
-  {
-    "id": "5e66c189.09a2d",
-    "type": "execute",
-    "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 188.9166717529297,
-    "y": 395.8888854980469,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "952f9338.7cfd6",
-        "3427840b.e5926c"
-      ]
-    ]
-  },
-  {
-    "id": "952f9338.7cfd6",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 233.9167022705078,
-    "y": 459.8888854980469,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "af0a8fe0.da1b7"
-      ]
-    ]
-  },
-  {
-    "id": "3427840b.e5926c",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 444.9167022705078,
-    "y": 336.8888854980469,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "fe324b44.d467d8",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>",
-    "comments": "",
-    "x": 1715.6786727905273,
-    "y": 991.5715913772583,
-    "z": "17bb73d2.dd297c",
-    "wires": []
-  },
-  {
-    "id": "fd0a971.5208268",
-    "type": "execute",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"Exception in getting VNF Hierachy\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1256.7501907348633,
-    "y": 370.7499990463257,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "bdcf415a.45ed5",
-    "type": "execute",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"VM Count is 0\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1208.7501220703125,
-    "y": 540.75,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "eae86873.6b23d8",
-    "type": "execute",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value='401'/>\n<parameter name='error-message' value=\"`'Error occured during snapshot of Stack '+ $VNF.heat-stack-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1797.750144958496,
-    "y": 774.7500247955322,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "832572c6.ef7df",
-    "type": "execute",
-    "name": "Set output payload, success code and message",
-    "xml": "<set>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value=\"Success\" />\n<parameter name='output.payload' value=\"`'snapshot.id :' + $output.snapshot.id`\"/>\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1803.7501525878906,
-    "y": 915.7500114440918,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "81c1ec58.459ae",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1513.7500839233398,
-    "y": 950.750057220459,
-    "z": "17bb73d2.dd297c",
-    "wires": [
-      [
-        "832572c6.ef7df",
-        "fe324b44.d467d8"
-      ]
-    ]
-  }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0_SSH_VNF_CONFIGURE.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0_SSH_VNF_CONFIGURE.json
deleted file mode 100644
index 4716e8a..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC-API_2.0.0_SSH_VNF_CONFIGURE.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
-    {
-        "id": "aaf4237b.4a939",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 163.66666158040363,
-        "y": 140.33332824707028,
-        "z": "95fc7c0a.f0bc9",
-        "wires": [
-            [
-                "de0ac7d0.e14e98"
-            ]
-        ]
-    },
-    {
-        "id": "de0ac7d0.e14e98",
-        "type": "service-logic",
-        "name": "APPC-API 2.0.0",
-        "module": "APPC-API",
-        "version": "2.0.0",
-        "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-API' version='2.0.0'>",
-        "outputs": 1,
-        "x": 361.99999237060547,
-        "y": 140.33332061767578,
-        "z": "95fc7c0a.f0bc9",
-        "wires": [
-            [
-                "e81270a0.727e8"
-            ]
-        ]
-    },
-    {
-        "id": "e81270a0.727e8",
-        "type": "method",
-        "name": "SSH_VNF_Configure",
-        "xml": "<method rpc='VNF_Configure' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 607.9524536132812,
-        "y": 139.61906337738037,
-        "z": "95fc7c0a.f0bc9",
-        "wires": [
-            [
-                "63ff76d8.f656f8"
-            ]
-        ]
-    },
-    {
-        "id": "4c02a583.c4889c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 484.14294052124023,
-        "y": 280.45239639282227,
-        "z": "95fc7c0a.f0bc9",
-        "wires": [
-            [
-                "86035845.07e918"
-            ]
-        ]
-    },
-    {
-        "id": "86035845.07e918",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status' value='`$status`' />\n<parameter name='stdout' value='`$stdout`' />\n<parameter name='stderr' value='`$stderr`' />\n",
-        "comments": "",
-        "x": 761.4049072265625,
-        "y": 278.9880847930908,
-        "z": "95fc7c0a.f0bc9",
-        "wires": []
-    },
-    {
-        "id": "2b985227.d5b28e",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 482.85715103149414,
-        "y": 421.3571548461914,
-        "z": "95fc7c0a.f0bc9",
-        "wires": [
-            [
-                "ffcc42ac.b88d7"
-            ]
-        ]
-    },
-    {
-        "id": "ffcc42ac.b88d7",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='status' value='$status`' />\n<parameter name='stdout' value='`$stdout`' />\n<parameter name='stderr' value='`$stderr`' />\n",
-        "comments": "",
-        "x": 764.0000877380371,
-        "y": 420.9643087387085,
-        "z": "95fc7c0a.f0bc9",
-        "wires": []
-    },
-    {
-        "id": "63ff76d8.f656f8",
-        "type": "execute",
-        "name": "execute ssh command",
-        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshService' method='execWithStatusCheck' >\n<parameter name='host' value='`$host`' />\n<parameter name='port' value='`$port`' />\n<parameter name='username' value='`$username`' />\n<parameter name='password' value='`$password`' />\n<parameter name='command' value='`$command`' />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 189.17861938476562,
-        "y": 346.67860412597656,
-        "z": "95fc7c0a.f0bc9",
-        "wires": [
-            [
-                "4c02a583.c4889c",
-                "2b985227.d5b28e"
-            ]
-        ]
-    }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0.0_NETCONF_CONFIGURE.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0.0_NETCONF_CONFIGURE.json
deleted file mode 100644
index 609c731..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0.0_NETCONF_CONFIGURE.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
-    {
-        "id": "1c2d2c19.e3d2d4",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 193,
-        "y": 200,
-        "z": "73df06d5.b89fa8",
-        "wires": [
-            [
-                "a3835946.5c7ca8"
-            ]
-        ]
-    },
-    {
-        "id": "a3835946.5c7ca8",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "comments": "test service logic",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 259,
-        "y": 283,
-        "z": "73df06d5.b89fa8",
-        "wires": [
-            [
-                "faa0f08b.055f1"
-            ]
-        ]
-    },
-    {
-        "id": "1c0a1696.e3f5e9",
-        "type": "execute",
-        "name": "execute-netconf-config",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='configure' >\n\t<parameter name=\"org.onap.appc.payload\" value=\"`$org.onap.appc.payload`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 511,
-        "y": 363,
-        "z": "73df06d5.b89fa8",
-        "wires": [
-            [
-                "9f0c88c7.60f378",
-                "ab656d56.549a9"
-            ]
-        ]
-    },
-    {
-        "id": "9f0c88c7.60f378",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 730,
-        "y": 293,
-        "z": "73df06d5.b89fa8",
-        "wires": [
-            [
-                "9be9d7cb.641628"
-            ]
-        ]
-    },
-    {
-        "id": "ab656d56.549a9",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 726,
-        "y": 432,
-        "z": "73df06d5.b89fa8",
-        "wires": [
-            [
-                "6f27856e.90d87c"
-            ]
-        ]
-    },
-    {
-        "id": "6f27856e.90d87c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='failure' />\n<parameter name='error-message' value='netconf configuration failed' />\n",
-        "comments": "",
-        "x": 912,
-        "y": 432,
-        "z": "73df06d5.b89fa8",
-        "wires": []
-    },
-    {
-        "id": "9be9d7cb.641628",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n",
-        "comments": "",
-        "x": 918,
-        "y": 293,
-        "z": "73df06d5.b89fa8",
-        "wires": []
-    },
-    {
-        "id": "faa0f08b.055f1",
-        "type": "method",
-        "name": "method",
-        "xml": "<method rpc='NETCONF_Configure' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 292,
-        "y": 358,
-        "z": "73df06d5.b89fa8",
-        "wires": [
-            [
-                "1c0a1696.e3f5e9"
-            ]
-        ]
-    }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_HUB_CONFIGURE.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_HUB_CONFIGURE.json
deleted file mode 100644
index 22923f8..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_HUB_CONFIGURE.json
+++ /dev/null
@@ -1,559 +0,0 @@
-[
-    {
-        "id": "88ff0ee4.127f9",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 128,
-        "y": 63,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "8d1f9124.e1f4a"
-            ]
-        ]
-    },
-    {
-        "id": "81ccbde2.50341",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.appc.dg.util.InputParameterValidation' method='validateAttribute' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 156,
-        "y": 234,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "a26d863e.374678",
-                "de958d31.1f71c"
-            ]
-        ]
-    },
-    {
-        "id": "8d1f9124.e1f4a",
-        "type": "service-logic",
-        "name": "APPC 2.0.0",
-        "module": "APPC",
-        "version": "2.0.0",
-        "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": 245,
-        "y": 127,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "16047e8c.19f4f1"
-            ]
-        ]
-    },
-    {
-        "id": "16047e8c.19f4f1",
-        "type": "method",
-        "name": "HUB_CONFIGURE",
-        "xml": "<method rpc='HUB_Configure' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 450,
-        "y": 128,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "81ccbde2.50341"
-            ]
-        ]
-    },
-    {
-        "id": "19df0391.29a5ac",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 647,
-        "y": 456,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "ddd1e97e.2e7958"
-            ]
-        ]
-    },
-    {
-        "id": "4263d9fe.a44478",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>",
-        "comments": "",
-        "x": 1277,
-        "y": 316,
-        "z": "3cdef05f.1a867",
-        "wires": []
-    },
-    {
-        "id": "ec2a4716.6f5bd8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>",
-        "comments": "",
-        "x": 840,
-        "y": 590,
-        "z": "3cdef05f.1a867",
-        "wires": []
-    },
-    {
-        "id": "a8db1260.3b4d2",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.appc.dg.util.InputParameterValidation' method='validateAttributeCharacter' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n<parameter name=\"special_characters\" value=\"!@#$%^*()_\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 414,
-        "y": 230,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "9ea2f9c9.97cca8",
-                "de958d31.1f71c"
-            ]
-        ]
-    },
-    {
-        "id": "6505e427.e6f8fc",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$validateAttribute`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 109,
-        "y": 415,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "e36d066.e4c57f8",
-                "8315ab3f.dd8748"
-            ]
-        ]
-    },
-    {
-        "id": "e36d066.e4c57f8",
-        "type": "outcome",
-        "name": "outcome",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 288,
-        "y": 328,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "a8db1260.3b4d2"
-            ]
-        ]
-    },
-    {
-        "id": "8315ab3f.dd8748",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 265,
-        "y": 462,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "3429ade3.024402"
-            ]
-        ]
-    },
-    {
-        "id": "4011e7a8.8a2f88",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>",
-        "comments": "",
-        "x": 276,
-        "y": 610,
-        "z": "3cdef05f.1a867",
-        "wires": []
-    },
-    {
-        "id": "237facf4.17bde4",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$validateAttributeCharacter`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 487,
-        "y": 399,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "19df0391.29a5ac",
-                "941dc362.20221"
-            ]
-        ]
-    },
-    {
-        "id": "941dc362.20221",
-        "type": "outcome",
-        "name": "outcome",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 644,
-        "y": 351,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "da96bd6f.7bfa5"
-            ]
-        ]
-    },
-    {
-        "id": "da96bd6f.7bfa5",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.appc.dg.util.InputParameterValidation' method='validateAttributeLength' >\n<parameter name=\"VM_ID\" value=\"`$VM_ID`\"/>\n<parameter name=\"maximum_length_param\" value=\"50\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 720,
-        "y": 215,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "190e25c4.6c54ca",
-                "de958d31.1f71c"
-            ]
-        ]
-    },
-    {
-        "id": "595c6432.9cb05c",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$validateAttributeLength`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 908,
-        "y": 371,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "ba40e581.4bf1a8",
-                "3de7f8b8.9d6078"
-            ]
-        ]
-    },
-    {
-        "id": "ba40e581.4bf1a8",
-        "type": "outcome",
-        "name": "outcome",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1082,
-        "y": 314,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "4263d9fe.a44478"
-            ]
-        ]
-    },
-    {
-        "id": "3de7f8b8.9d6078",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1074,
-        "y": 437,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "ba3f8014.78979"
-            ]
-        ]
-    },
-    {
-        "id": "41157b6a.f646a4",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>",
-        "comments": "",
-        "x": 1228,
-        "y": 589,
-        "z": "3cdef05f.1a867",
-        "wires": []
-    },
-    {
-        "id": "a26d863e.374678",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 108,
-        "y": 323,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "6505e427.e6f8fc"
-            ]
-        ]
-    },
-    {
-        "id": "9ea2f9c9.97cca8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 471,
-        "y": 304,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "237facf4.17bde4"
-            ]
-        ]
-    },
-    {
-        "id": "190e25c4.6c54ca",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 890,
-        "y": 301,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "595c6432.9cb05c"
-            ]
-        ]
-    },
-    {
-        "id": "de958d31.1f71c",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 873,
-        "y": 104,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "222ff717.c68c48"
-            ]
-        ]
-    },
-    {
-        "id": "9ef62278.0eef8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>",
-        "comments": "",
-        "x": 1152,
-        "y": 232,
-        "z": "3cdef05f.1a867",
-        "wires": []
-    },
-    {
-        "id": "267702aa.29ecfe",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1141,
-        "y": 128,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "e0cdb313.3c45d"
-            ]
-        ]
-    },
-    {
-        "id": "51a2c6.d2810d3c",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 267,
-        "y": 526,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "1761418a.b6d8ee"
-            ]
-        ]
-    },
-    {
-        "id": "828ae706.049e18",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 821,
-        "y": 480,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "6f253557.19a1dc"
-            ]
-        ]
-    },
-    {
-        "id": "1ab8afcb.3c8a4",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventTime\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"apiVer\" value=\"1.02\"/>\n<parameter name=\"eventId\" value=\"123\"/>\n<parameter name=\"reason\" value=\"Other\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1205,
-        "y": 481,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "aef121bc.322bd"
-            ]
-        ]
-    },
-    {
-        "id": "222ff717.c68c48",
-        "type": "block",
-        "name": "block",
-        "xml": "<block atomic='true'>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 955,
-        "y": 170,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "267702aa.29ecfe",
-                "9ef62278.0eef8"
-            ]
-        ]
-    },
-    {
-        "id": "e0cdb313.3c45d",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1289,
-        "y": 66,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3429ade3.024402",
-        "type": "block",
-        "name": "block",
-        "xml": "<block atomic='true'>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 106,
-        "y": 569,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "51a2c6.d2810d3c",
-                "4011e7a8.8a2f88"
-            ]
-        ]
-    },
-    {
-        "id": "ddd1e97e.2e7958",
-        "type": "block",
-        "name": "block",
-        "xml": "<block atomic='true'>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 663,
-        "y": 531,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "828ae706.049e18",
-                "ec2a4716.6f5bd8"
-            ]
-        ]
-    },
-    {
-        "id": "ba3f8014.78979",
-        "type": "block",
-        "name": "block",
-        "xml": "<block atomic='true'>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1060,
-        "y": 533,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            [
-                "1ab8afcb.3c8a4",
-                "41157b6a.f646a4"
-            ]
-        ]
-    },
-    {
-        "id": "1761418a.b6d8ee",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 411,
-        "y": 526,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6f253557.19a1dc",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 965,
-        "y": 480,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "aef121bc.322bd",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1340,
-        "y": 539,
-        "z": "3cdef05f.1a867",
-        "wires": [
-            []
-        ]
-    }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_VSRX_GetConfig.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_VSRX_GetConfig.json
deleted file mode 100644
index c7c65ac..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_VSRX_GetConfig.json
+++ /dev/null
@@ -1,798 +0,0 @@
-[
-    {
-        "id": "f7fa8fff.f2db5",
-        "type": "method",
-        "name": "VSRX_GetConfig",
-        "xml": "<method rpc='VSRX_GetConfig' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 106,
-        "y": 183,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "848e0abf.ad4068"
-            ]
-        ]
-    },
-    {
-        "id": "a5b12ccd.9b5d2",
-        "type": "service-logic",
-        "name": "APPC 2.0.0",
-        "module": "APPC",
-        "version": "2.0.0",
-        "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": 98.5,
-        "y": 106,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "f7fa8fff.f2db5"
-            ]
-        ]
-    },
-    {
-        "id": "acf8d85c.a64e78",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 78.5,
-        "y": 23,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "a5b12ccd.9b5d2"
-            ]
-        ]
-    },
-    {
-        "id": "d4b59933.d26998",
-        "type": "execute",
-        "name": "execute_getVNF_Hierarchy",
-        "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"nodeName\" value=\"execute_getVNF_Hierarchy\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 362.5,
-        "y": 514,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "5c563fba.47402",
-                "8266b647.8b0a88"
-            ]
-        ]
-    },
-    {
-        "id": "5c563fba.47402",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 368.5,
-        "y": 599,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "46cc0481.73e78c"
-            ]
-        ]
-    },
-    {
-        "id": "2a0a328f.13910e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>\n",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 543.5,
-        "y": 811,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "2daebecc.b36232"
-            ]
-        ]
-    },
-    {
-        "id": "2daebecc.b36232",
-        "type": "for",
-        "name": "for_each_VMs",
-        "xml": "<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >",
-        "comments": "",
-        "outputs": 1,
-        "x": 729.5,
-        "y": 812,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "c06a4341.ec82f"
-            ]
-        ]
-    },
-    {
-        "id": "c06a4341.ec82f",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>\n",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 727.5,
-        "y": 903,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "2c2a06fe.98ddba"
-            ]
-        ]
-    },
-    {
-        "id": "2c2a06fe.98ddba",
-        "type": "execute",
-        "name": "retrieveVMSSHConfiguration",
-        "xml": "<execute plugin='org.onap.appc.dg.util.NetconfDBPlugin' method='retrieveVMDSConfiguration' >\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name`\" />\n<parameter name=\"nodeName\" value=\"retrieveVMSSHConfiguration\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 738.5,
-        "y": 993,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "498ff39f.be3cfc",
-                "7c4f9f57.eb4e4"
-            ]
-        ]
-    },
-    {
-        "id": "498ff39f.be3cfc",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 831.5,
-        "y": 1078,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "558c56db.194258"
-            ]
-        ]
-    },
-    {
-        "id": "9d84d01f.ffef4",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n",
-        "comments": "",
-        "x": 103.5,
-        "y": 522,
-        "z": "39664169.9c031e",
-        "wires": []
-    },
-    {
-        "id": "8266b647.8b0a88",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1294.5,
-        "y": 524,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "8ba9ec90.9c794"
-            ]
-        ]
-    },
-    {
-        "id": "d7069cc8.15349",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n",
-        "comments": "",
-        "x": 1853.5,
-        "y": 966,
-        "z": "39664169.9c031e",
-        "wires": []
-    },
-    {
-        "id": "7c4f9f57.eb4e4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1298.5,
-        "y": 992,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "8ba9ec90.9c794"
-            ]
-        ]
-    },
-    {
-        "id": "46cc0481.73e78c",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$VNF.VMCount`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 386.5,
-        "y": 723,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "1e28c6f9.bbc059",
-                "18cc64bd.c146cb"
-            ]
-        ]
-    },
-    {
-        "id": "1e28c6f9.bbc059",
-        "type": "other",
-        "name": "outcome_0",
-        "xml": "<outcome value='0'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1296.5,
-        "y": 782,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "8ba9ec90.9c794"
-            ]
-        ]
-    },
-    {
-        "id": "18cc64bd.c146cb",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 377.5,
-        "y": 805,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "2a0a328f.13910e"
-            ]
-        ]
-    },
-    {
-        "id": "8ba9ec90.9c794",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1668.5,
-        "y": 909,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "d7069cc8.15349",
-                "1342848b.10b68b"
-            ]
-        ]
-    },
-    {
-        "id": "1342848b.10b68b",
-        "type": "execute",
-        "name": "execute_DCAEReporterPlugin",
-        "xml": "<execute plugin='org.onap.appc.dg.util.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$org.onap.appc.apiversion`\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1843.5,
-        "y": 780,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "c7d75190.228fd"
-            ]
-        ]
-    },
-    {
-        "id": "504bb6d6.3bc128",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2360.5,
-        "y": 776,
-        "z": "39664169.9c031e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7b04e7f0.163648",
-        "type": "execute",
-        "name": "get_Configuration",
-        "xml": "<execute plugin='org.onap.appc.dg.util.NetconfClientPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n<parameter name=\"nodeName\" value=\"get_Configuration\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 777.5,
-        "y": 1309,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "1d012da5.7898b2",
-                "e0e065cf.da6938"
-            ]
-        ]
-    },
-    {
-        "id": "d3f8ad27.db631",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 970.5,
-        "y": 112,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "e21b57a4.5ea998"
-            ]
-        ]
-    },
-    {
-        "id": "bfab5b6b.b57008",
-        "type": "outcome",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1292.5,
-        "y": 386,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "8ba9ec90.9c794"
-            ]
-        ]
-    },
-    {
-        "id": "558c56db.194258",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$retrieveVMDSConfiguration_Result`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 775.5,
-        "y": 1161,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "3416bac7.a684e6",
-                "8be5c519.3532f8"
-            ]
-        ]
-    },
-    {
-        "id": "3416bac7.a684e6",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 775.5,
-        "y": 1250,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "7b04e7f0.163648"
-            ]
-        ]
-    },
-    {
-        "id": "8be5c519.3532f8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1288.5,
-        "y": 1096,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "8ba9ec90.9c794"
-            ]
-        ]
-    },
-    {
-        "id": "e21b57a4.5ea998",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$getConfig_Result`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1124.5,
-        "y": 120,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "cce84fd0.a0f22",
-                "c2e06562.032b08"
-            ]
-        ]
-    },
-    {
-        "id": "cce84fd0.a0f22",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='Success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1269.5,
-        "y": 61,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "c8e36592.453328"
-            ]
-        ]
-    },
-    {
-        "id": "c2e06562.032b08",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1282.5,
-        "y": 202,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "8ba9ec90.9c794"
-            ]
-        ]
-    },
-    {
-        "id": "82e0381.f53dac8",
-        "type": "execute",
-        "name": "registerPayload",
-        "xml": "<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='registerPayload' >\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.confid+'.Configuration'`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1599,
-        "y": 61,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "7e05eae7.3d7694"
-            ]
-        ]
-    },
-    {
-        "id": "7e05eae7.3d7694",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1789,
-        "y": 132,
-        "z": "39664169.9c031e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b81740d5.22bfe",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 118,
-        "y": 428,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "9d84d01f.ffef4"
-            ]
-        ]
-    },
-    {
-        "id": "c8e36592.453328",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1442,
-        "y": 66,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "82e0381.f53dac8"
-            ]
-        ]
-    },
-    {
-        "id": "72ff50ec.62143",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test=\"`$org.onap.appc.confid`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 323.5,
-        "y": 216,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "d42cb172.bd7b8",
-                "d8b98ebe.3e41"
-            ]
-        ]
-    },
-    {
-        "id": "d42cb172.bd7b8",
-        "type": "outcome",
-        "name": "outcome_current",
-        "xml": "<outcome value='current'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 471.5,
-        "y": 366,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "d4b59933.d26998"
-            ]
-        ]
-    },
-    {
-        "id": "d8b98ebe.3e41",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 481.5,
-        "y": 187,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "3b2964a3.c85eac"
-            ]
-        ]
-    },
-    {
-        "id": "3b2964a3.c85eac",
-        "type": "execute",
-        "name": "getConfiguration",
-        "xml": "<execute plugin='org.onap.appc.dg.util.ConfigurationManagerPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n<parameter name=\"nodeName\" value=\"getConfiguration\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 696.5,
-        "y": 189,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "bfab5b6b.b57008",
-                "d3f8ad27.db631"
-            ]
-        ]
-    },
-    {
-        "id": "848e0abf.ad4068",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 110,
-        "y": 270,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "72ff50ec.62143",
-                "f10ec3da.6e759"
-            ]
-        ]
-    },
-    {
-        "id": "f10ec3da.6e759",
-        "type": "execute",
-        "name": "ctxCleanup",
-        "xml": "<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 143,
-        "y": 365,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "b81740d5.22bfe"
-            ]
-        ]
-    },
-    {
-        "id": "50e44062.8a63f",
-        "type": "comment",
-        "name": "Fetch all VMs and VNFCs from AA&I for given VNF_ID",
-        "info": "",
-        "comments": "",
-        "x": 587.5,
-        "y": 480,
-        "z": "39664169.9c031e",
-        "wires": []
-    },
-    {
-        "id": "1d012da5.7898b2",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1036.5,
-        "y": 1364,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "bde7e151.2a23e"
-            ]
-        ]
-    },
-    {
-        "id": "bde7e151.2a23e",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$getConfig_Result`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1268.5,
-        "y": 1446,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "735df4fd.90402c",
-                "f02c82b2.f3509"
-            ]
-        ]
-    },
-    {
-        "id": "735df4fd.90402c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='Success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1424.5,
-        "y": 1487,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "a55afee1.a9ca1"
-            ]
-        ]
-    },
-    {
-        "id": "f02c82b2.f3509",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1397.5,
-        "y": 1390,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "8ba9ec90.9c794"
-            ]
-        ]
-    },
-    {
-        "id": "fcbe0c1c.11c7d",
-        "type": "execute",
-        "name": "registerPayload",
-        "xml": "<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='registerPayload' >\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name+'.Configuration'`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1855,
-        "y": 1448,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "b0e981e3.4f6fb"
-            ]
-        ]
-    },
-    {
-        "id": "b0e981e3.4f6fb",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2018,
-        "y": 1446,
-        "z": "39664169.9c031e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a55afee1.a9ca1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1680,
-        "y": 1445,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "fcbe0c1c.11c7d"
-            ]
-        ]
-    },
-    {
-        "id": "e0e065cf.da6938",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1302.5,
-        "y": 1221,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "8ba9ec90.9c794"
-            ]
-        ]
-    },
-    {
-        "id": "c7d75190.228fd",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2049.5,
-        "y": 779,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "f0554fe0.4816e"
-            ]
-        ]
-    },
-    {
-        "id": "f0554fe0.4816e",
-        "type": "execute",
-        "name": "ctxCleanup",
-        "xml": "<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2199.5,
-        "y": 778,
-        "z": "39664169.9c031e",
-        "wires": [
-            [
-                "504bb6d6.3bc128"
-            ]
-        ]
-    }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_method_Generic_GetRunningConfig.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_method_Generic_GetRunningConfig.json
deleted file mode 100644
index 7237ad6..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_method_Generic_GetRunningConfig.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"180bf863.7ff698","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":638,"y":47,"z":"a4e67f56.cb2c9","wires":[["b1e85b4d.4de818"]]},{"id":"7b831419.1eac8c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":722.25,"y":363.49999237060547,"z":"a4e67f56.cb2c9","wires":[["63daa94e.76aae8"]]},{"id":"140f6ea5.4e8041","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":718.25,"y":416.24999237060547,"z":"a4e67f56.cb2c9","wires":[["3ce56e6e.d0d1b2"]]},{"id":"47086c60.ba95f4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":641,"y":115.99999237060547,"z":"a4e67f56.cb2c9","wires":[["fc731431.b82788"]]},{"id":"11938b45.589b15","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":638.2499389648438,"y":267.25,"z":"a4e67f56.cb2c9","wires":[["372c3af9.966c56"]]},{"id":"dbe515ac.28eb98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":632.2499389648438,"y":202,"z":"a4e67f56.cb2c9","wires":[["ba6f005b.3e44e"]]},{"id":"5f02c1cf.37b4f","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":710.5,"y":461.49999237060547,"z":"a4e67f56.cb2c9","wires":[["60cd06a7.dbee98"]]},{"id":"3a82553d.6d98ea","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":710,"y":512.4999923706055,"z":"a4e67f56.cb2c9","wires":[["358af0c2.a30ea"]]},{"id":"46c38e22.64329","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1380,"y":596.75,"z":"a4e67f56.cb2c9","wires":[["9806fd80.49448"]]},{"id":"8ecbeb04.4666d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1384.75,"y":695.25,"z":"a4e67f56.cb2c9","wires":[["13894430.36b39c"]]},{"id":"35ce6e5b.761062","type":"success","name":"multipleRunningConfig","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":832.5,"y":567.75,"z":"a4e67f56.cb2c9","wires":[["7b36969f.21ea78"]]},{"id":"c7e15c3e.27cb3","type":"get-resource","name":"Retrieve device credentials","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"select USER_NAME , PASSWORD , PORT_NUMBER from DEVICE_AUTHENTICATION where VNF_TYPE = $vnf-type \" >\n<parameter name=\"nodeName\" value=\"retrieveDeviceCredentials\" />\n","comments":"","outputs":1,"x":402.75006103515625,"y":111.74999237060547,"z":"a4e67f56.cb2c9","wires":[["180bf863.7ff698","47086c60.ba95f4","551adf9c.16e0f"]]},{"id":"8215021c.22176","type":"call","name":"Call device interfacing DG","xml":"<call rpc='`$dg-rpc`' module = '`$module`'  mode='sync'>\n<parameter name=\"nodeName\" value=\"callInterfacingDG\" />\n","comments":"","outputs":1,"x":453,"y":417.49999237060547,"z":"a4e67f56.cb2c9","wires":[["7b831419.1eac8c","140f6ea5.4e8041","11955887.62d437"]]},{"id":"ab93e21b.a1f7e","type":"get-resource","name":"Get device interfacing DG","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"select dg_rpc , module , protocol from DEVICE_INTERFACE_PROTOCOL where VNF_TYPE = $vnf-type and DG_RPC is not null \" >\n<parameter name=\"nodeName\" value=\"getDeviceInterfacingDG\" />\n","comments":"","outputs":1,"x":379.75,"y":266.5,"z":"a4e67f56.cb2c9","wires":[["11938b45.589b15","dbe515ac.28eb98","e9858666.192658"]]},{"id":"afcdc902.93d708","type":"get-resource","name":"Check if running config exists","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"select count(1) as value from UPLOAD_CONFIG where VNF_ID = $input.action-identifiers.vnf-id and ( if ( $vnfc-type = '' , VNFC_TYPE is NULL OR VNFC_TYPE = '' , VNFC_TYPE = $vnfc-type ) ) and HOST_IP_ADDRESS = $host-ip-address and CONFIG_INDICATOR = 'Running' AND (pending_delete IS NULL OR pending_delete != 'Y') \" force='true' pfx='runningConfig.count'>\n<parameter name=\"nodeName\" value=\"getDBRunningConf\" />\n","comments":"","outputs":1,"x":413.0000305175781,"y":551.2499923706055,"z":"a4e67f56.cb2c9","wires":[["5f02c1cf.37b4f","3a82553d.6d98ea","7b612e94.00088"]]},{"id":"b890cd70.906b9","type":"save","name":"Insert configuration","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,  PENDING_DELETE,  CONTENT ) VALUES ( $input.common-header.request-id , $input.common-header.originator-id , $service-description , $input.action , $input.action-identifiers.vnf-id , $vnf-name , $vm-name , $vnf-type , $vnfc-type , $host-ip-address , 'Running' , NULL , $device-running-config ) \" force='true' >\n<parameter name=\"nodeName\" value=\"InsertConfiguration\" />\n","comments":"","outputs":1,"x":1171.75,"y":608,"z":"a4e67f56.cb2c9","wires":[["46c38e22.64329","473728a6.0b2d68"]]},{"id":"a92cddb8.c9d51","type":"save","name":"Update configuration","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"update UPLOAD_CONFIG set CONTENT = $device-running-config , REQUEST_ID = $input.common-header.request-id , ORIGINATOR_ID = $input.common-header.originator-id ,  SERVICE_DESCRIPTION = $service-description , ACTION = $input.action , UPLOAD_DATE = CURRENT_TIMESTAMP  where VNF_ID = $input.action-identifiers.vnf-id and ( if ( $vnfc-type = '' , VNFC_TYPE is NULL OR VNFC_TYPE = '' , VNFC_TYPE = $vnfc-type ) ) and HOST_IP_ADDRESS = $host-ip-address and CONFIG_INDICATOR = 'Running' AND (pending_delete IS NULL OR pending_delete != 'Y') \" force='true' pfx='update'>\n<parameter name=\"nodeName\" value=\"updateConfiguration\" />\n","comments":"","outputs":1,"x":1171.2499885559082,"y":704.7499923706055,"z":"a4e67f56.cb2c9","wires":[["8ecbeb04.4666d8","541750f1.605a4"]]},{"id":"b92bafaa.6f832","type":"switchNode","name":"switch","xml":"<switch test='`$runningConfig.count.value`'>\n","comments":"","outputs":1,"x":623.7499961853027,"y":603.0000019073486,"z":"a4e67f56.cb2c9","wires":[["35ce6e5b.761062","78f7b47a.d6ce1c","4ed41f3c.8441d"]]},{"id":"3e4780c.eefb78","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":137.50000381469727,"y":224.24999618530273,"z":"a4e67f56.cb2c9","wires":[["c7e15c3e.27cb3","5449a18d.439af"]]},{"id":"551adf9c.16e0f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":450.24993896484375,"y":175.75,"z":"a4e67f56.cb2c9","wires":[["ab93e21b.a1f7e"]]},{"id":"11955887.62d437","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":414.74993896484375,"y":488.49999237060547,"z":"a4e67f56.cb2c9","wires":[["afcdc902.93d708"]]},{"id":"e9858666.192658","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":236.2498779296875,"y":342.24999237060547,"z":"a4e67f56.cb2c9","wires":[["90297c5e.6500e"]]},{"id":"7b612e94.00088","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":452.49993896484375,"y":653.4999923706055,"z":"a4e67f56.cb2c9","wires":[["b92bafaa.6f832"]]},{"id":"473728a6.0b2d68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1381.75,"y":646,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"35aaded4.f11712","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":997.75,"y":620,"z":"a4e67f56.cb2c9","wires":[["b890cd70.906b9"]]},{"id":"541750f1.605a4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1386.5,"y":744.25,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8c3cc0da.7b207","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":999.25,"y":683.25,"z":"a4e67f56.cb2c9","wires":[["a92cddb8.c9d51"]]},{"id":"78f7b47a.d6ce1c","type":"success","name":"noRunningConfig","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":823.75,"y":618.75,"z":"a4e67f56.cb2c9","wires":[["35aaded4.f11712"]]},{"id":"4ed41f3c.8441d","type":"failure","name":"runningConfigExists","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":827.25,"y":683.75,"z":"a4e67f56.cb2c9","wires":[["8c3cc0da.7b207"]]},{"id":"6c20bf89.5231d","type":"method","name":"GetRunningConfig","xml":"<method rpc='Generic_GetRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":128,"y":140.74999237060547,"z":"a4e67f56.cb2c9","wires":[["3e4780c.eefb78"]]},{"id":"84baaf90.5a32d","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":264.99999237060547,"y":55.9999942779541,"z":"a4e67f56.cb2c9","wires":[["6c20bf89.5231d"]]},{"id":"5449a18d.439af","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":118.00003051757812,"y":430.24999237060547,"z":"a4e67f56.cb2c9","wires":[]},{"id":"60394b9e.416b44","type":"dgstart","name":"DGSTART","outputs":1,"x":97.4999885559082,"y":56.74999237060547,"z":"a4e67f56.cb2c9","wires":[["84baaf90.5a32d"]]},{"id":"b1e85b4d.4de818","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":813,"y":48.499996185302734,"z":"a4e67f56.cb2c9","wires":[["c6bbc167.8e6de","a535318d.76e89","743a8961.a83bb8"]]},{"id":"c6bbc167.8e6de","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value='Error while retrieving device credentials' />\n","comments":"","x":1019.5,"y":34.74999237060547,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"fc731431.b82788","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":817.75,"y":114.99999237060547,"z":"a4e67f56.cb2c9","wires":[["5a58c62.8050138","a535318d.76e89","743a8961.a83bb8"]]},{"id":"5a58c62.8050138","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Device credentials not found for the ' + $vnf-type `\"/>\n","comments":"","x":1021.5,"y":74.24999237060547,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"ba6f005b.3e44e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":812.5,"y":185,"z":"a4e67f56.cb2c9","wires":[["27e3ed66.16f0c2","743a8961.a83bb8","a535318d.76e89"]]},{"id":"372c3af9.966c56","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":816.5,"y":241.25,"z":"a4e67f56.cb2c9","wires":[["c98aab75.3231f8","743a8961.a83bb8","a535318d.76e89"]]},{"id":"27e3ed66.16f0c2","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value='Error while getting device interfacing DG details' />\n","comments":"","x":1026.4999885559082,"y":121.75,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"c98aab75.3231f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Device Interfacing DG mapping not found for the ' + $vnf-type `\" />\n","comments":"","x":1024.25,"y":164.75,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"743a8961.a83bb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='`$node-error-message`' />","comments":"","x":1052.25,"y":260,"z":"a4e67f56.cb2c9","wires":[]},{"id":"63daa94e.76aae8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":883.75,"y":313.74999237060547,"z":"a4e67f56.cb2c9","wires":[["6b1bdb26.cbe694","e53f7a1.c43ed88","ffb12b2e.32f4f8"]]},{"id":"3ce56e6e.d0d1b2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":897.75,"y":398.99999237060547,"z":"a4e67f56.cb2c9","wires":[["189f4de.d45a0b2","e53f7a1.c43ed88","ffb12b2e.32f4f8"]]},{"id":"6b1bdb26.cbe694","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`$error-message`\"/>\n","comments":"","x":1151.75,"y":305.24999237060547,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"189f4de.d45a0b2","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value='Device Interfacing DG not found' />\n","comments":"","x":1153.75,"y":348.49999237060547,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"358af0c2.a30ea","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":914.25,"y":511.49999237060547,"z":"a4e67f56.cb2c9","wires":[["3871609f.8f563","ffb12b2e.32f4f8","e53f7a1.c43ed88"]]},{"id":"60cd06a7.dbee98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":913,"y":456.99999237060547,"z":"a4e67f56.cb2c9","wires":[["4f35fa3d.a4b784","ffb12b2e.32f4f8","e53f7a1.c43ed88"]]},{"id":"4f35fa3d.a4b784","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while quering the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\"/>\n","comments":"","x":1152.5,"y":392.99999237060547,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"3871609f.8f563","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while quering the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\" />\n","comments":"","x":1152.75,"y":432.99999237060547,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"ffb12b2e.32f4f8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='`$node-error-message`' />","comments":"","x":1160.25,"y":532.2499923706055,"z":"a4e67f56.cb2c9","wires":[]},{"id":"7b36969f.21ea78","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1550.75,"y":565.5,"z":"a4e67f56.cb2c9","wires":[["d90b7545.846c58","b1eeb2dd.58bb4","8702f3c1.de0c"]]},{"id":"d90b7545.846c58","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value='More than one running configuration available for a VNFC' />\n","comments":"","x":1758.5,"y":557,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"b1eeb2dd.58bb4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='`$node-error-message`' />","comments":"","x":1772.75,"y":782.75,"z":"a4e67f56.cb2c9","wires":[]},{"id":"9806fd80.49448","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1542.25,"y":627.5,"z":"a4e67f56.cb2c9","wires":[["c10f41b7.4725d","b1eeb2dd.58bb4","8702f3c1.de0c"]]},{"id":"c10f41b7.4725d","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while updating the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\" />\n","comments":"","x":1758.75,"y":612,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"13894430.36b39c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1537.75,"y":689,"z":"a4e67f56.cb2c9","wires":[["8a66df46.83bf","b1eeb2dd.58bb4","8702f3c1.de0c"]]},{"id":"8a66df46.83bf","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while updating the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\" />\n","comments":"","x":1764.5,"y":664,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"a535318d.76e89","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=\"`$node-error-message`\"/>\n","comments":"","outputs":1,"x":1044,"y":216,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"e53f7a1.c43ed88","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=\"`$node-error-message`\"/>\n","comments":"","outputs":1,"x":1160,"y":487.99999237060547,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8702f3c1.de0c","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=\"`$node-error-message`\"/>\n","comments":"","outputs":1,"x":1769,"y":720,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"e5f7f554.e2b2d8","type":"set","name":"set DG parameters","xml":"<set>\n<parameter name='config.vnf-type' value=\"`$vnf-type`\" />\n<parameter name='config.vnf-name' value=\"`$vnf-name`\" />\n<parameter name='config.protocol' value=\"`$protocol`\" />\n<parameter name='config.host-ip-address' value=\"`$host-ip-address`\" />\n<parameter name='config.user-name' value=\"`$USER-NAME`\" />\n<parameter name='config.password' value=\"`$PASSWORD`\" />\n<parameter name='config.port-number' value=\"`$PORT-NUMBER`\" />","comments":"","x":559,"y":318.74999237060547,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"90297c5e.6500e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":369,"y":341.74999237060547,"z":"a4e67f56.cb2c9","wires":[["e5f7f554.e2b2d8","8215021c.22176"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_method_vSRX_GetXmlRunningConfig.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_method_vSRX_GetXmlRunningConfig.json
deleted file mode 100644
index 554b3c8..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_2.0.0_method_vSRX_GetXmlRunningConfig.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"81a75d19.d19de","type":"dgstart","name":"DGSTART","outputs":1,"x":102,"y":37,"z":"214d83f7.3c518c","wires":[["910e9ec4.7af88"]]},{"id":"910e9ec4.7af88","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":110.50000762939453,"y":109.75,"z":"214d83f7.3c518c","wires":[["26feaf5a.9171d"]]},{"id":"26feaf5a.9171d","type":"method","name":"GetRunningConfig","xml":"<method rpc='vSRX_GetXmlRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":148.75003051757812,"y":191.75,"z":"214d83f7.3c518c","wires":[["b1c0732b.61d2e"]]},{"id":"42ce5f64.d4dc7","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":485.5,"y":464,"z":"214d83f7.3c518c","wires":[]},{"id":"b1c0732b.61d2e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":315,"y":308.25,"z":"214d83f7.3c518c","wires":[["42ce5f64.d4dc7","34a60a4b.c91646","14ef8882.fe0a17"]]},{"id":"34a60a4b.c91646","type":"execute","name":"get_Configuration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='getRunningConfig'>\n<parameter name=\"host-ip-address\" value=\"`$host-ip-address`\" />\n<parameter name=\"user-name\" value=\"`$USER-NAME`\" />\n<parameter name=\"password\" value=\"`$PASSWORD`\" />\n<parameter name=\"port-number\" value=\"`$PORT-NUMBER`\" />","comments":"","outputs":1,"x":472.75,"y":132.75,"z":"214d83f7.3c518c","wires":[["5931040.78065fc","f1a57725.85dd58","459d3ca2.15d404"]]},{"id":"f1a57725.85dd58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":682.5,"y":77,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"882a18a4.de2258","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":851.25,"y":239.75,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"6fb7e232.a4781c","type":"switchNode","name":"switch","xml":"<switch test='`$getRunningConfig_Result`'>\n","comments":"","outputs":1,"x":792.5,"y":398,"z":"214d83f7.3c518c","wires":[["f312cd43.e2751","882a18a4.de2258"]]},{"id":"5931040.78065fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":677.75,"y":250.25,"z":"214d83f7.3c518c","wires":[["6fb7e232.a4781c"]]},{"id":"f312cd43.e2751","type":"success","name":"success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":907.5,"y":495.5,"z":"214d83f7.3c518c","wires":[[]]},{"id":"6bf71909.695d08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","x":984.5,"y":89.75,"z":"214d83f7.3c518c","wires":[]},{"id":"459d3ca2.15d404","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":690.5,"y":154.75,"z":"214d83f7.3c518c","wires":[["6bf71909.695d08"]]},{"id":"14ef8882.fe0a17","type":"set","name":"set","xml":"<set>\n<parameter name='device-running-config' value=\"`$running-config`\" />\n","comments":"","outputs":1,"x":537,"y":281,"z":"214d83f7.3c518c","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json
deleted file mode 100644
index 9802449..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"49deed42.81d544","type":"method","name":"Check-Active_VNFC_vSCP","xml":"<method rpc='Check-Active_VNFC_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":167.80625915527344,"y":252.00000762939453,"z":"c0682e3f.3173c","wires":[["2f73c48e.7de84c"]]},{"id":"56154020.16fac","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":153.80625915527344,"y":173.0000004768375,"z":"c0682e3f.3173c","wires":[["49deed42.81d544"]]},{"id":"5b09cf65.4228c","type":"dgstart","name":"DGSTART","outputs":1,"x":128.80625915527344,"y":98.0000004768375,"z":"c0682e3f.3173c","wires":[["56154020.16fac"]]},{"id":"906908fc.43cf18","type":"execute","name":"execute","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='checkIfActive' >\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n","comments":"","outputs":1,"x":920.306266784668,"y":601.0000061988834,"z":"c0682e3f.3173c","wires":[["7805d251.09c37c","5622b0c9.b2e2d","fcf85234.6afd8"]]},{"id":"f08644b.81ce3b8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1151.8061981201172,"y":835.2500233650211,"z":"c0682e3f.3173c","wires":[]},{"id":"7805d251.09c37c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1121.806282043457,"y":696.5000138282779,"z":"c0682e3f.3173c","wires":[["f08644b.81ce3b8"]]},{"id":"5622b0c9.b2e2d","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1149.8061981201172,"y":639.2500233650211,"z":"c0682e3f.3173c","wires":[["fcc5b930.9c3858"]]},{"id":"2f73c48e.7de84c","type":"switchNode","name":"switch","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":290.80625915527344,"y":442.0000004768375,"z":"c0682e3f.3173c","wires":[["6a23cb1e.58a7a4","d7b3fd49.e8382"]]},{"id":"6a23cb1e.58a7a4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":454.55626678466797,"y":374.5000061988834,"z":"c0682e3f.3173c","wires":[["e548aab0.213398"]]},{"id":"d7b3fd49.e8382","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":454.05625915527344,"y":522.7500004768375,"z":"c0682e3f.3173c","wires":[["906908fc.43cf18"]]},{"id":"e548aab0.213398","type":"execute","name":"execute: retrieveConnectionDetails","xml":"<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":743.3062744140625,"y":355.7500061988834,"z":"c0682e3f.3173c","wires":[["ae264d49.ae7ad","99b67ee2.a89a5"]]},{"id":"ae264d49.ae7ad","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":837.0562591552734,"y":469.5000004768375,"z":"c0682e3f.3173c","wires":[["906908fc.43cf18"]]},{"id":"99b67ee2.a89a5","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1007.0562591552734,"y":275.7500004768375,"z":"c0682e3f.3173c","wires":[["c78d1a7f.685198"]]},{"id":"2730046b.7b6b6c","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","comments":"","x":1610.8061981201172,"y":752.7115101814273,"z":"c0682e3f.3173c","wires":[]},{"id":"2e2a4b44.42d064","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve connection details of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1529.287353515625,"y":187.00000143051182,"z":"c0682e3f.3173c","wires":[]},{"id":"c78d1a7f.685198","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1302.5179901123047,"y":297.8461232185367,"z":"c0682e3f.3173c","wires":[["2e2a4b44.42d064","2c80a8ba.83a878"]]},{"id":"fcf85234.6afd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1144.8061981201172,"y":569.6667103767398,"z":"c0682e3f.3173c","wires":[["fcc5b930.9c3858"]]},{"id":"7171117c.85bcd","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve the role(Active/Passive) of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1482.8061981201172,"y":501.6666798591617,"z":"c0682e3f.3173c","wires":[]},{"id":"fcc5b930.9c3858","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1348.8062591552734,"y":577.6666646003727,"z":"c0682e3f.3173c","wires":[["7171117c.85bcd","2730046b.7b6b6c"]]},{"id":"2c80a8ba.83a878","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","comments":"","x":1495.8062286376953,"y":384.6666569709781,"z":"c0682e3f.3173c","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json
deleted file mode 100644
index a9483cb..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"63ee9929.4f7758","type":"dgstart","name":"DGSTART","outputs":1,"x":167.80625915527344,"y":110.82500457763672,"z":"dc4cc75e.06b738","wires":[["cb9d6d77.df0cb"]]},{"id":"cb9d6d77.df0cb","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":266.80625915527344,"y":159.82500457763672,"z":"dc4cc75e.06b738","wires":[["c2c949ab.cfbdb8"]]},{"id":"c2c949ab.cfbdb8","type":"method","name":"HealthCheck_VNF_vSCP","xml":"<method rpc='HealthCheck_VNF_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":322.80625915527344,"y":260.8250045776367,"z":"dc4cc75e.06b738","wires":[["ec7a529c.e62e5"]]},{"id":"c00f6c66.afecd","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","comments":"","x":1247.5750579833984,"y":498.28661346435547,"z":"dc4cc75e.06b738","wires":[]},{"id":"97e98dca.283de","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='error-code' value='400' />\n","comments":"","x":1140.8060150146484,"y":896.8251266479492,"z":"dc4cc75e.06b738","wires":[]},{"id":"f55bbc3a.10506","type":"execute","name":"execute: retrieveConnectionDetails","xml":"<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":715.8061370849609,"y":413.82506561279297,"z":"dc4cc75e.06b738","wires":[["7b5a3bce.849884","c7f4caa4.4c7e88"]]},{"id":"83ed6d82.27f7b","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve connection details for vnfc : ' + $vnfcType`\"/> ","comments":"","x":1350.806137084961,"y":213.82512664794922,"z":"dc4cc75e.06b738","wires":[]},{"id":"7b5a3bce.849884","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":717.8061370849609,"y":545.825065612793,"z":"dc4cc75e.06b738","wires":[["3f7d06de.4adc9a"]]},{"id":"48769737.4cb898","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":848.8060150146484,"y":895.8251266479492,"z":"dc4cc75e.06b738","wires":[["97e98dca.283de"]]},{"id":"3f7d06de.4adc9a","type":"execute","name":"executeTest","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>","comments":"","outputs":1,"x":741.8060150146484,"y":738.825065612793,"z":"dc4cc75e.06b738","wires":[["48769737.4cb898","51efdcf8.289614"]]},{"id":"5eaef937.ba54c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1119.036849975586,"y":274.67125701904297,"z":"dc4cc75e.06b738","wires":[["83ed6d82.27f7b","de589d77.aee22","9d5c2e19.ae055"]]},{"id":"37d3c438.cac5ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":978.3442230224609,"y":460.4404830932617,"z":"dc4cc75e.06b738","wires":[["f52994d0.a42ec8","c00f6c66.afecd","ec0b5de3.efb66"]]},{"id":"ec7a529c.e62e5","type":"switchNode","name":"switch","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":302.80625915527344,"y":379.5750045776367,"z":"dc4cc75e.06b738","wires":[["f28dc950.083398","d4c1bf0.970e44"]]},{"id":"f28dc950.083398","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":472.80625915527344,"y":324.5750045776367,"z":"dc4cc75e.06b738","wires":[["f55bbc3a.10506"]]},{"id":"d4c1bf0.970e44","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":429.80625915527344,"y":461.5750045776367,"z":"dc4cc75e.06b738","wires":[["3f7d06de.4adc9a"]]},{"id":"c7f4caa4.4c7e88","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":953.8062591552734,"y":287.8250045776367,"z":"dc4cc75e.06b738","wires":[["5eaef937.ba54c8"]]},{"id":"51efdcf8.289614","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":881.8062591552734,"y":670.8250045776367,"z":"dc4cc75e.06b738","wires":[["37d3c438.cac5ec"]]},{"id":"f52994d0.a42ec8","type":"set","name":"set","xml":"<set>\n<parameter name=\"event-message\" value=\"`'Failed to do health check of the vnfc : ' + $vnfcType`\"/> ","comments":"","x":1226.8062591552734,"y":400.8250045776367,"z":"dc4cc75e.06b738","wires":[]},{"id":"de589d77.aee22","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1359.8062591552734,"y":273.8250045776367,"z":"dc4cc75e.06b738","wires":[[]]},{"id":"ec0b5de3.efb66","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1236.8062591552734,"y":454.8250045776367,"z":"dc4cc75e.06b738","wires":[[]]},{"id":"9d5c2e19.ae055","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","comments":"","x":1358.6552276611328,"y":336.3406295776367,"z":"dc4cc75e.06b738","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VM.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VM.json
deleted file mode 100644
index 8752402..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VM.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"40b86792.424e28","type":"dgstart","name":"DGSTART","outputs":1,"x":118.88888549804688,"y":77.88888549804688,"z":"d53a62cc.c8145","wires":[["bc032b26.e89658"]]},{"id":"bc032b26.e89658","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":295.88897705078125,"y":77.45555877685547,"z":"d53a62cc.c8145","wires":[["cd1bcdc.c4f313"]]},{"id":"cd1bcdc.c4f313","type":"method","name":"Rebuild_VM","xml":"<method rpc='Rebuild_VM' mode='sync'>\n","comments":"","outputs":1,"x":238.3532485961914,"y":169.27698135375977,"z":"d53a62cc.c8145","wires":[["b74d1e6.3a22ce"]]},{"id":"34f167f4.74fba8","type":"execute","name":"Rebuild","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$rebuild-vm-url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":786.5222053527832,"y":474.9246606826782,"z":"d53a62cc.c8145","wires":[["c389f8ca.0d8db8","63bb4f30.2be92"]]},{"id":"c389f8ca.0d8db8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":903.6770362854004,"y":734.2462749481201,"z":"d53a62cc.c8145","wires":[["45b189ba.d7c4e8"]]},{"id":"63bb4f30.2be92","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":942.6393356323242,"y":441.8532495498657,"z":"d53a62cc.c8145","wires":[["96e74630.8df888"]]},{"id":"a546e205.8a738","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1582.3176345825195,"y":724.8893241882324,"z":"d53a62cc.c8145","wires":[["17c11aa2.c734e5","27d3846c.08be6c","d38bac72.40eca"]]},{"id":"17c11aa2.c734e5","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while rebuilding the server: ' + $rebuild-vm-url`\"/>\n","comments":"","x":1843.6394386291504,"y":676.8535795211792,"z":"d53a62cc.c8145","wires":[]},{"id":"27d3846c.08be6c","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1836.0683631896973,"y":717.043927192688,"z":"d53a62cc.c8145","wires":[[]]},{"id":"de90dda7.71a4e","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Rebuild succeeded for the server : ' + $rebuild-vm-url`\"/>\n\n\n","comments":"","x":1597.3530807495117,"y":272.99626636505127,"z":"d53a62cc.c8145","wires":[]},{"id":"ee54bf93.e9baa","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1587.2102661132812,"y":324.5676784515381,"z":"d53a62cc.c8145","wires":[[]]},{"id":"d7feb7b1.3b6cd8","type":"switchNode","name":"switch:Last Attempt","xml":"<switch test='`$rebuildRetryCount == $retryIndex`'>\n","comments":"","outputs":1,"x":1232.3013343811035,"y":730.460786819458,"z":"d53a62cc.c8145","wires":[["2cc28296.df8a6e","9c67fa27.c3ff98"]]},{"id":"9c67fa27.c3ff98","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1441.1940994262695,"y":722.7822074890137,"z":"d53a62cc.c8145","wires":[["a546e205.8a738"]]},{"id":"2cc28296.df8a6e","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1426.5510845184326,"y":835.4961585998535,"z":"d53a62cc.c8145","wires":[["b3cb1d2b.62265"]]},{"id":"87033bf0.a89218","type":"for","name":"Loop","xml":"<for index=\"retryIndex\" start=\"1\" end=\"`$rebuildRetryCount + 1`\" >","comments":"","outputs":1,"x":295.7502975463867,"y":479.8532304763794,"z":"d53a62cc.c8145","wires":[["8f0dac95.828bd"]]},{"id":"b3cb1d2b.62265","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=\"`'Rebuild attempt ' + $retryIndex + ' of ' + $rebuildRetryCount + ' failed for server : ' + $rebuild-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":1669.6347026824951,"y":833.7461585998535,"z":"d53a62cc.c8145","wires":[[]]},{"id":"d38bac72.40eca","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1852.0837440490723,"y":766.282208442688,"z":"d53a62cc.c8145","wires":[]},{"id":"8187513d.589d1","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1595.4485092163086,"y":449.1390333175659,"z":"d53a62cc.c8145","wires":[]},{"id":"96e74630.8df888","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$REBUILD_STATUS`'>\n","comments":"","outputs":1,"x":1103.4325485229492,"y":443.4086961746216,"z":"d53a62cc.c8145","wires":[["ae2b10cb.cec5a","cd52c85b.5249d8","59307536.ee844c"]]},{"id":"ae2b10cb.cec5a","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1184.9563446044922,"y":529.3134174346924,"z":"d53a62cc.c8145","wires":[["45b189ba.d7c4e8"]]},{"id":"cd52c85b.5249d8","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1350.3850173950195,"y":412.3134517669678,"z":"d53a62cc.c8145","wires":[["f91485e2.798dc8"]]},{"id":"45b189ba.d7c4e8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1064.6191062927246,"y":731.3493366241455,"z":"d53a62cc.c8145","wires":[["d7feb7b1.3b6cd8"]]},{"id":"59307536.ee844c","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1413.8692588806152,"y":507.0785312652588,"z":"d53a62cc.c8145","wires":[["9a2a7a92.885b08"]]},{"id":"b74d1e6.3a22ce","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":297.7976417541504,"y":386.36428356170654,"z":"d53a62cc.c8145","wires":[["8c5bde88.c0aee","87033bf0.a89218","2d98dcb5.d16b44"]]},{"id":"8c5bde88.c0aee","type":"switchNode","name":"switch : rebuildRetryCount >= 0","xml":"<switch test='`$rebuildRetryCount >= 0`'>\n","comments":"","outputs":1,"x":567.797679901123,"y":317.7928533554077,"z":"d53a62cc.c8145","wires":[["2451c726.0ffbe8","6a4082a3.a5778c"]]},{"id":"2451c726.0ffbe8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":784.9404716491699,"y":276.3643217086792,"z":"d53a62cc.c8145","wires":[["23f87454.807cfc"]]},{"id":"6a4082a3.a5778c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":792.0833587646484,"y":353.5072250366211,"z":"d53a62cc.c8145","wires":[["39be1fd1.165f6"]]},{"id":"39be1fd1.165f6","type":"set","name":"increment rebuildRetryCount","xml":"<set>\n<parameter name=\"rebuildRetryCount\" value=\"`$rebuildRetryCount + 1`\" />\n","comments":"","x":974.9404563903809,"y":352.0786123275757,"z":"d53a62cc.c8145","wires":[]},{"id":"23f87454.807cfc","type":"set","name":"set rebuildRetryCount","xml":"<set>\n<parameter name='rebuildRetryCount' value='1' />\n","comments":"","x":956.3690452575684,"y":274.93574237823486,"z":"d53a62cc.c8145","wires":[]},{"id":"f91485e2.798dc8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1372.6388702392578,"y":319.85316371917725,"z":"d53a62cc.c8145","wires":[["de90dda7.71a4e","ee54bf93.e9baa","8187513d.589d1","8fdfd6a.1692b28"]]},{"id":"2d98dcb5.d16b44","type":"set","name":"initialize exitLoop","xml":"<set>\n<parameter name='exitLoop' value='false' />\n","comments":"","x":532.6389007568359,"y":209.85318422317505,"z":"d53a62cc.c8145","wires":[]},{"id":"8fdfd6a.1692b28","type":"set","name":"set exitLoop","xml":"<set>\n<parameter name='exitLoop' value='true' />\n","comments":"","x":1602.6389770507812,"y":384.1389150619507,"z":"d53a62cc.c8145","wires":[]},{"id":"8f0dac95.828bd","type":"switchNode","name":"switch exitLoop","xml":"<switch test='`$exitLoop`'>\n","comments":"","outputs":1,"x":462.63885498046875,"y":478.4245901107788,"z":"d53a62cc.c8145","wires":[["82ddebcb.4c72e8","e243de19.25b81"]]},{"id":"82ddebcb.4c72e8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":631.2102127075195,"y":479.853196144104,"z":"d53a62cc.c8145","wires":[["34f167f4.74fba8"]]},{"id":"e243de19.25b81","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":628.3532104492188,"y":545.5675039291382,"z":"d53a62cc.c8145","wires":[[]]},{"id":"9a2a7a92.885b08","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1578.263916015625,"y":657.8888959884644,"z":"d53a62cc.c8145","wires":[["63a3f95c.1a3338","27d3846c.08be6c","d38bac72.40eca"]]},{"id":"63a3f95c.1a3338","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while rebuilding the server: ' + $rebuild-vm-url + ' due to Invalid AICIdentity or tenant or credentials. Skipping all other VMs'`\"/>\n","comments":"","x":1837.0139465332031,"y":611.6389179229736,"z":"d53a62cc.c8145","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VNF.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VNF.json
deleted file mode 100644
index 515600d..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VNF.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"99f53284.c7a4f","type":"dgstart","name":"DGSTART","outputs":1,"x":235.31257247924805,"y":119.68750190734863,"z":"f77957d3.436788","wires":[["a9b40552.94aed8"]]},{"id":"a9b40552.94aed8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":410.31257247924805,"y":118.68750190734863,"z":"f77957d3.436788","wires":[["da95e894.c26c18"]]},{"id":"da95e894.c26c18","type":"method","name":"Rebuild_VNF","xml":"<method rpc='Rebuild_VNF' mode='sync'>\n","comments":"","outputs":1,"x":255.0626335144043,"y":223.18749523162842,"z":"f77957d3.436788","wires":[["5ad7a0e2.e23a5"]]},{"id":"3b455418.9d0d5c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":540.3129081726074,"y":236.68750190734863,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"8fe42265.357f9","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":539.3129081726074,"y":186.68750190734863,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"9790f27c.2ad33","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":533.3129081726074,"y":291.6875171661377,"z":"f77957d3.436788","wires":[["b2aedd26.cf3c9"]]},{"id":"5ad7a0e2.e23a5","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":313.3126640319824,"y":290.68753242492676,"z":"f77957d3.436788","wires":[["3b455418.9d0d5c","8fe42265.357f9","9790f27c.2ad33","410c982.243e868"]]},{"id":"410c982.243e868","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":539.3126029968262,"y":354.68753242492676,"z":"f77957d3.436788","wires":[["75980c6e.458ef4"]]},{"id":"75980c6e.458ef4","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":710.9792594909668,"y":354.68753242492676,"z":"f77957d3.436788","wires":[["efa01d4c.daf8a","feae5d34.8a474"]]},{"id":"feae5d34.8a474","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":898.979320526123,"y":313.68753242492676,"z":"f77957d3.436788","wires":[["215e20aa.17f1c"]]},{"id":"efa01d4c.daf8a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":886.9792747497559,"y":391.6874713897705,"z":"f77957d3.436788","wires":[["377be37d.dbad3c"]]},{"id":"377be37d.dbad3c","type":"switchNode","name":"getVnfHierarchy_result ?","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":1047.9791984558105,"y":459.79861640930176,"z":"f77957d3.436788","wires":[["11ebb613.07c99a","43836cda.890e74"]]},{"id":"11ebb613.07c99a","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1254.97953414917,"y":520.7986755371094,"z":"f77957d3.436788","wires":[["ef94726d.4aae5"]]},{"id":"43836cda.890e74","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1253.9794425964355,"y":399.79861640930176,"z":"f77957d3.436788","wires":[["215e20aa.17f1c"]]},{"id":"ef94726d.4aae5","type":"switchNode","name":"VNF_VMCount ?","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":1288.97953414917,"y":588.9095458984375,"z":"f77957d3.436788","wires":[["952ce3f8.01a9e","eb66eab0.036e88"]]},{"id":"952ce3f8.01a9e","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1474.9791679382324,"y":521.9096984863281,"z":"f77957d3.436788","wires":[["3a947231.c5d04e"]]},{"id":"eb66eab0.036e88","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1394.9791679382324,"y":654.90966796875,"z":"f77957d3.436788","wires":[["777e65f.8ffec9c"]]},{"id":"777e65f.8ffec9c","type":"execute","name":"Get Execution Flow","xml":"<execute plugin='org.onap.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":1452.9791679382324,"y":730.0208740234375,"z":"f77957d3.436788","wires":[["522a1860.9fb9c8","b54140f0.04101"]]},{"id":"522a1860.9fb9c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1644.9789848327637,"y":730.0207233428955,"z":"f77957d3.436788","wires":[["1e3f1032.b213d"]]},{"id":"b54140f0.04101","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1643.97904586792,"y":651.020751953125,"z":"f77957d3.436788","wires":[["328235af.1f26fa"]]},{"id":"b2aedd26.cf3c9","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":713.979564666748,"y":237.68750190734863,"z":"f77957d3.436788","wires":[["a17353c8.0a34b","76da6170.dde8f"]]},{"id":"a17353c8.0a34b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":911.3125114440918,"y":238.21122932434082,"z":"f77957d3.436788","wires":[]},{"id":"215e20aa.17f1c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1408.7570457458496,"y":316.57641792297363,"z":"f77957d3.436788","wires":[["4fe9b7ed.1601f8","ca19586f.86d648"]]},{"id":"4fe9b7ed.1601f8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1597.7572135925293,"y":377.57641792297363,"z":"f77957d3.436788","wires":[]},{"id":"3a947231.c5d04e","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1605.3126640319824,"y":520.9097595214844,"z":"f77957d3.436788","wires":[["97f70dfc.79444","e1d3466f.0e7098"]]},{"id":"97f70dfc.79444","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1794.3126640319824,"y":549.9098205566406,"z":"f77957d3.436788","wires":[]},{"id":"328235af.1f26fa","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1778.3126640319824,"y":652.1318073272705,"z":"f77957d3.436788","wires":[["24b5e0d0.c01c6","d3f21815.793788"]]},{"id":"24b5e0d0.c01c6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1967.3131523132324,"y":687.131929397583,"z":"f77957d3.436788","wires":[]},{"id":"93d0ecc5.6556b","type":"for","name":"For each VNFC","xml":"<for index='i' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":2342.5345039367676,"y":866.3541383743286,"z":"f77957d3.436788","wires":[["11fb64b5.aabd0b"]]},{"id":"67a8f3f3.8d9cbc","type":"call","name":"call VNFC DG","xml":"<call module='`$Rebuild.dg_module`' rpc='`$Rebuild.dg_name`' mode='sync' version='`$Rebuild.dg_version`'>\n","comments":"","outputs":1,"x":2754.534282684326,"y":950.4653339385986,"z":"f77957d3.436788","wires":[["d9556b49.ff6288","5d547b5d.13dd54","259d70ea.9205b"]]},{"id":"4a7f68fb.0b9158","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2137.534770965576,"y":864.3543109893799,"z":"f77957d3.436788","wires":[["93d0ecc5.6556b","ccca5726.839cc8","1ab58ce2.ef51e3"]]},{"id":"44559cc.a01e864","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2990.534526824951,"y":717.3544635772705,"z":"f77957d3.436788","wires":[["2596cb0e.a268b4"]]},{"id":"c8863e0a.cada4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2986.534282684326,"y":799.3544635772705,"z":"f77957d3.436788","wires":[["a339e96.0db2d18"]]},{"id":"a339e96.0db2d18","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3132.819637298584,"y":796.3544721603394,"z":"f77957d3.436788","wires":[["b6d198f4.0d1278","b0d45e14.49d5c"]]},{"id":"b6d198f4.0d1278","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3354.534038543701,"y":799.3544635772705,"z":"f77957d3.436788","wires":[]},{"id":"259d70ea.9205b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2950.311870574951,"y":998.5765399932861,"z":"f77957d3.436788","wires":[["926558dc.646c48"]]},{"id":"5d547b5d.13dd54","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2948.312114715576,"y":906.576509475708,"z":"f77957d3.436788","wires":[["50a44cd4.d414e4"]]},{"id":"d9556b49.ff6288","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2960.312358856201,"y":950.5765399932861,"z":"f77957d3.436788","wires":[["99a282c4.2df92"]]},{"id":"11fb64b5.aabd0b","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2513.2009086608887,"y":865.5765399932861,"z":"f77957d3.436788","wires":[["67a8f3f3.8d9cbc","7b35db37.4c0c44","f46a554a.bb3ab8","404a068e.f88bb8"]]},{"id":"1e3f1032.b213d","type":"switchNode","name":"dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":1790.9791679382324,"y":809.4653015136719,"z":"f77957d3.436788","wires":[["22bf2bd5.9d34d4","dc4848ab.c0f558"]]},{"id":"22bf2bd5.9d34d4","type":"outcome","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1988.6460990905762,"y":754.5763874053955,"z":"f77957d3.436788","wires":[["d3204260.85134"]]},{"id":"d3204260.85134","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2114.0908012390137,"y":754.6874713897705,"z":"f77957d3.436788","wires":[["52cba35.33bcb5c","58b344dc.ff91ec"]]},{"id":"52cba35.33bcb5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2294.0905570983887,"y":754.6874713897705,"z":"f77957d3.436788","wires":[]},{"id":"dc4848ab.c0f558","type":"outcome","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1995.9791069030762,"y":864.4655170440674,"z":"f77957d3.436788","wires":[["4a7f68fb.0b9158"]]},{"id":"7b35db37.4c0c44","type":"execute","name":"Resolve VNFC DG","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' />\n<parameter name=\"action\" value=\"Rebuild\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"Rebuild\" />\n","comments":"","outputs":1,"x":2747.312114715576,"y":758.437593460083,"z":"f77957d3.436788","wires":[["44559cc.a01e864","c8863e0a.cada4"]]},{"id":"f46a554a.bb3ab8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$i].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$i].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$i].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$i].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='HealthyVMCountAfterRebuild' value='0' />\n<parameter name='AAIUpdateSuccessFlag' value='false' />\n<parameter name='HealthcheckDGResolutionFlag' value='false' />","comments":"","x":2748.3394660949707,"y":809.5209503173828,"z":"f77957d3.436788","wires":[]},{"id":"404a068e.f88bb8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$i].vmCount`' >\n","comments":"","outputs":1,"x":2742.11727142334,"y":864.4929323196411,"z":"f77957d3.436788","wires":[["278b0a4a.a73a06"]]},{"id":"278b0a4a.a73a06","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$i].vm[$j].url`' />","comments":"","x":2940.117290496826,"y":858.4928302764893,"z":"f77957d3.436788","wires":[]},{"id":"50a44cd4.d414e4","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3111.201030731201,"y":905.6875324249268,"z":"f77957d3.436788","wires":[["caad9bb9.958e28","788bd40a.39f6cc"]]},{"id":"caad9bb9.958e28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3337.201274871826,"y":903.6875629425049,"z":"f77957d3.436788","wires":[]},{"id":"99a282c4.2df92","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3126.201030731201,"y":951.6875629425049,"z":"f77957d3.436788","wires":[["c1c2198e.b73818"]]},{"id":"ae52a5c8.97a288","type":"switchNode","name":"switch_vm_rebuild_success","xml":"<switch test='`$HealthyVMCountAfterRebuild >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":3738.7842330932617,"y":953.0489025115967,"z":"f77957d3.436788","wires":[["b21bf1ff.bd44","5b5f2276.10bb4c"]]},{"id":"5b5f2276.10bb4c","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3945.062313079834,"y":896.7989635467529,"z":"f77957d3.436788","wires":[["f4ce492.fb423b8"]]},{"id":"b21bf1ff.bd44","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3929.062313079834,"y":1008.5488433837891,"z":"f77957d3.436788","wires":[["a294dfb8.f861e"]]},{"id":"f4ce492.fb423b8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4081.0620727539062,"y":898.0489025115967,"z":"f77957d3.436788","wires":[["122dbb1e.5a5a05","e05695d0.20cab8","1a818ff1.7d3c","e479b650.bda0f8","96766d41.3d0c2"]]},{"id":"91041bf9.e984f8","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":4266.229263305664,"y":1062.7987823486328,"z":"f77957d3.436788","wires":[]},{"id":"122dbb1e.5a5a05","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":4265.367492675781,"y":953.5490856170654,"z":"f77957d3.436788","wires":[]},{"id":"a294dfb8.f861e","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":4065.423107147217,"y":1009.9099273681641,"z":"f77957d3.436788","wires":[["91041bf9.e984f8","6f1de83d.2a2998"]]},{"id":"1ab58ce2.ef51e3","type":"switchNode","name":"switch_vnfc_rebuild_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":2389.756694793701,"y":1038.687593460083,"z":"f77957d3.436788","wires":[["637851ad.9627a","f0efea53.43f2c8"]]},{"id":"637851ad.9627a","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2603.756694793701,"y":1000.6875324249268,"z":"f77957d3.436788","wires":[["cc826579.efac68"]]},{"id":"f0efea53.43f2c8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2604.256938934326,"y":1077.687593460083,"z":"f77957d3.436788","wires":[["e4468fd0.07a52"]]},{"id":"cc826579.efac68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2762.025737762451,"y":1000.2043781280518,"z":"f77957d3.436788","wires":[]},{"id":"e4468fd0.07a52","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2765.256694793701,"y":1076.6044025421143,"z":"f77957d3.436788","wires":[]},{"id":"ccca5726.839cc8","type":"set","name":"set Failed VNFC Count","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />","comments":"","x":2359.756694793701,"y":806.6875629425049,"z":"f77957d3.436788","wires":[]},{"id":"926558dc.646c48","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=\"`'Rebuild successful for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":3130.0897178649902,"y":999.6878213882446,"z":"f77957d3.436788","wires":[[]]},{"id":"e05695d0.20cab8","type":"record","name":"Log message","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":4282.089900970459,"y":831.4378781318665,"z":"f77957d3.436788","wires":[[]]},{"id":"6f1de83d.2a2998","type":"record","name":"Log message","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=\"`'Failed to Rebuild all VMs for VNFC : ' + $vnfcName + '. But successfully Rebuilt '+ $HealthyVMCountAfterRebuild +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":4232.768569946289,"y":1006.5807037353516,"z":"f77957d3.436788","wires":[[]]},{"id":"2596cb0e.a268b4","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=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Rebuild.dg_name + ', module: ' + $Rebuild.dg_module + ', version: ' + $Rebuild.dg_version `\"/>\n","comments":"","outputs":1,"x":3148.201274871826,"y":717.6877765655518,"z":"f77957d3.436788","wires":[[]]},{"id":"67776999.51d8f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Rebuilt successfully. Not proceeding to the next VNFC.'`\" />","comments":"","x":4692.192939758301,"y":825.5412721633911,"z":"f77957d3.436788","wires":[]},{"id":"1a818ff1.7d3c","type":"switchNode","name":"switch_aai_update_success","xml":"<switch test='`$AAIUpdateSuccessFlag`'>\n","comments":"","outputs":1,"x":4300.367980957031,"y":791.6320915222168,"z":"f77957d3.436788","wires":[["65446424.620e0c","ae30b408.0a1e68"]]},{"id":"ae30b408.0a1e68","type":"outcomeFalse","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4508.146545410156,"y":825.3822145462036,"z":"f77957d3.436788","wires":[["67776999.51d8f8"]]},{"id":"65446424.620e0c","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4507.146789550781,"y":760.6319689750671,"z":"f77957d3.436788","wires":[["261792e6.bf79be"]]},{"id":"261792e6.bf79be","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />","comments":"","x":4697.479560852051,"y":760.3822135925293,"z":"f77957d3.436788","wires":[]},{"id":"76da6170.dde8f","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":944.3126335144043,"y":189.5763874053955,"z":"f77957d3.436788","wires":[["87b305c2.55be58"]]},{"id":"24fda060.75b99","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1792.3126029968262,"y":268.5763874053955,"z":"f77957d3.436788","wires":[["a4743018.e3d08"]]},{"id":"a4743018.e3d08","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":1970.8841361999512,"y":268.29065132141113,"z":"f77957d3.436788","wires":[[]]},{"id":"ca19586f.86d648","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=\"Failed to retrieve VNF details from A&amp;AI\" />","comments":"","outputs":1,"x":1613.3126335144043,"y":267.5763874053955,"z":"f77957d3.436788","wires":[["24fda060.75b99"]]},{"id":"6d00b87f.e84a98","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":1353.9791984558105,"y":188.5763874053955,"z":"f77957d3.436788","wires":[[]]},{"id":"87b305c2.55be58","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1152.4076652526855,"y":188.86212348937988,"z":"f77957d3.436788","wires":[["6d00b87f.e84a98"]]},{"id":"e1d3466f.0e7098","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=\"Server/VNFC does not exists in A&amp;AI for the VNF\" />","comments":"","outputs":1,"x":1803.97953414917,"y":488.6875,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"2b410a66.bb6ac6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2348.9794731140137,"y":486.68750190734863,"z":"f77957d3.436788","wires":[["9e2af8d.3cbc608"]]},{"id":"9e2af8d.3cbc608","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":2522.5510063171387,"y":486.40176582336426,"z":"f77957d3.436788","wires":[[]]},{"id":"d3f21815.793788","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":1994.9794692993164,"y":611.7985947132111,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"58b344dc.ff91ec","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":2281.6454887390137,"y":665.7985553741455,"z":"f77957d3.436788","wires":[["2b410a66.bb6ac6"]]},{"id":"b0d45e14.49d5c","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=\"`'Failed to retrieve VNFC DG for : ' + $vnfcFlow[$i].vnfcType`\"/>","comments":"","outputs":1,"x":3381.7571983337402,"y":752.9097415208817,"z":"f77957d3.436788","wires":[["72dfca4f.62a4d4"]]},{"id":"72dfca4f.62a4d4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3618.8770141601562,"y":750.8344230651855,"z":"f77957d3.436788","wires":[["dc2979a5.4b84e8"]]},{"id":"dc2979a5.4b84e8","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":3845.4485473632812,"y":750.1200675964355,"z":"f77957d3.436788","wires":[[]]},{"id":"788bd40a.39f6cc","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=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":3346.8682823181152,"y":858.9097442626953,"z":"f77957d3.436788","wires":[["72dfca4f.62a4d4"]]},{"id":"33642eb2.ef4d82","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=\"`$event-message`\"/>","comments":"","outputs":1,"x":4630.340351104736,"y":912.9097423553467,"z":"f77957d3.436788","wires":[["aa0c5a08.e34788"]]},{"id":"aa0c5a08.e34788","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4820.56333732605,"y":912.5487775802612,"z":"f77957d3.436788","wires":[["729c89d.f391b78"]]},{"id":"729c89d.f391b78","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":5005.31268119812,"y":912.187593460083,"z":"f77957d3.436788","wires":[[]]},{"id":"e479b650.bda0f8","type":"set","name":"Set last count","xml":"<set>\n<parameter name='lastVNFCIndex' value='`$vnfcFlowCount - 1`' />","comments":"","x":4276.250019073486,"y":874.6875133514404,"z":"f77957d3.436788","wires":[]},{"id":"96766d41.3d0c2","type":"switchNode","name":"Last vnfc?","xml":"<switch test='`$i >= $lastVNFCIndex`'>\n","comments":"","outputs":1,"x":4285.6250648498535,"y":912.1875133514404,"z":"f77957d3.436788","wires":[["16047b15.b41365"]]},{"id":"16047b15.b41365","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4444.687517166138,"y":912.8125133514404,"z":"f77957d3.436788","wires":[["33642eb2.ef4d82"]]},{"id":"c1c2198e.b73818","type":"switchNode","name":"switch_healthcheck_res_flag","xml":"<switch test='`$HealthcheckDGResolutionFlag`'>\n","comments":"","outputs":1,"x":3334.6875534057617,"y":952.1875152587891,"z":"f77957d3.436788","wires":[["4727ccbc.cc3de4","27793737.47e1b8"]]},{"id":"4727ccbc.cc3de4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3539.6875534057617,"y":952.1875143051147,"z":"f77957d3.436788","wires":[["ae52a5c8.97a288"]]},{"id":"27793737.47e1b8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3544.6875,"y":1029.6875,"z":"f77957d3.436788","wires":[["47b9a4c3.5580bc"]]},{"id":"47b9a4c3.5580bc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3722.1875534057617,"y":1029.687515258789,"z":"f77957d3.436788","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VNFC.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VNFC.json
deleted file mode 100644
index f9aeb29..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Rebuild_VNFC.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"d0c7cb01.587088","type":"dgstart","name":"DGSTART","outputs":1,"x":95.80625915527344,"y":66.82500457763672,"z":"1d241215.b25dde","wires":[["dd12bd67.a0f56"]]},{"id":"dd12bd67.a0f56","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":254.8063735961914,"y":66.8249921798706,"z":"1d241215.b25dde","wires":[["5f7f02ec.a69dbc"]]},{"id":"5f7f02ec.a69dbc","type":"method","name":"Rebuild_VNFC","xml":"<method rpc='Rebuild_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":168.80636978149414,"y":213.8249807357788,"z":"1d241215.b25dde","wires":[["4d5149f1.260ce8"]]},{"id":"4d5149f1.260ce8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":170.16352081298828,"y":986.6821060180664,"z":"1d241215.b25dde","wires":[["ebd0580f.b36a18","758341ee.5afe2","8f3931fa.2e44a","67cc2227.82d17c","86eb9e9c.6b536"]]},{"id":"ebd0580f.b36a18","type":"execute","name":"Resolve Healthcheck DG","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n","comments":"","outputs":1,"x":617.806396484375,"y":436.07499980926514,"z":"1d241215.b25dde","wires":[["3adb353.99b99ca","c46da7cb.0edfd8","62240bdd.b27214"]]},{"id":"3adb353.99b99ca","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":912.806396484375,"y":381.32499980926514,"z":"1d241215.b25dde","wires":[["ae0cdeda.66656"]]},{"id":"ae0cdeda.66656","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1099.5286884307861,"y":380.49382305145264,"z":"1d241215.b25dde","wires":[["5c9c676a.abbfb8","65d3ed59.5345c4","57e27acc.e98974","1aebb7be.5306f8"]]},{"id":"5c9c676a.abbfb8","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1285.0564041137695,"y":368.0749988555908,"z":"1d241215.b25dde","wires":[]},{"id":"c46da7cb.0edfd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":929.5564575195312,"y":435.07499980926514,"z":"1d241215.b25dde","wires":[["befd0327.5a538"]]},{"id":"befd0327.5a538","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1076.0286903381348,"y":434.9638547897339,"z":"1d241215.b25dde","wires":[["f008480f.166a88","65d3ed59.5345c4","57e27acc.e98974","1aebb7be.5306f8"]]},{"id":"f008480f.166a88","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1286.278450012207,"y":408.96391582489014,"z":"1d241215.b25dde","wires":[]},{"id":"62240bdd.b27214","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":818.9451293945312,"y":499.7138566970825,"z":"1d241215.b25dde","wires":[["6080e29d.eac52c"]]},{"id":"2940d020.da57b","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=\"`'Healthchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":1111.3619422912598,"y":492.2138566970825,"z":"1d241215.b25dde","wires":[[]]},{"id":"65d3ed59.5345c4","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1307.8472995758057,"y":450.263783454895,"z":"1d241215.b25dde","wires":[[]]},{"id":"1aebb7be.5306f8","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1349.7229080200195,"y":489.07500171661377,"z":"1d241215.b25dde","wires":[["d60d692e.990628"]]},{"id":"57e27acc.e98974","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1318.834186553955,"y":528.4339361190796,"z":"1d241215.b25dde","wires":[]},{"id":"d60d692e.990628","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1844.722339630127,"y":496.07498836517334,"z":"1d241215.b25dde","wires":[["145d9131.e1d4cf"]]},{"id":"145d9131.e1d4cf","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":2030.2939949035645,"y":495.78925228118896,"z":"1d241215.b25dde","wires":[[]]},{"id":"758341ee.5afe2","type":"execute","name":"Update AAI Status","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Rebuilding\" />","comments":"","outputs":1,"x":652.3063011169434,"y":724.0750169754028,"z":"1d241215.b25dde","wires":[["dfd330fa.83396","bc51b6b6.be5498"]]},{"id":"dfd330fa.83396","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":857.3057975769043,"y":724.0750017166138,"z":"1d241215.b25dde","wires":[["13d3c724.57ca69"]]},{"id":"13d3c724.57ca69","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1020.2739448547363,"y":722.1067428588867,"z":"1d241215.b25dde","wires":[["28827390.015fdc","52dcec48.33a434","d0b6d307.edd5e"]]},{"id":"a2de3da7.a56b5","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1411.9095191955566,"y":725.9639024734497,"z":"1d241215.b25dde","wires":[["993e98c.e0c8868","7b879bdd.4e64d4"]]},{"id":"7b879bdd.4e64d4","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=\"`'Error occurred while updating VNFC details in A&amp;AI for VNFC ' + $vnfcName`\" />","comments":"","outputs":1,"x":1599.9565200805664,"y":687.0750160217285,"z":"1d241215.b25dde","wires":[["d60d692e.990628"]]},{"id":"993e98c.e0c8868","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1573.8138542175293,"y":752.356743812561,"z":"1d241215.b25dde","wires":[]},{"id":"8f3931fa.2e44a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":484.8062400817871,"y":919.1107482910156,"z":"1d241215.b25dde","wires":[["888c87ed.367a08","51109337.2748fc"]]},{"id":"888c87ed.367a08","type":"set","name":"init","xml":"<set>\n<parameter name='rebuildFailedCount' value='0' />\n<parameter name='rebuildSuccessCount' value='0' />\n","comments":"","x":680.7853965759277,"y":875.3965349197388,"z":"1d241215.b25dde","wires":[]},{"id":"51109337.2748fc","type":"for","name":"For Each VM","xml":"<for index=\"index1\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":686.820613861084,"y":969.1465358734131,"z":"1d241215.b25dde","wires":[["8db2e331.18b49"]]},{"id":"adb5e84a.4c3068","type":"comment","name":"Rebuild server","info":"","comments":"","x":489.7518119812012,"y":872.405366897583,"z":"1d241215.b25dde","wires":[]},{"id":"e9be6721.06d0e8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1340.6279067993164,"y":978.9679269790649,"z":"1d241215.b25dde","wires":[["cebfb71a.399308","45d955de.ffd76c","257e0cb.97519f4"]]},{"id":"cebfb71a.399308","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=\"`'Attempting to rebuild the server : ' + $vm[$index1].url`\"/>\n","comments":"","outputs":1,"x":1540.4853630065918,"y":939.2535924911499,"z":"1d241215.b25dde","wires":[[]]},{"id":"257e0cb.97519f4","type":"set","name":"Set Parameters","xml":"<set>\n<parameter name=\"rebuild-vm-url\" value=\"`$vm[$index1].url`\" />\n<parameter name='rebuildRetryCount' value='3'/>\n","comments":"","x":1530.1462478637695,"y":986.6823034286499,"z":"1d241215.b25dde","wires":[]},{"id":"45d955de.ffd76c","type":"call","name":"Rebuild","xml":"<call module='APPC' rpc='Rebuild_VM' mode='sync' >\n","comments":"","outputs":1,"x":1537.1463737487793,"y":1037.6820602416992,"z":"1d241215.b25dde","wires":[["4821dca9.597c04","acffa2c8.84ab5","3b311d1c.0273c2"]]},{"id":"3b311d1c.0273c2","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1733.4795379638672,"y":958.6821508407593,"z":"1d241215.b25dde","wires":[["a831888e.1f1638"]]},{"id":"4821dca9.597c04","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1741.3467254638672,"y":1039.6107397079468,"z":"1d241215.b25dde","wires":[["4229269a.bab898"]]},{"id":"acffa2c8.84ab5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1734.7016906738281,"y":1123.6821508407593,"z":"1d241215.b25dde","wires":[["3727c6bd.c3842a"]]},{"id":"a831888e.1f1638","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1869.4795379638672,"y":958.682089805603,"z":"1d241215.b25dde","wires":[["6c160aea.84b384","be1298ee.227198","8541099f.4e46e8"]]},{"id":"4229269a.bab898","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1887.1304168701172,"y":1039.539267539978,"z":"1d241215.b25dde","wires":[["be1298ee.227198","8541099f.4e46e8","faf4f9eb.717e58"]]},{"id":"3727c6bd.c3842a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1887.8442687988281,"y":1123.8250341415405,"z":"1d241215.b25dde","wires":[["5192b20a.4107fc","d7a887d6.a9e708","6158eeca.5f084"]]},{"id":"6c160aea.84b384","type":"set","name":"Set message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Rebuild action not found for VM: ' + $vm[$index1].url`\"/>\n<parameter name=\"rebuildFailedCount\" value=\"`$rebuildFailedCount + 1`\" />","comments":"","x":2116.550678253174,"y":900.6465406417847,"z":"1d241215.b25dde","wires":[]},{"id":"be1298ee.227198","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2109.381244659424,"y":994.1226167678833,"z":"1d241215.b25dde","wires":[[]]},{"id":"8541099f.4e46e8","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2125.7230377197266,"y":1040.6504487991333,"z":"1d241215.b25dde","wires":[["951f2311.e3f1b"]]},{"id":"d7a887d6.a9e708","type":"set","name":"Increment Rebuilt vm count","xml":"<set>\n<parameter name='rebuildSuccessCount' value='`$rebuildSuccessCount+1`' />\n","comments":"","x":2121.9837799072266,"y":1138.459776878357,"z":"1d241215.b25dde","wires":[]},{"id":"5192b20a.4107fc","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=\"`'Rebuild succeeded for the server : ' + $vm[$index1].url`\"/>\n","comments":"","outputs":1,"x":2081.2371978759766,"y":1188.2535953521729,"z":"1d241215.b25dde","wires":[[]]},{"id":"134d6532.cc4ccb","type":"call","name":"Call Healthcheck DG","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1127.7873611450195,"y":1460.7326030731201,"z":"1d241215.b25dde","wires":[["9955c6b2.3a20f8","c3075985.85d5c8","eb07eb85.4d0ce8"]]},{"id":"9955c6b2.3a20f8","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1334.4823684692383,"y":1460.4997491836548,"z":"1d241215.b25dde","wires":[["e108e61a.0b54c8"]]},{"id":"c3075985.85d5c8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1342.9990921020508,"y":1418.8376398086548,"z":"1d241215.b25dde","wires":[["db553441.3b6ad8"]]},{"id":"eb07eb85.4d0ce8","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1341.7326126098633,"y":1508.9996271133423,"z":"1d241215.b25dde","wires":[["aaccc107.0bdfa"]]},{"id":"aaccc107.0bdfa","type":"for","name":"For Each VM","xml":"<for index=\"index1\" start=\"0\" end=\"`$healthcheck.vmCount`\" >","comments":"","outputs":1,"x":1526.2326736450195,"y":1530.8212323188782,"z":"1d241215.b25dde","wires":[["43ac397d.ec34c8"]]},{"id":"db553441.3b6ad8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1532.4824829101562,"y":1417.2497177124023,"z":"1d241215.b25dde","wires":[["b734f6e2.e9c078","c9cb0dac.8ad56","aeea61b7.91b7d","c4c875e.5363488"]]},{"id":"e108e61a.0b54c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1537.232494354248,"y":1464.249656677246,"z":"1d241215.b25dde","wires":[["7f1fd1b5.693fb","b734f6e2.e9c078","aeea61b7.91b7d","c4c875e.5363488"]]},{"id":"43ac397d.ec34c8","type":"switchNode","name":"Healthcheck status ?","xml":"<switch test=\"`$healthcheck.vm[$index1].status`\">\n","comments":"","outputs":1,"x":1789.947036743164,"y":1530.8209829330444,"z":"1d241215.b25dde","wires":[["dceaf505.ff0098","f36ff68e.abe4e8"]]},{"id":"dceaf505.ff0098","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":2042.483139038086,"y":1562.1426229476929,"z":"1d241215.b25dde","wires":[["51697d75.cd6674"]]},{"id":"7f1fd1b5.693fb","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during health check of the rebuilt servers\"/>","comments":"","x":1785.2325592041016,"y":1315.249568939209,"z":"1d241215.b25dde","wires":[]},{"id":"c9cb0dac.8ad56","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1783.8995513916016,"y":1352.2495698928833,"z":"1d241215.b25dde","wires":[]},{"id":"b734f6e2.e9c078","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1771.3658599853516,"y":1389.0623140335083,"z":"1d241215.b25dde","wires":[[]]},{"id":"d45c9614.ff8588","type":"set","name":"Set Message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the rebuilt server : ' + $healthcheck.vm[$index1].url`\"/>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />","comments":"","x":2491.161521911621,"y":1413.5354585647583,"z":"1d241215.b25dde","wires":[]},{"id":"89862589.b9b638","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2485.857322692871,"y":1457.8856801986694,"z":"1d241215.b25dde","wires":[[]]},{"id":"10d8313b.6051bf","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Rebuild succeeded for the server : ' + $healthcheck.vm[$index1].url`\"/>\n<parameter name=\"HealthyVMCountAfterRebuild\" value=\"`$HealthyVMCountAfterRebuild + 1`\" />\n\n","comments":"","x":2447.537498474121,"y":1598.0661010742188,"z":"1d241215.b25dde","wires":[]},{"id":"df716347.e6da2","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2429.359275817871,"y":1639.2800912857056,"z":"1d241215.b25dde","wires":[[]]},{"id":"ed2f324f.da23d","type":"execute","name":"Report Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n\n","comments":"","outputs":1,"x":2430.697410583496,"y":1682.8208627700806,"z":"1d241215.b25dde","wires":[[]]},{"id":"951f2311.e3f1b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2333.702350616455,"y":1039.4829206466675,"z":"1d241215.b25dde","wires":[["64179684.35f708"]]},{"id":"64179684.35f708","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":2536.218650817871,"y":1037.9474458694458,"z":"1d241215.b25dde","wires":[[]]},{"id":"aeea61b7.91b7d","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1802.5201034545898,"y":1464.2884397506714,"z":"1d241215.b25dde","wires":[["1e2450dd.4a0e2f"]]},{"id":"cc6dfd01.896b3","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2517.595359802246,"y":1494.3715200424194,"z":"1d241215.b25dde","wires":[["b4a8bb45.c9f6d8"]]},{"id":"c4c875e.5363488","type":"set","name":"update failed count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthcheck.vmCount`\" />\n","comments":"","x":1802.7420806884766,"y":1426.6218852996826,"z":"1d241215.b25dde","wires":[]},{"id":"b4a8bb45.c9f6d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2708.318546295166,"y":1493.8884372711182,"z":"1d241215.b25dde","wires":[["716d9887.b27778"]]},{"id":"716d9887.b27778","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":2885.3351135253906,"y":1493.6029653549194,"z":"1d241215.b25dde","wires":[[]]},{"id":"414e92f3.6ca7cc","type":"execute","name":"Update_AAI_Status_Success","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":1017.029541015625,"y":1923.084303855896,"z":"1d241215.b25dde","wires":[["e4f8a2ae.c664b","8830d2e7.45daa"]]},{"id":"dd55a83.d95aa58","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":992.0296249389648,"y":2025.084433555603,"z":"1d241215.b25dde","wires":[]},{"id":"cb3909f7.d8a288","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":797.4740219116211,"y":1923.0842504501343,"z":"1d241215.b25dde","wires":[["414e92f3.6ca7cc","dd55a83.d95aa58","a61ca9c.4fa5b58"]]},{"id":"a61ca9c.4fa5b58","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=\"`'VNFC Rebuilt successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":1001.91845703125,"y":1971.9732208251953,"z":"1d241215.b25dde","wires":[[]]},{"id":"8029027e.f9658","type":"execute","name":"Update_AAI_Status_Failure","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":1007.0296630859375,"y":1780.08429813385,"z":"1d241215.b25dde","wires":[["e4f8a2ae.c664b","8830d2e7.45daa"]]},{"id":"2cac2089.b4761","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":979.0297470092773,"y":1857.084891319275,"z":"1d241215.b25dde","wires":[]},{"id":"4ac23437.50ab0c","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":790.8073348999023,"y":1780.9731664657593,"z":"1d241215.b25dde","wires":[["2cac2089.b4761","8029027e.f9658"]]},{"id":"e4f8a2ae.c664b","type":"not-found","name":"not-found/failure","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1314.743911743164,"y":1797.2271070480347,"z":"1d241215.b25dde","wires":[["9b043e36.9d60c"]]},{"id":"8830d2e7.45daa","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1263.0293502807617,"y":1922.0841588974,"z":"1d241215.b25dde","wires":[["10442df8.10d6a2"]]},{"id":"9b043e36.9d60c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1768.918628692627,"y":1801.8659811019897,"z":"1d241215.b25dde","wires":[["868194ed.771f68","5c1ea7a.87a7d58","91badf68.35f46"]]},{"id":"10442df8.10d6a2","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1390.1400680541992,"y":1921.973074913025,"z":"1d241215.b25dde","wires":[["10aa9304.7c72bd","a63ab149.af106"]]},{"id":"10aa9304.7c72bd","type":"outcome","name":"NOT_FOUND/FAILURE","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1587.9982528686523,"y":1911.1159162521362,"z":"1d241215.b25dde","wires":[["9b043e36.9d60c"]]},{"id":"868194ed.771f68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1935.1451568603516,"y":1882.1873254776,"z":"1d241215.b25dde","wires":[]},{"id":"67cc2227.82d17c","type":"switchNode","name":"switch_server_rebuild_success","xml":"<switch test='`$rebuildFailedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":426.8077926635742,"y":1807.94855594635,"z":"1d241215.b25dde","wires":[["4e97dabd.435314","167e8229.670afe"]]},{"id":"167e8229.670afe","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":648.5578231811523,"y":1923.6986303329468,"z":"1d241215.b25dde","wires":[["cb3909f7.d8a288"]]},{"id":"4e97dabd.435314","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":654.0578231811523,"y":1780.698691368103,"z":"1d241215.b25dde","wires":[["4ac23437.50ab0c"]]},{"id":"a63ab149.af106","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1567.8079071044922,"y":1967.0047960281372,"z":"1d241215.b25dde","wires":[["ec1e6eda.5ef93"]]},{"id":"ec1e6eda.5ef93","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1760.3475456237793,"y":1967.0049495697021,"z":"1d241215.b25dde","wires":[]},{"id":"5c1ea7a.87a7d58","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=\"`'Error occurred while updating VNFC details in A&amp;AI for VNFC ' + $vnfcName`\" />","comments":"","outputs":1,"x":1947.2247467041016,"y":1773.7151613235474,"z":"1d241215.b25dde","wires":[["d297d0a9.cd082"]]},{"id":"d297d0a9.cd082","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2171.545925140381,"y":1812.0364608764648,"z":"1d241215.b25dde","wires":[["fef71859.ed0688"]]},{"id":"fef71859.ed0688","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":2388.553768157959,"y":1811.8262910842896,"z":"1d241215.b25dde","wires":[[]]},{"id":"8db2e331.18b49","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$REBUILD_STATUS`'>\n","comments":"","outputs":1,"x":932.1458740234375,"y":970.3964147567749,"z":"1d241215.b25dde","wires":[["695a1648.2fabf8","dc52391e.29dc48","6cbcba39.209574"]]},{"id":"dc52391e.29dc48","type":"other","name":"ERROR/EMPTY","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1142.1458587646484,"y":1018.9678344726562,"z":"1d241215.b25dde","wires":[["e9be6721.06d0e8"]]},{"id":"695a1648.2fabf8","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1137.5746994018555,"y":907.6821279525757,"z":"1d241215.b25dde","wires":[["e9be6721.06d0e8"]]},{"id":"6cbcba39.209574","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1113.5743942260742,"y":1123.2534818649292,"z":"1d241215.b25dde","wires":[["4ac23437.50ab0c"]]},{"id":"faf4f9eb.717e58","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`$error-message`\"/>\n<parameter name=\"rebuildFailedCount\" value=\"`$rebuildFailedCount + 1`\" />","comments":"","x":2132.056537628174,"y":945.2179517745972,"z":"1d241215.b25dde","wires":[]},{"id":"1e2450dd.4a0e2f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1989.2350997924805,"y":1356.372338294983,"z":"1d241215.b25dde","wires":[["b3f01f64.5a4bb"]]},{"id":"b3f01f64.5a4bb","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":2191.751609802246,"y":1359.122859954834,"z":"1d241215.b25dde","wires":[[]]},{"id":"51697d75.cd6674","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2201.734573364258,"y":1632.0866012573242,"z":"1d241215.b25dde","wires":[["10d8313b.6051bf","df716347.e6da2","ed2f324f.da23d"]]},{"id":"6cc7ff9b.69bb7","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2259.2346572875977,"y":1483.5153160095215,"z":"1d241215.b25dde","wires":[["d45c9614.ff8588","89862589.b9b638","cc6dfd01.896b3"]]},{"id":"bc51b6b6.be5498","type":"failure","name":"failure/notFound","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1068.0204811096191,"y":788.6107168197632,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"86eb9e9c.6b536","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":587.4069175720215,"y":1158.584038734436,"z":"1d241215.b25dde","wires":[["c43287cc.92e448","2a43c35e.5e84ac"]]},{"id":"6158eeca.5f084","type":"set","name":"Mark vm Started","xml":"<set>\n<parameter name=\"rebuildServerList[$rebuildSuccessCount].url\" value=\"`$vm[$index1].url`\" />\n","comments":"","x":2082.5562896728516,"y":1090.2626266479492,"z":"1d241215.b25dde","wires":[]},{"id":"2a43c35e.5e84ac","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":774.9135131835938,"y":1155.896544456482,"z":"1d241215.b25dde","wires":[]},{"id":"c43287cc.92e448","type":"switchNode","name":"rebuilt server > 0","xml":"<switch test='`$rebuildSuccessCount > 0`'>\n","comments":"","outputs":1,"x":755.5587158203125,"y":1207.3251333236694,"z":"1d241215.b25dde","wires":[["4b48e794.82cd18"]]},{"id":"4b48e794.82cd18","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":902.594482421875,"y":1286.360993385315,"z":"1d241215.b25dde","wires":[["d6ae113.fa83bf"]]},{"id":"d6ae113.fa83bf","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1033.056411743164,"y":1286.6108713150024,"z":"1d241215.b25dde","wires":[["dbe107fc.610df8","6ce69f34.f7c1c","7b94b5cb.b2ec5c","134d6532.cc4ccb"]]},{"id":"dbe107fc.610df8","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=\"Attempting to health check the rebuilt servers of the VNFC\"/>\n","comments":"","outputs":1,"x":1244.913459777832,"y":1254.468073606491,"z":"1d241215.b25dde","wires":[[]]},{"id":"6ce69f34.f7c1c","type":"for","name":"for_each_vm","xml":"<for index=\"index1\" start=\"0\" end=\"`$rebuildSuccessCount`\" >","comments":"","outputs":1,"x":1249.004035949707,"y":1299.087098121643,"z":"1d241215.b25dde","wires":[["abaea328.b02c7"]]},{"id":"7b94b5cb.b2ec5c","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$rebuildSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1235.003791809082,"y":1342.0870933532715,"z":"1d241215.b25dde","wires":[]},{"id":"abaea328.b02c7","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$index1].url\" value=\"`$rebuildServerList[$index1].url`\" />\n","comments":"","x":1467.448257446289,"y":1300.1979331970215,"z":"1d241215.b25dde","wires":[]},{"id":"a3f09da0.00751","type":"comment","name":"Healthcheck Rebuilt servers","info":"","comments":"","x":564.9135284423828,"y":1243.0394353866577,"z":"1d241215.b25dde","wires":[]},{"id":"f36ff68e.abe4e8","type":"other","name":"UNKNOWN/DOWN","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2058.485061645508,"y":1484.4680242538452,"z":"1d241215.b25dde","wires":[["6cc7ff9b.69bb7"]]},{"id":"28827390.015fdc","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1204.02054977417,"y":696.646445274353,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"52dcec48.33a434","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1191.020793914795,"y":744.646445274353,"z":"1d241215.b25dde","wires":[["a2de3da7.a56b5"]]},{"id":"55a13b8.748e8c4","type":"set","name":"Set flag","xml":"<set>\n<parameter name='HealthcheckDGResolutionFlag' value=\"true\"/>\n","comments":"","x":1112.3687782287598,"y":535.2625017166138,"z":"1d241215.b25dde","wires":[]},{"id":"6080e29d.eac52c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":957.3687782287598,"y":500.26250171661377,"z":"1d241215.b25dde","wires":[["2940d020.da57b","55a13b8.748e8c4"]]},{"id":"d0b6d307.edd5e","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1193.618782043457,"y":642.7625036239624,"z":"1d241215.b25dde","wires":[["b1345184.f11"]]},{"id":"b1345184.f11","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1401.118782043457,"y":644.0125036239624,"z":"1d241215.b25dde","wires":[]},{"id":"91badf68.35f46","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='false' />\n","comments":"","x":1966.1187896728516,"y":1825.2625207901,"z":"1d241215.b25dde","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart-Active-Active_VNFC.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart-Active-Active_VNFC.json
deleted file mode 100644
index 6b4ba54..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart-Active-Active_VNFC.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"cd34f9f0.1d9868","type":"dgstart","name":"DGSTART","outputs":1,"x":127.28811645507812,"y":20.999963760375977,"z":"ae41b0e9.09ae2","wires":[["f6b6354f.0ddf38"]]},{"id":"f6b6354f.0ddf38","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":132.28817749023438,"y":70.56663703918457,"z":"ae41b0e9.09ae2","wires":[["8c403f40.821b5"]]},{"id":"8c403f40.821b5","type":"method","name":"Restart-Active-Active_VNFC","xml":"<method rpc='Restart-Active-Active_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":387.03822326660156,"y":71.81661415100098,"z":"ae41b0e9.09ae2","wires":[["ed7c3c6d.a984c"]]},{"id":"45276a62.7c92c4","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":480.28807067871094,"y":455.0000247955322,"z":"ae41b0e9.09ae2","wires":[["b0f68ecc.113e"]]},{"id":"ed7c3c6d.a984c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":75.5,"y":222.75000190734863,"z":"ae41b0e9.09ae2","wires":[["5b372d0b.047e04","f72d65c7.04b878","860a3ff7.f7ce8","2e70b639.278d4a","ce24660a.70bd38"]]},{"id":"3fc5910d.6ff2ae","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":468.3783874511719,"y":719.5356998443604,"z":"ae41b0e9.09ae2","wires":[["793be6bd.8ef148"]]},{"id":"74b788b3.2be2f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1629.9331359863281,"y":707.9285507202148,"z":"ae41b0e9.09ae2","wires":[["aed13d59.d33b6"]]},{"id":"e546a2e8.8d275","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":804.8614959716797,"y":1335.7500252723694,"z":"ae41b0e9.09ae2","wires":[]},{"id":"b8f2e995.5da048","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":805.0924224853516,"y":1275.1499276161194,"z":"ae41b0e9.09ae2","wires":[]},{"id":"5b372d0b.047e04","type":"switchNode","name":"switch_server_restart_success","xml":"<switch test='`$restartFailedCount == 0 and $restartSkippedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":371.34271240234375,"y":1302.4832401275635,"z":"ae41b0e9.09ae2","wires":[["a64987ff.3681c8","369d7bad.6115d4"]]},{"id":"a64987ff.3681c8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":594.5927124023438,"y":1335.2332711219788,"z":"ae41b0e9.09ae2","wires":[["e546a2e8.8d275"]]},{"id":"369d7bad.6115d4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":596.0927429199219,"y":1275.233332157135,"z":"ae41b0e9.09ae2","wires":[["b8f2e995.5da048"]]},{"id":"c833ddce.53e9a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1556.2881164550781,"y":796.9999618530273,"z":"ae41b0e9.09ae2","wires":[["3c5daadb.8b49d6"]]},{"id":"c78696a0.1c9918","type":"set","name":"set_mark_vm_failed","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2186.7174072265625,"y":618.7618103027344,"z":"ae41b0e9.09ae2","wires":[]},{"id":"2d7e5cc9.758c64","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2156.717803955078,"y":684.7618637084961,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"a1fe0884.e414e8","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2183.584560394287,"y":727.9492416381836,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"4019eb71.f46704","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=\"Attempting to restart DOWN servers\"/>\n","comments":"","outputs":1,"x":497.2881317138672,"y":385.6665897369385,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ccd05e9a.19417","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=\"Attempting to restart UP servers\"/>\n","comments":"","outputs":1,"x":471.28812408447266,"y":662.9166669845581,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"4dbab17.c93485","type":"comment","name":"Restart Up servers","info":"","comments":"","x":319.2881164550781,"y":618.6666507720947,"z":"ae41b0e9.09ae2","wires":[]},{"id":"45176027.28e49","type":"comment","name":"Restart Down servers","info":"","comments":"","x":311.0381164550781,"y":322.1666202545166,"z":"ae41b0e9.09ae2","wires":[]},{"id":"aed13d59.d33b6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1846.7168273925781,"y":706.8571395874023,"z":"ae41b0e9.09ae2","wires":[["c78696a0.1c9918","2d7e5cc9.758c64","a1fe0884.e414e8"]]},{"id":"f7834d15.217b6","type":"comment","name":"Update VNFC restart status","info":"","comments":"","x":376.5739440917969,"y":1248.0000247955322,"z":"ae41b0e9.09ae2","wires":[]},{"id":"b0f68ecc.113e","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$vm[$vmIndex].status`\">\n","comments":"","outputs":1,"x":707.2881698608398,"y":457.99996185302734,"z":"ae41b0e9.09ae2","wires":[["d743b216.3511","a6315d8d.44126","3bfcb24a.fa473e"]]},{"id":"d743b216.3511","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":975.5737915039062,"y":585.7142581939697,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"7e312494.69dbec","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1987.4308776855469,"y":766.1429386138916,"z":"ae41b0e9.09ae2","wires":[]},{"id":"72be6190.108dc","type":"set","name":"init","xml":"<set>\n<parameter name='restartFailedCount' value='0' />\n<parameter name='restartSkippedCount' value='0' />\n<parameter name='restartSuccessCount' value='0' />\n","comments":"","x":459.14527893066406,"y":342.2856693267822,"z":"ae41b0e9.09ae2","wires":[]},{"id":"ff29c3ed.900ee","type":"comment","name":"Health check restarted servers","info":"","comments":"","x":342.2881164550781,"y":819.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"4b594278.ba7cac","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=\"`'Restart succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1961.4308776855469,"y":854.1428775787354,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3c5daadb.8b49d6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1734.4309387207031,"y":799.1429080963135,"z":"ae41b0e9.09ae2","wires":[["4b594278.ba7cac","7e312494.69dbec","3908f3bc.3be64c"]]},{"id":"a6315d8d.44126","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":986.6428833007812,"y":522.2856693267822,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"ba04eada.28e368","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=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1387.0715637207031,"y":531.5713729858398,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"8ff4886b.b72338","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1183.642822265625,"y":588.8570804595947,"z":"ae41b0e9.09ae2","wires":[["ba04eada.28e368","5a80da73.594524","239f297a.71d536"]]},{"id":"f72d65c7.04b878","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":301.5,"y":234.00002479553223,"z":"ae41b0e9.09ae2","wires":[["8f74d90e.2b6ca8","5bf4a4d7.86b44c","e5c61a50.5fd478","628f7207.6b94dc"]]},{"id":"8f74d90e.2b6ca8","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":658.5,"y":214.00002479553223,"z":"ae41b0e9.09ae2","wires":[["c2e18a4b.2976a8"]]},{"id":"c2e18a4b.2976a8","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$vm[$i].url`\" />\n","comments":"","x":877.5000610351562,"y":213.99996376037598,"z":"ae41b0e9.09ae2","wires":[]},{"id":"5bf4a4d7.86b44c","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":693.8046875,"y":319.2333011627197,"z":"ae41b0e9.09ae2","wires":[["4139fead.003ea","f72b1721.a74a38","f4cc1b80.ecfd88"]]},{"id":"793be6bd.8ef148","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$vm[$vmIndex].status`\">\n","comments":"","outputs":1,"x":703.5,"y":718.9999713897705,"z":"ae41b0e9.09ae2","wires":[["ab80f920.4408b8"]]},{"id":"ab80f920.4408b8","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":958.0716552734375,"y":719.2856693267822,"z":"ae41b0e9.09ae2","wires":[["8ff4886b.b72338"]]},{"id":"2318f81f.7133f8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":699.5,"y":948.999963760376,"z":"ae41b0e9.09ae2","wires":[["7cccdfff.d92d3","80621325.2ca61","f5a17c54.48543","248ea7ff.fe9d18"]]},{"id":"7cccdfff.d92d3","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":906.5,"y":926.999963760376,"z":"ae41b0e9.09ae2","wires":[["68eeb3e8.99f9ac"]]},{"id":"68eeb3e8.99f9ac","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1126.9444999694824,"y":927.1109943389893,"z":"ae41b0e9.09ae2","wires":[]},{"id":"80621325.2ca61","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":947.8046875,"y":1025.2332401275635,"z":"ae41b0e9.09ae2","wires":[["ad8e8d3.979a07","4d6bfe7.14324","30227c5f.41a2b4"]]},{"id":"f5a17c54.48543","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":887.5,"y":975.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"ad8e8d3.979a07","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1211.5,"y":985.9999961853027,"z":"ae41b0e9.09ae2","wires":[["bead2929.f122e8"]]},{"id":"4d6bfe7.14324","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1183.0164947509766,"y":1038.3381748199463,"z":"ae41b0e9.09ae2","wires":[["67509b2d.7a3494"]]},{"id":"30227c5f.41a2b4","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1220.75,"y":1148.5000247955322,"z":"ae41b0e9.09ae2","wires":[["ccdf433.6eb21c"]]},{"id":"ccdf433.6eb21c","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1022.5,"y":1240.999963760376,"z":"ae41b0e9.09ae2","wires":[["61a58ac8.9830e4"]]},{"id":"61a58ac8.9830e4","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1232.5,"y":1278.999963760376,"z":"ae41b0e9.09ae2","wires":[["7e3e3230.6dba1c","db1f7fae.3cb2f","bf70ffe6.d3a17"]]},{"id":"7e3e3230.6dba1c","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1474.5000305175781,"y":1324.9999985694885,"z":"ae41b0e9.09ae2","wires":[["1652d018.e2aee"]]},{"id":"1652d018.e2aee","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1737.5,"y":1425.999963760376,"z":"ae41b0e9.09ae2","wires":[["1c064d7.3edc6b3","ba547465.f89908","8add556a.b92a78"]]},{"id":"1c064d7.3edc6b3","type":"execute","name":"Report_Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\"/>","comments":"","outputs":1,"x":1994.5001068115234,"y":1533.5714511871338,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ba547465.f89908","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1983.5548553466797,"y":1476.0666618347168,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"8add556a.b92a78","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n\n","comments":"","x":2006.5548553466797,"y":1426.0666618347168,"z":"ae41b0e9.09ae2","wires":[]},{"id":"bf70ffe6.d3a17","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1484.5000305175781,"y":1232.9999985694885,"z":"ae41b0e9.09ae2","wires":[["22071ff1.487f5"]]},{"id":"db1f7fae.3cb2f","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1495.283447265625,"y":1279.142786026001,"z":"ae41b0e9.09ae2","wires":[["22071ff1.487f5"]]},{"id":"22071ff1.487f5","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1731.21435546875,"y":1218.285608291626,"z":"ae41b0e9.09ae2","wires":[["d4d99d29.7a253","92aa83bf.6feed","f7e19e76.fbb7c","edeab88e.243dd8"]]},{"id":"d4d99d29.7a253","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the restarted server : ' + $restartedServerList[$i].url`\"/>\n","comments":"","x":1993.2144012451172,"y":1218.2856559753418,"z":"ae41b0e9.09ae2","wires":[]},{"id":"92aa83bf.6feed","type":"set","name":"increment healthCheck failed VM count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2061.214401245117,"y":1267.2856559753418,"z":"ae41b0e9.09ae2","wires":[]},{"id":"f7e19e76.fbb7c","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1968.1606903076172,"y":1315.8857536315918,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"edeab88e.243dd8","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2009.0274658203125,"y":1364.0730838775635,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"146acfc4.db634","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":468.5000305175781,"y":867.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"248ea7ff.fe9d18","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=\"Attempting to health check the restarted servers of the VNFC\"/>\n","comments":"","outputs":1,"x":909.4097290039062,"y":878.3809452056885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3bfcb24a.fa473e","type":"other","name":"outcome_failure","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":982.5,"y":457.999963760376,"z":"ae41b0e9.09ae2","wires":[["afe6d608.6433a8"]]},{"id":"f2029c3c.86a2f","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error occurred during pre-health check : ' + $vm[$vmIndex].url + '. Hence skipping its restart.'`\"/>","comments":"","x":1763.5,"y":370.9999942779541,"z":"ae41b0e9.09ae2","wires":[]},{"id":"afe6d608.6433a8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1373.833251953125,"y":456.9999942779541,"z":"ae41b0e9.09ae2","wires":[["f2029c3c.86a2f","bc689a04.21c6e8","77824ab1.d42474","c92c539c.fc047"]]},{"id":"bc689a04.21c6e8","type":"set","name":"set_mark_vm_skipped","xml":"<set>\n<parameter name=\"restartSkippedCount\" value=\"`$restartSkippedCount + 1`\" />\n","comments":"","x":1777.5,"y":417.9999942779541,"z":"ae41b0e9.09ae2","wires":[]},{"id":"4139fead.003ea","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1052.5,"y":340.999963760376,"z":"ae41b0e9.09ae2","wires":[["d5d15505.317458"]]},{"id":"f72b1721.a74a38","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1031.0164794921875,"y":395.3381290435791,"z":"ae41b0e9.09ae2","wires":[["8a1531f1.c2158"]]},{"id":"f4cc1b80.ecfd88","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1048.97216796875,"y":277.5000247955322,"z":"ae41b0e9.09ae2","wires":[["4c08ade6.fe4dd4"]]},{"id":"e5c61a50.5fd478","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$vmCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"false\"/>\n","comments":"","x":643.5,"y":262.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"67509b2d.7a3494","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1429.5,"y":1038.999963760376,"z":"ae41b0e9.09ae2","wires":[["cbd3bc29.1cecd","15a249d1.cb3bc6","8fd2ec2e.de8f1","cfc2f0d9.4cf62"]]},{"id":"cfc2f0d9.4cf62","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1704.166748046875,"y":1039.999948501587,"z":"ae41b0e9.09ae2","wires":[]},{"id":"8fd2ec2e.de8f1","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":1675.6329345703125,"y":1085.8125858306885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"cbd3bc29.1cecd","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1714.5001525878906,"y":1129.999963760376,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"15a249d1.cb3bc6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1684.2607421875,"y":1175.187952041626,"z":"ae41b0e9.09ae2","wires":[]},{"id":"bead2929.f122e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1433.5,"y":985.999963760376,"z":"ae41b0e9.09ae2","wires":[["207fed09.9a8492","8fd2ec2e.de8f1","cbd3bc29.1cecd","15a249d1.cb3bc6"]]},{"id":"207fed09.9a8492","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during post-health check of the restarted servers\"/>","comments":"","x":1700.5,"y":984.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"d5d15505.317458","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1397.5,"y":344.999963760376,"z":"ae41b0e9.09ae2","wires":[["2c8c1b1d.016d24","77824ab1.d42474","c92c539c.fc047","428cb220.cb137c"]]},{"id":"8a1531f1.c2158","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1387.5,"y":400.999963760376,"z":"ae41b0e9.09ae2","wires":[["c92c539c.fc047","428cb220.cb137c","77824ab1.d42474","fd9d4346.08f21"]]},{"id":"2c8c1b1d.016d24","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during pre-health check\"/>","comments":"","x":1756.5,"y":269.999963760376,"z":"ae41b0e9.09ae2","wires":[]},{"id":"fd9d4346.08f21","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1760.166748046875,"y":321.9999485015869,"z":"ae41b0e9.09ae2","wires":[]},{"id":"77824ab1.d42474","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1734.6329345703125,"y":462.8125858306885,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"c92c539c.fc047","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1771.5001220703125,"y":510.999963760376,"z":"ae41b0e9.09ae2","wires":[["de56e9e1.0fb738"]]},{"id":"428cb220.cb137c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1746.2607421875,"y":559.187952041626,"z":"ae41b0e9.09ae2","wires":[]},{"id":"860a3ff7.f7ce8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":296.5,"y":360.999963760376,"z":"ae41b0e9.09ae2","wires":[["72be6190.108dc","4019eb71.f46704","45276a62.7c92c4"]]},{"id":"2e70b639.278d4a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":303.5,"y":662.999963760376,"z":"ae41b0e9.09ae2","wires":[["ccd05e9a.19417","3fc5910d.6ff2ae"]]},{"id":"8c13cfcc.6b30e","type":"comment","name":"Health check servers","info":"","comments":"","x":340.5000305175781,"y":194.99996376037598,"z":"ae41b0e9.09ae2","wires":[]},{"id":"628f7207.6b94dc","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=\"Attempting to health check the servers of the VNFC before restarting them.\"/>\n","comments":"","outputs":1,"x":665.611083984375,"y":160.88884925842285,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"3908f3bc.3be64c","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":2014.1769714355469,"y":812.7777652740479,"z":"ae41b0e9.09ae2","wires":[]},{"id":"76ce77bd.4cacc8","type":"switchNode","name":"switch : restarted server > 0","xml":"<switch test='`$restartSuccessCount > 0`'>\n","comments":"","outputs":1,"x":347.2881164550781,"y":948.999963760376,"z":"ae41b0e9.09ae2","wires":[["9cfcf21e.faba1","c7044ad3.bc0ca8"]]},{"id":"c7044ad3.bc0ca8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":544.0381469726562,"y":948.7500858306885,"z":"ae41b0e9.09ae2","wires":[["2318f81f.7133f8"]]},{"id":"9cfcf21e.faba1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":542.5381164550781,"y":998.7500247955322,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"ce24660a.70bd38","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":304.2881164550781,"y":867.999963760376,"z":"ae41b0e9.09ae2","wires":[["76ce77bd.4cacc8","146acfc4.db634"]]},{"id":"5a80da73.594524","type":"call","name":"Restart","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1370.7325744628906,"y":655.999963760376,"z":"ae41b0e9.09ae2","wires":[["74b788b3.2be2f8","c833ddce.53e9a","f8a530a5.dc002"]]},{"id":"239f297a.71d536","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name=\"application-node-name\" value=\"`$vm[$vmIndex].node-name`\" />\n<parameter name=\"application-status\" value=\"`$vm[$vmIndex].status`\" />\n<parameter name='restartRetryCount' value='3'/>\n","comments":"","x":1416.7325744628906,"y":590.0000247955322,"z":"ae41b0e9.09ae2","wires":[]},{"id":"f8a530a5.dc002","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1618.0659484863281,"y":636.9999618530273,"z":"ae41b0e9.09ae2","wires":[["a7ed0995.4f2518"]]},{"id":"a7ed0995.4f2518","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1837.0659484863281,"y":636.9999618530273,"z":"ae41b0e9.09ae2","wires":[["78403997.4e6fc8","c78696a0.1c9918","2d7e5cc9.758c64","a1fe0884.e414e8"]]},{"id":"78403997.4e6fc8","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n","comments":"","x":2131.637237548828,"y":515.7141952514648,"z":"ae41b0e9.09ae2","wires":[]},{"id":"de56e9e1.0fb738","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2612.803741455078,"y":967.515588760376,"z":"ae41b0e9.09ae2","wires":[["3a327862.942808"]]},{"id":"3a327862.942808","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":3142.303741455078,"y":958.515588760376,"z":"ae41b0e9.09ae2","wires":[["d990af07.e6417"]]},{"id":"d990af07.e6417","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3396.589141845703,"y":965.944299697876,"z":"ae41b0e9.09ae2","wires":[[]]},{"id":"4c08ade6.fe4dd4","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":1261.8436279296875,"y":278.88884925842285,"z":"ae41b0e9.09ae2","wires":[["5866543a.6d051c"]]},{"id":"5866543a.6d051c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1456.544921875,"y":278.24883460998535,"z":"ae41b0e9.09ae2","wires":[["5cdd015c.a3958"]]},{"id":"5cdd015c.a3958","type":"set","name":"set VM params","xml":"<set>\n<parameter name=\"vm[$i].status\" value=\"`$healthcheck.vm[$i].status`\" />\n<parameter name=\"vm[$i].node-name\" value=\"`$healthcheck.vm[$i].nodeName`\" />\n","comments":"","x":1697.544921875,"y":199.24883460998535,"z":"ae41b0e9.09ae2","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json
deleted file mode 100644
index 7065c30..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"565d7830.671f38","type":"dgstart","name":"DGSTART","outputs":1,"x":120,"y":46,"z":"3fd3b806.3e5988","wires":[["ac4eea18.913ab8"]]},{"id":"59101988.5e8918","type":"method","name":"Restart-Active-Passive_VNFC","xml":"<method rpc='Restart-Active-Passive_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":140,"y":169,"z":"3fd3b806.3e5988","wires":[["794ec84e.03f458"]]},{"id":"ac4eea18.913ab8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":301,"y":45,"z":"3fd3b806.3e5988","wires":[["59101988.5e8918"]]},{"id":"794ec84e.03f458","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":213.10713958740234,"y":1121.833251953125,"z":"3fd3b806.3e5988","wires":[["4be16fa8.af873","e7b3ea7a.c2c148","fcff96c4.ade008","1c612bb4.7e9b94","f4113929.049f68","c5cfc802.b4cf68","3a78a34c.56b16c","b35d1ce3.c179b","1ba5abd.58e3954","bbe6528e.9f013","6c87077e.9e46d8"]]},{"id":"1c67b9e.8d46346","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":782.4375,"y":246.1875,"z":"3fd3b806.3e5988","wires":[["49de287f.6f6438","83c8d474.49add8","dfe164aa.2d4e48"]]},{"id":"49de287f.6f6438","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$vmCount`' >","comments":"","outputs":1,"x":956.9376068115234,"y":163.6875,"z":"3fd3b806.3e5988","wires":[["439a312b.1157c"]]},{"id":"dfe164aa.2d4e48","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$vmCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"false\"/>\n","comments":"","x":1000.6875152587891,"y":245.9373836517334,"z":"3fd3b806.3e5988","wires":[]},{"id":"83c8d474.49add8","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":962.7422485351562,"y":317.4207763671875,"z":"3fd3b806.3e5988","wires":[["14a8bba.80caa44","fd8d5af4.7df798","fff32611.8ae708"]]},{"id":"14a8bba.80caa44","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1225.4375610351562,"y":264.9375,"z":"3fd3b806.3e5988","wires":[["ae67c815.dcdce8"]]},{"id":"fd8d5af4.7df798","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1200.9542846679688,"y":317.2757568359375,"z":"3fd3b806.3e5988","wires":[["fa98825d.3010c"]]},{"id":"fff32611.8ae708","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1229.7233276367188,"y":368.7589111328125,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"98d9e8d0.be81a8","type":"comment","name":"Healthcheck VMs","info":"","comments":"","x":492.6597900390625,"y":199.29833984375,"z":"3fd3b806.3e5988","wires":[]},{"id":"439a312b.1157c","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$vm[$i].url`\" />\n","comments":"","x":1104.0765571594238,"y":162.71521377563477,"z":"3fd3b806.3e5988","wires":[]},{"id":"fa98825d.3010c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1581.8818969726562,"y":313.1596670150757,"z":"3fd3b806.3e5988","wires":[["4059468e.bea478","3662a5a.682225a","94c4b9c3.257ef8","2c062cf5.3f4d74"]]},{"id":"2c062cf5.3f4d74","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1978.7986450195312,"y":247.65954399108887,"z":"3fd3b806.3e5988","wires":[]},{"id":"94c4b9c3.257ef8","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1953.5149536132812,"y":320.72228813171387,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4059468e.bea478","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2043.3825073242188,"y":366.6596984863281,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3662a5a.682225a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1959.3928833007812,"y":409.5977153778076,"z":"3fd3b806.3e5988","wires":[]},{"id":"ae67c815.dcdce8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1585.8818969726562,"y":260.1596670150757,"z":"3fd3b806.3e5988","wires":[["94c4b9c3.257ef8","4059468e.bea478","3662a5a.682225a"]]},{"id":"4be16fa8.af873","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$vmCount>=1`'>\n","comments":"","outputs":1,"x":507.96527099609375,"y":247.4375,"z":"3fd3b806.3e5988","wires":[["9613c9c6.03d988","584f2018.2bde8"]]},{"id":"9613c9c6.03d988","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":662.9652862548828,"y":181.43753147125244,"z":"3fd3b806.3e5988","wires":[["1c67b9e.8d46346"]]},{"id":"584f2018.2bde8","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":678.9652709960938,"y":343.4375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4724f50a.19007c","type":"execute","name":"Resolve_Check-Active_VNFC_vSCP","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"IsActive\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"IsActiveDG\" />\n","comments":"","outputs":1,"x":1379.895980834961,"y":652.5207901000977,"z":"3fd3b806.3e5988","wires":[["1130e674.0489ea","2eb496e0.0cef8a","79cfc4c5.caf0ac"]]},{"id":"9cd35f9f.becbb","type":"call","name":"call_checkActive_DG","xml":"<call rpc='`$IsActiveDG.dg_name`' version='`$IsActiveDG.dg_version`' module='`$IsActiveDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1750.6736450195312,"y":827.6320190429688,"z":"3fd3b806.3e5988","wires":[["f1fd8fe2.c9c05","fde23278.98f7d","fc061fd9.a985d"]]},{"id":"52572003.4e273","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":1709.7014770507812,"y":759.6875,"z":"3fd3b806.3e5988","wires":[["9cd35f9f.becbb"]]},{"id":"1130e674.0489ea","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1600.8959350585938,"y":704.5208129882812,"z":"3fd3b806.3e5988","wires":[["52572003.4e273"]]},{"id":"2eb496e0.0cef8a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1614.8958129882812,"y":607.5208129882812,"z":"3fd3b806.3e5988","wires":[["5c094025.a30ec"]]},{"id":"79cfc4c5.caf0ac","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1625.8958740234375,"y":655.5208435058594,"z":"3fd3b806.3e5988","wires":[["be24d9c9.561338"]]},{"id":"5c094025.a30ec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1796.1182250976562,"y":604.939697265625,"z":"3fd3b806.3e5988","wires":[["f306145d.fdc398","5c26451c.10c92c","2e7608a5.5732a8","d8d5bc0a.b708c"]]},{"id":"f306145d.fdc398","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'IsActive DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2047.8960571289062,"y":540.5208129882812,"z":"3fd3b806.3e5988","wires":[]},{"id":"be24d9c9.561338","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1767.1182250976562,"y":656.4097900390625,"z":"3fd3b806.3e5988","wires":[["a229ed4e.0dcb6","5c26451c.10c92c","2e7608a5.5732a8","d8d5bc0a.b708c"]]},{"id":"a229ed4e.0dcb6","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving IsActive DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2062.1179809570312,"y":578.4097900390625,"z":"3fd3b806.3e5988","wires":[]},{"id":"5c26451c.10c92c","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2084.6869506835938,"y":620.7096557617188,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"2e7608a5.5732a8","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2203.5545043945312,"y":671.89697265625,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"d8d5bc0a.b708c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":2079.6736450195312,"y":719.8798217773438,"z":"3fd3b806.3e5988","wires":[]},{"id":"f27f6bc.1549998","type":"comment","name":"Check Active Passive Status","info":"","comments":"","x":1373.5347900390625,"y":615.4929504394531,"z":"3fd3b806.3e5988","wires":[]},{"id":"fde23278.98f7d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1946.2570190429688,"y":828.6876220703125,"z":"3fd3b806.3e5988","wires":[["211d3f71.d278e"]]},{"id":"211d3f71.d278e","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":2078.5066528320312,"y":828.076416015625,"z":"3fd3b806.3e5988","wires":[["57792db1.3c8d24","1f3a0577.6a147b","45ded8ec.fc9338"]]},{"id":"f1fd8fe2.c9c05","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1949.7850952148438,"y":771.1319580078125,"z":"3fd3b806.3e5988","wires":[["9bcb3092.a9072"]]},{"id":"9bcb3092.a9072","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2087.4519653320312,"y":770.7730712890625,"z":"3fd3b806.3e5988","wires":[["ab89d5f6.5f6638","57792db1.3c8d24","45ded8ec.fc9338","1f3a0577.6a147b"]]},{"id":"ab89d5f6.5f6638","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'IsActive DG not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":2306.0073852539062,"y":750.354248046875,"z":"3fd3b806.3e5988","wires":[]},{"id":"57792db1.3c8d24","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2315.8960571289062,"y":793.0208740234375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"45ded8ec.fc9338","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":2308.6738891601562,"y":886.6875610351562,"z":"3fd3b806.3e5988","wires":[]},{"id":"fc061fd9.a985d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1949.3959350585938,"y":903.4931030273438,"z":"3fd3b806.3e5988","wires":[["a5bcdddf.bc981"]]},{"id":"a5bcdddf.bc981","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":2096.1179809570312,"y":903.85400390625,"z":"3fd3b806.3e5988","wires":[["d6962e57.fda47"]]},{"id":"d6962e57.fda47","type":"record","name":"Log success","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=\"Active/Passive check succeeded\"/>\n","comments":"","outputs":1,"x":2283.0901489257812,"y":937.742919921875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e7b3ea7a.c2c148","type":"execute","name":"executePreRestart","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='restartSequenceGenerator' >\n","comments":"","outputs":1,"x":700.8542175292969,"y":846.7710266113281,"z":"3fd3b806.3e5988","wires":[["ff4b13d7.8ff6a","6e82fb15.444774","96ac29bf.e4a348"]]},{"id":"e598a9ef.046f68","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":873.5207977294922,"y":499.30663871765137,"z":"3fd3b806.3e5988","wires":[["794de1af.7fd7e"]]},{"id":"5ef368c3.4bd7b8","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1294.5206909179688,"y":498.8065776824951,"z":"3fd3b806.3e5988","wires":[["f2e22899.360288","433d325f.0e0b7c","21588e29.a3cc32"]]},{"id":"f2e22899.360288","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1541.5206909179688,"y":541.3066387176514,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"21588e29.a3cc32","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1557.5206909179688,"y":451.30663871765137,"z":"3fd3b806.3e5988","wires":[["5950449e.d1cb4c"]]},{"id":"433d325f.0e0b7c","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1559.3041381835938,"y":498.4493999481201,"z":"3fd3b806.3e5988","wires":[["5950449e.d1cb4c"]]},{"id":"5124c756.7348b8","type":"set","name":"set","xml":"<set>\n<parameter name=\"doCheckActive\" value=\"true\" />\n","comments":"","x":871.8689727783203,"y":435.59222412109375,"z":"3fd3b806.3e5988","wires":[]},{"id":"5950449e.d1cb4c","type":"set","name":"set_to_perform_checkActive","xml":"<set>\n<parameter name=\"doCheckActive\" value=\"false\" />\n","comments":"","x":1830.0833129882812,"y":470.3065776824951,"z":"3fd3b806.3e5988","wires":[]},{"id":"60571aaf.8d8604","type":"switchNode","name":"switch_Perform_check_active","xml":"<switch test='`$doCheckActive`'>\n","comments":"","outputs":1,"x":928.0833129882812,"y":652.7709045410156,"z":"3fd3b806.3e5988","wires":[["4b2bdd82.af31c4","36d8fdb0.8d2aa2"]]},{"id":"4b2bdd82.af31c4","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1157.3333740234375,"y":653.5208435058594,"z":"3fd3b806.3e5988","wires":[["4724f50a.19007c"]]},{"id":"6e82fb15.444774","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":971.6667175292969,"y":904.7709655761719,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"ff4b13d7.8ff6a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":948.1669464111328,"y":789.5208129882812,"z":"3fd3b806.3e5988","wires":[["6b9137e6.eeb0c8"]]},{"id":"3be108bc.20f958","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","comments":"","x":1368.2382507324219,"y":861.1994934082031,"z":"3fd3b806.3e5988","wires":[]},{"id":"30d0cd36.793752","type":"set","name":"set event message","xml":"<set>\n<parameter name='event-message' value='Pre-Restart Execution failed' />\n","comments":"","x":1387.9694519042969,"y":777.9878234863281,"z":"3fd3b806.3e5988","wires":[]},{"id":"691ca8da.821e88","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1366.9694519042969,"y":815.9878234863281,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"1c612bb4.7e9b94","type":"for","name":"for_first_list","xml":"<for index='vmIndex' start='0' end='`$vmCount`' >\n","comments":"","outputs":1,"x":486.75013732910156,"y":1122.166748046875,"z":"3fd3b806.3e5988","wires":[["38e206a3.cc06fa"]]},{"id":"25ad81f2.75882e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1361.2500610351562,"y":1148.4169311523438,"z":"3fd3b806.3e5988","wires":[["3e050b23.00ef54"]]},{"id":"4d653382.a429ec","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1366.2501983642578,"y":1239.4169917106624,"z":"3fd3b806.3e5988","wires":[["fd9f91c4.d80c9"]]},{"id":"b35d1ce3.c179b","type":"switchNode","name":"switch_any_firstList_vm_restarted","xml":"<switch test='`$restartedFirstVMListCount>=1`'>\n","comments":"","outputs":1,"x":658.7777938842773,"y":1780.138671875,"z":"3fd3b806.3e5988","wires":[["c7ae14aa.457d88","2f4154b1.cffeac"]]},{"id":"c7ae14aa.457d88","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":903.5277938842773,"y":1864.1387939453125,"z":"3fd3b806.3e5988","wires":[["90e673f0.925cf"]]},{"id":"2f4154b1.cffeac","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":905.7777633666992,"y":1704.1387939453125,"z":"3fd3b806.3e5988","wires":[["4047d58d.27a18c"]]},{"id":"4047d58d.27a18c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1105.5278854370117,"y":1702.8887939453125,"z":"3fd3b806.3e5988","wires":[]},{"id":"b7d474af.5c9d58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1849.000087738037,"y":1919.555528640747,"z":"3fd3b806.3e5988","wires":[["1601f900.8eba77"]]},{"id":"48e8232b.a696ec","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1867.000087738037,"y":2039.4445667266846,"z":"3fd3b806.3e5988","wires":[["a762c339.2cf29"]]},{"id":"db44a408.35fa18","type":"set","name":"Mark VM failed","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":1790.500015258789,"y":1061.1669917106624,"z":"3fd3b806.3e5988","wires":[]},{"id":"33b4c1af.2c1a5e","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1783.679702758789,"y":1104.6076655387874,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e4f324e3.458468","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1818.7965240478516,"y":1151.5446772575374,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3e050b23.00ef54","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1541.7501373291016,"y":1147.91686964035,"z":"3fd3b806.3e5988","wires":[["db44a408.35fa18","33b4c1af.2c1a5e","e4f324e3.458468"]]},{"id":"f44e0dc2.7f05c","type":"set","name":"Set event message and update counters","xml":"<set>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2412.4722290039062,"y":1807.9716796875,"z":"3fd3b806.3e5988","wires":[]},{"id":"2761c6df.41b09a","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2331.1519775390625,"y":1905.912133216858,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"bc22b70f.0c2028","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2721.7694702148438,"y":1948.0997314453125,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"1601f900.8eba77","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2080.389019012451,"y":1922.388557434082,"z":"3fd3b806.3e5988","wires":[["f44e0dc2.7f05c","2761c6df.41b09a","bc22b70f.0c2028"]]},{"id":"98dcf986.aced38","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=\"`'Restart succeed for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1777.4445190429688,"y":1334.6119995117188,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"f4113929.049f68","type":"set","name":"Initialize_restartedFirstList_Count","xml":"<set>\n<parameter name='restartedFirstVMListCount' value='0' />\n\n","comments":"","x":692.1666870117188,"y":1264.0274658203125,"z":"3fd3b806.3e5988","wires":[]},{"id":"fcff96c4.ade008","type":"set","name":"Initialize_restart_parameters","xml":"<set>\n<parameter name='restartFailedCount' value='0' />\n<parameter name='restartSuccessCount' value='0' />","comments":"","x":709.7500915527344,"y":971.4163818359375,"z":"3fd3b806.3e5988","wires":[]},{"id":"bbe6528e.9f013","type":"switchNode","name":"If_any_restart_failed","xml":"<switch test='`$restartFailedCount>=1`'>\n","comments":"","outputs":1,"x":626.250078201294,"y":2505.583155632019,"z":"3fd3b806.3e5988","wires":[["2ac4791e.46f246","159116ac.51a699"]]},{"id":"2ac4791e.46f246","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":892.5556812286377,"y":2452.305316925049,"z":"3fd3b806.3e5988","wires":[["7a649831.9f1858"]]},{"id":"159116ac.51a699","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":899.750078201294,"y":2556.583148956299,"z":"3fd3b806.3e5988","wires":[["37709497.487aec"]]},{"id":"37709497.487aec","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1123.000078201294,"y":2557.083148956299,"z":"3fd3b806.3e5988","wires":[]},{"id":"7a649831.9f1858","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1102.3056201934814,"y":2451.832904815674,"z":"3fd3b806.3e5988","wires":[]},{"id":"9c2d1d30.44395","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1107.7500610351562,"y":1380.6666259765625,"z":"3fd3b806.3e5988","wires":[["e32d3076.62496","9c6ca981.cf3198","9a0c3b86.dcc888"]]},{"id":"e32d3076.62496","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$restartSuccessCount`' >","comments":"","outputs":1,"x":1339.2500610351562,"y":1382.4166259765625,"z":"3fd3b806.3e5988","wires":[["c4ab230a.95c29"]]},{"id":"c4ab230a.95c29","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1524.2500610351562,"y":1377.9166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"9a0c3b86.dcc888","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1358.5000610351562,"y":1439.4166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"9c6ca981.cf3198","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1400.8048706054688,"y":1493.89990234375,"z":"3fd3b806.3e5988","wires":[["e30a91c0.1f657","d32c2422.06b3d8","d703536.35151b"]]},{"id":"e30a91c0.1f657","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1711.2500610351562,"y":1495.4166259765625,"z":"3fd3b806.3e5988","wires":[["e2ffb1de.b124e"]]},{"id":"d32c2422.06b3d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1706.7665405273438,"y":1554.7547607421875,"z":"3fd3b806.3e5988","wires":[["3298d778.916828"]]},{"id":"d703536.35151b","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1687.5000610351562,"y":1623.1666259765625,"z":"3fd3b806.3e5988","wires":[["2bd9fac.f2e7606"]]},{"id":"2bd9fac.f2e7606","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1905.4168090820312,"y":1686.4166259765625,"z":"3fd3b806.3e5988","wires":[["c4c4885d.681c88"]]},{"id":"c4c4885d.681c88","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":2161.5001831054688,"y":1693.9166259765625,"z":"3fd3b806.3e5988","wires":[["2e9fc35d.edaf5c","66adef5.39ab51","49abe035.4ef46"]]},{"id":"ef47ba9d.0acfa8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":992.9722766876221,"y":2186.916627883911,"z":"3fd3b806.3e5988","wires":[["f26ebaaf.f84c68","c45137da.947918","cb92c687.45d9b8"]]},{"id":"f26ebaaf.f84c68","type":"for","name":"for_each_vm","xml":"<for index='i' start='0' end='`$restartSuccessCount`' >","comments":"","outputs":1,"x":1166.222276687622,"y":2133.166626930237,"z":"3fd3b806.3e5988","wires":[["47769042.b3fd5"]]},{"id":"cb92c687.45d9b8","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$restartSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":1192.4722805023193,"y":2191.6665058135986,"z":"3fd3b806.3e5988","wires":[]},{"id":"c45137da.947918","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1173.276964187622,"y":2258.1499042510986,"z":"3fd3b806.3e5988","wires":[["fbea3fd2.46312","c08ecaf2.836998","5bf097d5.7d4a38"]]},{"id":"fbea3fd2.46312","type":"outcome","name":"healthcheck_failed","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1432.4722805023193,"y":2197.666627883911,"z":"3fd3b806.3e5988","wires":[["7c565f0f.63661"]]},{"id":"c08ecaf2.836998","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1443.4889698028564,"y":2250.0048265457153,"z":"3fd3b806.3e5988","wires":[["21eda6fd.da801a"]]},{"id":"5bf097d5.7d4a38","type":"outcome","name":"healthcheck_success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1449.2223682403564,"y":2321.416569709778,"z":"3fd3b806.3e5988","wires":[["29bda719.f445f8"]]},{"id":"ed661fb6.7a7a3","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1788.5276336669922,"y":1240.5278930664062,"z":"3fd3b806.3e5988","wires":[]},{"id":"3ee9ae0.e12b052","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":1813.7740478515625,"y":1286.6627807617188,"z":"3fd3b806.3e5988","wires":[]},{"id":"fd9f91c4.d80c9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1535.4167938232422,"y":1239.6115112304688,"z":"3fd3b806.3e5988","wires":[["98dcf986.aced38","ed661fb6.7a7a3","3ee9ae0.e12b052"]]},{"id":"3298d778.916828","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1890.1111450195312,"y":1553.4442138671875,"z":"3fd3b806.3e5988","wires":[["e42b2698.ff0c28","d6472f50.eeb0f","66766044.0bc98","f286d57a.a53198"]]},{"id":"f286d57a.a53198","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":2182.7781372070312,"y":1504.4442138671875,"z":"3fd3b806.3e5988","wires":[]},{"id":"66766044.0bc98","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2180.2444458007812,"y":1546.2568359375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"e42b2698.ff0c28","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2203.1113891601562,"y":1588.4442138671875,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"d6472f50.eeb0f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2176.6221313476562,"y":1630.3822021484375,"z":"3fd3b806.3e5988","wires":[]},{"id":"e2ffb1de.b124e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1922.1111450195312,"y":1495.4442138671875,"z":"3fd3b806.3e5988","wires":[["66766044.0bc98","e42b2698.ff0c28","d6472f50.eeb0f","7fe2609.cd44ea"]]},{"id":"7fe2609.cd44ea","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occured during health check of the Restarted servers\"/>","comments":"","x":2182.3613891601562,"y":1459.4442138671875,"z":"3fd3b806.3e5988","wires":[]},{"id":"49abe035.4ef46","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":2390.7504272460938,"y":1749.7222900390625,"z":"3fd3b806.3e5988","wires":[["8ae3ec83.85715"]]},{"id":"8ae3ec83.85715","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2611.0006713867188,"y":1747.2222900390625,"z":"3fd3b806.3e5988","wires":[["1fc212be.5390ed","4a8cea9d.531f74","ae266efa.9b164"]]},{"id":"1fc212be.5390ed","type":"execute","name":"Report_Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n","comments":"","outputs":1,"x":2848.7504272460938,"y":1837.7939453125,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4a8cea9d.531f74","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2849.8053588867188,"y":1793.2889404296875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"ae266efa.9b164","type":"set","name":"Set success message and update counters","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name='restartedFirstVMListCount' value='`$restartedFirstVMListCount+1`' />\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n\n","comments":"","x":2923.8053588867188,"y":1748.2890625,"z":"3fd3b806.3e5988","wires":[]},{"id":"2e9fc35d.edaf5c","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":2400.7501831054688,"y":1640.72216796875,"z":"3fd3b806.3e5988","wires":[["722f7db.ad64184"]]},{"id":"66adef5.39ab51","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":2414.5336303710938,"y":1696.8648681640625,"z":"3fd3b806.3e5988","wires":[["722f7db.ad64184"]]},{"id":"722f7db.ad64184","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2626.7147827148438,"y":1643.5078125,"z":"3fd3b806.3e5988","wires":[["2420dfd1.3d3f6","6aea1090.d7e6b","f6a19c69.5f799"]]},{"id":"2420dfd1.3d3f6","type":"set","name":"Set event message and update Counters","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the Restarted server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2914.7147827148438,"y":1596.508056640625,"z":"3fd3b806.3e5988","wires":[]},{"id":"6aea1090.d7e6b","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2842.6610717773438,"y":1643.1077880859375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"f6a19c69.5f799","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2858.5282592773438,"y":1685.2952880859375,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"202bd856.91c528","type":"comment","name":"Restart First List","info":"","comments":"","x":497.66676330566406,"y":1078.333251953125,"z":"3fd3b806.3e5988","wires":[]},{"id":"ded1e319.f55dd","type":"comment","name":"Healthcheck First List","info":"","comments":"","x":701.77783203125,"y":1379.9166259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"3676ee92.49abb2","type":"comment","name":"Restart Second List","info":"","comments":"","x":681.1111679077148,"y":1722.9163818359375,"z":"3fd3b806.3e5988","wires":[]},{"id":"72122241.50003c","type":"comment","name":"Healthcheck SecondList","info":"","comments":"","x":703.19455909729,"y":2140.027466773987,"z":"3fd3b806.3e5988","wires":[]},{"id":"e035a23b.7b864","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=\"`'Restart succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":2313.083854675293,"y":2155.361406326294,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"58515fa3.8d588","type":"set","name":"set_mark_vm_restarted","xml":"<set>\n<parameter name=\"restartedServerList[$restartSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":2366.667251586914,"y":2062.777953624725,"z":"3fd3b806.3e5988","wires":[]},{"id":"a242df26.53c36","type":"set","name":"increment_restarted_vm_count","xml":"<set>\n<parameter name='restartSuccessCount' value='`$restartSuccessCount+1`' />\n","comments":"","x":2342.663101196289,"y":2105.4125971794124,"z":"3fd3b806.3e5988","wires":[]},{"id":"a762c339.2cf29","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2082.8056640625,"y":2106.1110653877254,"z":"3fd3b806.3e5988","wires":[["e035a23b.7b864","58515fa3.8d588","a242df26.53c36"]]},{"id":"47769042.b3fd5","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$restartedServerList[$i].url`\" />\n","comments":"","x":1429.8610744476318,"y":2136.6943378448486,"z":"3fd3b806.3e5988","wires":[]},{"id":"21eda6fd.da801a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1633.6666202545166,"y":2251.3887977600098,"z":"3fd3b806.3e5988","wires":[["11eddd5.8a0d223","1627b80.c24f648","448eea91.f58eb4","51d1e08a.45697"]]},{"id":"51d1e08a.45697","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1892.8333759307861,"y":2237.888620376587,"z":"3fd3b806.3e5988","wires":[]},{"id":"448eea91.f58eb4","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1908.2995624542236,"y":2300.451364517212,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"11eddd5.8a0d223","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2569.1669311523438,"y":2206.8887939453125,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"1627b80.c24f648","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1907.9274921417236,"y":2366.0767879486084,"z":"3fd3b806.3e5988","wires":[]},{"id":"7c565f0f.63661","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1637.6666202545166,"y":2198.3887977600098,"z":"3fd3b806.3e5988","wires":[["448eea91.f58eb4","11eddd5.8a0d223","1627b80.c24f648","37b0d881.eecf48"]]},{"id":"37b0d881.eecf48","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occured during health check of the restarted servers\"/>","comments":"","x":1926.1666278839111,"y":2167.888864517212,"z":"3fd3b806.3e5988","wires":[]},{"id":"29bda719.f445f8","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$restartSuccessCount`\" >","comments":"","outputs":1,"x":1421.611177444458,"y":2438.1107234954834,"z":"3fd3b806.3e5988","wires":[["1cf0221.15704de"]]},{"id":"1cf0221.15704de","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1641.2221240997314,"y":2440.9440364837646,"z":"3fd3b806.3e5988","wires":[["78917505.3d9e0c","309b8ddd.a96422","aaa07653.033a58"]]},{"id":"aaa07653.033a58","type":"other","name":"outcome_up","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1986.9721698760986,"y":2570.749397277832,"z":"3fd3b806.3e5988","wires":[["f1e0d6b3.20cc08"]]},{"id":"f1e0d6b3.20cc08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2232.972291946411,"y":2571.749274253845,"z":"3fd3b806.3e5988","wires":[["34f66625.125b7a","3eee9a01.5d0826","3502f29e.fa060e"]]},{"id":"34f66625.125b7a","type":"execute","name":"Report_Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />","comments":"","outputs":1,"x":2558.9724254608154,"y":2643.82080745697,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"3eee9a01.5d0826","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2553.027109146118,"y":2599.31592464447,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"3502f29e.fa060e","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"RestartSuccessVMCount\" value=\"`$RestartSuccessVMCount + 1`\" />\n","comments":"","x":2552.0271129608154,"y":2551.316167831421,"z":"3fd3b806.3e5988","wires":[]},{"id":"78917505.3d9e0c","type":"other","name":"outcome_down","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1990.9720478057861,"y":2439.749397277832,"z":"3fd3b806.3e5988","wires":[["a5c41de1.d7dfd"]]},{"id":"309b8ddd.a96422","type":"other","name":"outcome_unknown","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1989.7556171417236,"y":2491.892219543457,"z":"3fd3b806.3e5988","wires":[["a5c41de1.d7dfd"]]},{"id":"a5c41de1.d7dfd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2233.686647415161,"y":2457.034918785095,"z":"3fd3b806.3e5988","wires":[["82a52a17.726898","473fa11c.d8f88","d56783d5.be2b6"]]},{"id":"82a52a17.726898","type":"set","name":"Set event message and update counters","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the Restarted server : ' + $restartedServerList[$i].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2527.6867065429688,"y":2394.535400390625,"z":"3fd3b806.3e5988","wires":[]},{"id":"473fa11c.d8f88","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2496.633062362671,"y":2445.1352586746216,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"d56783d5.be2b6","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2520.499765396118,"y":2496.3225145339966,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"3a78a34c.56b16c","type":"set","name":"Re Initialize_restart_success_count","xml":"<set>\n<parameter name='restartSuccessCount' value='0' />","comments":"","x":684.7499847412109,"y":1611.0831298828125,"z":"3fd3b806.3e5988","wires":[]},{"id":"1ba5abd.58e3954","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$restartSuccessCount>=1`'>\n","comments":"","outputs":1,"x":718.5000400543213,"y":2188.166627883911,"z":"3fd3b806.3e5988","wires":[["aedcde25.7a86b","76918471.5d839c"]]},{"id":"aedcde25.7a86b","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":883.5000457763672,"y":2136.6666259765625,"z":"3fd3b806.3e5988","wires":[["ef47ba9d.0acfa8"]]},{"id":"76918471.5d839c","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":889.5000171661377,"y":2284.166569709778,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"c5cfc802.b4cf68","type":"switchNode","name":"switch_any_vm_to_healthcheck","xml":"<switch test='`$restartSuccessCount>=1`'>\n","comments":"","outputs":1,"x":672.5000610351562,"y":1447.1666259765625,"z":"3fd3b806.3e5988","wires":[["a643ee70.b4dd9","adcaa36a.61cef"]]},{"id":"a643ee70.b4dd9","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":921.5,"y":1381.4166259765625,"z":"3fd3b806.3e5988","wires":[["9c2d1d30.44395"]]},{"id":"adcaa36a.61cef","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":910.7499847412109,"y":1508.1666259765625,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"66b6402.a4e8bc","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":927.9722900390625,"y":1083.0560913085938,"z":"3fd3b806.3e5988","wires":[["2c8da896.df9298","7c143892.7a48a8","6fce4d93.f36c94"]]},{"id":"2c8da896.df9298","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=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1102.4011840820312,"y":1025.2701416015625,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"6fce4d93.f36c94","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='restartRetryCount' value='3'/>\n<parameter name='application-node-name' value=\"`$vm[$vmIndex].node-name`\"/>\n<parameter name='application-status ' value=\"`$vm[$vmIndex].status`\"/>\n","comments":"","x":1130.8120346069336,"y":1082.4486465454102,"z":"3fd3b806.3e5988","wires":[]},{"id":"7c143892.7a48a8","type":"call","name":"Restart_VM","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1090.5618286132812,"y":1146.4487915039062,"z":"3fd3b806.3e5988","wires":[["25ad81f2.75882e","4d653382.a429ec","ced444de.57c2f8"]]},{"id":"47f00996.18f8a8","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":1480.5556259155273,"y":1864.7220458984375,"z":"3fd3b806.3e5988","wires":[["ed660e4a.df05a","4a73526b.75205c","4a729f7d.1e76c"]]},{"id":"ed660e4a.df05a","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=\"`'Attempting to restart the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1673.2345809936523,"y":1797.6864013671875,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"4a73526b.75205c","type":"call","name":"Restart_VM","xml":"<call module='APPC' rpc='Restart_VM' mode='sync' >\n","comments":"","outputs":1,"x":1655.6453857421875,"y":1970.364990234375,"z":"3fd3b806.3e5988","wires":[["b7d474af.5c9d58","48e8232b.a696ec","61c3630a.cc9c9c"]]},{"id":"ced444de.57c2f8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1368.4495239257812,"y":1071.4140014648438,"z":"3fd3b806.3e5988","wires":[["7ad527cc.c40e28"]]},{"id":"7ad527cc.c40e28","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1541.4495239257812,"y":1072.4140014648438,"z":"3fd3b806.3e5988","wires":[["33b4c1af.2c1a5e","e4f324e3.458468","5abc7a5f.2be054","6fb4cf51.1634b"]]},{"id":"5abc7a5f.2be054","type":"set","name":"Set event message and Mark VM failed","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":1843.520767211914,"y":1007.8781733512874,"z":"3fd3b806.3e5988","wires":[]},{"id":"61c3630a.cc9c9c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1854.1993980407715,"y":1973.4134702682495,"z":"3fd3b806.3e5988","wires":[["8fddaeff.19854"]]},{"id":"8fddaeff.19854","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2096.6993522644043,"y":1976.9134912490845,"z":"3fd3b806.3e5988","wires":[["2761c6df.41b09a","bc22b70f.0c2028","df04b667.517118","65123b76.9ed874"]]},{"id":"df04b667.517118","type":"set","name":"Set event message and Mark VM failed","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Restart action not found for VM: ' + $vm[$vmIndex].url`\"/>\n<parameter name=\"restartFailedCount\" value=\"`$restartFailedCount + 1`\" />\n","comments":"","x":2416.5051879882812,"y":1852.16357421875,"z":"3fd3b806.3e5988","wires":[]},{"id":"36d8fdb0.8d2aa2","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1148.3214263916016,"y":720.1786422729492,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"6b9137e6.eeb0c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1146.6071472167969,"y":815.4643859863281,"z":"3fd3b806.3e5988","wires":[["30d0cd36.793752","3be108bc.20f958","691ca8da.821e88"]]},{"id":"96ac29bf.e4a348","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":948.0358581542969,"y":846.4644470214844,"z":"3fd3b806.3e5988","wires":[["6b9137e6.eeb0c8"]]},{"id":"6c87077e.9e46d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":669.7500457763672,"y":497.0357036590576,"z":"3fd3b806.3e5988","wires":[["5124c756.7348b8","e598a9ef.046f68","60571aaf.8d8604"]]},{"id":"52451ef0.748c5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3488.7737426757812,"y":1440.0001220703125,"z":"3fd3b806.3e5988","wires":[["9a608560.1a75b8"]]},{"id":"9a608560.1a75b8","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":4340.773887634277,"y":1641.0000228881836,"z":"3fd3b806.3e5988","wires":[["929c559b.07cf48"]]},{"id":"929c559b.07cf48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4667.059288024902,"y":1618.4287338256836,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"1f3a0577.6a147b","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2343.4407348632812,"y":835.0000610351562,"z":"3fd3b806.3e5988","wires":[["52451ef0.748c5"]]},{"id":"794de1af.7fd7e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1058.2222137451172,"y":499.66662406921387,"z":"3fd3b806.3e5988","wires":[["5ef368c3.4bd7b8","63f52d2.4830bd4"]]},{"id":"63f52d2.4830bd4","type":"set","name":"set VM status","xml":"<set>\n<parameter name=\"vm[$i].status\" value=\"`$healthcheck.vm[$i].status`\" />\n<parameter name=\"vm[$i].node-name\" value=\"`$healthcheck.vm[$i].nodeName`\" />\n","comments":"","x":1267.22216796875,"y":433.6666259765625,"z":"3fd3b806.3e5988","wires":[]},{"id":"38e206a3.cc06fa","type":"switchNode","name":"Order ?","xml":"<switch test='`$vm[$vmIndex].order`'>\n","comments":"","outputs":1,"x":637.2222442626953,"y":1122.2225341796875,"z":"3fd3b806.3e5988","wires":[["a8c2ec5e.735c3","68251e28.9d153"]]},{"id":"a8c2ec5e.735c3","type":"other","name":"first","xml":"<outcome value='first'>\n","comments":"","outputs":1,"x":792.2222442626953,"y":1082.4725952148438,"z":"3fd3b806.3e5988","wires":[["66b6402.a4e8bc"]]},{"id":"68251e28.9d153","type":"outcomeTrue","name":"second","xml":"<outcome value='second'>\n","comments":"","outputs":1,"x":783.4722290039062,"y":1169.2225952148438,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"90e673f0.925cf","type":"for","name":"for_first_list","xml":"<for index='vmIndex' start='0' end='`$vmCount`' >\n","comments":"","outputs":1,"x":1056.2222518920898,"y":1863.77783203125,"z":"3fd3b806.3e5988","wires":[["41e7de35.4909a"]]},{"id":"41e7de35.4909a","type":"switchNode","name":"Order ?","xml":"<switch test='`$vm[$vmIndex].order`'>\n","comments":"","outputs":1,"x":1202.6944198608398,"y":1865.8336181640625,"z":"3fd3b806.3e5988","wires":[["9f13b01a.2bea1","24e3bd72.508902"]]},{"id":"9f13b01a.2bea1","type":"other","name":"first","xml":"<outcome value='first'>\n","comments":"","outputs":1,"x":1364.6942977905273,"y":1779.083740234375,"z":"3fd3b806.3e5988","wires":[[]]},{"id":"24e3bd72.508902","type":"outcomeTrue","name":"second","xml":"<outcome value='second'>\n","comments":"","outputs":1,"x":1342.9442977905273,"y":1864.8336181640625,"z":"3fd3b806.3e5988","wires":[["47f00996.18f8a8"]]},{"id":"4a729f7d.1e76c","type":"set","name":"set restart parameters","xml":"<set>\n<parameter name=\"restart-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='restartRetryCount' value='3'/>\n<parameter name='application-node-name' value=\"`$vm[$vmIndex].node-name`\"/>\n<parameter name='application-status ' value=\"`$vm[$vmIndex].status`\"/>\n","comments":"","x":1692.222412109375,"y":1864.5555419921875,"z":"3fd3b806.3e5988","wires":[]},{"id":"6fb4cf51.1634b","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","comments":"","x":1798.599868774414,"y":1193.8249506950374,"z":"3fd3b806.3e5988","wires":[]},{"id":"65123b76.9ed874","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2282.600112915039,"y":2015.8249506950374,"z":"3fd3b806.3e5988","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_RestartVM_VM.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_RestartVM_VM.json
deleted file mode 100644
index e0262b0..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_RestartVM_VM.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"7f4de7a8.ac56b8","type":"dgstart","name":"DGSTART","outputs":1,"x":119.80625915527344,"y":126.4333267211914,"z":"b771fc5b.409cb","wires":[["256d787.026be88"]]},{"id":"256d787.026be88","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":312.80633544921875,"y":126,"z":"b771fc5b.409cb","wires":[["98e831ca.cf20f"]]},{"id":"98e831ca.cf20f","type":"method","name":"RestartVM_VM","xml":"<method rpc='RestartVM_VM' mode='sync'>\n","comments":"","outputs":1,"x":138.5563201904297,"y":222.2499771118164,"z":"b771fc5b.409cb","wires":[["72dbf7c2.2df8e8"]]},{"id":"a218356d.8a7768","type":"execute","name":"execute_restart","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"skip-hypervisor-check\" value=\"`$skip-hypervisor-check`\" />","comments":"","outputs":1,"x":984.8326797485352,"y":496.218994140625,"z":"b771fc5b.409cb","wires":[["a79fc9de.660258","4f648386.c6afdc"]]},{"id":"a79fc9de.660258","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1240.4515228271484,"y":569.3620681762695,"z":"b771fc5b.409cb","wires":[["abb47796.fc7f08"]]},{"id":"4f648386.c6afdc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1107.8062591552734,"y":406.43335723876953,"z":"b771fc5b.409cb","wires":[["6795df77.7887d"]]},{"id":"6795df77.7887d","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":1232.6633758544922,"y":346.86197662353516,"z":"b771fc5b.409cb","wires":[["565819ab.6ea5f8","86f97daf.53db4"]]},{"id":"86f97daf.53db4","type":"other","name":"error","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1273.9488372802734,"y":454.5762710571289,"z":"b771fc5b.409cb","wires":[["abb47796.fc7f08"]]},{"id":"565819ab.6ea5f8","type":"other","name":"success","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1372.3779754638672,"y":262.2905960083008,"z":"b771fc5b.409cb","wires":[["a981085a.cff378"]]},{"id":"a981085a.cff378","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1537.9490661621094,"y":199.57630157470703,"z":"b771fc5b.409cb","wires":[["b4c2d507.0578e8","78fc68f3.711408","1ab78a0a.88aaa6"]]},{"id":"47fadddd.26d6f4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1997.2352142333984,"y":571.2905960083008,"z":"b771fc5b.409cb","wires":[["529541dd.a26eb","418f8e8f.8feee","409705a1.942bdc"]]},{"id":"529541dd.a26eb","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while restarting the server : ' + $restart-vm-url`\"/>\n","comments":"","x":2218.8069915771484,"y":498.0048294067383,"z":"b771fc5b.409cb","wires":[]},{"id":"418f8e8f.8feee","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2202.2359466552734,"y":571.1953201293945,"z":"b771fc5b.409cb","wires":[[]]},{"id":"78fc68f3.711408","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restart-vm-url`\"/>\n\n\n","comments":"","x":1765.9490661621094,"y":147.5763931274414,"z":"b771fc5b.409cb","wires":[]},{"id":"b4c2d507.0578e8","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1759.9490661621094,"y":198.57633209228516,"z":"b771fc5b.409cb","wires":[[]]},{"id":"3eae949.bf5786c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":699.8062591552734,"y":368.4333267211914,"z":"b771fc5b.409cb","wires":[["e1cc571.7242da8"]]},{"id":"80437160.c9765","type":"switchNode","name":"switch : Last Attempt","xml":"<switch test='`$restartRetryCount == $i`'>\n","comments":"","outputs":1,"x":1638.3616790771484,"y":506.43338775634766,"z":"b771fc5b.409cb","wires":[["c9437e52.f755d","84e517eb.b75708"]]},{"id":"84e517eb.b75708","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1839.111557006836,"y":572.1836013793945,"z":"b771fc5b.409cb","wires":[["47fadddd.26d6f4"]]},{"id":"c9437e52.f755d","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1844.6116180419922,"y":451.1834487915039,"z":"b771fc5b.409cb","wires":[["225e5cc2.bacbe4"]]},{"id":"e1cc571.7242da8","type":"for","name":"Loop","xml":"<for index=\"i\" start=\"1\" end=\"`$restartRetryCount + 1`\" >","comments":"","outputs":1,"x":868.9175872802734,"y":410.43341064453125,"z":"b771fc5b.409cb","wires":[["a218356d.8a7768"]]},{"id":"225e5cc2.bacbe4","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=\"`'Restart attempt ' + $i + ' of ' + $restartRetryCount + ' failed for server : ' + $restart-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":2018.6951141357422,"y":451.43338775634766,"z":"b771fc5b.409cb","wires":[[]]},{"id":"409705a1.942bdc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2230.2513275146484,"y":625.4333877563477,"z":"b771fc5b.409cb","wires":[]},{"id":"1ab78a0a.88aaa6","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1761.4729919433594,"y":250.43338775634766,"z":"b771fc5b.409cb","wires":[]},{"id":"abb47796.fc7f08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1427.0279388427734,"y":504.43335723876953,"z":"b771fc5b.409cb","wires":[["80437160.c9765"]]},{"id":"72dbf7c2.2df8e8","type":"execute","name":"execute_restart","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />","comments":"","outputs":1,"x":308.36180114746094,"y":284.4333267211914,"z":"b771fc5b.409cb","wires":[["9097a072.2eda7","393cd209.7f961e"]]},{"id":"9097a072.2eda7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":505.2508201599121,"y":196.4333267211914,"z":"b771fc5b.409cb","wires":[["8d1da1c0.8a6e3"]]},{"id":"393cd209.7f961e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":509.25075912475586,"y":369.4333267211914,"z":"b771fc5b.409cb","wires":[["3eae949.bf5786c"]]},{"id":"8d1da1c0.8a6e3","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":651.4728660583496,"y":197.4333267211914,"z":"b771fc5b.409cb","wires":[["56de1010.e3cfc","8f627675.a8bb68"]]},{"id":"56de1010.e3cfc","type":"other","name":"success","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1024.1874237060547,"y":131.86194610595703,"z":"b771fc5b.409cb","wires":[["a981085a.cff378"]]},{"id":"8f627675.a8bb68","type":"other","name":"error","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":662.7583923339844,"y":289.14762115478516,"z":"b771fc5b.409cb","wires":[["3eae949.bf5786c"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VM.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VM.json
deleted file mode 100644
index 75e5cd6..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VM.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"a9512af0.2ec648","type":"dgstart","name":"DGSTART","outputs":1,"x":95,"y":42,"z":"b984f735.170a28","wires":[["9d497354.98d4d"]]},{"id":"9d497354.98d4d","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":134.0000762939453,"y":104.5666732788086,"z":"b984f735.170a28","wires":[["7525850b.012bec"]]},{"id":"7525850b.012bec","type":"method","name":"Restart_VM","xml":"<method rpc='Restart_VM' mode='sync'>\n","comments":"","outputs":1,"x":175.7500762939453,"y":160.81666564941406,"z":"b984f735.170a28","wires":[["3c44027b.eab53e"]]},{"id":"a0d8147d.9fd638","type":"execute","name":"Resolve Application Sop DG","xml":"<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Stop_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"ApplicationStop\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n","comments":"","outputs":1,"x":574.0000152587891,"y":85.00001525878906,"z":"b984f735.170a28","wires":[["39b85a6a.3da766"]]},{"id":"39b85a6a.3da766","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":805.2223205566406,"y":84.91676330566406,"z":"b984f735.170a28","wires":[["fa92d96.4e4e928"]]},{"id":"7a2fb34.9a5cf4c","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=\"`$error-message`\"/>\n","comments":"","outputs":1,"x":1215,"y":173.00003051757812,"z":"b984f735.170a28","wires":[[]]},{"id":"fa92d96.4e4e928","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986.0000610351562,"y":85.00001525878906,"z":"b984f735.170a28","wires":[["90706af8.c781f8","7a2fb34.9a5cf4c","f98f3898.faecf8"]]},{"id":"861e0104.35b31","type":"call","name":"Stop Application","xml":"<call module='`$ApplicationStop.dg_module`' rpc='`$ApplicationStop.dg_name`' version='`$ApplicationStop.dg_version`' mode='sync'  >\n","comments":"","outputs":1,"x":541.3175659179688,"y":354.99981689453125,"z":"b984f735.170a28","wires":[["847e984.ecc4868","8b93e1af.acf0a","d2e13936.d3ac68"]]},{"id":"d2e13936.d3ac68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":772.6510620117188,"y":303.9996337890625,"z":"b984f735.170a28","wires":[["36c612c4.c0fcce"]]},{"id":"847e984.ecc4868","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":766.5182495117188,"y":480.92840576171875,"z":"b984f735.170a28","wires":[["64f7aa4b.531954"]]},{"id":"8b93e1af.acf0a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":767.873291015625,"y":394.999755859375,"z":"b984f735.170a28","wires":[["4933b52f.71e72c"]]},{"id":"64f7aa4b.531954","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":979.7615966796875,"y":480.99969768524375,"z":"b984f735.170a28","wires":[["a7a86bfe.db5a78","f89ae72.d92c718"]]},{"id":"f89ae72.d92c718","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while stopping the server: ' + $restart-vm-url + ' at Application level.'`\"/>","comments":"","x":1239.5393981933594,"y":481.9996843337992,"z":"b984f735.170a28","wires":[]},{"id":"a7a86bfe.db5a78","type":"record","name":"Log message","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":1225.6723327636719,"y":528.8123064041117,"z":"b984f735.170a28","wires":[[]]},{"id":"36c612c4.c0fcce","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":979.7615966796875,"y":303.9996337890625,"z":"b984f735.170a28","wires":[["af672dc5.7c144","6fbe061b.5a2d78","2e149572.9b4aea"]]},{"id":"af672dc5.7c144","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Application stop DG : ' + $ApplicationStop.dg_name + ' not found.'`\"/>","comments":"","x":1229.5394287109375,"y":264.99969482421875,"z":"b984f735.170a28","wires":[]},{"id":"6fbe061b.5a2d78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1214.7615966796875,"y":345.9996337890625,"z":"b984f735.170a28","wires":[]},{"id":"4933b52f.71e72c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986.872802734375,"y":394.999755859375,"z":"b984f735.170a28","wires":[["87599293.c745a","dc2add7.18f442"]]},{"id":"dc2add7.18f442","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Stop succeeded for the server : ' + $restart-vm-url` at application level.\"/>\n","comments":"","x":1245.9276123046875,"y":395.0665283203125,"z":"b984f735.170a28","wires":[]},{"id":"87599293.c745a","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1222.9276123046875,"y":438.0664978027344,"z":"b984f735.170a28","wires":[[]]},{"id":"21ee16d0.7c845a","type":"execute","name":"Resolve Application Start DG","xml":"<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Start_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"ApplicationStart\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n","comments":"","outputs":1,"x":575,"y":175,"z":"b984f735.170a28","wires":[["11ee72e6.cf116d"]]},{"id":"11ee72e6.cf116d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":804.2222900390625,"y":174.916748046875,"z":"b984f735.170a28","wires":[["95a44f48.850ee"]]},{"id":"95a44f48.850ee","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":986,"y":175,"z":"b984f735.170a28","wires":[["47e99597.7f430c","7a2fb34.9a5cf4c","f98f3898.faecf8"]]},{"id":"90706af8.c781f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failed to resolve Application stop DG for : ' + $vnfcType`\"/>","comments":"","x":1229,"y":85,"z":"b984f735.170a28","wires":[]},{"id":"47e99597.7f430c","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failed to resolve Application start DG for : ' + $vnfcType`\"/>","comments":"","x":1231,"y":132,"z":"b984f735.170a28","wires":[]},{"id":"f98f3898.faecf8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1212,"y":216,"z":"b984f735.170a28","wires":[]},{"id":"e8324ff0.b7785","type":"call","name":"Restart VM","xml":"<call module='APPC' rpc='RestartVM_VM' mode='sync' >\n","comments":"","outputs":1,"x":509,"y":669,"z":"b984f735.170a28","wires":[["7c0c0d04.13c0c4","3aa07333.27bc0c","d7b6d480.c99688"]]},{"id":"7c0c0d04.13c0c4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":711.7998046875,"y":764,"z":"b984f735.170a28","wires":[["6e7a0094.c01bd"]]},{"id":"d7b6d480.c99688","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":721.5775756835938,"y":579,"z":"b984f735.170a28","wires":[["e5234f3a.f31fc"]]},{"id":"3aa07333.27bc0c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":710.44482421875,"y":668.928466796875,"z":"b984f735.170a28","wires":[["72e8010b.e80bb"]]},{"id":"2e149572.9b4aea","type":"record","name":"Log message","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":1212,"y":304,"z":"b984f735.170a28","wires":[[]]},{"id":"3c44027b.eab53e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":265,"y":557,"z":"b984f735.170a28","wires":[["21ee16d0.7c845a","e8324ff0.b7785","417783a9.d9a3dc","8293147d.835ab8","e852d328.2c314","a0d8147d.9fd638","861e0104.35b31"]]},{"id":"e5234f3a.f31fc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":903,"y":579,"z":"b984f735.170a28","wires":[["e786eccc.52ef5","9773ec20.4e23e","9cc414cf.e7c9e8"]]},{"id":"9773ec20.4e23e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1144,"y":710,"z":"b984f735.170a28","wires":[]},{"id":"9cc414cf.e7c9e8","type":"record","name":"Log message","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":1141.2384033203125,"y":668.0003662109375,"z":"b984f735.170a28","wires":[[]]},{"id":"e786eccc.52ef5","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"VM Restart DG not found.\"/>","comments":"","x":1154.77783203125,"y":579.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"6e7a0094.c01bd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":885.9999389648438,"y":765,"z":"b984f735.170a28","wires":[["a3c4853f.40b318","33fe1ee6.042e72"]]},{"id":"33fe1ee6.042e72","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Restart succeeded for the server : ' + $restart-vm-url`\"/>\n","comments":"","x":1172.0547485351562,"y":757.0667724609375,"z":"b984f735.170a28","wires":[]},{"id":"a3c4853f.40b318","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1147.0547485351562,"y":800.0667419433594,"z":"b984f735.170a28","wires":[[]]},{"id":"72e8010b.e80bb","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":882,"y":669,"z":"b984f735.170a28","wires":[["9cc414cf.e7c9e8","9773ec20.4e23e"]]},{"id":"5659bad0.a5df44","type":"call","name":"Start Application","xml":"<call module='`$ApplicationStart.dg_module`' rpc='`$ApplicationStart.dg_name`' version='`$ApplicationStart.dg_version`' mode='sync'  >\n","comments":"","outputs":1,"x":1804.0001220703125,"y":969.0000610351562,"z":"b984f735.170a28","wires":[["921b7a03.dc3578","26931ef5.273852","f0eafdd5.891c1"]]},{"id":"f0eafdd5.891c1","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2074.3336181640625,"y":883.9998779296875,"z":"b984f735.170a28","wires":[["647d9a28.b03584"]]},{"id":"921b7a03.dc3578","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2061.2008056640625,"y":970.9286499023438,"z":"b984f735.170a28","wires":[["498aae01.db4c8"]]},{"id":"26931ef5.273852","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2066.5558471679688,"y":1083.9999389648438,"z":"b984f735.170a28","wires":[["3b52a93.0a7f756"]]},{"id":"498aae01.db4c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2236.4441528320312,"y":970.9999418258687,"z":"b984f735.170a28","wires":[["56221b95.e94674","7fc18918.d80b88","ed1928d0.c013d8"]]},{"id":"56221b95.e94674","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while starting the server: ' + $restart-vm-url + ' at Application level.'`\"/>","comments":"","x":2494.221954345703,"y":903.9999284744242,"z":"b984f735.170a28","wires":[]},{"id":"647d9a28.b03584","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2243.4441528320312,"y":883.9998779296875,"z":"b984f735.170a28","wires":[["bc465d1a.8f2f8","ed1928d0.c013d8","7fc18918.d80b88"]]},{"id":"bc465d1a.8f2f8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Application start DG : ' + $ApplicationStart.dg_name + ' not found.'`\"/>","comments":"","x":2491.2219848632812,"y":854.9999389648438,"z":"b984f735.170a28","wires":[]},{"id":"ed1928d0.c013d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2484.444091796875,"y":996.9998779296875,"z":"b984f735.170a28","wires":[]},{"id":"3b52a93.0a7f756","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2236.5553588867188,"y":1083.9999389648438,"z":"b984f735.170a28","wires":[["f056aa26.f7dff8","542ce20.b31862","442acb3.1d6a034"]]},{"id":"542ce20.b31862","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $restart-vm-url` at application level.\"/>\n","comments":"","x":2513.6101684570312,"y":1041.0667114257812,"z":"b984f735.170a28","wires":[]},{"id":"f056aa26.f7dff8","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2492.610107421875,"y":1085.066650390625,"z":"b984f735.170a28","wires":[[]]},{"id":"7fc18918.d80b88","type":"record","name":"Log message","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":2481.6824951171875,"y":955.000244140625,"z":"b984f735.170a28","wires":[[]]},{"id":"e546334b.650fb","type":"set","name":"set start parameters","xml":"<set>\n<parameter name=\"start-vm-url\" value=\"`$restart-vm-url`\" />","comments":"","x":1817.0001220703125,"y":919.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"417783a9.d9a3dc","type":"set","name":"set stop parameters","xml":"<set>\n<parameter name=\"stop-vm-url\" value=\"`$restart-vm-url`\" />","comments":"","x":553,"y":302,"z":"b984f735.170a28","wires":[]},{"id":"442acb3.1d6a034","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2497.0001220703125,"y":1128.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"8293147d.835ab8","type":"set","name":"set healthcheck parameters","xml":"<set>\n<parameter name=\"healthcheck.vm[0].url\" value=\"`$restart-vm-url`\" />\n<parameter name=\"healthcheck.vmCount\" value=\"1\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":554,"y":859,"z":"b984f735.170a28","wires":[]},{"id":"e852d328.2c314","type":"call","name":"Healthcheck Application","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":538.3046875,"y":912.2333374023438,"z":"b984f735.170a28","wires":[["c45e9b3d.f04c68","eb378fb1.6a751","b683026f.8d186"]]},{"id":"c45e9b3d.f04c68","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":824.47216796875,"y":874.5001220703125,"z":"b984f735.170a28","wires":[["1de23c81.8d2603"]]},{"id":"1de23c81.8d2603","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[0].status`\">\n","comments":"","outputs":1,"x":1118,"y":874.0000610351562,"z":"b984f735.170a28","wires":[["f22c3d56.f72a4","c82cd43c.aa1778","db3ee578.1b38c8"]]},{"id":"f22c3d56.f72a4","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1359,"y":826.0000610351562,"z":"b984f735.170a28","wires":[["23734e9f.70a3f2"]]},{"id":"23734e9f.70a3f2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1563.99951171875,"y":824.0000610351562,"z":"b984f735.170a28","wires":[["788520dc.d8dd7","2f68662.8cfa69a","a1dd23cd.927a7"]]},{"id":"2f68662.8cfa69a","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Healthcheck succeeded for the restarted server : ' + $restart-vm-url`\"/>\n","comments":"","x":1824.0543212890625,"y":781.0668334960938,"z":"b984f735.170a28","wires":[]},{"id":"788520dc.d8dd7","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1800.0543212890625,"y":824.0668029785156,"z":"b984f735.170a28","wires":[[]]},{"id":"a1dd23cd.927a7","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1804.4442749023438,"y":868.0001831054688,"z":"b984f735.170a28","wires":[]},{"id":"c82cd43c.aa1778","type":"other","name":"DOWN","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1359,"y":875.0000610351562,"z":"b984f735.170a28","wires":[["e6e0685d.7d2e08"]]},{"id":"db3ee578.1b38c8","type":"other","name":"UNKNOWN","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1375.783447265625,"y":924.1428833007812,"z":"b984f735.170a28","wires":[["e6e0685d.7d2e08"]]},{"id":"e6e0685d.7d2e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1609,"y":942,"z":"b984f735.170a28","wires":[["e546334b.650fb","5659bad0.a5df44"]]},{"id":"eb378fb1.6a751","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":812,"y":979,"z":"b984f735.170a28","wires":[["9cd90f6e.fcf8a"]]},{"id":"b683026f.8d186","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":815.5164794921875,"y":1067.338134765625,"z":"b984f735.170a28","wires":[["44e9943.917966c"]]},{"id":"9cd90f6e.fcf8a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1006,"y":979.0000610351562,"z":"b984f735.170a28","wires":[["67b277fb.8ee0c8","8e0f7825.4d1df8","cdc1c975.d33b68"]]},{"id":"44e9943.917966c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":996,"y":1067.0000610351562,"z":"b984f735.170a28","wires":[["cdc1c975.d33b68","8e0f7825.4d1df8","b1c7157.0ed5be8"]]},{"id":"67b277fb.8ee0c8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Error occurred during post-health check of the restarted server: ' + $restart-vm-url`\"/>","comments":"","x":1267,"y":980.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"b1c7157.0ed5be8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1265.666748046875,"y":1026.0000610351562,"z":"b984f735.170a28","wires":[]},{"id":"8e0f7825.4d1df8","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":1238.1329345703125,"y":1071.8126831054688,"z":"b984f735.170a28","wires":[[]]},{"id":"cdc1c975.d33b68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1247.7607421875,"y":1116.1880493164062,"z":"b984f735.170a28","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VNF.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VNF.json
deleted file mode 100644
index 0766c47..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VNF.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"9ac68df1.3eeeb","type":"dgstart","name":"DGSTART","outputs":1,"x":238.4375,"y":257.86907958984375,"z":"75c5f17a.eda5d","wires":[["273c5344.72899c"]]},{"id":"273c5344.72899c","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":422.4375,"y":257.86907958984375,"z":"75c5f17a.eda5d","wires":[["8dd8ca14.1d2288"]]},{"id":"8dd8ca14.1d2288","type":"method","name":"Restart_VNF","xml":"<method rpc='Restart_VNF' mode='sync'>\n","comments":"","outputs":1,"x":270.43756103515625,"y":339.86907958984375,"z":"75c5f17a.eda5d","wires":[["5d3382c5.b1f6ec"]]},{"id":"70aaf732.9e9648","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":834.4377136230469,"y":285.86907958984375,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"d75599d9.2ac1c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":836.4377136230469,"y":244.86907958984375,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"e872f2e6.4460c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":835.4377136230469,"y":339.8690948486328,"z":"75c5f17a.eda5d","wires":[["9c8d5b92.af3218"]]},{"id":"5d3382c5.b1f6ec","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":515.4375915527344,"y":340.8691101074219,"z":"75c5f17a.eda5d","wires":[["70aaf732.9e9648","d75599d9.2ac1c8","e872f2e6.4460c","ada92d8a.b912f"]]},{"id":"ada92d8a.b912f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":687.4375305175781,"y":410.8690948486328,"z":"75c5f17a.eda5d","wires":[["bbde3d59.c9e7d"]]},{"id":"bbde3d59.c9e7d","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":605.1041259765625,"y":482.8691101074219,"z":"75c5f17a.eda5d","wires":[["fd4a217b.a9b57","7cc75d13.2aef74"]]},{"id":"7cc75d13.2aef74","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":930.1041564941406,"y":454.8691101074219,"z":"75c5f17a.eda5d","wires":[["b74a1f32.1d872"]]},{"id":"fd4a217b.a9b57","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":687.1041564941406,"y":554.8690490722656,"z":"75c5f17a.eda5d","wires":[["284ac8b0.ea6d28"]]},{"id":"284ac8b0.ea6d28","type":"switchNode","name":"switch_getVnfHierarchy_result","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":682.1041870117188,"y":617.9801940917969,"z":"75c5f17a.eda5d","wires":[["4ea4ea52.d70e44","53eb72ea.6a097c"]]},{"id":"4ea4ea52.d70e44","type":"outcome","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":720.1041870117188,"y":695.9802551269531,"z":"75c5f17a.eda5d","wires":[["9b95c3bd.6f8db"]]},{"id":"53eb72ea.6a097c","type":"outcome","name":"outcome_FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":999.1042175292969,"y":586.9801940917969,"z":"75c5f17a.eda5d","wires":[["24fa6be.3ab3c94"]]},{"id":"9b95c3bd.6f8db","type":"switchNode","name":"switch_VNF_VMCount","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":721.1041870117188,"y":770.0912780761719,"z":"75c5f17a.eda5d","wires":[["279a19c4.a60a36","eb77493d.5744e8"]]},{"id":"279a19c4.a60a36","type":"outcome","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":953.1041564941406,"y":735.0912780761719,"z":"75c5f17a.eda5d","wires":[["6b2a2a0c.d9ce64"]]},{"id":"eb77493d.5744e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":817.1041641235352,"y":831.0913391113281,"z":"75c5f17a.eda5d","wires":[["a4ecb63a.5c5838"]]},{"id":"a4ecb63a.5c5838","type":"execute","name":"Get VNFC Execution Flow Data","xml":"<execute plugin='org.onap.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":765.1040420532227,"y":896.2024841308594,"z":"75c5f17a.eda5d","wires":[["892a65d2.ce83c8","d9875dc.74feda"]]},{"id":"892a65d2.ce83c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":833.1041030883789,"y":954.2024230957031,"z":"75c5f17a.eda5d","wires":[["ae689d83.c6b01"]]},{"id":"d9875dc.74feda","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1008.1041030883789,"y":861.2023620605469,"z":"75c5f17a.eda5d","wires":[["ed720e24.72ff6"]]},{"id":"9c8d5b92.af3218","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1041.1044616699219,"y":282.8690872192383,"z":"75c5f17a.eda5d","wires":[["6da25f82.3ace7","8ebaa00a.5f127"]]},{"id":"8ebaa00a.5f127","type":"execute","name":"OutputMessageBuilde","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":1300.009033203125,"y":236.25,"z":"75c5f17a.eda5d","wires":[["3e85e6ac.70e63a"]]},{"id":"3e85e6ac.70e63a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1541.2948379516602,"y":236.67862701416016,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"6da25f82.3ace7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":1271.4374084472656,"y":328.3927917480469,"z":"75c5f17a.eda5d","wires":[]},{"id":"b74a1f32.1d872","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1098.8819274902344,"y":454.75799560546875,"z":"75c5f17a.eda5d","wires":[["70eeb508.3e2e3c","a413144c.5a7408"]]},{"id":"a413144c.5a7408","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=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n","comments":"","outputs":1,"x":1320.8818054199219,"y":420.75799560546875,"z":"75c5f17a.eda5d","wires":[["1b02a128.9f020f"]]},{"id":"70eeb508.3e2e3c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1289.8818054199219,"y":485.75799560546875,"z":"75c5f17a.eda5d","wires":[]},{"id":"1b02a128.9f020f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1530.8818740844727,"y":420.7579803466797,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"24fa6be.3ab3c94","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1207.7709045410156,"y":577.9801788330078,"z":"75c5f17a.eda5d","wires":[["ed3ddf12.9c052","b53931d8.8a057"]]},{"id":"7f3210ce.eac0e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1597.7707824707031,"y":545.9801864624023,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"ed3ddf12.9c052","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1430.7707824707031,"y":625.9801483154297,"z":"75c5f17a.eda5d","wires":[]},{"id":"6b2a2a0c.d9ce64","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1136.4375305175781,"y":736.0913391113281,"z":"75c5f17a.eda5d","wires":[["1824c2d.c22413d","dc0dbb4a.577668"]]},{"id":"dc0dbb4a.577668","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=\"Server or VNFC not exists in A&amp;AI for the VNF\"/>\n\n","comments":"","outputs":1,"x":1414.4374160766602,"y":701.0913696289062,"z":"75c5f17a.eda5d","wires":[["7238540.2af54ac"]]},{"id":"7238540.2af54ac","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1620.4374084472656,"y":704.0913009643555,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"1824c2d.c22413d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1392.4374160766602,"y":759.0914001464844,"z":"75c5f17a.eda5d","wires":[]},{"id":"ed720e24.72ff6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1176.4374771118164,"y":860.3135070800781,"z":"75c5f17a.eda5d","wires":[["dcc566b6.2ed2d8","1a34c826.e93e58"]]},{"id":"1a34c826.e93e58","type":"execute","name":"OutputMessageBuilder","xml":"<execute plugin='org.onap.appc.dg.common.OutputMessagePlugin' method='outputMessageBuilder' >\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","outputs":1,"x":1439.4373779296875,"y":825.3134841918945,"z":"75c5f17a.eda5d","wires":[["1bb9b256.3c599e"]]},{"id":"1bb9b256.3c599e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1665.4374084472656,"y":820.3134689331055,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"dcc566b6.2ed2d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1411.4374084472656,"y":877.3135299682617,"z":"75c5f17a.eda5d","wires":[]},{"id":"62c490ca.74454","type":"for","name":"For each VNFC","xml":"<for index='vnfcCounter' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":968.6598510742188,"y":1312.535400390625,"z":"75c5f17a.eda5d","wires":[["38f732d.673eece"]]},{"id":"a9fb203e.05197","type":"call","name":"call VNFC DG","xml":"<call module='`$Restart.dg_module`' rpc='`$Restart.dg_name`' mode='sync' version='`$Restart.dg_version`'>\n","comments":"","outputs":1,"x":1372.659683227539,"y":1363.646728515625,"z":"75c5f17a.eda5d","wires":[["9534aa2d.196af8","2398588.9d68ea8","5c723b91.ee2874"]]},{"id":"46f195f5.40ae1c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":752.6597900390625,"y":1312.5357666015625,"z":"75c5f17a.eda5d","wires":[["62c490ca.74454","202a8d89.1b7fe2","f88e788.8616a88","17128b11.be84d5"]]},{"id":"783f06ad.7c3438","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1650.6599731445312,"y":1059.5357360839844,"z":"75c5f17a.eda5d","wires":[["2100653b.73255a"]]},{"id":"f7c5a47.39a1f58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1648.65966796875,"y":1144.5357360839844,"z":"75c5f17a.eda5d","wires":[["58ab2482.9113bc"]]},{"id":"58ab2482.9113bc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1838.65966796875,"y":1143.5357360839844,"z":"75c5f17a.eda5d","wires":[["9644598c.158738","b9e17e61.e8e82"]]},{"id":"b9e17e61.e8e82","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=\"`'Failed to retrieve VNFC DG for ' + $vnfcFlow[$i].vnfcType`\"/>\n","comments":"","outputs":1,"x":2066.65966796875,"y":1103.5357360839844,"z":"75c5f17a.eda5d","wires":[["440404e.5c865fc"]]},{"id":"440404e.5c865fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2269.659912109375,"y":1103.5357360839844,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"9644598c.158738","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2035.65966796875,"y":1180.5357360839844,"z":"75c5f17a.eda5d","wires":[]},{"id":"5c723b91.ee2874","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1589.4374389648438,"y":1423.7578125,"z":"75c5f17a.eda5d","wires":[["c060c328.286b4"]]},{"id":"2398588.9d68ea8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1588.4374389648438,"y":1302.7578735351562,"z":"75c5f17a.eda5d","wires":[["4c8339c2.bc3ba8"]]},{"id":"9534aa2d.196af8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1590.4375610351562,"y":1360.7578125,"z":"75c5f17a.eda5d","wires":[["dec3e93f.1e0318"]]},{"id":"38f732d.673eece","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1157.3263549804688,"y":1208.7578430175781,"z":"75c5f17a.eda5d","wires":[["a9fb203e.05197","814ca941.4fa208","ddb8f914.46dbc8","a0732a1.d4944d8"]]},{"id":"ae689d83.c6b01","type":"switchNode","name":"switch_dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":775.1040344238281,"y":1024.6469421386719,"z":"75c5f17a.eda5d","wires":[["b9c5cf99.51","19ad2d9a.c524d2"]]},{"id":"b9c5cf99.51","type":"outcome","name":"outcome_false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1068.770851135254,"y":965.7579650878906,"z":"75c5f17a.eda5d","wires":[["4fb101a5.38c5a"]]},{"id":"19ad2d9a.c524d2","type":"outcome","name":"outcome_true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":716.1041870117188,"y":1142.64697265625,"z":"75c5f17a.eda5d","wires":[["46f195f5.40ae1c"]]},{"id":"814ca941.4fa208","type":"execute","name":"execute_Resolve_VNFC_DG","xml":"<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$vnfcCounter].vnfcType`' />\n<parameter name=\"action\" value=\"Restart\" />\n<parameter name=\"prefix\" value=\"Restart\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />","comments":"","outputs":1,"x":1418.4374389648438,"y":1105.6189880371094,"z":"75c5f17a.eda5d","wires":[["783f06ad.7c3438","f7c5a47.39a1f58"]]},{"id":"ddb8f914.46dbc8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$vnfcCounter].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$vnfcCounter].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$vnfcCounter].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$vnfcCounter].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='RestartSuccessVMCount' value='0' />\n<parameter name='AAIUpdateSuccessFlag' value='false' />","comments":"","x":1402.4647827148438,"y":1172.7023315429688,"z":"75c5f17a.eda5d","wires":[]},{"id":"a0732a1.d4944d8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$vnfcCounter].vmCount`' >\n","comments":"","outputs":1,"x":1387.2424926757812,"y":1240.6742553710938,"z":"75c5f17a.eda5d","wires":[["b2c4cf28.5e7a5"]]},{"id":"b2c4cf28.5e7a5","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$vnfcCounter].vm[$j].url`' />","comments":"","x":1629.2425231933594,"y":1238.6742782592773,"z":"75c5f17a.eda5d","wires":[]},{"id":"4c8339c2.bc3ba8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1768.3264770507812,"y":1302.8689575195312,"z":"75c5f17a.eda5d","wires":[["8a8ff00d.9d0b3","eb3b629b.35cb"]]},{"id":"8a8ff00d.9d0b3","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1973.3266296386719,"y":1331.8689804077148,"z":"75c5f17a.eda5d","wires":[]},{"id":"a68d3770.e2f208","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2229.3267211914062,"y":1257.8689575195312,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"eb3b629b.35cb","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=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":2011.3264770507812,"y":1257.8689575195312,"z":"75c5f17a.eda5d","wires":[["a68d3770.e2f208"]]},{"id":"dec3e93f.1e0318","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1756.3265991210938,"y":1359.8689575195312,"z":"75c5f17a.eda5d","wires":[["4848825e.eb8f0c"]]},{"id":"4848825e.eb8f0c","type":"switchNode","name":"switch_vm_restart_success","xml":"<switch test='`$RestartSuccessVMCount >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":1997.6597595214844,"y":1403.9799194335938,"z":"75c5f17a.eda5d","wires":[["67708009.ef876","a837107b.524fa"]]},{"id":"a837107b.524fa","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2189.4378662109375,"y":1348.9801025390625,"z":"75c5f17a.eda5d","wires":[["8d01a890.2fbeb8"]]},{"id":"67708009.ef876","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2194.9378051757812,"y":1458.9800415039062,"z":"75c5f17a.eda5d","wires":[["30ca3ed4.6640a2"]]},{"id":"8d01a890.2fbeb8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2359.4378051757812,"y":1348.9800415039062,"z":"75c5f17a.eda5d","wires":[["569739a0.423578","eaec519f.214dc","89bc175a.1df198","8cdac361.a8e5c"]]},{"id":"902f4f1d.36ed3","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":2600.1043701171875,"y":1486.9801025390625,"z":"75c5f17a.eda5d","wires":[]},{"id":"569739a0.423578","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2577.992950439453,"y":1372.9800720214844,"z":"75c5f17a.eda5d","wires":[]},{"id":"30ca3ed4.6640a2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2355.5486450195312,"y":1459.0912475585938,"z":"75c5f17a.eda5d","wires":[["902f4f1d.36ed3","d4c030eb.6cec9"]]},{"id":"f88e788.8616a88","type":"switchNode","name":"switch_vnfc_restart_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":993.8818969726562,"y":1542.8690185546875,"z":"75c5f17a.eda5d","wires":[["df26bc01.d7fa1","2bcfdfc8.8bf36"]]},{"id":"df26bc01.d7fa1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1229.8818969726562,"y":1497.8689575195312,"z":"75c5f17a.eda5d","wires":[["1a89739d.14981c"]]},{"id":"2bcfdfc8.8bf36","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1225.3820190429688,"y":1584.8689575195312,"z":"75c5f17a.eda5d","wires":[["471bece0.a1cdc4"]]},{"id":"1a89739d.14981c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1409.6318969726562,"y":1497.3412475585938,"z":"75c5f17a.eda5d","wires":[["f29375ef.e47478"]]},{"id":"f29375ef.e47478","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1619.1508178710938,"y":1498.3858032226562,"z":"75c5f17a.eda5d","wires":[]},{"id":"471bece0.a1cdc4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1415.6320190429688,"y":1584.3412475585938,"z":"75c5f17a.eda5d","wires":[["ae8ad841.b59cb8"]]},{"id":"ae8ad841.b59cb8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1616.3817749023438,"y":1583.7857055664062,"z":"75c5f17a.eda5d","wires":[]},{"id":"202a8d89.1b7fe2","type":"set","name":"set Failed VNFC Count","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />","comments":"","x":963.8819580078125,"y":1104.8689575195312,"z":"75c5f17a.eda5d","wires":[]},{"id":"c060c328.286b4","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=\"`'Restart successfull for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":1766.2151489257812,"y":1422.869140625,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"eaec519f.214dc","type":"record","name":"Log message","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2575.215591430664,"y":1211.869140625,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"d4c030eb.6cec9","type":"record","name":"Log message","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=\"`'Failed to restart all VMs for VNFC : ' + $vnfcName + '. But successfully restarted '+ $RestartSuccessVMCount +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":2563.2149963378906,"y":1434.8690795898438,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"2100653b.73255a","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=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Restart.dg_name + ', module: ' + $Restart.dg_module + ', version: ' + $Restart.dg_version `\"/>\n","comments":"","outputs":1,"x":1844.3265991210938,"y":1056.8691711425781,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"31d62dbc.3761f2","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=\"`$event-message`\"/>","comments":"","outputs":1,"x":3125.1048736572266,"y":1339.758056640625,"z":"75c5f17a.eda5d","wires":[["1dd07e2b.67d132"]]},{"id":"1dd07e2b.67d132","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3345.1048736572266,"y":1322.758056640625,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"89bc175a.1df198","type":"switchNode","name":"switch_vm_restart_success","xml":"<switch test='`$RestartSuccessVMCount >= 1`'>\n","comments":"","outputs":1,"x":2569.881607055664,"y":1144.64697265625,"z":"75c5f17a.eda5d","wires":[["572b73b.db5c88c","14fb62d3.c79b1d"]]},{"id":"572b73b.db5c88c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2801.160171508789,"y":1092.64697265625,"z":"75c5f17a.eda5d","wires":[["7c40c2f3.e0b87c"]]},{"id":"14fb62d3.c79b1d","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2778.6610260009766,"y":1189.6470947265625,"z":"75c5f17a.eda5d","wires":[["f8b19ae6.fe6ca8"]]},{"id":"7c40c2f3.e0b87c","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. '`\" />","comments":"","x":3021.993179321289,"y":1079.6470947265625,"z":"75c5f17a.eda5d","wires":[]},{"id":"f8b19ae6.fe6ca8","type":"set","name":"Set event message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Restarted. Not proceeding to next VNFC'`\" />","comments":"","x":3001.9925689697266,"y":1168.091796875,"z":"75c5f17a.eda5d","wires":[]},{"id":"6568c60d.62fbd8","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":3152.837677001953,"y":427.8690643310547,"z":"75c5f17a.eda5d","wires":[["13d3844f.cd4abc"]]},{"id":"13d3844f.cd4abc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3444.123321533203,"y":445.2976837158203,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"b53931d8.8a057","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=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n","comments":"","outputs":1,"x":1425.9708557128906,"y":544.8690643310547,"z":"75c5f17a.eda5d","wires":[["7f3210ce.eac0e"]]},{"id":"4fb101a5.38c5a","type":"call","name":"call Generic Restart without Model DG","xml":"<call module='APPC' rpc='Generic_Restart' version='2.0.1' mode='sync' >\n","comments":"","outputs":1,"x":1390.4375,"y":958.8690795898438,"z":"75c5f17a.eda5d","wires":[["a0f3b6b2.4c3988","cdb0db18.a743c8","618f6f6e.254cf"]]},{"id":"a0f3b6b2.4c3988","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1657.21533203125,"y":919.980224609375,"z":"75c5f17a.eda5d","wires":[["3a86e05a.69adc"]]},{"id":"cdb0db18.a743c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1660.21533203125,"y":960.980224609375,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"618f6f6e.254cf","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1669.2153778076172,"y":1000.9801940917969,"z":"75c5f17a.eda5d","wires":[["bcfdc7ad.06d448"]]},{"id":"bcfdc7ad.06d448","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1903.21533203125,"y":999.980224609375,"z":"75c5f17a.eda5d","wires":[]},{"id":"3a86e05a.69adc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1848.65966796875,"y":897.980224609375,"z":"75c5f17a.eda5d","wires":[["857666e2.60b258","5400697c.4b3de8"]]},{"id":"5400697c.4b3de8","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=\"Restart DG not found\"/>","comments":"","outputs":1,"x":2055.659912109375,"y":847.980224609375,"z":"75c5f17a.eda5d","wires":[["3e41a3d3.9fb8fc"]]},{"id":"857666e2.60b258","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2020.659912109375,"y":947.9802856445312,"z":"75c5f17a.eda5d","wires":[]},{"id":"3e41a3d3.9fb8fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2330.4375,"y":793.8690795898438,"z":"75c5f17a.eda5d","wires":[["6568c60d.62fbd8"]]},{"id":"8cdac361.a8e5c","type":"switchNode","name":"switch last vnfc","xml":"<switch test='`$secondLastVnfcCounter == $vnfcCounter`'>\n","comments":"","outputs":1,"x":2607.037612915039,"y":1312.074951171875,"z":"75c5f17a.eda5d","wires":[["8f658fcd.5fbcc","7ffa8431.bbdbbc"]]},{"id":"17128b11.be84d5","type":"set","name":"set secondLastVnfcCounter","xml":"<set>\n<parameter name='secondLastVnfcCounter' value='`$vnfcFlowCount - 1`' />\n","comments":"","x":1003.4375,"y":1158.074951171875,"z":"75c5f17a.eda5d","wires":[]},{"id":"8f658fcd.5fbcc","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2772.8373943138176,"y":1258.0749688148517,"z":"75c5f17a.eda5d","wires":[[]]},{"id":"7ffa8431.bbdbbc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2803.8373943138176,"y":1346.0749688148517,"z":"75c5f17a.eda5d","wires":[["31d62dbc.3761f2"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VNFC.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VNFC.json
deleted file mode 100644
index 8637e73..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Restart_VNFC.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"3999b2fb.e7e18e","type":"dgstart","name":"DGSTART","outputs":1,"x":93.80625915527344,"y":73,"z":"4854885a.f23e18","wires":[["b5e49950.85b5a8"]]},{"id":"b5e49950.85b5a8","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":242.80638122558594,"y":71,"z":"4854885a.f23e18","wires":[["bdcf7e7f.4e437"]]},{"id":"bdcf7e7f.4e437","type":"method","name":"Restart_VNFC","xml":"<method rpc='Restart_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":179.8064422607422,"y":195,"z":"4854885a.f23e18","wires":[["a5783312.b327c"]]},{"id":"1bd84ac3.7fcfd5","type":"execute","name":"Resolve_VNFC_Healthcheck_DG","xml":"<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />","comments":"","outputs":1,"x":556.8065338134766,"y":131,"z":"4854885a.f23e18","wires":[["53648e0a.881e6","a7ddd2a4.8b0b1","cbf0e15a.5803f"]]},{"id":"53648e0a.881e6","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":820.8063812255859,"y":73,"z":"4854885a.f23e18","wires":[["725f6041.883d9"]]},{"id":"a7ddd2a4.8b0b1","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":815.8064422607422,"y":153,"z":"4854885a.f23e18","wires":[["97c69f2.728956"]]},{"id":"a5783312.b327c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":317.80638122558594,"y":335,"z":"4854885a.f23e18","wires":[["1bd84ac3.7fcfd5","d71f5937.f14218","936e1ac5.afa968"]]},{"id":"d71f5937.f14218","type":"execute","name":"Update AAI ","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Restarting\" />","comments":"","outputs":1,"x":1197.8065185546875,"y":332.00000762939453,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"936e1ac5.afa968","type":"switchNode","name":"Resilence Type ?","xml":"<switch test='`$resilienceType`'>\n","comments":"","outputs":1,"x":488.80633544921875,"y":589.0002136230469,"z":"4854885a.f23e18","wires":[["c45e35f9.dc3078","f08e1f81.6c0c6","2a0b09fd.8888e6"]]},{"id":"c45e35f9.dc3078","type":"outcome","name":"Active_Active","xml":"<outcome value='Active-Active'>\n","comments":"","outputs":1,"x":685.8064117431641,"y":517.0001220703125,"z":"4854885a.f23e18","wires":[["da64233c.b93ea"]]},{"id":"f08e1f81.6c0c6","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":669.8064727783203,"y":590.0001525878906,"z":"4854885a.f23e18","wires":[["da64233c.b93ea"]]},{"id":"2a0b09fd.8888e6","type":"outcome","name":"Active_Passive","xml":"<outcome value='Active-Passive'>\n","comments":"","outputs":1,"x":699.8064270019531,"y":673.0003356933594,"z":"4854885a.f23e18","wires":[["c062a5d9.ab8188"]]},{"id":"da64233c.b93ea","type":"call","name":"Restart-Active-Active_VNFC","xml":"<call module='APPC' rpc='Restart-Active-Active_VNFC' mode='sync' >\n","comments":"","outputs":1,"x":902.8066558837891,"y":517.0000915527344,"z":"4854885a.f23e18","wires":[["76b0f0de.90c76","31b4e906.be1f16","f041df7c.46d81"]]},{"id":"c062a5d9.ab8188","type":"call","name":"Restart-Active-Passive_VNFC","xml":"<call module='APPC' rpc='Restart-Active-Passive_VNFC' mode='sync' >\n","comments":"","outputs":1,"x":905.8065338134766,"y":673.0001983642578,"z":"4854885a.f23e18","wires":[["76b0f0de.90c76","31b4e906.be1f16","f041df7c.46d81"]]},{"id":"76b0f0de.90c76","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1157.8064880371094,"y":517.0000915527344,"z":"4854885a.f23e18","wires":[["ebbd3602.006ea8"]]},{"id":"31b4e906.be1f16","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1164.8068542480469,"y":592.0001373291016,"z":"4854885a.f23e18","wires":[["b02a2f12.c650d"]]},{"id":"d9102a6.6c83ed8","type":"execute","name":"Update AAI Error","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":1487.8067474365234,"y":424.000244140625,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"5f6c2b04.563a64","type":"execute","name":"Update AAI Success","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":1499.8065032958984,"y":678.0003662109375,"z":"4854885a.f23e18","wires":[["bea680bc.2d4ac","c88e6fc7.c8b1a","b684c3af.4fe9d"]]},{"id":"f2b5d348.d725c","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1480.8064880371094,"y":831.0003814697266,"z":"4854885a.f23e18","wires":[]},{"id":"725f6041.883d9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0286712646484,"y":73.41883087158203,"z":"4854885a.f23e18","wires":[["938f579b.411248","7176b2b1.aefe5c","f1e55ee7.25d16","ecd3f4e6.878f68","92cc8ec.5ca637"]]},{"id":"938f579b.411248","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1214.8065643310547,"y":54,"z":"4854885a.f23e18","wires":[]},{"id":"97c69f2.728956","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0286712646484,"y":132.88888549804688,"z":"4854885a.f23e18","wires":[["ebdfd4f1.4d8308","7176b2b1.aefe5c","f1e55ee7.25d16","ecd3f4e6.878f68","92cc8ec.5ca637"]]},{"id":"ebdfd4f1.4d8308","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1225.0286102294922,"y":95.88888549804688,"z":"4854885a.f23e18","wires":[]},{"id":"7176b2b1.aefe5c","type":"record","name":"Log event","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1206.5973358154297,"y":133.18878173828125,"z":"4854885a.f23e18","wires":[[]]},{"id":"f1e55ee7.25d16","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1247.4647064208984,"y":172.37603759765625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ecd3f4e6.878f68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1216.5843353271484,"y":250.35894775390625,"z":"4854885a.f23e18","wires":[]},{"id":"8c69089c.629f08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":1499.806625366211,"y":633.00048828125,"z":"4854885a.f23e18","wires":[]},{"id":"b02a2f12.c650d","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1311.2509460449219,"y":591.0002593994141,"z":"4854885a.f23e18","wires":[["d9102a6.6c83ed8","8c69089c.629f08","518c8bec.70b344"]]},{"id":"51555c54.d61924","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1294.2510223388672,"y":673.0003356933594,"z":"4854885a.f23e18","wires":[["5f6c2b04.563a64","f2b5d348.d725c","39261310.3b1cac","e457098a.bbf808"]]},{"id":"39261310.3b1cac","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=\"`'VNFC restarted successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":1488.695297241211,"y":782.888916015625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ebbd3602.006ea8","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1288.5841827392578,"y":516.8889465332031,"z":"4854885a.f23e18","wires":[["8c69089c.629f08","c16bef1.90f251","d9102a6.6c83ed8","518c8bec.70b344","ed0a15aa.d0fb28"]]},{"id":"c16bef1.90f251","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=\"`'VNFC Restart DG not found for resilience type : ' + $resilienceType`\" />","comments":"","outputs":1,"x":1530.5840911865234,"y":527.888916015625,"z":"4854885a.f23e18","wires":[[]]},{"id":"bea680bc.2d4ac","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1837.9176025390625,"y":220.11121368408203,"z":"4854885a.f23e18","wires":[["355e292.0ccebd6"]]},{"id":"c88e6fc7.c8b1a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1832.9173583984375,"y":274.11112213134766,"z":"4854885a.f23e18","wires":[["bc52d02f.83b3b"]]},{"id":"b684c3af.4fe9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1792.9172668457031,"y":371.11112213134766,"z":"4854885a.f23e18","wires":[["564492cb.9e00cc"]]},{"id":"564492cb.9e00cc","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1919.0279541015625,"y":371.0000991821289,"z":"4854885a.f23e18","wires":[["8bd18854.c20b98","f0c03ee4.fd60e"]]},{"id":"8bd18854.c20b98","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2081.0286865234375,"y":324.0000991821289,"z":"4854885a.f23e18","wires":[["74288e2b.a3955"]]},{"id":"f0c03ee4.fd60e","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2078.029052734375,"y":403.0000991821289,"z":"4854885a.f23e18","wires":[["7d7bf29.5cc980c"]]},{"id":"74288e2b.a3955","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":2230.028564453125,"y":324.0000991821289,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","e9478caf.5709c","51856197.1ce12"]]},{"id":"7d7bf29.5cc980c","type":"block","name":"block","xml":"<block>","atomic":"true","comments":"","outputs":1,"x":2218.028564453125,"y":370.0000991821289,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","8a498524.f57948","51856197.1ce12"]]},{"id":"3589aab3.2a6646","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2438.0296478271484,"y":538.0001220703125,"z":"4854885a.f23e18","wires":[]},{"id":"f041df7c.46d81","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1155.8069610595703,"y":673.0000915527344,"z":"4854885a.f23e18","wires":[["51555c54.d61924"]]},{"id":"bc52d02f.83b3b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2241.806396484375,"y":272.47013092041016,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","f0d258f1.eac3c8"]]},{"id":"355e292.0ccebd6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2241.806396484375,"y":221.00012969970703,"z":"4854885a.f23e18","wires":[["3589aab3.2a6646","d0f8911a.f3c29","51856197.1ce12"]]},{"id":"d0f8911a.f3c29","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=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>\n\n","comments":"","outputs":1,"x":2491.6238861083984,"y":118.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"f0d258f1.eac3c8","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=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>","comments":"","outputs":1,"x":2476.6241302490234,"y":224.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"e9478caf.5709c","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=\"`'Error occurred while updating VNF details in A&amp;AI for : '+ $vnfcName`\"/>\n\n","comments":"","outputs":1,"x":2453.6240844726562,"y":279.48438262939453,"z":"4854885a.f23e18","wires":[[]]},{"id":"8a498524.f57948","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=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>","comments":"","outputs":1,"x":2453.6241302490234,"y":326.484375,"z":"4854885a.f23e18","wires":[[]]},{"id":"e457098a.bbf808","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1499.8062591552734,"y":725,"z":"4854885a.f23e18","wires":[]},{"id":"518c8bec.70b344","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1516.3062591552734,"y":477,"z":"4854885a.f23e18","wires":[]},{"id":"51856197.1ce12","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":2460.8062591552734,"y":399.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"ed0a15aa.d0fb28","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":1536.3062591552734,"y":582.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"92cc8ec.5ca637","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":1238.3062591552734,"y":210.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"86490b1e.e7c3e8","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=\"`'Hleathchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":910.8062591552734,"y":220.515625,"z":"4854885a.f23e18","wires":[[]]},{"id":"cbf0e15a.5803f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":742.8062591552734,"y":228.51560711860702,"z":"4854885a.f23e18","wires":[["86490b1e.e7c3e8"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json
deleted file mode 100644
index d0bcc7d..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"bab79b58.ed1388","type":"dgstart","name":"DGSTART","outputs":1,"x":108.88888549804688,"y":71.88888549804688,"z":"98dae834.cf1368","wires":[["8e43a11f.9f02f"]]},{"id":"8e43a11f.9f02f","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":301.8889617919922,"y":71.45555877685547,"z":"98dae834.cf1368","wires":[["e154cdd4.86eff"]]},{"id":"e154cdd4.86eff","type":"method","name":"vSCP Start Application","xml":"<method rpc='StartApplication_VM_vSCP' mode='sync'>\n","comments":"","outputs":1,"x":242.63894653320312,"y":183.70553588867188,"z":"98dae834.cf1368","wires":[["d2374304.9bac6"]]},{"id":"5fb00be2.55cd14","type":"execute","name":"Start Application ","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='startNode'>\n<parameter name=\"node-name\" value=\"`$node-name`\" />\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />","comments":"","outputs":1,"x":575.470588684082,"y":548.2461242675781,"z":"98dae834.cf1368","wires":[["ac3d6e4.2692c9","d3d3e78a.0af1a8"]]},{"id":"ac3d6e4.2692c9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":779.089485168457,"y":628.3890686035156,"z":"98dae834.cf1368","wires":[["232b6f89.0c20d"]]},{"id":"d3d3e78a.0af1a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":784.444221496582,"y":455.4604187011719,"z":"98dae834.cf1368","wires":[["ae3b9746.49e278"]]},{"id":"232b6f89.0c20d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":966.873176574707,"y":628.3175354003906,"z":"98dae834.cf1368","wires":[["723d563d.137518","5235d365.f9647c","d4e4f8ab.aa9cb8"]]},{"id":"723d563d.137518","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":1175.8739395141602,"y":630.2221984863281,"z":"98dae834.cf1368","wires":[[]]},{"id":"d2374304.9bac6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":321.4443359375,"y":285.4603271484375,"z":"98dae834.cf1368","wires":[["5fb00be2.55cd14","4151a0ce.20144","6c8ebab7.6be074"]]},{"id":"5235d365.f9647c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1185.8893203735352,"y":676.4602355957031,"z":"98dae834.cf1368","wires":[]},{"id":"d4e4f8ab.aa9cb8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='error-message' value=\"`'Failure while starting the server: ' + $start-vm-url + ' at Application level.'`\"/>\n\n","comments":"","x":1201.6667861938477,"y":581.1110534667969,"z":"98dae834.cf1368","wires":[]},{"id":"ae3b9746.49e278","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":969.111213684082,"y":454.8889465332031,"z":"98dae834.cf1368","wires":[["3461b18d.58599e","da6895a5.557dd8","8734b67.1dc5248"]]},{"id":"3461b18d.58599e","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1191.166145324707,"y":453.9555969238281,"z":"98dae834.cf1368","wires":[[]]},{"id":"da6895a5.557dd8","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $start-vm-url`\"/>\n\n\n","comments":"","x":1208.166145324707,"y":406.9556579589844,"z":"98dae834.cf1368","wires":[]},{"id":"8734b67.1dc5248","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1187.9995193481445,"y":502.888916015625,"z":"98dae834.cf1368","wires":[]},{"id":"67ff62e7.beb08c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":1151.5073318481445,"y":335.5582580566406,"z":"98dae834.cf1368","wires":[]},{"id":"4151a0ce.20144","type":"switchNode","name":"connection-details empty ?","xml":"<switch test='`length($connection-details) == 0`'>\n\n\n","comments":"","outputs":1,"x":622.888916015625,"y":124.20541381835938,"z":"98dae834.cf1368","wires":[["b3b5bdd2.0b38"]]},{"id":"b3b5bdd2.0b38","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":820.888916015625,"y":124.20541381835938,"z":"98dae834.cf1368","wires":[["cc11913a.48f44"]]},{"id":"cc11913a.48f44","type":"execute","name":"Retrieve connection details","xml":"<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n","comments":"","outputs":1,"x":1057.8887939453125,"y":123.45547485351562,"z":"98dae834.cf1368","wires":[["391d6e3c.8a72d2"]]},{"id":"391d6e3c.8a72d2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1289.888916015625,"y":123.45541381835938,"z":"98dae834.cf1368","wires":[["8f9ebcf.1ede04"]]},{"id":"8f9ebcf.1ede04","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1468.1195068359375,"y":123.30166625976562,"z":"98dae834.cf1368","wires":[["1d1d1d57.9e78e3","d0e4817e.f3eeb","23f88ee8.fe2732"]]},{"id":"1d1d1d57.9e78e3","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Failed to retrieve connection details for vnfc : ' + $vnfcType`\"/> ","comments":"","x":1705.8888244628906,"y":62.455535888671875,"z":"98dae834.cf1368","wires":[]},{"id":"d0e4817e.f3eeb","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":1675.888916015625,"y":122.45541381835938,"z":"98dae834.cf1368","wires":[[]]},{"id":"23f88ee8.fe2732","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":1690.7378845214844,"y":181.97103881835938,"z":"98dae834.cf1368","wires":[]},{"id":"6c8ebab7.6be074","type":"execute","name":"Get Node Name","xml":"<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='getNodeName'>\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n","comments":"","outputs":1,"x":595.888916015625,"y":285.45556640625,"z":"98dae834.cf1368","wires":[["1a21ec6a.914c44"]]},{"id":"1a21ec6a.914c44","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":771.888916015625,"y":285.45556640625,"z":"98dae834.cf1368","wires":[["3c007341.3351ec"]]},{"id":"3c007341.3351ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":926.888916015625,"y":284.8888931274414,"z":"98dae834.cf1368","wires":[["e857a16c.03b3b","3b7e8926.862e86","67ff62e7.beb08c"]]},{"id":"e857a16c.03b3b","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"error-message\" value=\"`'Failed to retrieve node name for server : ' + $start-vm-url`\"/> ","comments":"","x":1163.6582336425781,"y":228.04276275634766,"z":"98dae834.cf1368","wires":[]},{"id":"3b7e8926.862e86","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":1134.6583251953125,"y":284.04264068603516,"z":"98dae834.cf1368","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VM.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VM.json
deleted file mode 100644
index 0ddff5b..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VM.json
+++ /dev/null
@@ -1,333 +0,0 @@
-[
-  {
-    "id": "d52f4308.555fb",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 96.99993896484375,
-    "y": 54,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "763cad7e.1450b4"
-      ]
-    ]
-  },
-  {
-    "id": "763cad7e.1450b4",
-    "type": "service-logic",
-    "name": "APPC 2.0.0",
-    "module": "APPC",
-    "version": "2.0.0",
-    "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": 141.99993896484375,
-    "y": 137,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "812b1c37.4885c"
-      ]
-    ]
-  },
-  {
-    "id": "812b1c37.4885c",
-    "type": "method",
-    "name": "Start VM",
-    "xml": "<method rpc='Start_VM' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 301.99993896484375,
-    "y": 137,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "c47aa6c9.8c9378"
-      ]
-    ]
-  },
-  {
-    "id": "280842c.c99e1be",
-    "type": "call",
-    "name": "Start Application ",
-    "xml": "<call module='`$ApplicationStart.dg_module`' rpc='`$ApplicationStart.dg_name`' version='`$ApplicationStart.dg_version`' mode='sync'  >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 766.9999771118164,
-    "y": 336.0000305175781,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "144156f7.572b29",
-        "7eab80e5.2adb3",
-        "70e14c1f.8e34e4"
-      ]
-    ]
-  },
-  {
-    "id": "144156f7.572b29",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 998.9999771118164,
-    "y": 266.9998779296875,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "96fd3f86.877cb"
-      ]
-    ]
-  },
-  {
-    "id": "7eab80e5.2adb3",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 996.9999771118164,
-    "y": 407.9999694824219,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "deb77571.89feb8"
-      ]
-    ]
-  },
-  {
-    "id": "db549b18.455358",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 1378.0005493164062,
-    "y": 262.9998779296875,
-    "z": "1cdd4efa.2a36b1",
-    "wires": []
-  },
-  {
-    "id": "c47aa6c9.8c9378",
-    "type": "execute",
-    "name": "Resolve Application Start DG",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DgResolverPlugin' method='resolveDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"Start_Application\" />\n<parameter name=\"api-ver\" value=\"2.0.0\" />\n<parameter name=\"prefix\" value=\"ApplicationStart\" />\n<parameter name=\"DGResolutionType\" value=\"VNFC\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 349,
-    "y": 238,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "ba0ce95d.a32d48",
-        "cc32ed95.f1246"
-      ]
-    ]
-  },
-  {
-    "id": "ba0ce95d.a32d48",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 604,
-    "y": 143,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "c89af7a5.6217e8"
-      ]
-    ]
-  },
-  {
-    "id": "cc32ed95.f1246",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 598.9999771118164,
-    "y": 336.0000305175781,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "280842c.c99e1be"
-      ]
-    ]
-  },
-  {
-    "id": "c89af7a5.6217e8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 770.0000610351562,
-    "y": 142,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "e4e7b04c.adb7d",
-        "d2671f6c.53d78",
-        "735a4bd9.4bb604"
-      ]
-    ]
-  },
-  {
-    "id": "e4e7b04c.adb7d",
-    "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=\"`$error-message`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 992,
-    "y": 143,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "735a4bd9.4bb604",
-    "type": "set",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value=\"401\"/>\n<parameter name='error-message' value=\"`'Failed to resolve Application start DG for : ' + $vnfcType`\"/>\n",
-    "comments": "",
-    "x": 1037,
-    "y": 98.88888549804688,
-    "z": "1cdd4efa.2a36b1",
-    "wires": []
-  },
-  {
-    "id": "d2671f6c.53d78",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 989.9998779296875,
-    "y": 186.00006103515625,
-    "z": "1cdd4efa.2a36b1",
-    "wires": []
-  },
-  {
-    "id": "70e14c1f.8e34e4",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 996.5555191040039,
-    "y": 335.8888854980469,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "bbaacbc9.6e42a8"
-      ]
-    ]
-  },
-  {
-    "id": "bbaacbc9.6e42a8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1172.222267150879,
-    "y": 336.8888854980469,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "2620f33d.ba7aac",
-        "d98a42e2.78acd",
-        "87259f65.26a31"
-      ]
-    ]
-  },
-  {
-    "id": "2620f33d.ba7aac",
-    "type": "set",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value=\"401\"/>\n<parameter name='error-message' value=\"`'Application Start DG not found for : ' + $vnfcType`\" />\n",
-    "comments": "",
-    "x": 1426.5555419921875,
-    "y": 316.77777099609375,
-    "z": "1cdd4efa.2a36b1",
-    "wires": []
-  },
-  {
-    "id": "d98a42e2.78acd",
-    "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=\"`$error-message`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1381.5554809570312,
-    "y": 362.8888854980469,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "87259f65.26a31",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1379.555519104004,
-    "y": 408.8888854980469,
-    "z": "1cdd4efa.2a36b1",
-    "wires": []
-  },
-  {
-    "id": "deb77571.89feb8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1155.555549621582,
-    "y": 407.8888854980469,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "d98a42e2.78acd",
-        "87259f65.26a31"
-      ]
-    ]
-  },
-  {
-    "id": "96fd3f86.877cb",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1172.9999389648438,
-    "y": 264,
-    "z": "1cdd4efa.2a36b1",
-    "wires": [
-      [
-        "db549b18.455358",
-        "ba9d1c0b.3d282"
-      ]
-    ]
-  },
-  {
-    "id": "ba9d1c0b.3d282",
-    "type": "set",
-    "name": "Set success code and message",
-    "xml": "<set>\n<parameter name='error-code' value=\"400\"/>\n<parameter name='error-message' value=\"Success\" />\n",
-    "comments": "",
-    "x": 1430.9999389648438,
-    "y": 218,
-    "z": "1cdd4efa.2a36b1",
-    "wires": []
-  }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VNF.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VNF.json
deleted file mode 100644
index cb4001c..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VNF.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"299910f3.66048","type":"dgstart","name":"DGSTART","outputs":1,"x":108.88888549804688,"y":43.888885498046875,"z":"5c4aa102.e34ff","wires":[["4c139e83.c4319"]]},{"id":"4c139e83.c4319","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":283.8888854980469,"y":42.888885498046875,"z":"5c4aa102.e34ff","wires":[["bfb729c1.a8e6c8"]]},{"id":"bfb729c1.a8e6c8","type":"method","name":"Start_VNF","xml":"<method rpc='Start_VNF' mode='sync'>\n","comments":"","outputs":1,"x":134.88894653320312,"y":134.88888549804688,"z":"5c4aa102.e34ff","wires":[["6ec09531.21892c"]]},{"id":"3c8b6771.447f48","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":413.88922119140625,"y":160.88888549804688,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"50133d6a.76f334","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":412.88922119140625,"y":110.88888549804688,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"29442299.20a70e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":406.88922119140625,"y":215.88890075683594,"z":"5c4aa102.e34ff","wires":[["c9c46d3e.b8431"]]},{"id":"6ec09531.21892c","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":186.88897705078125,"y":214.888916015625,"z":"5c4aa102.e34ff","wires":[["3c8b6771.447f48","50133d6a.76f334","29442299.20a70e","c1780f4e.03327"]]},{"id":"c1780f4e.03327","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":412.888916015625,"y":278.888916015625,"z":"5c4aa102.e34ff","wires":[["2f541c3b.cee8b4"]]},{"id":"2f541c3b.cee8b4","type":"execute","name":"Get Vnf Hierarchy","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":584.5555725097656,"y":278.888916015625,"z":"5c4aa102.e34ff","wires":[["ef6bc2fa.faa29","9bba9c55.7f49d"]]},{"id":"9bba9c55.7f49d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":772.5556335449219,"y":237.888916015625,"z":"5c4aa102.e34ff","wires":[["2e270a1.07ca7f6"]]},{"id":"ef6bc2fa.faa29","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":760.5555877685547,"y":315.88885498046875,"z":"5c4aa102.e34ff","wires":[["1e6364a8.66f95b"]]},{"id":"1e6364a8.66f95b","type":"switchNode","name":"getVnfHierarchy_result ?","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":921.5555114746094,"y":384,"z":"5c4aa102.e34ff","wires":[["c8100453.9d35b8","99c4ec1e.ee054"]]},{"id":"c8100453.9d35b8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1128.5558471679688,"y":445.0000591278076,"z":"5c4aa102.e34ff","wires":[["3ff31edf.ede1c2"]]},{"id":"99c4ec1e.ee054","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1127.5557556152344,"y":324,"z":"5c4aa102.e34ff","wires":[["2e270a1.07ca7f6"]]},{"id":"3ff31edf.ede1c2","type":"switchNode","name":"VNF_VMCount ?","xml":"<switch test='`$VNF.VMCount`'>","comments":"","outputs":1,"x":1162.5558471679688,"y":513.1109294891357,"z":"5c4aa102.e34ff","wires":[["1416e132.1c0aaf","eb4fad9c.bce16"]]},{"id":"1416e132.1c0aaf","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1348.5554809570312,"y":446.11108207702637,"z":"5c4aa102.e34ff","wires":[["b17b296.f6d01d8"]]},{"id":"eb4fad9c.bce16","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1268.5554809570312,"y":579.1110515594482,"z":"5c4aa102.e34ff","wires":[["11321978.17eea7"]]},{"id":"11321978.17eea7","type":"execute","name":"Get Execution Flow","xml":"<execute plugin='org.onap.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='FORWARD' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n","comments":"","outputs":1,"x":1326.5554809570312,"y":654.2222576141357,"z":"5c4aa102.e34ff","wires":[["c56fb547.a74a68","2e8596f1.80158a"]]},{"id":"c56fb547.a74a68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1518.5552978515625,"y":654.2221069335938,"z":"5c4aa102.e34ff","wires":[["499f0443.9d41ec"]]},{"id":"2e8596f1.80158a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1517.5553588867188,"y":575.2221355438232,"z":"5c4aa102.e34ff","wires":[["f2bd14d8.012ae8"]]},{"id":"c9c46d3e.b8431","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":587.5558776855469,"y":161.88888549804688,"z":"5c4aa102.e34ff","wires":[["9db67ad0.c72e08","8a01f366.7f8b3"]]},{"id":"9db67ad0.c72e08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":784.8888244628906,"y":162.41261291503906,"z":"5c4aa102.e34ff","wires":[]},{"id":"2e270a1.07ca7f6","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1282.3333587646484,"y":240.77780151367188,"z":"5c4aa102.e34ff","wires":[["c7ba02c4.f3caf","62ddf370.b593cc"]]},{"id":"c7ba02c4.f3caf","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1471.3335266113281,"y":301.7778015136719,"z":"5c4aa102.e34ff","wires":[]},{"id":"b17b296.f6d01d8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1478.8889770507812,"y":445.1111431121826,"z":"5c4aa102.e34ff","wires":[["8936d091.5239b","abde09fa.791d28"]]},{"id":"8936d091.5239b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1667.8889770507812,"y":474.11120414733887,"z":"5c4aa102.e34ff","wires":[]},{"id":"f2bd14d8.012ae8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1651.8889770507812,"y":576.3331909179688,"z":"5c4aa102.e34ff","wires":[["c62e4740.de62c8","d289f63d.66e818"]]},{"id":"c62e4740.de62c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1840.8894653320312,"y":611.3333129882812,"z":"5c4aa102.e34ff","wires":[]},{"id":"17cf107e.7f886","type":"for","name":"For each VNFC","xml":"<for index='vnfcIndex' start='0' end='`$vnfcFlowCount`' >\n","comments":"","outputs":1,"x":2216.1107177734375,"y":790.5554504394531,"z":"5c4aa102.e34ff","wires":[["f8177f2d.a6291"]]},{"id":"17f10685.cdf999","type":"call","name":"call VNFC DG","xml":"<call module='`$Start.dg_module`' rpc='`$Start.dg_name`' mode='sync' version='`$Start.dg_version`'>\n","comments":"","outputs":1,"x":2628.110595703125,"y":874.6667175292969,"z":"5c4aa102.e34ff","wires":[["8a3cbe9b.5b621","27952ef7.62ca42","c4f76289.bdede"]]},{"id":"be1f667a.981e38","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2011.111083984375,"y":788.5556945800781,"z":"5c4aa102.e34ff","wires":[["17cf107e.7f886","c5f7ab23.b45e78","81405549.a04ab8"]]},{"id":"212c800c.bdb73","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2864.11083984375,"y":641.5558471679688,"z":"5c4aa102.e34ff","wires":[["2a011c5b.f9d6d4"]]},{"id":"d9418288.26914","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2860.110595703125,"y":723.5558471679688,"z":"5c4aa102.e34ff","wires":[["d652f7c2.e41888"]]},{"id":"d652f7c2.e41888","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3002.1103515625,"y":720.5558776855469,"z":"5c4aa102.e34ff","wires":[["1ebfb7bf.a79bb8","a93d5b4f.a969b8"]]},{"id":"1ebfb7bf.a79bb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3228.1103515625,"y":723.5558471679688,"z":"5c4aa102.e34ff","wires":[]},{"id":"c4f76289.bdede","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2823.88818359375,"y":922.7779235839844,"z":"5c4aa102.e34ff","wires":[["58061af.316bde4"]]},{"id":"27952ef7.62ca42","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2821.888427734375,"y":830.7778930664062,"z":"5c4aa102.e34ff","wires":[["52a01fc.6384ce"]]},{"id":"8a3cbe9b.5b621","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2833.888671875,"y":874.7779235839844,"z":"5c4aa102.e34ff","wires":[["3015773a.9e8ed8"]]},{"id":"f8177f2d.a6291","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2386.7772216796875,"y":789.7779235839844,"z":"5c4aa102.e34ff","wires":[["17f10685.cdf999","49f4569c.8a2998","d0f4b673.bb9bc8","49762763.3da6f8"]]},{"id":"499f0443.9d41ec","type":"switchNode","name":"dependencyModelFound","xml":"<switch test='`$dependencyModelFound`'>\n","comments":"","outputs":1,"x":1664.5554809570312,"y":733.6666851043701,"z":"5c4aa102.e34ff","wires":[["caef42e3.e2cd1","ba818266.2f63b"]]},{"id":"caef42e3.e2cd1","type":"outcome","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1862.222412109375,"y":678.7777709960938,"z":"5c4aa102.e34ff","wires":[["32dbf6d7.c27d6a"]]},{"id":"32dbf6d7.c27d6a","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1987.6671142578125,"y":678.8888549804688,"z":"5c4aa102.e34ff","wires":[["1d118892.752427","6182f37b.1d21cc"]]},{"id":"1d118892.752427","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2167.6668701171875,"y":678.8888549804688,"z":"5c4aa102.e34ff","wires":[]},{"id":"ba818266.2f63b","type":"outcome","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1869.555419921875,"y":788.6669006347656,"z":"5c4aa102.e34ff","wires":[["be1f667a.981e38"]]},{"id":"49f4569c.8a2998","type":"execute","name":"Resolve VNFC DG","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$vnfcIndex].vnfcType`' />\n<parameter name=\"action\" value=\"Start\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"Start\" />\n","comments":"","outputs":1,"x":2620.888427734375,"y":682.6389770507812,"z":"5c4aa102.e34ff","wires":[["212c800c.bdb73","d9418288.26914"]]},{"id":"d0f4b673.bb9bc8","type":"set","name":"set DG Parameters","xml":"<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$vnfcIndex].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$vnfcIndex].vnfcType`' />\n<parameter name='resilienceType' value='`$vnfcFlow[$vnfcIndex].resilienceType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$vnfcIndex].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='StartSuccessVMCount' value='0' />","comments":"","x":2621.9158935546875,"y":733.7223205566406,"z":"5c4aa102.e34ff","wires":[]},{"id":"49762763.3da6f8","type":"for","name":"For Each VM","xml":"<for index='j' start='0' end='`$vnfcFlow[$vnfcIndex].vmCount`' >\n","comments":"","outputs":1,"x":2615.693603515625,"y":788.6942443847656,"z":"5c4aa102.e34ff","wires":[["49159f53.bab48"]]},{"id":"49159f53.bab48","type":"set","name":"Set VM URL","xml":"<set>\n<parameter name=\"$vm[$j].url\" value='`$vnfcFlow[$vnfcIndex].vm[$j].url`' />","comments":"","x":2813.693603515625,"y":782.6942138671875,"z":"5c4aa102.e34ff","wires":[]},{"id":"52a01fc.6384ce","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2984.77734375,"y":829.888916015625,"z":"5c4aa102.e34ff","wires":[["febe94b.f9ea268","f2b1c346.5441c"]]},{"id":"febe94b.f9ea268","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3210.777587890625,"y":827.8889465332031,"z":"5c4aa102.e34ff","wires":[]},{"id":"3015773a.9e8ed8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2999.77734375,"y":875.8889465332031,"z":"5c4aa102.e34ff","wires":[["5e5e2482.c568bc"]]},{"id":"5e5e2482.c568bc","type":"switchNode","name":"switch_vm_start_success","xml":"<switch test='`$StartSuccessVMCount >= 1 and $AAIUpdateSuccessFlag == true`'>\n","comments":"","outputs":1,"x":3186.1103515625,"y":876.0003356933594,"z":"5c4aa102.e34ff","wires":[["a6d2b1f5.d987f","4b8ed0.8acc413"]]},{"id":"4b8ed0.8acc413","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3407.888671875,"y":803.0003967285156,"z":"5c4aa102.e34ff","wires":[["c6426185.7dfe3"]]},{"id":"a6d2b1f5.d987f","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3399.388671875,"y":987.0002746582031,"z":"5c4aa102.e34ff","wires":[["c1a5bebe.ca387"]]},{"id":"5c097e27.bb7de","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3900.888427734375,"y":767.0003967285156,"z":"5c4aa102.e34ff","wires":[["1a3707f5.b0cfd8","aff88561.dea378","185bd07b.b7ca8","a981436.e6979c"]]},{"id":"f9cfce90.be4a4","type":"set","name":"update failed VNFC count","xml":"<set>\n<parameter name=\"FailedVNFCCount\" value=\"`$FailedVNFCCount + 1`\" />\n","comments":"","x":3746.555419921875,"y":1030.0002136230469,"z":"5c4aa102.e34ff","wires":[]},{"id":"1a3707f5.b0cfd8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":4106.44384765625,"y":877.0005187988281,"z":"5c4aa102.e34ff","wires":[]},{"id":"c1a5bebe.ca387","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3521.99951171875,"y":987.1113586425781,"z":"5c4aa102.e34ff","wires":[["f9cfce90.be4a4","c3210bb.7e0d2f8"]]},{"id":"81405549.a04ab8","type":"switchNode","name":"switch_vnfc_start_success","xml":"<switch test='`$FailedVNFCCount == 0`'>\n","comments":"","outputs":1,"x":2263.3330078125,"y":962.8889770507812,"z":"5c4aa102.e34ff","wires":[["1b88a948.830f47","3fa70651.493b2a"]]},{"id":"1b88a948.830f47","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2477.3330078125,"y":924.888916015625,"z":"5c4aa102.e34ff","wires":[["c17e8a64.feee78"]]},{"id":"3fa70651.493b2a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2477.833251953125,"y":1001.8889770507812,"z":"5c4aa102.e34ff","wires":[["d811481f.f55068"]]},{"id":"c17e8a64.feee78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2635.60205078125,"y":924.40576171875,"z":"5c4aa102.e34ff","wires":[]},{"id":"d811481f.f55068","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2638.8330078125,"y":1000.8057861328125,"z":"5c4aa102.e34ff","wires":[]},{"id":"c5f7ab23.b45e78","type":"set","name":"set Counters","xml":"<set>\n<parameter name='FailedVNFCCount' value='0' />\n<parameter name='secondLastVnfcCounter' value=\"`$vnfcFlowCount - 1`\" />","comments":"","x":2233.3330078125,"y":730.8889465332031,"z":"5c4aa102.e34ff","wires":[]},{"id":"58061af.316bde4","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=\"`'Start successfull for VNFC : ' + $vnfcName `\"/>\n","comments":"","outputs":1,"x":3003.666015625,"y":923.8891906738281,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"aff88561.dea378","type":"record","name":"Log message","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":4120.666015625,"y":766.8893737792969,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"c3210bb.7e0d2f8","type":"record","name":"Log message","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=\"`'Failed to Start all VMs for VNFC : ' + $vnfcName + '. But successfully Started '+ $StartSuccessVMCount +' VM/s so continue to next VNFC'`\"/>\n","comments":"","outputs":1,"x":3711.666015625,"y":987.8893737792969,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"2a011c5b.f9d6d4","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=\"`'VNFC DG for ' + $vnfcName + ' resolves to rpc: ' + $Start.dg_name + ', module: ' + $Start.dg_module + ', version: ' + $Start.dg_version `\"/>\n","comments":"","outputs":1,"x":3021.777587890625,"y":641.88916015625,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"81dc48bb.8279b8","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'None of the VMs of VNFC ' + $vnfcName + ' are Started. Not proceeding to the next VNFC.'`\" />","comments":"","x":4511.5546875,"y":756.7783508300781,"z":"5c4aa102.e34ff","wires":[]},{"id":"185bd07b.b7ca8","type":"switchNode","name":"switch_vm_start_success","xml":"<switch test='`$StartSuccessVMCount >= 1`'>\n","comments":"","outputs":1,"x":4133.444580078125,"y":714.3335266113281,"z":"5c4aa102.e34ff","wires":[["31b691a6.d4b12e","192eb901.761be7"]]},{"id":"192eb901.761be7","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":4348.22265625,"y":757.3336486816406,"z":"5c4aa102.e34ff","wires":[["81dc48bb.8279b8"]]},{"id":"31b691a6.d4b12e","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4345.72265625,"y":715.3335266113281,"z":"5c4aa102.e34ff","wires":[["a35ba1c.042ef6"]]},{"id":"a35ba1c.042ef6","type":"set","name":"Set error message","xml":"<set>\n<parameter name=\"event-message\" value=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />","comments":"","x":4508.555419921875,"y":715.3336486816406,"z":"5c4aa102.e34ff","wires":[]},{"id":"8a01f366.7f8b3","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":817.8889465332031,"y":113.77777099609375,"z":"5c4aa102.e34ff","wires":[["fc577427.eef7c8"]]},{"id":"3b70b982.0b63e6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1665.888916015625,"y":192.77777099609375,"z":"5c4aa102.e34ff","wires":[["e8b9ba94.acda98"]]},{"id":"e8b9ba94.acda98","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":1844.46044921875,"y":192.49203491210938,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"62ddf370.b593cc","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=\"Failed to retrieve VNF details from A&amp;AI\" />","comments":"","outputs":1,"x":1486.8889465332031,"y":191.77777099609375,"z":"5c4aa102.e34ff","wires":[["3b70b982.0b63e6"]]},{"id":"4d23f1d5.255c2","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":1227.5555114746094,"y":112.77777099609375,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"fc577427.eef7c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1025.9839782714844,"y":113.06350708007812,"z":"5c4aa102.e34ff","wires":[["4d23f1d5.255c2"]]},{"id":"abde09fa.791d28","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=\"Server/VNFC does not exists in A&amp;AI for the VNF\" />","comments":"","outputs":1,"x":1677.5558471679688,"y":412.88888359069824,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"bc782016.90984","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2222.5557861328125,"y":410.8888854980469,"z":"5c4aa102.e34ff","wires":[["b07f6dbb.8bd43"]]},{"id":"b07f6dbb.8bd43","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":2396.1273193359375,"y":410.6031494140625,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"d289f63d.66e818","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":1868.5557250976562,"y":535.9999389648438,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"6182f37b.1d21cc","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":2155.2218017578125,"y":589.9999389648438,"z":"5c4aa102.e34ff","wires":[["bc782016.90984"]]},{"id":"a93d5b4f.a969b8","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=\"`'Failed to retrieve VNFC DG for : ' + $vnfcFlow[$vnfcIndex].vnfcType`\"/>","comments":"","outputs":1,"x":3255.33349609375,"y":677.1111145019531,"z":"5c4aa102.e34ff","wires":[["27acd7c9.c9d3f8"]]},{"id":"27acd7c9.c9d3f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3470.66748046875,"y":682.0000915527344,"z":"5c4aa102.e34ff","wires":[["bb169884.8524d8"]]},{"id":"bb169884.8524d8","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":3662.239013671875,"y":682.7143249511719,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"f2b1c346.5441c","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=\"`'VNFC DG not found for : ' + $vnfcName`\"/>","comments":"","outputs":1,"x":3220.444580078125,"y":783.1111145019531,"z":"5c4aa102.e34ff","wires":[["27acd7c9.c9d3f8"]]},{"id":"a981436.e6979c","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=\"`$event-message`\"/>","comments":"","outputs":1,"x":4130.666748046875,"y":810.1112365722656,"z":"5c4aa102.e34ff","wires":[["2ccc3a15.045cd6"]]},{"id":"2ccc3a15.045cd6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":4345.8896484375,"y":811.0002136230469,"z":"5c4aa102.e34ff","wires":[["d620e55c.b5a9c8"]]},{"id":"d620e55c.b5a9c8","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":4542.462158203125,"y":810.7144470214844,"z":"5c4aa102.e34ff","wires":[[]]},{"id":"c6426185.7dfe3","type":"switchNode","name":"switch last vnfc","xml":"<switch test='`$secondLastVnfcCounter == $vnfcIndex`'>\n","comments":"","outputs":1,"x":3556.5556640625,"y":801.3334045410156,"z":"5c4aa102.e34ff","wires":[["c418f351.9d5a9","d075b39f.c65b1"]]},{"id":"c418f351.9d5a9","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3760.77783203125,"y":875.3334045410156,"z":"5c4aa102.e34ff","wires":[["1a3707f5.b0cfd8"]]},{"id":"d075b39f.c65b1","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":3756.278076171875,"y":768.3335266113281,"z":"5c4aa102.e34ff","wires":[["5c097e27.bb7de"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VNFC.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VNFC.json
deleted file mode 100644
index 82f5e5c..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Start_VNFC.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"1a470291.a963fd","type":"dgstart","name":"DGSTART","outputs":1,"x":85.80625915527344,"y":73,"z":"2fe30bf3.5a02e4","wires":[["368abe9d.90c702"]]},{"id":"368abe9d.90c702","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":119.80638122558594,"y":141,"z":"2fe30bf3.5a02e4","wires":[["9f74d2fb.bc71e"]]},{"id":"9f74d2fb.bc71e","type":"method","name":"Start_VNFC","xml":"<method rpc='Start_VNFC' mode='sync'>\n","comments":"","outputs":1,"x":152.80641174316406,"y":213,"z":"2fe30bf3.5a02e4","wires":[["bdba45dd.15e5c8"]]},{"id":"497933c8.b206ec","type":"execute","name":"Resolve Healthcheck DG","xml":"<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcType`' />\n<parameter name=\"action\" value=\"HealthCheck\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value=\"HealthCheckDG\" />\n","comments":"","outputs":1,"x":613.8064422607422,"y":143,"z":"2fe30bf3.5a02e4","wires":[["d7ce9461.e88a68","62ec37a8.172928","75dad6ba.48a458"]]},{"id":"d7ce9461.e88a68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":836.8064422607422,"y":92,"z":"2fe30bf3.5a02e4","wires":[["37af42.94d100be"]]},{"id":"62ec37a8.172928","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":837.8065643310547,"y":143,"z":"2fe30bf3.5a02e4","wires":[["83580dcd.5f36f"]]},{"id":"bdba45dd.15e5c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"false","comments":"","outputs":1,"x":132.8063507080078,"y":310,"z":"2fe30bf3.5a02e4","wires":[["497933c8.b206ec","7f5f1cb7.8aca24","f1ed0579.63f1b8","16e2a975.926777","eb4bfac1.da01f8"]]},{"id":"7f5f1cb7.8aca24","type":"execute","name":"Update_AAI_Status","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Starting\" />","comments":"","outputs":1,"x":1134.8065643310547,"y":302,"z":"2fe30bf3.5a02e4","wires":[["36bd1de8.b0c632","4cc486e0.d290d8","91b35c7b.49f2c"]]},{"id":"4cc486e0.d290d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1443.8068389892578,"y":284,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"91b35c7b.49f2c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1453.8063507080078,"y":326,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"36bd1de8.b0c632","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1408.8061065673828,"y":244,"z":"2fe30bf3.5a02e4","wires":[["5f8bf1c.c8cef1"]]},{"id":"37af42.94d100be","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":971.0287322998047,"y":91.41883087158203,"z":"2fe30bf3.5a02e4","wires":[["950b3e69.00d3b","5c7ad2d.1115a2c","89c755e0.cb6588","a5078ee3.ebb7f"]]},{"id":"950b3e69.00d3b","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Healthcheck DG resolution plugin not found for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1198.8064727783203,"y":75,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"83580dcd.5f36f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.0287322998047,"y":142.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["f4335fed.0da16","5c7ad2d.1115a2c","89c755e0.cb6588","a5078ee3.ebb7f"]]},{"id":"f4335fed.0da16","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'Error while resolving Healthcheck DG for VNFC : ' + $vnfcName`\"/>\n","comments":"","x":1204.0285186767578,"y":122.88888549804688,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"8e557a40.222a38","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1854.6954498291016,"y":285.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["4cfe160d.5a95e8","69cc0201.551e3c"]]},{"id":"5c7ad2d.1115a2c","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1188.5973510742188,"y":169.18878173828125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"89c755e0.cb6588","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value=\"`$error-message`\"/>","comments":"","x":1210.5842742919922,"y":251.35894775390625,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"5f8bf1c.c8cef1","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1535.9170684814453,"y":243.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["baf70582.73b758","f2273c8a.ea5c4"]]},{"id":"baf70582.73b758","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1696.9175567626953,"y":195.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"f2273c8a.ea5c4","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1681.9176788330078,"y":242.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["8e557a40.222a38"]]},{"id":"4cfe160d.5a95e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2007.0284576416016,"y":344.8888854980469,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"75dad6ba.48a458","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":839.6952514648438,"y":203.88888549804688,"z":"2fe30bf3.5a02e4","wires":[["a8b1a96d.d59ab8"]]},{"id":"a8b1a96d.d59ab8","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=\"`'Hleathchek DG resolved to : ' + $HealthCheckDG.dg_name`\"/>\n","comments":"","outputs":1,"x":988.3619995117188,"y":203.88888549804688,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"3b4f9814.e2ad98","type":"set","name":"init","xml":"<set>\n<parameter name='startFailedCount' value='0' />\n<parameter name='startSuccessCount' value='0' />\n","comments":"","x":514.4516448974609,"y":332.1745910644531,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"9d9e0e20.60bbe","type":"for","name":"for_each_vm","xml":"<for index=\"vmIndex\" start=\"0\" end=\"`$vmCount`\" >","comments":"","outputs":1,"x":532.5944366455078,"y":396.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["cd5abeb4.2254"]]},{"id":"cd5abeb4.2254","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":696.3618621826172,"y":396.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["4f1c6b48.d34304","809e42b.52a73c","6ce36de3.135c74"]]},{"id":"4f1c6b48.d34304","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=\"`'Attempting to start the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":870.7906341552734,"y":345.6031799316406,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"6ce36de3.135c74","type":"set","name":"set start parameters","xml":"<set>\n<parameter name=\"start-vm-url\" value=\"`$vm[$vmIndex].url`\" />\n<parameter name='startRetryCount' value='3'/>\n","comments":"","x":890.4515838623047,"y":398.03179931640625,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"809e42b.52a73c","type":"call","name":"Start","xml":"<call module='APPC' rpc='Start_VM' mode='sync' >\n","comments":"","outputs":1,"x":866.4516448974609,"y":484.03173828125,"z":"2fe30bf3.5a02e4","wires":[["e9e973e5.43003","cf35edf3.ce1f3","286386e1.b6b11a"]]},{"id":"286386e1.b6b11a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1022.7849578857422,"y":438.03173828125,"z":"2fe30bf3.5a02e4","wires":[["f1f6e27e.6487b"]]},{"id":"e9e973e5.43003","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1028.6521453857422,"y":483.9603271484375,"z":"2fe30bf3.5a02e4","wires":[["890ad316.9f99d"]]},{"id":"cf35edf3.ce1f3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1023.0069732666016,"y":566.0317668914795,"z":"2fe30bf3.5a02e4","wires":[["2779a3f.bc4c45c"]]},{"id":"2779a3f.bc4c45c","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1164.1498565673828,"y":565.174711227417,"z":"2fe30bf3.5a02e4","wires":[["24b2e5c0.1a66ea","a27787d1.bd06a8","e53b7469.4e2428"]]},{"id":"f1f6e27e.6487b","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1157.7849578857422,"y":438.03173828125,"z":"2fe30bf3.5a02e4","wires":[["59d92c23.70d234","f0a3b326.8b285","a6dd21c9.3e41c","db25d1d6.9bc34"]]},{"id":"890ad316.9f99d","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1158.4358367919922,"y":483.888916015625,"z":"2fe30bf3.5a02e4","wires":[["f0a3b326.8b285","a6dd21c9.3e41c","db25d1d6.9bc34","8bd43260.5eb42"]]},{"id":"a27787d1.bd06a8","type":"set","name":"Mark vm Started","xml":"<set>\n<parameter name=\"startedServerList[$startSuccessCount].url\" value=\"`$vm[$vmIndex].url`\" />\n","comments":"","x":1371.1497344970703,"y":566.1747722625732,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"e53b7469.4e2428","type":"set","name":"Increment Started vm count","xml":"<set>\n<parameter name='startSuccessCount' value='`$startSuccessCount+1`' />\n","comments":"","x":1404.8959503173828,"y":605.809476852417,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"24b2e5c0.1a66ea","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=\"`'Start succeeded for the server : ' + $vm[$vmIndex].url`\"/>\n","comments":"","outputs":1,"x":1356.1498565673828,"y":646.1746826171875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"a6dd21c9.3e41c","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1376.4366912841797,"y":480.7936382293701,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"f0a3b326.8b285","type":"set","name":"set_mark_vm_failed","xml":"<set>\n<parameter name=\"startFailedCount\" value=\"`$startFailedCount + 1`\" />\n","comments":"","x":1389.4364471435547,"y":442.79357719421387,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"59d92c23.70d234","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`'DG to execute Start action not found for VM: ' + $vm[$vmIndex].url`\"/>\n","comments":"","x":1388.3563690185547,"y":368.74596977233887,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"1fc9009e.86fd2f","type":"comment","name":"Health check started servers","info":"","comments":"","x":385.4182586669922,"y":571.1834697723389,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"7fcf9784.ff3178","type":"set","name":"init","xml":"<set>\n<parameter name='healthCheckFailedCount' value='0' />\n","comments":"","x":507.63025283813477,"y":609.1834106445312,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"ff0c18c8.f1cb88","type":"switchNode","name":"started server > 0","xml":"<switch test='`$startSuccessCount > 0`'>\n","comments":"","outputs":1,"x":515.4183807373047,"y":665.1834697723389,"z":"2fe30bf3.5a02e4","wires":[["b26968f.6e75098","b15f37a3.f2acf8"]]},{"id":"b15f37a3.f2acf8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":688.1683807373047,"y":729.9335918426514,"z":"2fe30bf3.5a02e4","wires":[["a78e254c.02c078"]]},{"id":"b26968f.6e75098","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":696.6683692932129,"y":621.9334716796875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"a78e254c.02c078","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":812.6302833557129,"y":730.1834106445312,"z":"2fe30bf3.5a02e4","wires":[["2b9f0ce9.6571f4","c5b2f2ce.cc748","b6eeb883.4737a8","38df2d3a.1c6b72"]]},{"id":"38df2d3a.1c6b72","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=\"Attempting to health check the started servers of the VNFC\"/>\n","comments":"","outputs":1,"x":989.5399627685547,"y":668.564453125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"2b9f0ce9.6571f4","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$startSuccessCount`\" >","comments":"","outputs":1,"x":993.6304168701172,"y":713.1834716796875,"z":"2fe30bf3.5a02e4","wires":[["d65d79a1.52d338"]]},{"id":"b6eeb883.4737a8","type":"set","name":"set","xml":"<set>\n<parameter name=\"healthcheck.vmCount\" value=\"`$startSuccessCount`\" />\n<parameter name=\"retry-healthcheck\" value=\"true\"/>\n","comments":"","x":979.6301727294922,"y":756.1834716796875,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"d65d79a1.52d338","type":"set","name":"set : health check input list","xml":"<set>\n<parameter name=\"healthcheck.vm[$i].url\" value=\"`$startedServerList[$i].url`\" />\n","comments":"","x":1204.0746765136719,"y":712.29443359375,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"c5b2f2ce.cc748","type":"call","name":"call_vnfc_healthcheck_dg","xml":"<call rpc='`$HealthCheckDG.dg_name`' version='`$HealthCheckDG.dg_version`' module='`$HealthCheckDG.dg_module`' mode='sync' >\n","comments":"","outputs":1,"x":1033.9349822998047,"y":801.416748046875,"z":"2fe30bf3.5a02e4","wires":[["d1531542.c646f8","b755495d.033df8","aa99d38e.616c1"]]},{"id":"d1531542.c646f8","type":"outcome","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1273.6300811767578,"y":805.1837158203125,"z":"2fe30bf3.5a02e4","wires":[["999c3522.a16f48"]]},{"id":"b755495d.033df8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1279.1468353271484,"y":758.5216369628906,"z":"2fe30bf3.5a02e4","wires":[["aa248ff6.575f3"]]},{"id":"aa99d38e.616c1","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1271.8803253173828,"y":851.68359375,"z":"2fe30bf3.5a02e4","wires":[["dfeacdef.57da3"]]},{"id":"dfeacdef.57da3","type":"for","name":"for_each_vm","xml":"<for index=\"i\" start=\"0\" end=\"`$startSuccessCount`\" >","comments":"","outputs":1,"x":1419.6302642822266,"y":851.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["325c7a00.1c3df6"]]},{"id":"325c7a00.1c3df6","type":"switchNode","name":"switch : healthcheck status","xml":"<switch test=\"`$healthcheck.vm[$i].status`\">\n","comments":"","outputs":1,"x":1632.6300201416016,"y":851.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["a0cc95d1.d14208","f9a1c849.631ee8","815cbe58.50221"]]},{"id":"815cbe58.50221","type":"other","name":"DOWN","xml":"<outcome value='DOWN'>\n","comments":"","outputs":1,"x":1901.6302032470703,"y":810.1835021972656,"z":"2fe30bf3.5a02e4","wires":[["79d320a7.79de4"]]},{"id":"f9a1c849.631ee8","type":"other","name":"UNKNOWN","xml":"<outcome value='UNKNOWN'>\n","comments":"","outputs":1,"x":1871.4139556884766,"y":850.3263549804688,"z":"2fe30bf3.5a02e4","wires":[["79d320a7.79de4"]]},{"id":"a0cc95d1.d14208","type":"other","name":"UP","xml":"<outcome value='UP'>\n","comments":"","outputs":1,"x":1882.6307525634766,"y":906.1837158203125,"z":"2fe30bf3.5a02e4","wires":[["3c905744.ff9818"]]},{"id":"aa248ff6.575f3","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1408.6300811767578,"y":757.1835327148438,"z":"2fe30bf3.5a02e4","wires":[["f684de68.9d9c2","1774dfbf.897b2","ede6e99a.c88818","f4fcd65c.1b68d8"]]},{"id":"999c3522.a16f48","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1412.6300811767578,"y":804.1835327148438,"z":"2fe30bf3.5a02e4","wires":[["d3a9eab2.9f7a78","f684de68.9d9c2","ede6e99a.c88818","f4fcd65c.1b68d8"]]},{"id":"d3a9eab2.9f7a78","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"Error occurred during health check of the started servers\"/>","comments":"","x":1645.6302337646484,"y":627.1835021972656,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"1774dfbf.897b2","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"VNFC Health check DG not found\"/>","comments":"","x":1658.2970733642578,"y":672.1834106445312,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"f684de68.9d9c2","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":1635.7633819580078,"y":714.9960327148438,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"79d320a7.79de4","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2049.344497680664,"y":826.4690551757812,"z":"2fe30bf3.5a02e4","wires":[["d8a6df2a.7dd4","aee7be5b.f82c8","937cf884.7f6f78","bc4bcf48.26b37"]]},{"id":"d8a6df2a.7dd4","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Health check failed for the started server : ' + $startedServerList[$i].url`\"/>\n","comments":"","x":2289.345474243164,"y":724.4691772460938,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"aee7be5b.f82c8","type":"set","name":"increment healthCheck failed VM count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$healthCheckFailedCount + 1`\" />\n","comments":"","x":2348.345474243164,"y":770.4691772460938,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"937cf884.7f6f78","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2276.291275024414,"y":810.0693359375,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"3c905744.ff9818","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2039.630630493164,"y":905.1836547851562,"z":"2fe30bf3.5a02e4","wires":[["e1da7adf.b45238","b4fa63d.6dabba","9fefa332.fd358"]]},{"id":"9fefa332.fd358","type":"set","name":"Set success message","xml":"<set>\n<parameter name='success-message' value=\"`'Start succeeded for the server : ' + $startedServerList[$i].url`\"/>\n<parameter name=\"StartSuccessVMCount\" value=\"`$StartSuccessVMCount + 1`\" />\n\n","comments":"","x":2289.684829711914,"y":903.2501831054688,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"b4fa63d.6dabba","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":2300.685317993164,"y":942.2501831054688,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"e1da7adf.b45238","type":"execute","name":"Report_Success","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />\n\n","comments":"","outputs":1,"x":2295.630630493164,"y":981.7549438476562,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"16e2a975.926777","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":341.4182586669922,"y":663.1834697723389,"z":"2fe30bf3.5a02e4","wires":[["ff0c18c8.f1cb88","7fcf9784.ff3178"]]},{"id":"f1ed0579.63f1b8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":351.47291564941406,"y":359.8888854980469,"z":"2fe30bf3.5a02e4","wires":[["3b4f9814.e2ad98","9d9e0e20.60bbe"]]},{"id":"60427904.cffb48","type":"execute","name":"Update_AAI_Status_Success","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Running\" />\n","comments":"","outputs":1,"x":913.1391448974609,"y":1090.888916015625,"z":"2fe30bf3.5a02e4","wires":[["d229c29c.1c5a5","32097ba7.a930c4","fb49cf8a.60582"]]},{"id":"25e341a2.474c9e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":888.1392669677734,"y":1192.8892211914062,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"a570b6c0.693758","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":693.5836639404297,"y":1090.8890380859375,"z":"2fe30bf3.5a02e4","wires":[["60427904.cffb48","25e341a2.474c9e","1f885944.deb907"]]},{"id":"1f885944.deb907","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=\"`'VNFC Started successfully : ' + $vnfcName`\"/>\n","comments":"","outputs":1,"x":898.0281219482422,"y":1139.77783203125,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"15725357.0eb17d","type":"execute","name":"Update_AAI_Status_Failure","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />","comments":"","outputs":1,"x":903.1393280029297,"y":947.8890380859375,"z":"2fe30bf3.5a02e4","wires":[["d229c29c.1c5a5","32097ba7.a930c4","fb49cf8a.60582"]]},{"id":"eac568e8.d84638","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":875.1393890380859,"y":1024.8896789550781,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"c95cab6.08b0358","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":686.9169769287109,"y":948.7779541015625,"z":"2fe30bf3.5a02e4","wires":[["eac568e8.d84638","15725357.0eb17d"]]},{"id":"d229c29c.1c5a5","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1185.1392974853516,"y":947.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"32097ba7.a930c4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1184.1390533447266,"y":1003.888916015625,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"fb49cf8a.60582","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1159.1389923095703,"y":1089.8889465332031,"z":"2fe30bf3.5a02e4","wires":[["1f4262ac.f8c95d"]]},{"id":"68c72cc4.2a6b44","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1660.0282745361328,"y":1013.7778015136719,"z":"2fe30bf3.5a02e4","wires":[["7cacd3c8.cb4e7c","63bf861a.2d76a8"]]},{"id":"1f4262ac.f8c95d","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1286.2497100830078,"y":1089.7778625488281,"z":"2fe30bf3.5a02e4","wires":[["4d740d53.13d1b4","2af9f7fe.d47ef8","9445997.2e24868"]]},{"id":"4d740d53.13d1b4","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1461.2508087158203,"y":1041.7778625488281,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"2af9f7fe.d47ef8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1479.2506866455078,"y":1090.7779235839844,"z":"2fe30bf3.5a02e4","wires":[["68c72cc4.2a6b44"]]},{"id":"7cacd3c8.cb4e7c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1815.3616485595703,"y":1056.7778015136719,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"eb4bfac1.da01f8","type":"switchNode","name":"switch_server_start_success","xml":"<switch test='`$startFailedCount == 0 and $healthCheckFailedCount == 0`'>\n","comments":"","outputs":1,"x":322.91737365722656,"y":975.7532958984375,"z":"2fe30bf3.5a02e4","wires":[["953185e1.700a28","72decc28.91a144"]]},{"id":"72decc28.91a144","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":544.6674652099609,"y":1091.50341796875,"z":"2fe30bf3.5a02e4","wires":[["a570b6c0.693758"]]},{"id":"953185e1.700a28","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":550.1674652099609,"y":948.5034790039062,"z":"2fe30bf3.5a02e4","wires":[["c95cab6.08b0358"]]},{"id":"9445997.2e24868","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1463.9175567626953,"y":1137.6668395996094,"z":"2fe30bf3.5a02e4","wires":[["1ee65462.74023c"]]},{"id":"1ee65462.74023c","type":"set","name":"Set AAI update Flag","xml":"<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n","comments":"","x":1655.0285186767578,"y":1137.6668395996094,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"a5078ee3.ebb7f","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1238.4729614257812,"y":210,"z":"2fe30bf3.5a02e4","wires":[["ac68f81b.5c48e8"]]},{"id":"ac68f81b.5c48e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1758.4725494384766,"y":111,"z":"2fe30bf3.5a02e4","wires":[["5b461a8f.62eed4"]]},{"id":"5b461a8f.62eed4","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":2429.0443267822266,"y":118.71426391601562,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"69cc0201.551e3c","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=\"Error occurred while updating VNFC details in A&amp;AI\" />","comments":"","outputs":1,"x":2028.0282135009766,"y":210,"z":"2fe30bf3.5a02e4","wires":[["51c3354e.2fa70c"]]},{"id":"51c3354e.2fa70c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2233.028091430664,"y":170,"z":"2fe30bf3.5a02e4","wires":[["5b461a8f.62eed4"]]},{"id":"db25d1d6.9bc34","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1392.0284881591797,"y":522.9999980926514,"z":"2fe30bf3.5a02e4","wires":[["74d607b1.bd0498"]]},{"id":"74d607b1.bd0498","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1906.028091430664,"y":614.9999084472656,"z":"2fe30bf3.5a02e4","wires":[["94e7dbf9.b04ce8"]]},{"id":"94e7dbf9.b04ce8","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":2089.0445098876953,"y":614.71435546875,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"ede6e99a.c88818","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=\"`$event-message`\" />","comments":"","outputs":1,"x":1691.9176788330078,"y":804.2222290039062,"z":"2fe30bf3.5a02e4","wires":[["74d607b1.bd0498"]]},{"id":"bc4bcf48.26b37","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=\"`$event-message`\" />","comments":"","outputs":1,"x":2281.028823852539,"y":862.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["80fab7b3.2f0e48"]]},{"id":"80fab7b3.2f0e48","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2505.139419555664,"y":862.3332824707031,"z":"2fe30bf3.5a02e4","wires":[["d15983e5.4706b"]]},{"id":"d15983e5.4706b","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":2698.156021118164,"y":863.0476379394531,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"63bf861a.2d76a8","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=\"Error occurred while updating VNFC details in A&amp;AI\" />","comments":"","outputs":1,"x":1849.584243774414,"y":974.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["479e4d8c.1ac324"]]},{"id":"479e4d8c.1ac324","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2031.5841217041016,"y":1005.5555725097656,"z":"2fe30bf3.5a02e4","wires":[["151b06a1.86efe9"]]},{"id":"151b06a1.86efe9","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":2216.8062896728516,"y":1042.6667785644531,"z":"2fe30bf3.5a02e4","wires":[[]]},{"id":"f4fcd65c.1b68d8","type":"set","name":"update healthCheck failed count","xml":"<set>\n<parameter name=\"healthCheckFailedCount\" value=\"`$startSuccessCount`\" />\n","comments":"","x":1681.1396026611328,"y":756.5556030273438,"z":"2fe30bf3.5a02e4","wires":[]},{"id":"8bd43260.5eb42","type":"set","name":"Set event message","xml":"<set>\n<parameter name='event-message' value=\"`$error-message`\"/>\n","comments":"","x":1388.8065643310547,"y":404.99999809265137,"z":"2fe30bf3.5a02e4","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json
deleted file mode 100644
index e9a04a3..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json
+++ /dev/null
@@ -1,581 +0,0 @@
-[
-  {
-    "id": "45094e01.04b5",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 118,
-    "y": 60,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "2edc368c.b0f64a"
-      ]
-    ]
-  },
-  {
-    "id": "2edc368c.b0f64a",
-    "type": "service-logic",
-    "name": "APPC 2.0.0",
-    "module": "APPC",
-    "version": "2.0.0",
-    "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": 271.0000762939453,
-    "y": 59.566673278808594,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "65d6d2.3359293"
-      ]
-    ]
-  },
-  {
-    "id": "65d6d2.3359293",
-    "type": "method",
-    "name": "StopApplication_VM_VSCP",
-    "xml": "<method rpc='StopApplication_VM_vSCP' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 483.5000915527344,
-    "y": 59.56667232513428,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "a649fe4e.d578c"
-      ]
-    ]
-  },
-  {
-    "id": "a649fe4e.d578c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 172,
-    "y": 140,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "3befe32a.cda1ac",
-        "38e0f472.ba404c",
-        "bb87dbed.34a348",
-        "593a11f2.81bf1",
-        "d6d1b7f.22dce48"
-      ]
-    ]
-  },
-  {
-    "id": "3befe32a.cda1ac",
-    "type": "switchNode",
-    "name": "Connection details already exist ?",
-    "xml": "<switch test='`length($connection-details) == 0`'>\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 455,
-    "y": 200,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "4e1f878a.293dd8"
-      ]
-    ]
-  },
-  {
-    "id": "4e1f878a.293dd8",
-    "type": "outcomeTrue",
-    "name": "none found",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 704.5,
-    "y": 200,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "c48be551.f0b508"
-      ]
-    ]
-  },
-  {
-    "id": "631a6eca.08715",
-    "type": "outcome",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 690,
-    "y": 380,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "ba6732ad.5b2b7"
-      ]
-    ]
-  },
-  {
-    "id": "90519af5.3cf8f8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 699,
-    "y": 320,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "7bf6eaa2.0c00b4"
-      ]
-    ]
-  },
-  {
-    "id": "c48be551.f0b508",
-    "type": "execute",
-    "name": "Execute retrieve connection",
-    "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$vnf.type`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 936.5,
-    "y": 200,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "c24e43e3.47358"
-      ]
-    ]
-  },
-  {
-    "id": "c24e43e3.47358",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1130,
-    "y": 200,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "7000ea12.cc2c54"
-      ]
-    ]
-  },
-  {
-    "id": "cba91b7e.1a9828",
-    "type": "execute",
-    "name": "Execute stop node",
-    "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='stopNode'>\n<parameter name=\"node-name\" value=\"`$healthcheck.vm[0].nodeName`\" />\n<parameter name=\"node-status\" value=\"`$healthcheck.vm[0].status`\" />\n<parameter name=\"vm-url\" value=\"`$stop-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 907.5,
-    "y": 440,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "3e771072.dff42",
-        "4c818d83.efdfa4"
-      ]
-    ]
-  },
-  {
-    "id": "7000ea12.cc2c54",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1270,
-    "y": 200,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "9ed7e5c6.794218",
-        "625a967b.641258"
-      ]
-    ]
-  },
-  {
-    "id": "9ed7e5c6.794218",
-    "type": "set",
-    "name": "Set event message",
-    "xml": "<set>\n<parameter name=\"event-message\" value=\"`'Failed to retrieve connection details for vnfc : ' + $vnfcType`\"/> ",
-    "comments": "",
-    "x": 1609.5,
-    "y": 200,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "2e18822.6fd057e",
-    "type": "set",
-    "name": "Set event message",
-    "xml": "<set>\n<parameter name='event-message' value=\"`'Stop failed for the node : ' + $healthcheck.vm[0].nodeName`\"/>",
-    "comments": "",
-    "x": 1609.5,
-    "y": 440,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "3e771072.dff42",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1130,
-    "y": 440,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "87e9f084.dc614"
-      ]
-    ]
-  },
-  {
-    "id": "38e0f472.ba404c",
-    "type": "set",
-    "name": "init",
-    "xml": "<set>\n<parameter name='current-dg-name' value=\"StopApplication_VM_vSCP\"/>\n<parameter name=\"healthcheck.vmCount\" value=\"1\" />\n<parameter name=\"retry-healthcheck\" value=\"false\"/>\n<parameter name=\"exitLoop\" value=\"false\"/>\n<parameter name=\"stopSucceeded\" value=\"false\"/>\n<parameter name=\"healthcheck.vm[0].url\" value=\"`$stop-vm-url`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 370,
-    "y": 140,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "bb87dbed.34a348",
-    "type": "execute",
-    "name": "Healthcheck to get Node Name",
-    "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 447.5,
-    "y": 320,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "90519af5.3cf8f8",
-        "631a6eca.08715"
-      ]
-    ]
-  },
-  {
-    "id": "593a11f2.81bf1",
-    "type": "switchNode",
-    "name": "Healthcheck status ?",
-    "xml": "<switch test=\"`$healthcheck.vm[0].status`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 414.5,
-    "y": 440,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "4c418f9c.9c0fb",
-        "13d3d83.6ec2928",
-        "1d8db4ea.ee850b"
-      ]
-    ]
-  },
-  {
-    "id": "4c418f9c.9c0fb",
-    "type": "other",
-    "name": "DOWN",
-    "xml": "<outcome value='DOWN'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 690.5,
-    "y": 560,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "a188ecb2.2c019"
-      ]
-    ]
-  },
-  {
-    "id": "87e9f084.dc614",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1272,
-    "y": 440,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "2e18822.6fd057e",
-        "625a967b.641258"
-      ]
-    ]
-  },
-  {
-    "id": "2572bd6f.e17262",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 1295,
-    "y": 500,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "13d3d83.6ec2928",
-    "type": "other",
-    "name": "UP",
-    "xml": "<outcome value='UP'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 690,
-    "y": 440,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "cba91b7e.1a9828"
-      ]
-    ]
-  },
-  {
-    "id": "4c818d83.efdfa4",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1134,
-    "y": 500,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "2572bd6f.e17262"
-      ]
-    ]
-  },
-  {
-    "id": "d6d1b7f.22dce48",
-    "type": "execute",
-    "name": "Select vnf-host-ip via connection test",
-    "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='selectActiveConnectionDetails'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"vnf-host-ip2-address\" value=\"`$vnf-host-ip2-address`\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 464.5,
-    "y": 260,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "d9e8802e.e0979"
-      ]
-    ]
-  },
-  {
-    "id": "d9e8802e.e0979",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 690,
-    "y": 260,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "960cbdd2.f45fa"
-      ]
-    ]
-  },
-  {
-    "id": "960cbdd2.f45fa",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1270,
-    "y": 260,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "93f6e97f.86f498",
-        "625a967b.641258"
-      ]
-    ]
-  },
-  {
-    "id": "93f6e97f.86f498",
-    "type": "set",
-    "name": "Set event message",
-    "xml": "<set>\n<parameter name=\"event-message\" value=\"`'Failed to ssh to vnfc : ' + $vnfcType`\"/> ",
-    "comments": "",
-    "x": 1609.5,
-    "y": 260,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "7bf6eaa2.0c00b4",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1270,
-    "y": 320,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "fbbe6078.75537",
-        "625a967b.641258"
-      ]
-    ]
-  },
-  {
-    "id": "fbbe6078.75537",
-    "type": "set",
-    "name": "Set event message",
-    "xml": "<set>\n<parameter name=\"event-message\" value=\"Health Check not found\"/> ",
-    "comments": "",
-    "x": 1609.5,
-    "y": 320,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "ba6732ad.5b2b7",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1270,
-    "y": 380,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "5d6a8bd9.c4f1a4",
-        "625a967b.641258"
-      ]
-    ]
-  },
-  {
-    "id": "5d6a8bd9.c4f1a4",
-    "type": "set",
-    "name": "Set event message",
-    "xml": "<set>\n<parameter name=\"event-message\" value=\"Health Check failed\"/> ",
-    "comments": "",
-    "x": 1609.5,
-    "y": 380,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "625a967b.641258",
-    "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",
-    "comments": "",
-    "x": 1589,
-    "y": 500,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "a188ecb2.2c019",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 870,
-    "y": 560,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "623a9eea.473fc",
-        "6b885833.1ca728"
-      ]
-    ]
-  },
-  {
-    "id": "623a9eea.473fc",
-    "type": "set",
-    "name": "Set success message",
-    "xml": "<set>\n<parameter name='success-message' value=\"`'Node already down: ' + $healthcheck.vm[0].nodeName`\"/>",
-    "comments": "",
-    "x": 1177.5,
-    "y": 560,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "1d8db4ea.ee850b",
-    "type": "other",
-    "name": "UNKNOWN",
-    "xml": "<outcome value='UNKNOWN'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 705,
-    "y": 620,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "5945a3dd.87e51c"
-      ]
-    ]
-  },
-  {
-    "id": "5945a3dd.87e51c",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 870,
-    "y": 620,
-    "z": "4469619c.5c5ce",
-    "wires": [
-      [
-        "4a02e5a3.cf7dcc",
-        "6b885833.1ca728"
-      ]
-    ]
-  },
-  {
-    "id": "4a02e5a3.cf7dcc",
-    "type": "set",
-    "name": "Set success message",
-    "xml": "<set>\n<parameter name='success-message' value=\"Application Shutdown unnessecary for node in state UNKNOWN.\"/>",
-    "comments": "",
-    "x": 1177.5,
-    "y": 620,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  },
-  {
-    "id": "6b885833.1ca728",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 1157,
-    "y": 680,
-    "z": "4469619c.5c5ce",
-    "wires": []
-  }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StopVM_VM_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StopVM_VM_2.0.0.json
deleted file mode 100644
index b47c06d..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_StopVM_VM_2.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"1cef050a.1dfbcb","type":"dgstart","name":"DGSTART","outputs":1,"x":141.515625,"y":164.4333267211914,"z":"a6b16db5.af508","wires":[["a9d8f072.10cbd"]]},{"id":"a9d8f072.10cbd","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":318.5157165527344,"y":164,"z":"a6b16db5.af508","wires":[["46c68f6c.01837"]]},{"id":"46c68f6c.01837","type":"method","name":"StopVM_VM","xml":"<method rpc='StopVM_VM' mode='sync'>\n","comments":"","outputs":1,"x":260.97997665405273,"y":255.8214054107666,"z":"a6b16db5.af508","wires":[["fd5f6afc.5b61a8"]]},{"id":"ed427ea8.f19f5","type":"execute","name":"Stop","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$stop-vm-url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1105.3989791870117,"y":605.2190837860107,"z":"a6b16db5.af508","wires":[["b5b4b5a6.7469d8","d5e5239f.dcc79"]]},{"id":"b5b4b5a6.7469d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1226.303726196289,"y":770.7907104492188,"z":"a6b16db5.af508","wires":[["ed170974.4288c8"]]},{"id":"d5e5239f.dcc79","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1261.5160751342773,"y":572.1476917266846,"z":"a6b16db5.af508","wires":[["249fafc6.75699"]]},{"id":"a3ddab0f.be74c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1904.9443244934082,"y":761.433759689331,"z":"a6b16db5.af508","wires":[["dbdf325c.08025","f2981778.0beac8","e1c0fbcb.5e70d8"]]},{"id":"dbdf325c.08025","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"`'Failure while stopping the server: ' + $stop-vm-url`\"/>\n","comments":"","x":2087.516101837158,"y":722.1479930877686,"z":"a6b16db5.af508","wires":[]},{"id":"f2981778.0beac8","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":2079.945056915283,"y":762.3383617401123,"z":"a6b16db5.af508","wires":[[]]},{"id":"44750395.80221c","type":"set","name":"Set Success Message","xml":"<set>\n<parameter name='success-message' value=\"`'Stop succeeded for the server : ' + $stop-vm-url`\"/>\n\n\n","comments":"","x":1916.2298202514648,"y":403.2907085418701,"z":"a6b16db5.af508","wires":[]},{"id":"5c22eb96.f3da94","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=\"`$success-message`\"/>\n","comments":"","outputs":1,"x":1906.0870056152344,"y":454.86212062835693,"z":"a6b16db5.af508","wires":[[]]},{"id":"64459e63.09ed5","type":"switchNode","name":"switch:Last Attempt","xml":"<switch test='`$stopRetryCount == $retryIndex`'>\n","comments":"","outputs":1,"x":1554.9280242919922,"y":767.0052223205566,"z":"a6b16db5.af508","wires":[["76293fdb.a702e","c9e6ef87.507db"]]},{"id":"c9e6ef87.507db","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1763.8207893371582,"y":759.3266429901123,"z":"a6b16db5.af508","wires":[["a3ddab0f.be74c8"]]},{"id":"76293fdb.a702e","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1749.1777744293213,"y":872.0405941009521,"z":"a6b16db5.af508","wires":[["ebef8c77.3f0be"]]},{"id":"2b09b8ff.3e3148","type":"for","name":"Loop","xml":"<for index=\"retryIndex\" start=\"1\" end=\"`$stopRetryCount + 1`\" >","comments":"","outputs":1,"x":614.6270370483398,"y":610.1476726531982,"z":"a6b16db5.af508","wires":[["9f75fd7d.6a168"]]},{"id":"ebef8c77.3f0be","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=\"`'Stop attempt ' + $retryIndex + ' of ' + $stopRetryCount + ' failed for server : ' + $stop-vm-url + '. Retrying.'`\"/>\n","comments":"","outputs":1,"x":1992.2613925933838,"y":870.2905941009521,"z":"a6b16db5.af508","wires":[[]]},{"id":"e1c0fbcb.5e70d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2095.960437774658,"y":811.5766429901123,"z":"a6b16db5.af508","wires":[]},{"id":"ab4f157e.b95da8","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":1914.3252487182617,"y":579.4334754943848,"z":"a6b16db5.af508","wires":[]},{"id":"249fafc6.75699","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":1422.3092880249023,"y":573.7031383514404,"z":"a6b16db5.af508","wires":[["bfaa23ff.9722f","6d690331.49ee2c","335e834f.a28b2c"]]},{"id":"bfaa23ff.9722f","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1503.8330841064453,"y":659.6078596115112,"z":"a6b16db5.af508","wires":[["ed170974.4288c8"]]},{"id":"6d690331.49ee2c","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1669.2617568969727,"y":542.6078939437866,"z":"a6b16db5.af508","wires":[["85005452.136278"]]},{"id":"ed170974.4288c8","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1387.2457962036133,"y":767.8937721252441,"z":"a6b16db5.af508","wires":[["64459e63.09ed5"]]},{"id":"fd5f6afc.5b61a8","type":"switchNode","name":"switch STATUS","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":238.10294723510742,"y":523.8015937805176,"z":"a6b16db5.af508","wires":[["517f7561.af124c","15485fed.56523","ddbde736.0b20d8","4810dc09.1ec194"]]},{"id":"15485fed.56523","type":"other","name":"ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":412.3886528015137,"y":588.087329864502,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"517f7561.af124c","type":"success","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":407.8174858093262,"y":461.08732986450195,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"ddbde736.0b20d8","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":419.53152084350586,"y":676.6587200164795,"z":"a6b16db5.af508","wires":[["b496c2e5.7e0b7"]]},{"id":"335e834f.a28b2c","type":"other","name":"CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":1725.245979309082,"y":622.3729629516602,"z":"a6b16db5.af508","wires":[["a3ddab0f.be74c8"]]},{"id":"784c3e4a.5134e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":499.5314750671387,"y":878.0872135162354,"z":"a6b16db5.af508","wires":[]},{"id":"b496c2e5.7e0b7","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":275.2457695007324,"y":826.658694267273,"z":"a6b16db5.af508","wires":[["784c3e4a.5134e","34ff62bb.1ea1ce","c3ad6392.97ef"]]},{"id":"4810dc09.1ec194","type":"success","name":"EMPTY","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":408.1029472351074,"y":520.9444465637207,"z":"a6b16db5.af508","wires":[["8f66cbff.7a29e8"]]},{"id":"34ff62bb.1ea1ce","type":"set","name":"Set error message","xml":"<set>\n<parameter name='event-message' value=\"Invalid AICIdentity or tenant or credentials\"/>\n","comments":"","x":523.8172416687012,"y":782.3729972839355,"z":"a6b16db5.af508","wires":[]},{"id":"c3ad6392.97ef","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=\"`$event-message`\"/>\n","comments":"","outputs":1,"x":506.24620056152344,"y":823.9919185638428,"z":"a6b16db5.af508","wires":[[]]},{"id":"8f66cbff.7a29e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":616.6743812561035,"y":516.6587257385254,"z":"a6b16db5.af508","wires":[["614e98a0.740898","2b09b8ff.3e3148","630a1e7d.61b31"]]},{"id":"614e98a0.740898","type":"switchNode","name":"switch : stopRetryCount >= 0","xml":"<switch test='`$stopRetryCount >= 0`'>\n","comments":"","outputs":1,"x":886.6744194030762,"y":448.08729553222656,"z":"a6b16db5.af508","wires":[["1f5b5e63.c28f42","e7474230.d8845"]]},{"id":"1f5b5e63.c28f42","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1103.817211151123,"y":406.65876388549805,"z":"a6b16db5.af508","wires":[["e793bc34.ec31a"]]},{"id":"e7474230.d8845","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1110.9600982666016,"y":483.80166721343994,"z":"a6b16db5.af508","wires":[["af7b47ca.fc8588"]]},{"id":"af7b47ca.fc8588","type":"set","name":"increment stopRetryCount","xml":"<set>\n<parameter name=\"stopRetryCount\" value=\"`$stopRetryCount + 1`\" />\n","comments":"","x":1293.817195892334,"y":482.37305450439453,"z":"a6b16db5.af508","wires":[]},{"id":"e793bc34.ec31a","type":"set","name":"set stopRetryCount","xml":"<set>\n<parameter name='stopRetryCount' value='1' />\n","comments":"","x":1275.2457847595215,"y":405.2301845550537,"z":"a6b16db5.af508","wires":[]},{"id":"85005452.136278","type":"block","name":"block","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1691.515609741211,"y":450.1476058959961,"z":"a6b16db5.af508","wires":[["44750395.80221c","5c22eb96.f3da94","ab4f157e.b95da8","40c219cc.406928"]]},{"id":"630a1e7d.61b31","type":"set","name":"initialize exitLoop","xml":"<set>\n<parameter name='exitLoop' value='false' />\n","comments":"","x":851.5155944824219,"y":340.14762115478516,"z":"a6b16db5.af508","wires":[]},{"id":"40c219cc.406928","type":"set","name":"set exitLoop","xml":"<set>\n<parameter name='exitLoop' value='true' />\n","comments":"","x":1921.5157165527344,"y":514.4333572387695,"z":"a6b16db5.af508","wires":[]},{"id":"9f75fd7d.6a168","type":"switchNode","name":"switch exitLoop","xml":"<switch test='`$exitLoop`'>\n","comments":"","outputs":1,"x":781.5155944824219,"y":608.7190322875977,"z":"a6b16db5.af508","wires":[["e7b114e6.a3f9c8","91b0004b.02402"]]},{"id":"e7b114e6.a3f9c8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":950.0869522094727,"y":610.1476383209229,"z":"a6b16db5.af508","wires":[["ed427ea8.f19f5"]]},{"id":"91b0004b.02402","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":947.2299499511719,"y":675.861946105957,"z":"a6b16db5.af508","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VM_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VM_2.0.0.json
deleted file mode 100644
index 872ee1b..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VM_2.0.0.json
+++ /dev/null
@@ -1,627 +0,0 @@
-[
-  {
-    "id": "4a37fdf2.6a2504",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 114,
-    "y": 144,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "24ca19d3.fe69f6"
-      ]
-    ]
-  },
-  {
-    "id": "24ca19d3.fe69f6",
-    "type": "service-logic",
-    "name": "APPC 2.0.0",
-    "module": "APPC",
-    "version": "2.0.0",
-    "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": 261,
-    "y": 144,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "68e5e092.be1d4"
-      ]
-    ]
-  },
-  {
-    "id": "68e5e092.be1d4",
-    "type": "method",
-    "name": "Stop_VM",
-    "xml": "<method rpc='Stop_VM' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 413.5,
-    "y": 144,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "79ce376b.14ba38"
-      ]
-    ]
-  },
-  {
-    "id": "546085a8.48136c",
-    "type": "execute",
-    "name": "Resolve Stop Application DG",
-    "xml": "<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' /> \n<parameter name=\"action\" value=\"Stop_Application\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' />\n<parameter name=\"prefix\" value='StopApplication' />",
-    "comments": "",
-    "outputs": 1,
-    "x": 315.5,
-    "y": 364,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "af254db7.09d53",
-        "27344cac.0eda34"
-      ]
-    ]
-  },
-  {
-    "id": "af254db7.09d53",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 546,
-    "y": 444,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "b3421a0a.ab34d8"
-      ]
-    ]
-  },
-  {
-    "id": "4a4711ec.83e88",
-    "type": "call",
-    "name": "Call Stop Application DG",
-    "xml": "<call module='`$StopApplication.dg_module`' rpc='`$StopApplication.dg_name`' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 742,
-    "y": 364,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "5b84fc8a.59ac94",
-        "c108322b.df0e7",
-        "3efda8ab.632bf8"
-      ]
-    ]
-  },
-  {
-    "id": "5b84fc8a.59ac94",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 990,
-    "y": 364,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "3c46d78d.4277c8"
-      ]
-    ]
-  },
-  {
-    "id": "7892211.d99b2e",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1146,
-    "y": 244,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "b3421a0a.ab34d8",
-        "2013c4a3.b2f33c",
-        "f600a7ce.f7f418"
-      ]
-    ]
-  },
-  {
-    "id": "b3421a0a.ab34d8",
-    "type": "call",
-    "name": "Call StopVM_VM",
-    "xml": "<call module='APPC' rpc='StopVM_VM' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1398,
-    "y": 444,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "823575c7.9529b8",
-        "403b9a.8f504468",
-        "ff7db04.0cfe85"
-      ]
-    ]
-  },
-  {
-    "id": "823575c7.9529b8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1646,
-    "y": 304,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "f628fc33.96856"
-      ]
-    ]
-  },
-  {
-    "id": "403b9a.8f504468",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1650,
-    "y": 444,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "ea7f288e.c58648"
-      ]
-    ]
-  },
-  {
-    "id": "27344cac.0eda34",
-    "type": "other",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 546,
-    "y": 364,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "4a4711ec.83e88"
-      ]
-    ]
-  },
-  {
-    "id": "c108322b.df0e7",
-    "type": "other",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 986,
-    "y": 244,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "7892211.d99b2e"
-      ]
-    ]
-  },
-  {
-    "id": "3efda8ab.632bf8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 995,
-    "y": 144,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "191e02b6.f79f4d"
-      ]
-    ]
-  },
-  {
-    "id": "191e02b6.f79f4d",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1806,
-    "y": 144,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "8812042b.ba9358",
-        "f628fc33.96856"
-      ]
-    ]
-  },
-  {
-    "id": "8812042b.ba9358",
-    "type": "set",
-    "name": "Set event message",
-    "xml": "<set>\n<parameter name='event-message' value=\"`'Cannot find DG: ' + $StopApplication.dg_module + ' ' + $StopApplication.dg_name`\"/>\n\n\n",
-    "comments": "",
-    "x": 2085.5,
-    "y": 144,
-    "z": "bff4e0f.991972",
-    "wires": []
-  },
-  {
-    "id": "59b9a03e.8323b",
-    "type": "set",
-    "name": "init",
-    "xml": "<set>\n<parameter name='StopApplicationFailed' value='false' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 246,
-    "y": 244,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "79ce376b.14ba38",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 106,
-    "y": 244,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "59b9a03e.8323b",
-        "546085a8.48136c"
-      ]
-    ]
-  },
-  {
-    "id": "ea7f288e.c58648",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1806,
-    "y": 444,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "d59b6aa1.c91618",
-        "b8335fae.52296"
-      ]
-    ]
-  },
-  {
-    "id": "3c46d78d.4277c8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1146,
-    "y": 364,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "b3421a0a.ab34d8",
-        "b8335fae.52296"
-      ]
-    ]
-  },
-  {
-    "id": "2013c4a3.b2f33c",
-    "type": "set",
-    "name": "Set Stop Application Failed",
-    "xml": "<set>\n<parameter name='StopApplicationFailed' value='true' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1429.5,
-    "y": 204,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d59b6aa1.c91618",
-    "type": "switchNode",
-    "name": "Switch Stop Application Failed",
-    "xml": "<switch test=\"`$StopApplicationFailed`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2035.5,
-    "y": 471,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "b987da03.0dc0f8",
-        "8fa7fbb8.8355c8"
-      ]
-    ]
-  },
-  {
-    "id": "b987da03.0dc0f8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2266,
-    "y": 444,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "98412d6e.2237"
-      ]
-    ]
-  },
-  {
-    "id": "98412d6e.2237",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2465,
-    "y": 444,
-    "z": "bff4e0f.991972",
-    "wires": []
-  },
-  {
-    "id": "fffd4e3c.8b204",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 2471,
-    "y": 504,
-    "z": "bff4e0f.991972",
-    "wires": []
-  },
-  {
-    "id": "8fa7fbb8.8355c8",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2266,
-    "y": 504,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "fffd4e3c.8b204"
-      ]
-    ]
-  },
-  {
-    "id": "ff7db04.0cfe85",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1655,
-    "y": 204,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "c640b015.2be11"
-      ]
-    ]
-  },
-  {
-    "id": "1dffaf3f.e12151",
-    "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=\"`$event-message`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 2509,
-    "y": 122,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f628fc33.96856",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2046,
-    "y": 304,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "f600a7ce.f7f418",
-        "cf5c9d26.942c4"
-      ]
-    ]
-  },
-  {
-    "id": "c41ea253.33c72",
-    "type": "set",
-    "name": "Set event message",
-    "xml": "<set>\n<parameter name='event-message' value=\"Cannot find DG: StopVM_VM\"/>\n\n\n",
-    "comments": "",
-    "x": 2085.5,
-    "y": 204,
-    "z": "bff4e0f.991972",
-    "wires": []
-  },
-  {
-    "id": "2186d059.4b82f",
-    "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=\"`$event-message`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2465,
-    "y": 71,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "cf5c9d26.942c4",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2465,
-    "y": 304,
-    "z": "bff4e0f.991972",
-    "wires": []
-  },
-  {
-    "id": "c640b015.2be11",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1806,
-    "y": 204,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "c41ea253.33c72",
-        "f628fc33.96856"
-      ]
-    ]
-  },
-  {
-    "id": "5fb32110.cadf8",
-    "type": "execute",
-    "name": "Report Error",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"event-message\" value=\"`$event-message`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 2478,
-    "y": 176,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f600a7ce.f7f418",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2266,
-    "y": 244,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "2186d059.4b82f",
-        "1dffaf3f.e12151",
-        "5fb32110.cadf8",
-        "a2ebc53c.230e08"
-      ]
-    ]
-  },
-  {
-    "id": "b8335fae.52296",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2446,
-    "y": 364,
-    "z": "bff4e0f.991972",
-    "wires": [
-      [
-        "72a691f7.431cd",
-        "2b14f2c8.13f01e",
-        "292317f2.1be5c8"
-      ]
-    ]
-  },
-  {
-    "id": "2b14f2c8.13f01e",
-    "type": "execute",
-    "name": "Report Success",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"event-message\" value=\"`$success-message`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 2684.5,
-    "y": 358,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "72a691f7.431cd",
-    "type": "record",
-    "name": "Log success",
-    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2674,
-    "y": 300,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "a2ebc53c.230e08",
-    "type": "set",
-    "name": "Set failure code and message",
-    "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value=\"`$event-message`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2531,
-    "y": 229,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "292317f2.1be5c8",
-    "type": "set",
-    "name": "Set success code and message",
-    "xml": "<set>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value=\"`$success-message`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2737,
-    "y": 412,
-    "z": "bff4e0f.991972",
-    "wires": [
-      []
-    ]
-  }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNFC_2.0.2.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNFC_2.0.2.json
deleted file mode 100644
index 4cb03c8..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNFC_2.0.2.json
+++ /dev/null
@@ -1,850 +0,0 @@
-[
-  {
-    "id": "6bb80f2c.7080b",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 158,
-    "y": 80,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "6b619ec8.d45c4"
-      ]
-    ]
-  },
-  {
-    "id": "6b619ec8.d45c4",
-    "type": "service-logic",
-    "name": "APPC 2.0.2",
-    "module": "APPC",
-    "version": "2.0.2",
-    "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.2'>",
-    "outputs": 1,
-    "x": 326.0001220703125,
-    "y": 81,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "c6bac291.2c2d3"
-      ]
-    ]
-  },
-  {
-    "id": "c6bac291.2c2d3",
-    "type": "method",
-    "name": "Stop_VNFC",
-    "xml": "<method rpc='Stop_VNFC' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 254.00015258789062,
-    "y": 155,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "f6ef3aa.b96dbc8"
-      ]
-    ]
-  },
-  {
-    "id": "f6ef3aa.b96dbc8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 204.0001220703125,
-    "y": 237.99999809265137,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "7faaeb57.5e7824",
-        "fc170e86.4107f",
-        "5ea187ee.d6e158",
-        "41b645cc.41c3fc"
-      ]
-    ]
-  },
-  {
-    "id": "7faaeb57.5e7824",
-    "type": "execute",
-    "name": "Update_AAI_Stopping",
-    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name =  $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopping\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 920.00048828125,
-    "y": 172,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "76cf3ef.ad105c",
-        "3e9e1468.83185c",
-        "3f3edb07.2f9944"
-      ]
-    ]
-  },
-  {
-    "id": "3e9e1468.83185c",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1666.000732421875,
-    "y": 275.99999809265137,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "c1bc1cba.f920b"
-      ]
-    ]
-  },
-  {
-    "id": "3f3edb07.2f9944",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1682,
-    "y": 339.99999809265137,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "f8673aca.705658"
-      ]
-    ]
-  },
-  {
-    "id": "76cf3ef.ad105c",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1663.0000305175781,
-    "y": 409,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "c832b521.3d9768"
-      ]
-    ]
-  },
-  {
-    "id": "c1bc1cba.f920b",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1838.8891906738281,
-    "y": 273.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "8cac271.4e263d8",
-        "d65062b7.3cbfd"
-      ]
-    ]
-  },
-  {
-    "id": "f8673aca.705658",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1914.8892059326172,
-    "y": 338.35894775390625,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "71a4120e.5d054c",
-        "4a1462f9.672d7c"
-      ]
-    ]
-  },
-  {
-    "id": "c832b521.3d9768",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$postResource_result`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1810.1106262207031,
-    "y": 407.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "c52b0e2c.d1338",
-        "e724ae4f.d3c13"
-      ]
-    ]
-  },
-  {
-    "id": "c52b0e2c.d1338",
-    "type": "outcome",
-    "name": "NOT_FOUND",
-    "xml": "<outcome value='NOT_FOUND'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1976.1111145019531,
-    "y": 388.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "c7d68d2.879e37"
-      ]
-    ]
-  },
-  {
-    "id": "e724ae4f.d3c13",
-    "type": "outcome",
-    "name": "FAILURE",
-    "xml": "<outcome value='FAILURE'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1970.1112670898438,
-    "y": 447.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "f34e4663.0043f8"
-      ]
-    ]
-  },
-  {
-    "id": "c7d68d2.879e37",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2158.1114807128906,
-    "y": 386.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "40cd2698.77b968",
-        "fdb3d9d6.7fb368"
-      ]
-    ]
-  },
-  {
-    "id": "f34e4663.0043f8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2152.1114807128906,
-    "y": 448.888916015625,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "88d48d7b.011a9",
-        "b834e7a3.fb5ca8"
-      ]
-    ]
-  },
-  {
-    "id": "b834e7a3.fb5ca8",
-    "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=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 2391.1122131347656,
-    "y": 437.8889465332031,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "b735bff9.feb5e"
-      ]
-    ]
-  },
-  {
-    "id": "88d48d7b.011a9",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2374.1122131347656,
-    "y": 497.888916015625,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "8cac271.4e263d8",
-    "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=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2063.2223358154297,
-    "y": 190.88888549804688,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "d058580f.a167c8"
-      ]
-    ]
-  },
-  {
-    "id": "d65062b7.3cbfd",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2060.2223358154297,
-    "y": 237.88885498046875,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "4a1462f9.672d7c",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2103.2223358154297,
-    "y": 336.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "71a4120e.5d054c",
-    "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=\"`'Error occurred while updating VNF details in A&amp;AI for '+ $vnfcName`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 2112.2223358154297,
-    "y": 289.888916015625,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "b49279c1.cbf648"
-      ]
-    ]
-  },
-  {
-    "id": "fdb3d9d6.7fb368",
-    "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=\"`'Error occurred while updating VNF details in A&amp;AI for : '+ $vnfcName`\"/>\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2391.2220764160156,
-    "y": 339.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "78ec3f34.90138"
-      ]
-    ]
-  },
-  {
-    "id": "40cd2698.77b968",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2373.2220764160156,
-    "y": 385.88885498046875,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "fc170e86.4107f",
-    "type": "for",
-    "name": "for_each_vm",
-    "xml": "<for index=\"i\" start=\"0\" end=\"`$vmCount`\" >",
-    "comments": "",
-    "outputs": 1,
-    "x": 408.00018310546875,
-    "y": 261.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "ad2f571e.472378"
-      ]
-    ]
-  },
-  {
-    "id": "c04c4a2.7a0a3b8",
-    "type": "execute",
-    "name": "Update_AA&I_Error",
-    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1292.0003967285156,
-    "y": 520.5237102508545,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "3e9e1468.83185c",
-        "3f3edb07.2f9944",
-        "76cf3ef.ad105c"
-      ]
-    ]
-  },
-  {
-    "id": "2b6c1bfa.73a104",
-    "type": "execute",
-    "name": "update_AA&I_Stopped",
-    "xml": "<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnfcName' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopped\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1268.4282531738281,
-    "y": 639.9525737762451,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "3e9e1468.83185c",
-        "3f3edb07.2f9944",
-        "76cf3ef.ad105c"
-      ]
-    ]
-  },
-  {
-    "id": "ad2f571e.472378",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>\n",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 454.0000915527344,
-    "y": 331.8888854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "e049cef5.ca3d3",
-        "6103761f.d41698",
-        "f1d156a7.37a158"
-      ]
-    ]
-  },
-  {
-    "id": "630101.74f3df",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 963.7541046142578,
-    "y": 420.9959783554077,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "2057f935.74b346",
-        "523d6a77.8b8ea4",
-        "b06e9efa.c9bbb"
-      ]
-    ]
-  },
-  {
-    "id": "5ea187ee.d6e158",
-    "type": "set",
-    "name": "init_vm_failed_count",
-    "xml": "<set>\n<parameter name='stopFailedVmCount' value='0' />\n",
-    "comments": "",
-    "x": 568.7778625488281,
-    "y": 165.88888549804688,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "41b645cc.41c3fc",
-    "type": "switchNode",
-    "name": "switch VNFC Stop Success",
-    "xml": "<switch test='`$stopFailedVmCount == 0`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 486,
-    "y": 615.8890228271484,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "d6d0256a.e73ea8",
-        "e60e85fa.0569a8"
-      ]
-    ]
-  },
-  {
-    "id": "e60e85fa.0569a8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 756.7500305175781,
-    "y": 655.6389141082764,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "8b02220e.5cbf4"
-      ]
-    ]
-  },
-  {
-    "id": "d6d0256a.e73ea8",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 761.2500610351562,
-    "y": 579.6388854980469,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "ed61f50.6ab0708"
-      ]
-    ]
-  },
-  {
-    "id": "72ebe700.9eb218",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 1259.749755859375,
-    "y": 717.5555400848389,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "370d52b3.3d830e",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1274.5188751220703,
-    "y": 601.1556091308594,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "8b02220e.5cbf4",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1010,
-    "y": 656.1110820770264,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "72ebe700.9eb218",
-        "2b6c1bfa.73a104",
-        "b07b98f7.65d868"
-      ]
-    ]
-  },
-  {
-    "id": "ed61f50.6ab0708",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1042.0000610351562,
-    "y": 579.1110534667969,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "370d52b3.3d830e",
-        "c04c4a2.7a0a3b8",
-        "170bee40.e3fdf2"
-      ]
-    ]
-  },
-  {
-    "id": "2057f935.74b346",
-    "type": "set",
-    "name": "Update Error message and Counts",
-    "xml": "<set>\n<parameter name=\"stopFailedVmCount\" value=\"`$stopFailedVmCount + 1`\" />\n<parameter name=\"event-message\" value=\"`'Error occurred while stopping VM: ' + $vm[$i].url`\" />\n",
-    "comments": "",
-    "x": 1256.0000610351562,
-    "y": 366,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "523d6a77.8b8ea4",
-    "type": "record",
-    "name": "Log event",
-    "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=\"`$event-message`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1207.2222290039062,
-    "y": 413,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b06e9efa.c9bbb",
-    "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=\"`$event-message`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1189.0896606445312,
-    "y": 466.1873149871826,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "3ccb5c62.3b2bb4"
-      ]
-    ]
-  },
-  {
-    "id": "e049cef5.ca3d3",
-    "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=\"`'Attempting to stop the server : ' + $vm[$i].url`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 674.4287185668945,
-    "y": 237.82540893554688,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "6103761f.d41698",
-    "type": "set",
-    "name": "set stop parameters",
-    "xml": "<set>\n<parameter name=\"stop-vm-url\" value=\"`$vm[$i].url`\" />\n<parameter name='stopRetryCount' value='3'/>\n",
-    "comments": "",
-    "x": 692.089729309082,
-    "y": 299.2539978027344,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "f1d156a7.37a158",
-    "type": "call",
-    "name": "Stop_VM",
-    "xml": "<call module='APPC' rpc='Stop_VM' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 639.089729309082,
-    "y": 418.2539978027344,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "e3e85aa1.954ea8",
-        "e5db30a9.cda31"
-      ]
-    ]
-  },
-  {
-    "id": "e3e85aa1.954ea8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 805.0001220703125,
-    "y": 419.1111145019531,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "630101.74f3df"
-      ]
-    ]
-  },
-  {
-    "id": "3ccb5c62.3b2bb4",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1367.0000610351562,
-    "y": 467,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "ecdcb16f.8d932"
-      ]
-    ]
-  },
-  {
-    "id": "d058580f.a167c8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2559.9999237060547,
-    "y": 181.9999542236328,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "ecdcb16f.8d932"
-      ]
-    ]
-  },
-  {
-    "id": "b49279c1.cbf648",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2570.9999237060547,
-    "y": 280.9999542236328,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "ecdcb16f.8d932"
-      ]
-    ]
-  },
-  {
-    "id": "78ec3f34.90138",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2573.0001678466797,
-    "y": 347.99998474121094,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "ecdcb16f.8d932"
-      ]
-    ]
-  },
-  {
-    "id": "b735bff9.feb5e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2576.0001678466797,
-    "y": 434.99998474121094,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "ecdcb16f.8d932"
-      ]
-    ]
-  },
-  {
-    "id": "ecdcb16f.8d932",
-    "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": 2441.666793823242,
-    "y": 916.0000457763672,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "e628d16a.c904d"
-      ]
-    ]
-  },
-  {
-    "id": "e628d16a.c904d",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2512.9525604248047,
-    "y": 987.4286804199219,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "170bee40.e3fdf2",
-    "type": "set",
-    "name": "Set AAI update Flag",
-    "xml": "<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n",
-    "comments": "",
-    "x": 1288.0000305175781,
-    "y": 562,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "b07b98f7.65d868",
-    "type": "set",
-    "name": "Set AAI update Flag",
-    "xml": "<set>\n<parameter name='AAIUpdateSuccessFlag' value='true' />\n",
-    "comments": "",
-    "x": 1265.0000305175781,
-    "y": 678.9999980926514,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "e71ab49c.bd0528",
-    "type": "comment",
-    "name": "Reporting handled in Stop_VM",
-    "info": "",
-    "comments": "",
-    "x": 575.5000152587891,
-    "y": 461.42862701416016,
-    "z": "b84e704e.6dc59",
-    "wires": []
-  },
-  {
-    "id": "e5db30a9.cda31",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 796.5000152587891,
-    "y": 346.75000762939453,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "1826c546.16091b"
-      ]
-    ]
-  },
-  {
-    "id": "1826c546.16091b",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 958.2500152587891,
-    "y": 343.7500047683716,
-    "z": "b84e704e.6dc59",
-    "wires": [
-      [
-        "2057f935.74b346"
-      ]
-    ]
-  }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNF_2.0.1.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNF_2.0.1.json
deleted file mode 100644
index 3768972..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNF_2.0.1.json
+++ /dev/null
@@ -1,1882 +0,0 @@
-[
-  {
-    "id": "2ad2ccc0.ed45b4",
-    "type": "method",
-    "name": "Stop_VNF",
-    "xml": "<method rpc='Stop_VNF' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 151.80625915527344,
-    "y": 143.82501220703125,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "44594fa2.fbe3f"
-      ]
-    ]
-  },
-  {
-    "id": "2bb548d1.038db8",
-    "type": "service-logic",
-    "name": "APPC 2.0.1",
-    "module": "APPC",
-    "version": "2.0.1",
-    "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.1'>",
-    "outputs": 1,
-    "x": 134.80625915527344,
-    "y": 94.82501220703125,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "2ad2ccc0.ed45b4"
-      ]
-    ]
-  },
-  {
-    "id": "4082b484.03120c",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 126.80625915527344,
-    "y": 44.82501220703125,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "2bb548d1.038db8"
-      ]
-    ]
-  },
-  {
-    "id": "83e59925.56b318",
-    "type": "execute",
-    "name": "execute_getVNF_Hierarchy",
-    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 322.80625915527344,
-    "y": 279.82501220703125,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "8ac1338f.645fc",
-        "ff4ad31d.954dd"
-      ]
-    ]
-  },
-  {
-    "id": "8ac1338f.645fc",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 558.0919799804688,
-    "y": 276.6821460723877,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "42e4db07.e3a004"
-      ]
-    ]
-  },
-  {
-    "id": "b224c8e0.aa4aa8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>\n",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1383.6636505126953,
-    "y": 271.39640855789185,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "2e7cae15.9739c2",
-        "5a7bd217.41064c"
-      ]
-    ]
-  },
-  {
-    "id": "2e7cae15.9739c2",
-    "type": "for",
-    "name": "for_each_VNFC",
-    "xml": "<for index=\"i\" start=\"0\" end=\"`$vnf.vnfcCount`\" >",
-    "comments": "",
-    "outputs": 1,
-    "x": 1576.3779830932617,
-    "y": 281.2535433769226,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "66e4ace7.4d9064"
-      ]
-    ]
-  },
-  {
-    "id": "66e4ace7.4d9064",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>\n",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1688.3779602050781,
-    "y": 214.53926372528076,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "a282aae0.bfc518"
-      ]
-    ]
-  },
-  {
-    "id": "a282aae0.bfc518",
-    "type": "execute",
-    "name": "execute_UpdateAA&I",
-    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopping\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1797.0922775268555,
-    "y": 281.2535524368286,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "ec4c8d57.0618d",
-        "7d2185c7.30c2ac"
-      ]
-    ]
-  },
-  {
-    "id": "ec4c8d57.0618d",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2060.234848022461,
-    "y": 282.3964385986328,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "ab283aed.271ac8"
-      ]
-    ]
-  },
-  {
-    "id": "5a7bd217.41064c",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 1570.0922012329102,
-    "y": 338.5391764640808,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "ff4ad31d.954dd",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 567.0919570922852,
-    "y": 55.110724449157715,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "6c94868d.aae958"
-      ]
-    ]
-  },
-  {
-    "id": "6fe91ea6.db8d6",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 924.3776931762695,
-    "y": 103.39643800258636,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "8d10ba17.c1d1d8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3507.806266784668,
-    "y": 393.39647102355957,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "72c01457.77e3ec"
-      ]
-    ]
-  },
-  {
-    "id": "e6d70e75.2a057",
-    "type": "execute",
-    "name": "execute_update_AA&I",
-    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Stopped\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4344.520042419434,
-    "y": 941.9679336547852,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "d0d63af9.b80d38",
-        "d148c424.424878"
-      ]
-    ]
-  },
-  {
-    "id": "d0d63af9.b80d38",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4537.9484786987305,
-    "y": 1047.1108417510986,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "650db065.a724f"
-      ]
-    ]
-  },
-  {
-    "id": "3f25ae8f.106522",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 4884.9484786987305,
-    "y": 1098.1108417510986,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "d148c424.424878",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4537.234298706055,
-    "y": 849.825098991394,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "b4468ce9.c6cf8"
-      ]
-    ]
-  },
-  {
-    "id": "7d2185c7.30c2ac",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1871.806297302246,
-    "y": 574.3964910507202,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "612720cc.fa585"
-      ]
-    ]
-  },
-  {
-    "id": "c38a3fd0.87d55",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2195.3776321411133,
-    "y": 663.253659248352,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "7dd6f598.8b1cec",
-    "type": "execute",
-    "name": "execute_Update_AA&I",
-    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $vnf.vnfc[$i].name' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Error\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4870.092239379883,
-    "y": 556.5393600463867,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "18f700c0.f08b9f",
-        "7857330d.66efac"
-      ]
-    ]
-  },
-  {
-    "id": "18f700c0.f08b9f",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5141.806171417236,
-    "y": 290.8250379562378,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "b12b12c2.9eb7c"
-      ]
-    ]
-  },
-  {
-    "id": "cf5745dd.7215e8",
-    "type": "comment",
-    "name": "update VNFCs to STOPPING",
-    "info": "",
-    "comments": "",
-    "x": 1877.663719177246,
-    "y": 243.53924942016602,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "cf6aac11.4b0c6",
-    "type": "comment",
-    "name": "call south bound to STOP VMs",
-    "info": "",
-    "comments": "",
-    "x": 3334.234130859375,
-    "y": 214.25359535217285,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "11dd9c28.d271f4",
-    "type": "comment",
-    "name": "if failure from south bound then update as Error",
-    "info": "",
-    "comments": "",
-    "x": 4865.3781661987305,
-    "y": 625.9678764343262,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "d80c14d8.bd96b8",
-    "type": "comment",
-    "name": "STOPPED VNFCs in AA&I",
-    "info": "",
-    "comments": "",
-    "x": 4375.377372741699,
-    "y": 979.5393466949463,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "c68baa03.5c9d58",
-    "type": "comment",
-    "name": "Fetch all VMs and VNFCs from AA&I for given VNF_ID",
-    "info": "",
-    "comments": "",
-    "x": 893.5205535888672,
-    "y": 134.68215370178223,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "7857330d.66efac",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5133.664012908936,
-    "y": 383.9679584503174,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "7d9e9e25.52a38"
-      ]
-    ]
-  },
-  {
-    "id": "8c742a38.ba05e8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3472.0920181274414,
-    "y": 64.68217468261719,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "c6bd2fa4.9a21b"
-      ]
-    ]
-  },
-  {
-    "id": "c7dcb85c.c58e98",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$vnf.vnfcCount`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1000.6636810302734,
-    "y": 274.1107292175293,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "2a4b0426.65c6ec",
-        "cb718ed3.e8db4"
-      ]
-    ]
-  },
-  {
-    "id": "2a4b0426.65c6ec",
-    "type": "other",
-    "name": "outcome_0",
-    "xml": "<outcome value='0'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1269.0920867919922,
-    "y": 54.253597259521484,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "96f75c8b.194df"
-      ]
-    ]
-  },
-  {
-    "id": "cb718ed3.e8db4",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1204.9494018554688,
-    "y": 275.96790313720703,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "b224c8e0.aa4aa8"
-      ]
-    ]
-  },
-  {
-    "id": "72c01457.77e3ec",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$STOP_STATUS`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3689.806266784668,
-    "y": 392.39647102355957,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "a2c47fe0.a0ecd",
-        "66f529cc.fe2978",
-        "241500fb.1944f"
-      ]
-    ]
-  },
-  {
-    "id": "241500fb.1944f",
-    "type": "success",
-    "name": "outcome_SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3977.234817504883,
-    "y": 728.8250350952148,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "e2750964.bdc668"
-      ]
-    ]
-  },
-  {
-    "id": "a2c47fe0.a0ecd",
-    "type": "other",
-    "name": "outcome_CONTEXT_NOT_FOUND",
-    "xml": "<outcome value='CONTEXT_NOT_FOUND'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3992.6638946533203,
-    "y": 588.253643989563,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "393b640d.0244bc"
-      ]
-    ]
-  },
-  {
-    "id": "66f529cc.fe2978",
-    "type": "other",
-    "name": "outcome_ERROR",
-    "xml": "<outcome value='ERROR'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3889.806106567383,
-    "y": 345.82506561279297,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "cf85dfe1.af032"
-      ]
-    ]
-  },
-  {
-    "id": "309772d8.4e5b7e",
-    "type": "execute",
-    "name": "execute_STOP",
-    "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vnf.vnfc[$i].vm[$j].url`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3332.092124938965,
-    "y": 281.68220233917236,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "8d10ba17.c1d1d8",
-        "8c742a38.ba05e8"
-      ]
-    ]
-  },
-  {
-    "id": "42e4db07.e3a004",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$getVnfHierarchy_result`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 708.3776931762695,
-    "y": 274.6822204589844,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "72046e0d.bb933",
-        "d518e578.ced098"
-      ]
-    ]
-  },
-  {
-    "id": "d518e578.ced098",
-    "type": "outcome",
-    "name": "FAILURE",
-    "xml": "<outcome value='FAILURE'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 856.5921020507812,
-    "y": 545.3964314460754,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "47090aaf.222fd4"
-      ]
-    ]
-  },
-  {
-    "id": "3ca875a6.91ca8a",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1337.1634483337402,
-    "y": 622.1107501983643,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "72046e0d.bb933",
-    "type": "outcome",
-    "name": "SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 860.8062362670898,
-    "y": 274.9679203033447,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "c7dcb85c.c58e98"
-      ]
-    ]
-  },
-  {
-    "id": "9238af95.d5434",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1623.3780059814453,
-    "y": 108.68211364746094,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "ab283aed.271ac8",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$postResource_result`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2395.2348594665527,
-    "y": 275.25357723236084,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "6d0cbea4.1461b",
-        "1f6eff8a.e5b54",
-        "e636c1f2.8920b"
-      ]
-    ]
-  },
-  {
-    "id": "6d0cbea4.1461b",
-    "type": "outcome",
-    "name": "SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2595.8065185546875,
-    "y": 280.5392837524414,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "a416e90c.481bf8"
-      ]
-    ]
-  },
-  {
-    "id": "1f6eff8a.e5b54",
-    "type": "outcome",
-    "name": "NOT_FOUND",
-    "xml": "<outcome value='NOT_FOUND'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2499.94917678833,
-    "y": 58.253623962402344,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "1205f3e9.5a7d4c"
-      ]
-    ]
-  },
-  {
-    "id": "da046d9.ba2ec9",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2890.9491271972656,
-    "y": 150.25355529785156,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "e636c1f2.8920b",
-    "type": "outcome",
-    "name": "FAILURE",
-    "xml": "<outcome value='FAILURE'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2512.520534515381,
-    "y": 566.6820755004883,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "56576d03.27cba4"
-      ]
-    ]
-  },
-  {
-    "id": "3e14031.4c784fc",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2832.377326965332,
-    "y": 662.1107234954834,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "b4468ce9.c6cf8",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$postResource_result`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4699.948547363281,
-    "y": 850.2536840438843,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "2ee7990e.1c4316",
-        "6f0b83da.d4d43c",
-        "34ee2bdc.3ca1f4"
-      ]
-    ]
-  },
-  {
-    "id": "2ee7990e.1c4316",
-    "type": "outcome",
-    "name": "SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4885.663040161133,
-    "y": 848.9679288864136,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "6f0b83da.d4d43c",
-    "type": "outcome",
-    "name": "NOT_FOUND",
-    "xml": "<outcome value='NOT_FOUND'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4890.663246154785,
-    "y": 781.1107606887817,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "4e125db.cca88a4"
-      ]
-    ]
-  },
-  {
-    "id": "34ee2bdc.3ca1f4",
-    "type": "outcome",
-    "name": "FAILURE",
-    "xml": "<outcome value='FAILURE'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4873.662757873535,
-    "y": 914.9679098129272,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "d85456e7.649b38"
-      ]
-    ]
-  },
-  {
-    "id": "afa1afed.f8c2a",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 5254.0916748046875,
-    "y": 843.6821527481079,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "eba950dc.7fc52",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 5281.520454406738,
-    "y": 965.2535791397095,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "b12b12c2.9eb7c",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$postResource_result`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5268.235366821289,
-    "y": 284.68217372894287,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "d69cd997.2dd228",
-        "423e88af.767668",
-        "fa8644b9.d21d88"
-      ]
-    ]
-  },
-  {
-    "id": "d69cd997.2dd228",
-    "type": "outcome",
-    "name": "SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5515.94909286499,
-    "y": 230.82503509521484,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "e7aae791.295e58"
-      ]
-    ]
-  },
-  {
-    "id": "e7aae791.295e58",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 5767.806583404541,
-    "y": 229.8250331878662,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "423e88af.767668",
-    "type": "outcome",
-    "name": "NOT_FOUND",
-    "xml": "<outcome value='NOT_FOUND'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5517.949306488037,
-    "y": 285.6821765899658,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "de0c10e.19725f"
-      ]
-    ]
-  },
-  {
-    "id": "fa8644b9.d21d88",
-    "type": "outcome",
-    "name": "FAILURE",
-    "xml": "<outcome value='FAILURE'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5510.806308746338,
-    "y": 351.2536106109619,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "1af37740.e90369"
-      ]
-    ]
-  },
-  {
-    "id": "6c94868d.aae958",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 719.0919456481934,
-    "y": 53.8250093460083,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "12e86e5e.c1b0e2",
-        "6fe91ea6.db8d6"
-      ]
-    ]
-  },
-  {
-    "id": "12e86e5e.c1b0e2",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 924.2348518371582,
-    "y": 52.68215370178223,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "71efbd8d.60bce4"
-      ]
-    ]
-  },
-  {
-    "id": "71efbd8d.60bce4",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1070.9491348266602,
-    "y": 48.96786880493164,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "47090aaf.222fd4",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1125.8301696777344,
-    "y": 547.5870265960693,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "3ca875a6.91ca8a",
-        "2d0d48a.2de4bb8"
-      ]
-    ]
-  },
-  {
-    "id": "2d0d48a.2de4bb8",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1318.7348976135254,
-    "y": 546.9679565429688,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "e59dddad.ddd8f"
-      ]
-    ]
-  },
-  {
-    "id": "e59dddad.ddd8f",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1500.0206756591797,
-    "y": 546.3965539932251,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "96f75c8b.194df",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1449.3779220581055,
-    "y": 55.682186126708984,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "9238af95.d5434",
-        "31b238ff.837628"
-      ]
-    ]
-  },
-  {
-    "id": "31b238ff.837628",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1632.8066139221191,
-    "y": 52.68215465545654,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "fabacb3e.76dd88"
-      ]
-    ]
-  },
-  {
-    "id": "fabacb3e.76dd88",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1806.663703918457,
-    "y": 54.39640235900879,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "612720cc.fa585",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2019.3776931762695,
-    "y": 572.9678936004639,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "94ab01a4.1db23",
-        "c38a3fd0.87d55"
-      ]
-    ]
-  },
-  {
-    "id": "94ab01a4.1db23",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2190.8065032958984,
-    "y": 569.8250732421875,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "6475da69.b758f4"
-      ]
-    ]
-  },
-  {
-    "id": "6475da69.b758f4",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2324.0919036865234,
-    "y": 569.6821899414062,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "56576d03.27cba4",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2677.091682434082,
-    "y": 564.1106910705566,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "2a4a5a93.3d21a6",
-        "3e14031.4c784fc"
-      ]
-    ]
-  },
-  {
-    "id": "2a4a5a93.3d21a6",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc ' + $vnf.vnfc[$i].name`\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2834.0919036865234,
-    "y": 564.9678344726562,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "ba47576.cfe3ea8"
-      ]
-    ]
-  },
-  {
-    "id": "ba47576.cfe3ea8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2961.2343254089355,
-    "y": 564.6820840835571,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "1205f3e9.5a7d4c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2688.5206718444824,
-    "y": 54.25362205505371,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "aea4cad3.f582f8",
-        "da046d9.ba2ec9"
-      ]
-    ]
-  },
-  {
-    "id": "aea4cad3.f582f8",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2888.2349891662598,
-    "y": 53.68217754364014,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "28ad3523.91147a"
-      ]
-    ]
-  },
-  {
-    "id": "28ad3523.91147a",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3047.66349029541,
-    "y": 52.82505989074707,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "c6bd2fa4.9a21b",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 4700.663116455078,
-    "y": 66.39645004272461,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "8c1c2d57.93d6f",
-        "7dd6f598.8b1cec"
-      ]
-    ]
-  },
-  {
-    "id": "8c1c2d57.93d6f",
-    "type": "execute",
-    "name": "Report_Failure_in_Stop",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in stop for:' + $vnf.vnfc[$i].vm[$j].url`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 4920.235027313232,
-    "y": 93.11075019836426,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "cf878e2b.d033f"
-      ]
-    ]
-  },
-  {
-    "id": "cf878e2b.d033f",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5104.234672546387,
-    "y": 95.11075592041016,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "393b640d.0244bc",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 4275.23503112793,
-    "y": 582.3964748382568,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "7dd6f598.8b1cec",
-        "322d698f.b46f96"
-      ]
-    ]
-  },
-  {
-    "id": "322d698f.b46f96",
-    "type": "execute",
-    "name": "Report_Context_not_found",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $vnf.vnfc[$i].vm[$j].url`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 4484.377815246582,
-    "y": 327.39648818969727,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "10827cd0.8ad493"
-      ]
-    ]
-  },
-  {
-    "id": "10827cd0.8ad493",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4852.236282348633,
-    "y": 337.96788787841797,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "cf85dfe1.af032",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 4107.235305786133,
-    "y": 321.82503509521484,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "7dd6f598.8b1cec",
-        "6a2b403b.59abf"
-      ]
-    ]
-  },
-  {
-    "id": "6a2b403b.59abf",
-    "type": "execute",
-    "name": "Report_Error_occoured_while_stopping_the_server",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while stopping the server:' + $vnf.vnfc[$i].vm[$j].url`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 4302.663665771484,
-    "y": 182.6821699142456,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "9f3cbb50.15cf18"
-      ]
-    ]
-  },
-  {
-    "id": "9f3cbb50.15cf18",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4645.235305786133,
-    "y": 159.82500457763672,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "4e125db.cca88a4",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 5087.663383483887,
-    "y": 779.5393323898315,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "cbb3c57f.95eb28",
-        "afa1afed.f8c2a"
-      ]
-    ]
-  },
-  {
-    "id": "d85456e7.649b38",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 5084.520175933838,
-    "y": 911.6821422576904,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "7a001de8.702584",
-        "eba950dc.7fc52"
-      ]
-    ]
-  },
-  {
-    "id": "650db065.a724f",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 4674.9484786987305,
-    "y": 1043.1108417510986,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "746b0185.8192d",
-        "3f25ae8f.106522"
-      ]
-    ]
-  },
-  {
-    "id": "cbb3c57f.95eb28",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 5251.949172973633,
-    "y": 778.3964462280273,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "114932c4.f8447d"
-      ]
-    ]
-  },
-  {
-    "id": "7a001de8.702584",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc' + $vnf.vnfc[$i].name`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 5267.8060302734375,
-    "y": 910.396402835846,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "bc6131ba.1ae98"
-      ]
-    ]
-  },
-  {
-    "id": "114932c4.f8447d",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5424.948745727539,
-    "y": 783.1107883453369,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "bc6131ba.1ae98",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5435.09188079834,
-    "y": 908.6821174621582,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "746b0185.8192d",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 4877.234405517578,
-    "y": 1038.967966079712,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "8080799.e130288"
-      ]
-    ]
-  },
-  {
-    "id": "8080799.e130288",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5034.80583190918,
-    "y": 1032.967966079712,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "1cb1e0d0.21321f",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 120.80625915527344,
-    "y": 282.7138977050781,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "83e59925.56b318"
-      ]
-    ]
-  },
-  {
-    "id": "44594fa2.fbe3f",
-    "type": "execute",
-    "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 168.80625915527344,
-    "y": 207.82500457763672,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "1cb1e0d0.21321f",
-        "3fbfed99.b50af2",
-        "3979a683.5741ca"
-      ]
-    ]
-  },
-  {
-    "id": "d81b1f69.55285",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 5429.806198120117,
-    "y": 651.8250112533569,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "7d9e9e25.52a38",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 5253.806259155273,
-    "y": 561.5392456054688,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "ac55cbef.3c59f8",
-        "d81b1f69.55285"
-      ]
-    ]
-  },
-  {
-    "id": "ac55cbef.3c59f8",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for' + $vnf.vnfc[$i].name`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5425.235069274902,
-    "y": 558.3964157104492,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "fb774fb4.e2f59"
-      ]
-    ]
-  },
-  {
-    "id": "fb774fb4.e2f59",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5558.520469665527,
-    "y": 558.2535419464111,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "93300f92.e2643",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 6138.806259155273,
-    "y": 369.82501220703125,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "de0c10e.19725f",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 5931.378036499023,
-    "y": 289.8250732421875,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "d2b1eb53.8867c8",
-        "93300f92.e2643"
-      ]
-    ]
-  },
-  {
-    "id": "d2b1eb53.8867c8",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI : ' + $vnf.vnfc[$i].name`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 6136.092121124268,
-    "y": 273.2536344528198,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "b1ffeaa3.1d0e98"
-      ]
-    ]
-  },
-  {
-    "id": "b1ffeaa3.1d0e98",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 6295.520622253418,
-    "y": 272.39651679992676,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "aca35b5b.13df08",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 5871.806259155273,
-    "y": 543.8250122070312,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "1af37740.e90369",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 5716.520614624023,
-    "y": 445.8249797821045,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "a1f75570.727518",
-        "aca35b5b.13df08"
-      ]
-    ]
-  },
-  {
-    "id": "a1f75570.727518",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value='Exception in AAI Update for vnfc $vnf.vnfc[$i].name' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 5873.520835876465,
-    "y": 446.6821231842041,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "b886c219.8fe3f"
-      ]
-    ]
-  },
-  {
-    "id": "b886c219.8fe3f",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 6000.663257598877,
-    "y": 446.396372795105,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "9bfcb100.bea99",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
-    "comments": "",
-    "x": 490.8062286376953,
-    "y": 486.4917526245117,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "920348a5.6809c8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 277.4729766845703,
-    "y": 440.96797943115234,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "9bfcb100.bea99",
-        "e0347aed.5c5778"
-      ]
-    ]
-  },
-  {
-    "id": "e0347aed.5c5778",
-    "type": "execute",
-    "name": "Report_Error_Flattening_Payload_Json",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 566.3776702880859,
-    "y": 368.3488998413086,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "56f4d06f.7ca03"
-      ]
-    ]
-  },
-  {
-    "id": "56f4d06f.7ca03",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 651.6634826660156,
-    "y": 439.7775068283081,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "3fbfed99.b50af2",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 101.80625915527344,
-    "y": 442.4916763305664,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "920348a5.6809c8"
-      ]
-    ]
-  },
-  {
-    "id": "3711d1.ecfd7e3",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />",
-    "comments": "",
-    "x": 472.80625915527344,
-    "y": 702.4916915893555,
-    "z": "6ca06960.9ba8c8",
-    "wires": []
-  },
-  {
-    "id": "2330453d.90136a",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 284.4729804992676,
-    "y": 663.9679756164551,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "3711d1.ecfd7e3",
-        "ae76c4ea.4835d8"
-      ]
-    ]
-  },
-  {
-    "id": "ae76c4ea.4835d8",
-    "type": "execute",
-    "name": "Report_Error_Loading_Json_Flattening_Plugin",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$input.common-header.api-ver`\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 573.3776741027832,
-    "y": 591.3488960266113,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "280eab37.d94a44"
-      ]
-    ]
-  },
-  {
-    "id": "280eab37.d94a44",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 658.6634864807129,
-    "y": 662.7775030136108,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "3979a683.5741ca",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 108.80625915527344,
-    "y": 662.4916763305664,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "2330453d.90136a"
-      ]
-    ]
-  },
-  {
-    "id": "e2750964.bdc668",
-    "type": "execute",
-    "name": "Report_Success_in_Stop",
-    "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'STOP event executed successfully for ' + $vnf.vnfc[$i].vm[$j].url`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3835.139602661133,
-    "y": 936.4917221069336,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "69e98882.2de298",
-        "cd83fd16.fabdc"
-      ]
-    ]
-  },
-  {
-    "id": "69e98882.2de298",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4061.1395924886074,
-    "y": 978.4916763305664,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "e6d70e75.2a057"
-      ]
-    ]
-  },
-  {
-    "id": "cd83fd16.fabdc",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4095.1395924886074,
-    "y": 870.4916763305664,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "a416e90c.481bf8",
-    "type": "for",
-    "name": "for each vm",
-    "xml": "<for index='j' start='0' end='`$vnf.vnfc[$i].vm_count`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2817.4063720703125,
-    "y": 281.8250198364258,
-    "z": "6ca06960.9ba8c8",
-    "wires": [
-      [
-        "309772d8.4e5b7e"
-      ]
-    ]
-  }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNF_2.0.2.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNF_2.0.2.json
deleted file mode 100644
index 357dcf3..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_Stop_VNF_2.0.2.json
+++ /dev/null
@@ -1,1460 +0,0 @@
-[
-  {
-    "id": "b25ea899.d365d8",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 174.515625,
-    "y": 391.515625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "f1895f0c.4c6ea"
-      ]
-    ]
-  },
-  {
-    "id": "f1895f0c.4c6ea",
-    "type": "service-logic",
-    "name": "APPC 2.0.2",
-    "module": "APPC",
-    "version": "2.0.2",
-    "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.2'>",
-    "outputs": 1,
-    "x": 350.515625,
-    "y": 391.515625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "29d8b20c.bcc73e"
-      ]
-    ]
-  },
-  {
-    "id": "29d8b20c.bcc73e",
-    "type": "method",
-    "name": "Stop_VNF",
-    "xml": "<method rpc='Stop_VNF' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 182.51568603515625,
-    "y": 473.515625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "dd256332.18b52"
-      ]
-    ]
-  },
-  {
-    "id": "3303293f.b715b6",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 734.5159301757812,
-    "y": 415.515625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "1160b666.e3e76a"
-      ]
-    ]
-  },
-  {
-    "id": "de3c0f63.e4197",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 733.515869140625,
-    "y": 363.515625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "1160b666.e3e76a"
-      ]
-    ]
-  },
-  {
-    "id": "2a306103.619fbe",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 729.5159301757812,
-    "y": 455.51563262939453,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "1160b666.e3e76a"
-      ]
-    ]
-  },
-  {
-    "id": "dd256332.18b52",
-    "type": "execute",
-    "name": "flatAndAddToContext",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 422.5157165527344,
-    "y": 472.51564025878906,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "3303293f.b715b6",
-        "de3c0f63.e4197",
-        "2a306103.619fbe",
-        "60deb41e.71e38c"
-      ]
-    ]
-  },
-  {
-    "id": "60deb41e.71e38c",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 252.51565551757812,
-    "y": 580.5156555175781,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "c02b5f84.eb026"
-      ]
-    ]
-  },
-  {
-    "id": "c02b5f84.eb026",
-    "type": "execute",
-    "name": "execute_getVnfHierarchy",
-    "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 434.182373046875,
-    "y": 580.5157165527344,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "f740cf84.95c9",
-        "7eef4ecc.dbdbd"
-      ]
-    ]
-  },
-  {
-    "id": "7eef4ecc.dbdbd",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 679.1823120117188,
-    "y": 531.5156555175781,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "314e24d1.2af52c"
-      ]
-    ]
-  },
-  {
-    "id": "f740cf84.95c9",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 404.1823425292969,
-    "y": 650.5156860351562,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "dcc95947.dc16f8"
-      ]
-    ]
-  },
-  {
-    "id": "dcc95947.dc16f8",
-    "type": "switchNode",
-    "name": "switch_getVnfHierarchy_result",
-    "xml": "<switch test='`$getVnfHierarchy_result`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 492.18231201171875,
-    "y": 713.6268310546875,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "26dec072.fac0a",
-        "c73a3ef3.82e05"
-      ]
-    ]
-  },
-  {
-    "id": "26dec072.fac0a",
-    "type": "outcome",
-    "name": "outcome_SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 495.18231201171875,
-    "y": 787.6268310546875,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "445c9cba.fb5d94"
-      ]
-    ]
-  },
-  {
-    "id": "c73a3ef3.82e05",
-    "type": "outcome",
-    "name": "outcome_FAILURE",
-    "xml": "<outcome value='FAILURE'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 767.182373046875,
-    "y": 639.6268310546875,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "8df5db13.758428"
-      ]
-    ]
-  },
-  {
-    "id": "445c9cba.fb5d94",
-    "type": "switchNode",
-    "name": "switch_VNF_VMCount",
-    "xml": "<switch test='`$VNF.VMCount`'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 610.1823425292969,
-    "y": 853.7379150390625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "43163179.13979",
-        "a3b76bbf.32b818"
-      ]
-    ]
-  },
-  {
-    "id": "43163179.13979",
-    "type": "outcome",
-    "name": "outcome_0",
-    "xml": "<outcome value='0'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 834.1823120117188,
-    "y": 755.73779296875,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "b911488a.955a38"
-      ]
-    ]
-  },
-  {
-    "id": "a3b76bbf.32b818",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 564.1823120117188,
-    "y": 916.7379150390625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "1de7ef77.6f1701"
-      ]
-    ]
-  },
-  {
-    "id": "1de7ef77.6f1701",
-    "type": "execute",
-    "name": "Get VNFC Execution Flow Data",
-    "xml": "<execute plugin='org.onap.appc.dg.common.VnfExecutionFlow' method='getVnfExecutionFlowData' >\n<parameter name=\"DependencyType\" value='RESOURCE' />\n<parameter name=\"FlowStrategy\" value='REVERSE' />\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfVersion\" value='`$vnf.version`' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 596.1823120117188,
-    "y": 969.8489990234375,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "62e8b7ae.830b88",
-        "3ccb7956.965646"
-      ]
-    ]
-  },
-  {
-    "id": "62e8b7ae.830b88",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 846.1823120117188,
-    "y": 905.8489990234375,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "bf9622b3.21e47"
-      ]
-    ]
-  },
-  {
-    "id": "1160b666.e3e76a",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 892.182487487793,
-    "y": 414.515625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6fae0bcd.781004",
-        "915b6526.fc9068"
-      ]
-    ]
-  },
-  {
-    "id": "6a4cb650.71b798",
-    "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": 2930.0870666503906,
-    "y": 979.8965454101562,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "b93bd4c0.a52508"
-      ]
-    ]
-  },
-  {
-    "id": "b93bd4c0.a52508",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3104.3724670410156,
-    "y": 977.3251953125,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "6fae0bcd.781004",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />",
-    "comments": "",
-    "x": 969.5154304504395,
-    "y": 488.0393295288086,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "314e24d1.2af52c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 857.9600219726562,
-    "y": 531.404541015625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "cfef6dc8.945be",
-        "1c582707.184b99"
-      ]
-    ]
-  },
-  {
-    "id": "1c582707.184b99",
-    "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=\"Failed to retrieve VNF details from A&amp;AI\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1281.9598999023438,
-    "y": 537.404541015625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "d5e38f40.40fcd"
-      ]
-    ]
-  },
-  {
-    "id": "cfef6dc8.945be",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1097.9600219726562,
-    "y": 583.404541015625,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "d5e38f40.40fcd",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1496.9600219726562,
-    "y": 474.4045104980469,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "8df5db13.758428",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1010.8490600585938,
-    "y": 640.6268310546875,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "8259cf4e.93836",
-        "58014ac2.8034f4"
-      ]
-    ]
-  },
-  {
-    "id": "58014ac2.8034f4",
-    "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=\"Failed to retrieve VNF details from A&amp;AI\"/>\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1276.8490600585938,
-    "y": 638.6268310546875,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "848f3b70.e46888"
-      ]
-    ]
-  },
-  {
-    "id": "848f3b70.e46888",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1500.8490600585938,
-    "y": 548.6268310546875,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "8259cf4e.93836",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1258.8490600585938,
-    "y": 687.6268310546875,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "b911488a.955a38",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1022.5156860351562,
-    "y": 756.7379455566406,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "10549a32.dff226",
-        "fe639385.f254b"
-      ]
-    ]
-  },
-  {
-    "id": "fe639385.f254b",
-    "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": 1287.5156860351562,
-    "y": 738.7379150390625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "d6ec24dc.40d138"
-      ]
-    ]
-  },
-  {
-    "id": "d6ec24dc.40d138",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1520.5156860351562,
-    "y": 646.7379150390625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "10549a32.dff226",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1252.5156860351562,
-    "y": 806.7379150390625,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "bf9622b3.21e47",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1014.515625,
-    "y": 906.9600830078125,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "b19f523c.7b27f",
-        "ca1fafca.d9e25"
-      ]
-    ]
-  },
-  {
-    "id": "ca1fafca.d9e25",
-    "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": 1293.515625,
-    "y": 872.9600830078125,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "5d09f297.44349c"
-      ]
-    ]
-  },
-  {
-    "id": "5d09f297.44349c",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1522.5156860351562,
-    "y": 733.9601135253906,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "b19f523c.7b27f",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1258.5155639648438,
-    "y": 942.9601440429688,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "741ec63e.47b658",
-    "type": "execute",
-    "name": "Resolve VNFC DG",
-    "xml": "<execute plugin='org.onap.appc.dg.common.VNFCDgResolverPlugin' method='resolveVNFCDg'>\n<parameter name=\"vnfType\" value='`$vnf.type`' />\n<parameter name=\"vnfcType\" value='`$vnfcFlow[$i].vnfcType`' /> \n<parameter name=\"action\" value=\"Stop\" />\n<parameter name=\"api-ver\" value='`$input.common-header.api-ver`' /> \n<parameter name=\"prefix\" value=\"Stop\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1256.7380676269531,
-    "y": 1276.1823425292969,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "ce601d5.d4914e",
-        "ca1cbabc.1584a8"
-      ]
-    ]
-  },
-  {
-    "id": "1d9ddab5.667815",
-    "type": "for",
-    "name": "for_each_vnfcFlow",
-    "xml": "<for index='i' start='0' end='`$vnfcFlowCount`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 850.7379302978516,
-    "y": 1259.1824035644531,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "b0ac43b7.cee43"
-      ]
-    ]
-  },
-  {
-    "id": "504ee939.7682f8",
-    "type": "set",
-    "name": "set vnfc parameters",
-    "xml": "<set>\n<parameter name='vnfcName' value='`$vnfcFlow[$i].vnfcName`' />\n<parameter name='vnfcType' value='`$vnfcFlow[$i].vnfcType`' />\n<parameter name='vmCount' value='`$vnfcFlow[$i].vmCount`' />\n<parameter name='input.action' value='`$input.action`' />\n<parameter name='AAIUpdateSuccessFlag' value='false' />\n\n",
-    "comments": "",
-    "x": 1261.7376708984375,
-    "y": 1091.2935180664062,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "6688cc5b.a481f4",
-    "type": "call",
-    "name": "call VNFC DG",
-    "xml": "<call module='`$Stop.dg_module`' rpc='`$Stop.dg_name`' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1592.7378234863281,
-    "y": 1318.2936096191406,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "d62f7e05.fc757",
-        "867811c.94c21f",
-        "abe16d65.fa0ad"
-      ]
-    ]
-  },
-  {
-    "id": "1ff36a5c.3a1fa6",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 622.7380981445312,
-    "y": 1258.1824645996094,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "1d9ddab5.667815",
-        "cacb482f.c409f8",
-        "442ba77d.874db8"
-      ]
-    ]
-  },
-  {
-    "id": "ce601d5.d4914e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1431.7375793457031,
-    "y": 1318.1824035644531,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6688cc5b.a481f4"
-      ]
-    ]
-  },
-  {
-    "id": "ca1cbabc.1584a8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1443.7377014160156,
-    "y": 1237.1824035644531,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "9a471db7.e302b"
-      ]
-    ]
-  },
-  {
-    "id": "9a471db7.e302b",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1625.7376708984375,
-    "y": 1236.1824035644531,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "2b7c2fc2.fce28",
-        "d1b96ddb.ec598"
-      ]
-    ]
-  },
-  {
-    "id": "2b7c2fc2.fce28",
-    "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=\"`'Failed to retrieve VNFC DG for ' + $vnfcFlow[$i].vnfcType`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1905.7377624511719,
-    "y": 1195.1825256347656,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "7b9666da.06bef8"
-      ]
-    ]
-  },
-  {
-    "id": "867811c.94c21f",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1782.5155944824219,
-    "y": 1278.4046936035156,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "a8bdf6b0.355778"
-      ]
-    ]
-  },
-  {
-    "id": "d62f7e05.fc757",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1771.5156555175781,
-    "y": 1361.4049072265625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "d9f2c28b.c7429"
-      ]
-    ]
-  },
-  {
-    "id": "a8bdf6b0.355778",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1959.9599914550781,
-    "y": 1278.4046936035156,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "44681b66.f4c3a4",
-        "9dc3e92d.6f7f18"
-      ]
-    ]
-  },
-  {
-    "id": "44681b66.f4c3a4",
-    "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=\"`'VNFC DG not found for: ' + $vnfcFlow[$i].vnfcName`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 2185.960723876953,
-    "y": 1279.4048156738281,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "5b4bdcd5.0244f4"
-      ]
-    ]
-  },
-  {
-    "id": "d9f2c28b.c7429",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1920.4045715332031,
-    "y": 1363.40478515625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6d279d37.78ccd4"
-      ]
-    ]
-  },
-  {
-    "id": "b0ac43b7.cee43",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1038.4044647216797,
-    "y": 1177.4045715332031,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "741ec63e.47b658",
-        "504ee939.7682f8",
-        "ba8e7dc8.b3d94"
-      ]
-    ]
-  },
-  {
-    "id": "ba8e7dc8.b3d94",
-    "type": "for",
-    "name": "for_each_vm",
-    "xml": "<for index='j' start='0' end='`$vmCount`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1262.515640258789,
-    "y": 1177.9601135253906,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "73299151.c13e7"
-      ]
-    ]
-  },
-  {
-    "id": "89ef910b.6f179",
-    "type": "set",
-    "name": "set VM url",
-    "xml": "<set>\n<parameter name=\"vm[$j].url\" value='`$vnfcFlow[$i].vm[$j].url`' />\n\n\n\n\n\n",
-    "comments": "",
-    "x": 1681.515640258789,
-    "y": 1174.9601135253906,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "73299151.c13e7",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1497.515640258789,
-    "y": 1175.9601135253906,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "89ef910b.6f179"
-      ]
-    ]
-  },
-  {
-    "id": "3ccb7956.965646",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 842.515625,
-    "y": 962.7378540039062,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "926dd466.d05b38"
-      ]
-    ]
-  },
-  {
-    "id": "926dd466.d05b38",
-    "type": "switchNode",
-    "name": "switch_dependencyModelFound",
-    "xml": "<switch test='`$dependencyModelFound`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 606.5157470703125,
-    "y": 1043.1823120117188,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "bcdaaae8.15d2e8",
-        "a9b756f3.902238"
-      ]
-    ]
-  },
-  {
-    "id": "bcdaaae8.15d2e8",
-    "type": "outcome",
-    "name": "outcome_false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 955.1824340820312,
-    "y": 1014.2933959960938,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "a3432c6e.32994"
-      ]
-    ]
-  },
-  {
-    "id": "a9b756f3.902238",
-    "type": "outcome",
-    "name": "outcome_true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 568.5156860351562,
-    "y": 1148.1822814941406,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "1ff36a5c.3a1fa6"
-      ]
-    ]
-  },
-  {
-    "id": "a3432c6e.32994",
-    "type": "call",
-    "name": "call Stop VNF without Model DG",
-    "xml": "<call module='APPC' rpc='Stop_VNF' version='2.0.1' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1233.5154876708984,
-    "y": 1004.7378845214844,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "28d59860.ed9638",
-        "b6692659.08be28",
-        "85aacc05.3e737"
-      ]
-    ]
-  },
-  {
-    "id": "28d59860.ed9638",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1490.2933197021484,
-    "y": 954.8490295410156,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "ddc29a60.9b4398"
-      ]
-    ]
-  },
-  {
-    "id": "b6692659.08be28",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1493.2933197021484,
-    "y": 995.8490295410156,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "7e1f30ff.7a6f7"
-      ]
-    ]
-  },
-  {
-    "id": "ddc29a60.9b4398",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1677.7377319335938,
-    "y": 943.8490371704102,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "fabbee43.1dc99",
-        "f7377249.220f5"
-      ]
-    ]
-  },
-  {
-    "id": "f7377249.220f5",
-    "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=\"Stop DG not found\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1895.7378845214844,
-    "y": 919.8490371704102,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "9324252c.fadd38"
-      ]
-    ]
-  },
-  {
-    "id": "fabbee43.1dc99",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1905.7378845214844,
-    "y": 974.8490982055664,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "7e1f30ff.7a6f7",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1730.182357788086,
-    "y": 990.8491516113281,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "85aacc05.3e737",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1502.2933654785156,
-    "y": 1035.8489990234375,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "8d846ad5.9a88c8"
-      ]
-    ]
-  },
-  {
-    "id": "8d846ad5.9a88c8",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n\n",
-    "comments": "",
-    "x": 1736.2933197021484,
-    "y": 1034.8490295410156,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "442ba77d.874db8",
-    "type": "set",
-    "name": "init failed VNFC count",
-    "xml": "<set>\n<parameter name='stopFailedVNFCCount' value='0' />\n",
-    "comments": "",
-    "x": 892.6267242431641,
-    "y": 1101.1824035644531,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "cacb482f.c409f8",
-    "type": "switchNode",
-    "name": "switch_server_restart_success",
-    "xml": "<switch test='`$stopFailedVNFCCount == 0`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 895.8489379882812,
-    "y": 1446.1825866699219,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "11544b2a.bebbb5",
-        "9af5b3b0.6ce16"
-      ]
-    ]
-  },
-  {
-    "id": "11544b2a.bebbb5",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1126.0988464355469,
-    "y": 1408.9324645996094,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "7d480213.47e71c"
-      ]
-    ]
-  },
-  {
-    "id": "9af5b3b0.6ce16",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1123.5989379882812,
-    "y": 1467.9324645996094,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "744fa6c6.b167d8"
-      ]
-    ]
-  },
-  {
-    "id": "7d480213.47e71c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1302.8488464355469,
-    "y": 1409.4046325683594,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "9bb8d081.6d716"
-      ]
-    ]
-  },
-  {
-    "id": "9bb8d081.6d716",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1545.367691040039,
-    "y": 1409.4493408203125,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "744fa6c6.b167d8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1303.8489379882812,
-    "y": 1468.4046325683594,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "306bf572.a2195a"
-      ]
-    ]
-  },
-  {
-    "id": "306bf572.a2195a",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 1540.5986938476562,
-    "y": 1468.8492126464844,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "89bf85ab.857028",
-    "type": "set",
-    "name": "update failed VNFC count",
-    "xml": "<set>\n<parameter name=\"stopFailedVNFCCount\" value=\"`$stopFailedVNFCCount + 1`\" />\n",
-    "comments": "",
-    "x": 2546.6261291503906,
-    "y": 1402.0712890625,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "abe16d65.fa0ad",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1785.5156555175781,
-    "y": 1320.4049072265625,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "915b6526.fc9068",
-    "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": 1266.5155639648438,
-    "y": 391.18228912353516,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "88963945.2b6798"
-      ]
-    ]
-  },
-  {
-    "id": "88963945.2b6798",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1476.5155639648438,
-    "y": 387.18228912353516,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "9324252c.fadd38",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2103.515594482422,
-    "y": 923.1822891235352,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "7b9666da.06bef8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2109.1819763183594,
-    "y": 1194.8490295410156,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "5b4bdcd5.0244f4",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2374.1827697753906,
-    "y": 1279.8489990234375,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "d1b96ddb.ec598",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 1875.9600524902344,
-    "y": 1234.8490295410156,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "9dc3e92d.6f7f18",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2160.960479736328,
-    "y": 1318.9600830078125,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "6d279d37.78ccd4",
-    "type": "switchNode",
-    "name": "AAIUpdateSuccessFlag ?",
-    "xml": "<switch test='`$AAIUpdateSuccessFlag == true`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2126.6263732910156,
-    "y": 1363.9600830078125,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "ba58c904.507168",
-        "a925e3d2.fb1ff"
-      ]
-    ]
-  },
-  {
-    "id": "a925e3d2.fb1ff",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2333.4044494628906,
-    "y": 1340.960205078125,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "fda81ffe.7d7c7"
-      ]
-    ]
-  },
-  {
-    "id": "ba58c904.507168",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2332.9044494628906,
-    "y": 1401.960205078125,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "89bf85ab.857028"
-      ]
-    ]
-  },
-  {
-    "id": "ae5453ba.3f87c",
-    "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=\"`'AAI update for VNFC ' + $vnfcName + '  failed. Not proceeding to the next VNFC.'`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2692.6266174316406,
-    "y": 1288.9600830078125,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "c93a0a4b.c48288"
-      ]
-    ]
-  },
-  {
-    "id": "c93a0a4b.c48288",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2723.8487854003906,
-    "y": 1171.404296875,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "6a4cb650.71b798"
-      ]
-    ]
-  },
-  {
-    "id": "c5c2ca6e.d26dc8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n",
-    "comments": "",
-    "x": 2684.6263732910156,
-    "y": 1339.515380859375,
-    "z": "25788422.0cd1fc",
-    "wires": []
-  },
-  {
-    "id": "fda81ffe.7d7c7",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2478.6266174316406,
-    "y": 1339.9600830078125,
-    "z": "25788422.0cd1fc",
-    "wires": [
-      [
-        "ae5453ba.3f87c",
-        "c5c2ca6e.d26dc8"
-      ]
-    ]
-  }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_FIREWALL_Configure_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_FIREWALL_Configure_2.0.0.json
deleted file mode 100644
index ffa01e6..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_FIREWALL_Configure_2.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"e300eb8d.e228b8","type":"dgstart","name":"DGSTART","outputs":1,"x":146,"y":152,"z":"8266ef6c.2a723","wires":[["78eca58a.cc28fc"]]},{"id":"78eca58a.cc28fc","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":150,"y":242,"z":"8266ef6c.2a723","wires":[["89a3ba51.457e08"]]},{"id":"89a3ba51.457e08","type":"method","name":"FIREWALL_Configure","xml":"<method rpc='FIREWALL_Configure' mode='sync'>\n","comments":"","outputs":1,"x":171,"y":328,"z":"8266ef6c.2a723","wires":[["203050e6.0500a"]]},{"id":"f056109.d3d72f","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"output.status.dgerror.code\" value=\"503\" />\n","comments":"","outputs":1,"x":627,"y":325,"z":"8266ef6c.2a723","wires":[["bb728ed6.12c5","a6f6f578.370da8"]]},{"id":"203050e6.0500a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":426,"y":329,"z":"8266ef6c.2a723","wires":[["f056109.d3d72f"]]},{"id":"bb728ed6.12c5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":815,"y":335,"z":"8266ef6c.2a723","wires":[["e13eb078.a647"]]},{"id":"e13eb078.a647","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1001,"y":332,"z":"8266ef6c.2a723","wires":[]},{"id":"a6f6f578.370da8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":773,"y":398,"z":"8266ef6c.2a723","wires":[["e13eb078.a647"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
deleted file mode 100644
index 6e9925b..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
+++ /dev/null
@@ -1,1427 +0,0 @@
-[{
-  "id": "81a02ecc.e61b6",
-  "type": "dgstart",
-  "name": "DGSTART",
-  "outputs": 1,
-  "x": 119.66666412353516,
-  "y": 84.08333426713943,
-  "z": "f16b4873.701568",
-  "wires": [["98597336.3c647"]]
-},
-  {
-    "id": "98597336.3c647",
-    "type": "service-logic",
-    "name": "APPC 2.0.0",
-    "module": "APPC",
-    "version": "2.0.0",
-    "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,
-    "y": 84.08333426713943,
-    "z": "f16b4873.701568",
-    "wires": [["3dddb84a.a123f8"]]
-  },
-  {
-    "id": "3dddb84a.a123f8",
-    "type": "method",
-    "name": "Generic_Audit",
-    "xml": "<method rpc='Generic_Audit' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 478.66666412353516,
-    "y": 84.08333426713943,
-    "z": "f16b4873.701568",
-    "wires": [["d043d660.7cbce8"]]
-  },
-  {
-    "id": "7490fc55.b23eb4",
-    "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,
-    "y": 480.8665657043457,
-    "z": "f16b4873.701568",
-    "wires": [["dceb4c56.95345",
-      "a55ef9f.1845d08",
-      "7c43698a.2b9eb8"]]
-  },
-  {
-    "id": "7c43698a.2b9eb8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 733.3759384155273,
-    "y": 418.58686447143555,
-    "z": "f16b4873.701568",
-    "wires": [["90511868.d5a528"]]
-  },
-  {
-    "id": "dceb4c56.95345",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 740.3759994506836,
-    "y": 483.3646430969238,
-    "z": "f16b4873.701568",
-    "wires": [["867bd8aa.3a55e8"]]
-  },
-  {
-    "id": "a55ef9f.1845d08",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 672.5982284545898,
-    "y": 533.0313148498535,
-    "z": "f16b4873.701568",
-    "wires": [["30e459ed.1b9986"]]
-  },
-  {
-    "id": "7eaffd91.5e2494",
-    "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,
-    "y": 496.9629249572754,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "2bbc2c8c.227ae4",
-    "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,
-    "y": 542.1509742736816,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "2c17d4fd.27bcac",
-    "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,
-    "y": 411.1424140930176,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "d4c8b998.7b4678",
-    "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,
-    "y": 368.0569190979004,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "90511868.d5a528",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 894.4568099975586,
-    "y": 417.4757499694824,
-    "z": "f16b4873.701568",
-    "wires": [["d4c8b998.7b4678",
-      "7eaffd91.5e2494",
-      "2bbc2c8c.227ae4",
-      "ac51bff5.352e5"]]
-  },
-  {
-    "id": "867bd8aa.3a55e8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 905.0124130249023,
-    "y": 481.2535285949707,
-    "z": "f16b4873.701568",
-    "wires": [["2c17d4fd.27bcac",
-      "7eaffd91.5e2494",
-      "2bbc2c8c.227ae4",
-      "ac51bff5.352e5"]]
-  },
-  {
-    "id": "30e459ed.1b9986",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 302.56404876708984,
-    "y": 631.1004371643066,
-    "z": "f16b4873.701568",
-    "wires": [["b79fac1d.f13e1",
-      "925cca6f.85b738",
-      "a844b2a2.8681f",
-      "dda489b7.a7bc78"]]
-  },
-  {
-    "id": "b79fac1d.f13e1",
-    "type": "for",
-    "name": "for each current config",
-    "xml": "<for index=\"i\" start=\"0\" end=\"`$currnt-config_length`\" >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 530.6324081420898,
-    "y": 631.4679908752441,
-    "z": "f16b4873.701568",
-    "wires": [["67f30b25.070c24"]]
-  },
-  {
-    "id": "eb62c9d8.e05988",
-    "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,
-    "y": 609.6987953186035,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "c66c9b28.d58e38",
-    "type": "call",
-    "name": "Call Retrieve running Config DG",
-    "xml": "<call rpc='GetRunningConfig' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 857.4786605834961,
-    "y": 666.6988258361816,
-    "z": "f16b4873.701568",
-    "wires": [["e6375b8c.512fa8",
-      "b4636b56.55a038",
-      "67a55747.3e2588"]]
-  },
-  {
-    "id": "67f30b25.070c24",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 552.7863082885742,
-    "y": 729.6218299865723,
-    "z": "f16b4873.701568",
-    "wires": [["eb62c9d8.e05988",
-      "c66c9b28.d58e38",
-      "1a5aec1c.ab3e44",
-      "58111dc9.5f25b4",
-      "b86d049a.13a1b8"]]
-  },
-  {
-    "id": "e6375b8c.512fa8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1118.5898056030273,
-    "y": 613.6987342834473,
-    "z": "f16b4873.701568",
-    "wires": [["5a971e26.a7171"]]
-  },
-  {
-    "id": "b4636b56.55a038",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1119.0341415405273,
-    "y": 666.6988258361816,
-    "z": "f16b4873.701568",
-    "wires": [["bd38a484.bd0a98"]]
-  },
-  {
-    "id": "67a55747.3e2588",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1123.1452865600586,
-    "y": 710.8098487854004,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "5a971e26.a7171",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1268.145408630371,
-    "y": 613.6987342834473,
-    "z": "f16b4873.701568",
-    "wires": [["72158f5.d06fd7",
-      "580bd65f.53d9c8",
-      "c4fa8668.3392a8"]]
-  },
-  {
-    "id": "bd38a484.bd0a98",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1270.478660583496,
-    "y": 664.5876808166504,
-    "z": "f16b4873.701568",
-    "wires": [["c433e537.6d3cf8",
-      "72158f5.d06fd7",
-      "580bd65f.53d9c8",
-      "c4fa8668.3392a8"]]
-  },
-  {
-    "id": "c433e537.6d3cf8",
-    "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,
-    "y": 639.5876808166504,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "580bd65f.53d9c8",
-    "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,
-    "y": 884.4338417053223,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "72158f5.d06fd7",
-    "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,
-    "y": 806.4338111877441,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "752bb299.feb57c",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 250.66664123535156,
-    "y": 412.99244117736816,
-    "z": "f16b4873.701568",
-    "wires": [["7490fc55.b23eb4",
-      "7c0de445.f1cc6c"]]
-  },
-  {
-    "id": "ac51bff5.352e5",
-    "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": 1153.3589096069336,
-    "y": 454.77563858032227,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "c4fa8668.3392a8",
-    "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": 1493.024314880371,
-    "y": 765.1839942932129,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "7c0de445.f1cc6c",
-    "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": 440.08553314208984,
-    "y": 414.57805252075195,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "925cca6f.85b738",
-    "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=\"`'Audit action successful for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 524.6198310852051,
-    "y": 1553.2725563049316,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "a844b2a2.8681f",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 502.4659614562988,
-    "y": 1623.2724342346191,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "a97ef4e9.131748",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1059.9563827514648,
-    "y": 923.8037452697754,
-    "z": "f16b4873.701568",
-    "wires": [["7f859626.3ecfd8"]]
-  },
-  {
-    "id": "8225d505.2c9498",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1063.9565048217773,
-    "y": 978.5815773010254,
-    "z": "f16b4873.701568",
-    "wires": [["bde3e23.e488b2"]]
-  },
-  {
-    "id": "57cfd6f7.764c38",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 926.1786422729492,
-    "y": 1035.2482738494873,
-    "z": "f16b4873.701568",
-    "wires": [["fb928b6.eef3f78"]]
-  },
-  {
-    "id": "bde3e23.e488b2",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1348.5930557250977,
-    "y": 974.4703979492188,
-    "z": "f16b4873.701568",
-    "wires": [["1d860eb4.38f4b1",
-      "e4322d3b.8d1ab",
-      "9380a644.f57908",
-      "a832eaf1.bc4ea8"]]
-  },
-  {
-    "id": "7f859626.3ecfd8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1348.0373153686523,
-    "y": 923.692569732666,
-    "z": "f16b4873.701568",
-    "wires": [["e4322d3b.8d1ab",
-      "9380a644.f57908",
-      "a832eaf1.bc4ea8",
-      "1d860eb4.38f4b1"]]
-  },
-  {
-    "id": "1d860eb4.38f4b1",
-    "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,
-    "y": 973.3591957092285,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "fb928b6.eef3f78",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$STATUS`'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1053.6667098999023,
-    "y": 1070.083408355713,
-    "z": "f16b4873.701568",
-    "wires": [["8e39a0cd.ee399",
-      "d61b176c.169178",
-      "fd1426ee.97bc68"]]
-  },
-  {
-    "id": "8e39a0cd.ee399",
-    "type": "success",
-    "name": "no match",
-    "xml": "<outcome value='FAILURE'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1209.6667098999023,
-    "y": 1071.833408355713,
-    "z": "f16b4873.701568",
-    "wires": [["328dd4e4.27801c"]]
-  },
-  {
-    "id": "328dd4e4.27801c",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1372.666790008545,
-    "y": 1085.0833568572998,
-    "z": "f16b4873.701568",
-    "wires": [["e4322d3b.8d1ab",
-      "9380a644.f57908",
-      "a832eaf1.bc4ea8",
-      "764e8614.57f5c8",
-      "5aeed919.b83438",
-      "93ba279d.5bcbb8"]]
-  },
-  {
-    "id": "77ff9a98.2bf224",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1353.6667098999023,
-    "y": 1033.5833778381348,
-    "z": "f16b4873.701568",
-    "wires": [["e4322d3b.8d1ab",
-      "9380a644.f57908",
-      "a832eaf1.bc4ea8",
-      "1d860eb4.38f4b1"]]
-  },
-  {
-    "id": "e4322d3b.8d1ab",
-    "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": 1624.6667098999023,
-    "y": 1100.083408355713,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "9380a644.f57908",
-    "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,
-    "y": 1201.2707862854004,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "a832eaf1.bc4ea8",
-    "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,
-    "y": 1460.458869934082,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "1a5aec1c.ab3e44",
-    "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,
-    "y": 967.0834083557129,
-    "z": "f16b4873.701568",
-    "wires": [["a97ef4e9.131748",
-      "8225d505.2c9498",
-      "57cfd6f7.764c38"]]
-  },
-  {
-    "id": "764e8614.57f5c8",
-    "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,
-    "y": 1052.0833187103271,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "87b58856.047f68",
-    "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,
-    "y": 727.0833473205566,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "f549e445.f74888",
-    "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,
-    "y": 680.9978675842285,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "6cdf93fd.27cd0c",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1274.037239074707,
-    "y": 747.416690826416,
-    "z": "f16b4873.701568",
-    "wires": [["f549e445.f74888",
-      "c4fa8668.3392a8",
-      "72158f5.d06fd7",
-      "580bd65f.53d9c8",
-      "b79736f.f56eac8"]]
-  },
-  {
-    "id": "cea9c726.916838",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1281.592903137207,
-    "y": 797.1944618225098,
-    "z": "f16b4873.701568",
-    "wires": [["87b58856.047f68",
-      "c4fa8668.3392a8",
-      "72158f5.d06fd7",
-      "580bd65f.53d9c8",
-      "b79736f.f56eac8"]]
-  },
-  {
-    "id": "183d6159.f57e3f",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1127.956428527832,
-    "y": 797.3055458068848,
-    "z": "f16b4873.701568",
-    "wires": [["cea9c726.916838"]]
-  },
-  {
-    "id": "4f9c33fe.ee7c6c",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1128.9562454223633,
-    "y": 749.5278053283691,
-    "z": "f16b4873.701568",
-    "wires": [["6cdf93fd.27cd0c"]]
-  },
-  {
-    "id": "58111dc9.5f25b4",
-    "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,
-    "y": 793.8074684143066,
-    "z": "f16b4873.701568",
-    "wires": [["183d6159.f57e3f",
-      "4f9c33fe.ee7c6c",
-      "5fa98c15.aa8b74"]]
-  },
-  {
-    "id": "5fa98c15.aa8b74",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1126.6665115356445,
-    "y": 847.0833778381348,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "d61b176c.169178",
-    "type": "success",
-    "name": "match",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1202.6667175292969,
-    "y": 1132.0834693908691,
-    "z": "f16b4873.701568",
-    "wires": [["5584c2d4.ec7c8c"]]
-  },
-  {
-    "id": "fd1426ee.97bc68",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1213.6667098999023,
-    "y": 1027.083408355713,
-    "z": "f16b4873.701568",
-    "wires": [["77ff9a98.2bf224"]]
-  },
-  {
-    "id": "b86d049a.13a1b8",
-    "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,
-    "y": 728.4167518615723,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "dda489b7.a7bc78",
-    "type": "execute",
-    "name": "Generate output payload",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 593.8887214660645,
-    "y": 1493.5281105041504,
-    "z": "f16b4873.701568",
-    "wires": [["96b89330.eeb7f",
-      "23bea1a6.82114e",
-      "dabc8dd4.4c031"]]
-  },
-  {
-    "id": "96b89330.eeb7f",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 823.888843536377,
-    "y": 1431.5280494689941,
-    "z": "f16b4873.701568",
-    "wires": [["5584053a.68313c"]]
-  },
-  {
-    "id": "23bea1a6.82114e",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 835.888843536377,
-    "y": 1494.5281105041504,
-    "z": "f16b4873.701568",
-    "wires": [["5584053a.68313c"]]
-  },
-  {
-    "id": "dabc8dd4.4c031",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 830.8887214660645,
-    "y": 1558.5280494689941,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "5584053a.68313c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1025.555591583252,
-    "y": 1494.5280494689941,
-    "z": "f16b4873.701568",
-    "wires": [["2fc5495.ed614b6",
-      "34834985.8ba986"]]
-  },
-  {
-    "id": "34834985.8ba986",
-    "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,
-    "y": 1496.9089088439941,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "2fc5495.ed614b6",
-    "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,
-    "y": 1549.0517311096191,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "5aeed919.b83438",
-    "type": "execute",
-    "name": "Generate output payload",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 1674.3334579467773,
-    "y": 1149.5278358459473,
-    "z": "f16b4873.701568",
-    "wires": [["2f4b01d0.23640e",
-      "fc0cdc70.37ff2",
-      "bf7d7229.c2d58"]]
-  },
-  {
-    "id": "2f4b01d0.23640e",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1893.3335494995117,
-    "y": 1115.527744293213,
-    "z": "f16b4873.701568",
-    "wires": [["db92eec9.b5f62"]]
-  },
-  {
-    "id": "fc0cdc70.37ff2",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1895.3335494995117,
-    "y": 1161.5278663635254,
-    "z": "f16b4873.701568",
-    "wires": [["db92eec9.b5f62"]]
-  },
-  {
-    "id": "bf7d7229.c2d58",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1895.3334579467773,
-    "y": 1204.5277137756348,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "db92eec9.b5f62",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2088.0002975463867,
-    "y": 1136.527744293213,
-    "z": "f16b4873.701568",
-    "wires": [["e04cb8f.eb7b748",
-      "254d3066.a4bc5"]]
-  },
-  {
-    "id": "254d3066.a4bc5",
-    "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,
-    "y": 1093.908603668213,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "e04cb8f.eb7b748",
-    "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,
-    "y": 1181.051670074463,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "b79736f.f56eac8",
-    "type": "execute",
-    "name": "Generate output payload",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='generateOutputPayloadFromContext' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 1561.1111373901367,
-    "y": 843.416690826416,
-    "z": "f16b4873.701568",
-    "wires": [["97850b52.a31cd8",
-      "41d36ebc.ba016",
-      "e6d25885.e4e788"]]
-  },
-  {
-    "id": "97850b52.a31cd8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1805.111228942871,
-    "y": 809.4165992736816,
-    "z": "f16b4873.701568",
-    "wires": [["847cbebd.ab185"]]
-  },
-  {
-    "id": "41d36ebc.ba016",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1807.111228942871,
-    "y": 855.4167213439941,
-    "z": "f16b4873.701568",
-    "wires": [["847cbebd.ab185"]]
-  },
-  {
-    "id": "e6d25885.e4e788",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1807.1111373901367,
-    "y": 898.4165687561035,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "847cbebd.ab185",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1999.777976989746,
-    "y": 830.4165992736816,
-    "z": "f16b4873.701568",
-    "wires": [["e2703a71.5e2d08",
-      "7312ce6e.051b1"]]
-  },
-  {
-    "id": "7312ce6e.051b1",
-    "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,
-    "y": 787.7974586486816,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "e2703a71.5e2d08",
-    "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,
-    "y": 874.9405250549316,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "5584c2d4.ec7c8c",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$Publish_Config`'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1240.1670684814453,
-    "y": 1266.083574295044,
-    "z": "f16b4873.701568",
-    "wires": [["b07cce86.c2267",
-      "54d48804.2f6488"]]
-  },
-  {
-    "id": "b07cce86.c2267",
-    "type": "outcome",
-    "name": "Outcome: y",
-    "xml": "<outcome value='y'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1414.1669692993164,
-    "y": 1246.7502841949463,
-    "z": "f16b4873.701568",
-    "wires": [["93ba279d.5bcbb8"]]
-  },
-  {
-    "id": "54d48804.2f6488",
-    "type": "outcome",
-    "name": "Outcome: Y",
-    "xml": "<outcome value='Y'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1411.0838241577148,
-    "y": 1289.833547592163,
-    "z": "f16b4873.701568",
-    "wires": [["93ba279d.5bcbb8"]]
-  },
-  {
-    "id": "93ba279d.5bcbb8",
-    "type": "execute",
-    "name": "execute CvaasDataIntoContext",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/app/bvc/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,
-    "y": 1298.8338718414307,
-    "z": "f16b4873.701568",
-    "wires": [["4f8601db.1cc81",
-      "d4ee7229.fae85"]]
-  },
-  {
-    "id": "4f8601db.1cc81",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2036.8341751098633,
-    "y": 1299.8340373039246,
-    "z": "f16b4873.701568",
-    "wires": [["17c3243e.6f760c"]]
-  },
-  {
-    "id": "17c3243e.6f760c",
-    "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,
-    "y": 1307.599196434021,
-    "z": "f16b4873.701568",
-    "wires": [["1befff30.f1b281",
-      "e5a0a1ba.78591"]]
-  },
-  {
-    "id": "1befff30.f1b281",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2469.364891052246,
-    "y": 1320.3642568588257,
-    "z": "f16b4873.701568",
-    "wires": [["d4049805.d34618"]]
-  },
-  {
-    "id": "e5a0a1ba.78591",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2471.3645401000977,
-    "y": 1369.364426612854,
-    "z": "f16b4873.701568",
-    "wires": [["d4049805.d34618"]]
-  },
-  {
-    "id": "d4049805.d34618",
-    "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,
-    "y": 1343.3643054962158,
-    "z": "f16b4873.701568",
-    "wires": [["8587844.5a70378",
-      "13a60653.f2418a"]]
-  },
-  {
-    "id": "8587844.5a70378",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2956.850357055664,
-    "y": 1421.5993309020996,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "a89beb23.e0d968",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 3162.849021911621,
-    "y": 1374.5991201400757,
-    "z": "f16b4873.701568",
-    "wires": [["6c7eaa88.024dc4",
-      "fd02487c.77b308",
-      "e5102b5c.3b53c8",
-      "45de7390.486dfc"]]
-  },
-  {
-    "id": "6c7eaa88.024dc4",
-    "type": "set",
-    "name": "Set error message",
-    "xml": "<set>\n<parameter name='error-message' value=\"`'Cvass file could not be created'`\"/>",
-    "comments": "",
-    "x": 3427.404800415039,
-    "y": 1313.487928390503,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "fd02487c.77b308",
-    "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,
-    "y": 1498.3346118927002,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "e5102b5c.3b53c8",
-    "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,
-    "y": 1429.4880809783936,
-    "z": "f16b4873.701568",
-    "wires": [["89703cbf.30313"]]
-  },
-  {
-    "id": "89703cbf.30313",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3634.1327743530273,
-    "y": 1436.0382852554321,
-    "z": "f16b4873.701568",
-    "wires": [["892031d3.9e1bd"]]
-  },
-  {
-    "id": "892031d3.9e1bd",
-    "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,
-    "y": 1436.4882678985596,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "45de7390.486dfc",
-    "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`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 3399.500015258789,
-    "y": 1378.4880485534668,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "d4ee7229.fae85",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2056.666831970215,
-    "y": 1465.0834197998047,
-    "z": "f16b4873.701568",
-    "wires": [["86d0a871.815158"]]
-  },
-  {
-    "id": "a2c9685e.16d318",
-    "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,
-    "y": 1463.083589553833,
-    "z": "f16b4873.701568",
-    "wires": [["d7d7645d.5e76c8"]]
-  },
-  {
-    "id": "d7d7645d.5e76c8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2604.79891204834,
-    "y": 1463.6331634521484,
-    "z": "f16b4873.701568",
-    "wires": [["80effa9c.33fce8"]]
-  },
-  {
-    "id": "80effa9c.33fce8",
-    "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,
-    "y": 1464.633376121521,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "86d0a871.815158",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2208.666831970215,
-    "y": 1465.0834197998047,
-    "z": "f16b4873.701568",
-    "wires": [["a2c9685e.16d318",
-      "897e770a.605f58"]]
-  },
-  {
-    "id": "897e770a.605f58",
-    "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,
-    "y": 1552.0834197998047,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "d043d660.7cbce8",
-    "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,
-    "y": 86.75000667572021,
-    "z": "f16b4873.701568",
-    "wires": [["3c42bbb1.da71f4",
-      "d63e629f.39f9",
-      "17b5a1dd.0754de",
-      "4fad0fe1.40343"]]
-  },
-  {
-    "id": "d63e629f.39f9",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1033.666648864746,
-    "y": 20,
-    "z": "f16b4873.701568",
-    "wires": [["51284245.e89c1c"]]
-  },
-  {
-    "id": "17b5a1dd.0754de",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1034.666648864746,
-    "y": 70,
-    "z": "f16b4873.701568",
-    "wires": [["51284245.e89c1c"]]
-  },
-  {
-    "id": "4fad0fe1.40343",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1027.666648864746,
-    "y": 125.00001525878906,
-    "z": "f16b4873.701568",
-    "wires": [["51284245.e89c1c"]]
-  },
-  {
-    "id": "3c42bbb1.da71f4",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1024.6667098999023,
-    "y": 180.7500114440918,
-    "z": "f16b4873.701568",
-    "wires": [["752bb299.feb57c"]]
-  },
-  {
-    "id": "51284245.e89c1c",
-    "type": "block",
-    "name": "block",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1241.3332901000977,
-    "y": 113.00000190734863,
-    "z": "f16b4873.701568",
-    "wires": [["41523e11.c90e9",
-      "a9abc91a.956e38"]]
-  },
-  {
-    "id": "a9abc91a.956e38",
-    "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,
-    "y": 64.88888740539551,
-    "z": "f16b4873.701568",
-    "wires": [["10f72f11.953841"]]
-  },
-  {
-    "id": "41523e11.c90e9",
-    "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,
-    "y": 113.52372932434082,
-    "z": "f16b4873.701568",
-    "wires": []
-  },
-  {
-    "id": "10f72f11.953841",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1679.7613906860352,
-    "y": 64.17462348937988,
-    "z": "f16b4873.701568",
-    "wires": [["789d293f.1e9dc8"]]
-  },
-  {
-    "id": "789d293f.1e9dc8",
-    "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,
-    "y": 63.88888740539551,
-    "z": "f16b4873.701568",
-    "wires": [[]]
-  },
-  {
-    "id": "13a60653.f2418a",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3001.3334045410156,
-    "y": 1327.9999796748161,
-    "z": "f16b4873.701568",
-    "wires": [["a89beb23.e0d968"]]
-  }]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Stop_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Stop_2.0.0.json
deleted file mode 100644
index f043b7a..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Stop_2.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"7e2fb931.5cb6a8","type":"method","name":"Generic_Stop","xml":"<method rpc='Generic_Stop' mode='sync'>\n","comments":"","outputs":1,"x":246,"y":93,"z":"a4e67f56.cb2c9","wires":[["2587b8bb.e5e958"]]},{"id":"ec3c7234.5264c","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":327,"y":29,"z":"a4e67f56.cb2c9","wires":[["7e2fb931.5cb6a8"]]},{"id":"315a077d.12b998","type":"dgstart","name":"DGSTART","outputs":1,"x":151,"y":29,"z":"a4e67f56.cb2c9","wires":[["ec3c7234.5264c"]]},{"id":"2587b8bb.e5e958","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.vfid`\" />","comments":"","outputs":1,"x":171,"y":198,"z":"a4e67f56.cb2c9","wires":[["9dcb5f4b.e5edc","cbcbe34a.531c7"]]},{"id":"9dcb5f4b.e5edc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":142,"y":374,"z":"a4e67f56.cb2c9","wires":[["682f2d38.85dcf4"]]},{"id":"ef252110.98a58","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":459,"y":643,"z":"a4e67f56.cb2c9","wires":[["8564038a.20f11","99f8b9e.6458b48"]]},{"id":"8564038a.20f11","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":606,"y":470,"z":"a4e67f56.cb2c9","wires":[["d55f4a78.4ab358"]]},{"id":"d55f4a78.4ab358","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":748,"y":399,"z":"a4e67f56.cb2c9","wires":[["8fc22181.f2a49"]]},{"id":"8fc22181.f2a49","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"STOPPING\" />\n","comments":"","outputs":1,"x":901,"y":470,"z":"a4e67f56.cb2c9","wires":[["a9079be8.d4a478","9876fdec.6f37b"]]},{"id":"a9079be8.d4a478","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1007,"y":244,"z":"a4e67f56.cb2c9","wires":[["8115b889.f550c8"]]},{"id":"99f8b9e.6458b48","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":624,"y":833,"z":"a4e67f56.cb2c9","wires":[]},{"id":"cbcbe34a.531c7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":403,"y":156,"z":"a4e67f56.cb2c9","wires":[["e1b9b789.f64058"]]},{"id":"88300794.7ebab8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":774,"y":125,"z":"a4e67f56.cb2c9","wires":[]},{"id":"16f41970.2b9937","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1436,"y":335,"z":"a4e67f56.cb2c9","wires":[["209159f2.bcb756"]]},{"id":"c8ee356c.0659d8","type":"execute","name":"execute_update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"STOPPED\" />\n","comments":"","outputs":1,"x":1857,"y":585,"z":"a4e67f56.cb2c9","wires":[["4d7443c4.c8179c","8b55dde0.3bbb"]]},{"id":"4d7443c4.c8179c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2089,"y":733,"z":"a4e67f56.cb2c9","wires":[["f46b9146.02c08"]]},{"id":"e8c9cfc3.43aba","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2436,"y":784,"z":"a4e67f56.cb2c9","wires":[]},{"id":"8b55dde0.3bbb","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2074,"y":400,"z":"a4e67f56.cb2c9","wires":[["c7b8b650.debeb8"]]},{"id":"9876fdec.6f37b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":740,"y":596,"z":"a4e67f56.cb2c9","wires":[["ee34ffbb.23891"]]},{"id":"e0f1fadf.9c0e38","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":995,"y":762,"z":"a4e67f56.cb2c9","wires":[]},{"id":"25ea35c8.19f71a","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1920.0000305175781,"y":236,"z":"a4e67f56.cb2c9","wires":[["34ca0aa7.90eda6","a0a350ed.07716"]]},{"id":"34ca0aa7.90eda6","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2120,"y":312,"z":"a4e67f56.cb2c9","wires":[["e98338be.9afa58"]]},{"id":"4b5d9174.e2d7d","type":"comment","name":"update VNFCs to STOPPING","info":"","comments":"","x":863,"y":518,"z":"a4e67f56.cb2c9","wires":[]},{"id":"fd5a214f.ebac2","type":"comment","name":"call south bound to STOP VMs","info":"","comments":"","x":1321,"y":63,"z":"a4e67f56.cb2c9","wires":[]},{"id":"69e7f6ee.f0f488","type":"comment","name":"if failure from south bound then update as Error","info":"","comments":"","x":1905,"y":69,"z":"a4e67f56.cb2c9","wires":[]},{"id":"5a8b51ce.7d4ff","type":"comment","name":"STOPPED VNFCs in AA&I","info":"","comments":"","x":2105,"y":574,"z":"a4e67f56.cb2c9","wires":[]},{"id":"6c7dacf5.ea4894","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":596,"y":182,"z":"a4e67f56.cb2c9","wires":[]},{"id":"84f683a0.d9fcb","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2233,"y":110,"z":"a4e67f56.cb2c9","wires":[]},{"id":"a0a350ed.07716","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2099,"y":148,"z":"a4e67f56.cb2c9","wires":[["84f683a0.d9fcb"]]},{"id":"74105ed4.70bad","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1416,"y":102,"z":"a4e67f56.cb2c9","wires":[["b8a6176c.8ff0e8"]]},{"id":"333d173e.eb68a8","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":136,"y":670.0000305175781,"z":"a4e67f56.cb2c9","wires":[["f1e14e66.f97c6","ddd6b13.e25e15"]]},{"id":"f1e14e66.f97c6","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":333,"y":552.0000305175781,"z":"a4e67f56.cb2c9","wires":[["debeaa94.ae7058"]]},{"id":"ddd6b13.e25e15","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":319,"y":683.0000305175781,"z":"a4e67f56.cb2c9","wires":[["ef252110.98a58"]]},{"id":"209159f2.bcb756","type":"switchNode","name":"switch","xml":"<switch test='`$STOP_STATUS`'>\n","comments":"","outputs":1,"x":1618,"y":334,"z":"a4e67f56.cb2c9","wires":[["727f90cf.4e78e","6bc80951.a39408","5a17e4b6.24cc2c"]]},{"id":"727f90cf.4e78e","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1845,"y":464,"z":"a4e67f56.cb2c9","wires":[["c8ee356c.0659d8"]]},{"id":"6bc80951.a39408","type":"other","name":"outcome_SERVER_NOT_FOUND","xml":"<outcome value='SERVER_NOT_FOUND'>\n","comments":"","outputs":1,"x":1608,"y":227,"z":"a4e67f56.cb2c9","wires":[["f58c9809.cd0798"]]},{"id":"5a17e4b6.24cc2c","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1783,"y":324,"z":"a4e67f56.cb2c9","wires":[["22896989.a0c9c6"]]},{"id":"6a7166f0.3d8308","type":"execute","name":"execute_STOP","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='stopServer'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1326,"y":239,"z":"a4e67f56.cb2c9","wires":[["16f41970.2b9937","74105ed4.70bad"]]},{"id":"682f2d38.85dcf4","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":128,"y":492.0000305175781,"z":"a4e67f56.cb2c9","wires":[["cbff0a6a.206938","bf5be080.c5c5e"]]},{"id":"bf5be080.c5c5e","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":271,"y":437,"z":"a4e67f56.cb2c9","wires":[["646e1f85.cb186"]]},{"id":"c13b792d.778058","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":483,"y":318,"z":"a4e67f56.cb2c9","wires":[]},{"id":"cbff0a6a.206938","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":129,"y":568.0000305175781,"z":"a4e67f56.cb2c9","wires":[["333d173e.eb68a8"]]},{"id":"10c91a07.a117c6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":583,"y":425,"z":"a4e67f56.cb2c9","wires":[]},{"id":"8115b889.f550c8","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1092,"y":344,"z":"a4e67f56.cb2c9","wires":[["1127dc8f.3f9963","c9595f20.2a9c8","a2f5ef46.94c16"]]},{"id":"1127dc8f.3f9963","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1209,"y":111,"z":"a4e67f56.cb2c9","wires":[["6a7166f0.3d8308"]]},{"id":"c9595f20.2a9c8","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1341,"y":427,"z":"a4e67f56.cb2c9","wires":[["f8f3a23a.eb879"]]},{"id":"8217861.f831678","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1572,"y":559,"z":"a4e67f56.cb2c9","wires":[]},{"id":"a2f5ef46.94c16","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1205,"y":514,"z":"a4e67f56.cb2c9","wires":[["e97be688.52f7b8"]]},{"id":"833e99d3.8e1fc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1392,"y":748,"z":"a4e67f56.cb2c9","wires":[]},{"id":"c7b8b650.debeb8","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2251,"y":519,"z":"a4e67f56.cb2c9","wires":[["b7c2ee30.1eb72","e4923dfa.c9afb","b90b071c.055b78"]]},{"id":"b7c2ee30.1eb72","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2451,"y":422,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"e4923dfa.c9afb","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2456,"y":527,"z":"a4e67f56.cb2c9","wires":[["801303e7.59ed6"]]},{"id":"b90b071c.055b78","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2459,"y":638,"z":"a4e67f56.cb2c9","wires":[["cfc89854.f4d468"]]},{"id":"a69ecbbf.1d5bc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2798,"y":531,"z":"a4e67f56.cb2c9","wires":[]},{"id":"2edb4a8d.6d3ab6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2854,"y":664,"z":"a4e67f56.cb2c9","wires":[]},{"id":"e98338be.9afa58","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2225,"y":213,"z":"a4e67f56.cb2c9","wires":[["8822689b.0636b8","d848ce46.2a685","f77fa469.3a14b8"]]},{"id":"8822689b.0636b8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2437,"y":102,"z":"a4e67f56.cb2c9","wires":[["81c78045.cc4b7"]]},{"id":"81c78045.cc4b7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2696,"y":101,"z":"a4e67f56.cb2c9","wires":[]},{"id":"d848ce46.2a685","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2449,"y":184,"z":"a4e67f56.cb2c9","wires":[["9b1f5185.99c3d"]]},{"id":"9b1f5185.99c3d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2700,"y":185,"z":"a4e67f56.cb2c9","wires":[]},{"id":"f77fa469.3a14b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2449,"y":291,"z":"a4e67f56.cb2c9","wires":[["8a3cbd67.71ce4"]]},{"id":"8a3cbd67.71ce4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2705,"y":293,"z":"a4e67f56.cb2c9","wires":[]},{"id":"e1b9b789.f64058","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":623,"y":74,"z":"a4e67f56.cb2c9","wires":[["ad90eade.1e4318","88300794.7ebab8"]]},{"id":"ad90eade.1e4318","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\" />\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\" />\n","comments":"","outputs":1,"x":761,"y":20,"z":"a4e67f56.cb2c9","wires":[["5162c75b.63a0f8"]]},{"id":"5162c75b.63a0f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":922,"y":32,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"646e1f85.cb186","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":415,"y":253,"z":"a4e67f56.cb2c9","wires":[["c13b792d.778058","cfce6271.431d"]]},{"id":"cfce6271.431d","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Failure in getting VNF Hierachy\" />\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\" />","comments":"","outputs":1,"x":576,"y":230,"z":"a4e67f56.cb2c9","wires":[["b23db4a.b34b848"]]},{"id":"b23db4a.b34b848","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":713,"y":218,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"debeaa94.ae7058","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":569,"y":352,"z":"a4e67f56.cb2c9","wires":[["10c91a07.a117c6","30d4ccc8.122954"]]},{"id":"30d4ccc8.122954","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\" />\n<parameter name=\"output.status.message\" value=\"VM Count is 0\" />","comments":"","outputs":1,"x":671,"y":289,"z":"a4e67f56.cb2c9","wires":[["7e7f8d2.f243e74"]]},{"id":"7e7f8d2.f243e74","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":812,"y":305,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"ee34ffbb.23891","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":819,"y":686,"z":"a4e67f56.cb2c9","wires":[["9c0e0f69.b19d1","e0f1fadf.9c0e38"]]},{"id":"9c0e0f69.b19d1","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n \n","comments":"","outputs":1,"x":1009,"y":630,"z":"a4e67f56.cb2c9","wires":[["46b448f9.a03378"]]},{"id":"46b448f9.a03378","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1209,"y":717,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"e97be688.52f7b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1201,"y":590,"z":"a4e67f56.cb2c9","wires":[["c7dca449.abdeb8","833e99d3.8e1fc8"]]},{"id":"c7dca449.abdeb8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1390,"y":658,"z":"a4e67f56.cb2c9","wires":[["26eaa68f.bf82ea"]]},{"id":"26eaa68f.bf82ea","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1568,"y":652,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f8f3a23a.eb879","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1431,"y":503,"z":"a4e67f56.cb2c9","wires":[["8b3b5e98.1be6d","8217861.f831678"]]},{"id":"8b3b5e98.1be6d","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1585,"y":461,"z":"a4e67f56.cb2c9","wires":[["13b89cf6.a36ed3"]]},{"id":"13b89cf6.a36ed3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1693,"y":513,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"b8a6176c.8ff0e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1446,"y":48,"z":"a4e67f56.cb2c9","wires":[["a45ba5fc.9feb68","25ea35c8.19f71a"]]},{"id":"a45ba5fc.9feb68","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Failure in stop for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in stop for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1587,"y":29,"z":"a4e67f56.cb2c9","wires":[["9bacb3e0.f2d41"]]},{"id":"9bacb3e0.f2d41","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1741,"y":31,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f58c9809.cd0798","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1582,"y":164,"z":"a4e67f56.cb2c9","wires":[["25ea35c8.19f71a","10bd5099.1c07bf"]]},{"id":"10bd5099.1c07bf","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Stop : Server not found '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stop : Server not found '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1706,"y":99,"z":"a4e67f56.cb2c9","wires":[["677f73ad.c6c76c"]]},{"id":"677f73ad.c6c76c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1863,"y":102,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"22896989.a0c9c6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1853.9999389648438,"y":163,"z":"a4e67f56.cb2c9","wires":[["25ea35c8.19f71a","1a1bb1b5.d95e6e"]]},{"id":"1a1bb1b5.d95e6e","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Stop : Error occoured while stopping the server '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while stopping the server '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1954,"y":144,"z":"a4e67f56.cb2c9","wires":[["89e55d1b.8bacb"]]},{"id":"89e55d1b.8bacb","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2083,"y":109,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"801303e7.59ed6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2623,"y":514,"z":"a4e67f56.cb2c9","wires":[["6cc2dd3a.5ab1c4","a69ecbbf.1d5bc8"]]},{"id":"cfc89854.f4d468","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2627,"y":629,"z":"a4e67f56.cb2c9","wires":[["4f117e3b.87012","2edb4a8d.6d3ab6"]]},{"id":"f46b9146.02c08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2226,"y":729,"z":"a4e67f56.cb2c9","wires":[["30bc77c5.9a7ea8","e8c9cfc3.43aba"]]},{"id":"6cc2dd3a.5ab1c4","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2793,"y":473,"z":"a4e67f56.cb2c9","wires":[["b58381a3.ec774"]]},{"id":"4f117e3b.87012","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2816,"y":592,"z":"a4e67f56.cb2c9","wires":[["ca332e3a.6a09e"]]},{"id":"b58381a3.ec774","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2966,"y":479,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"ca332e3a.6a09e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3049,"y":586,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"30bc77c5.9a7ea8","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name='org.onap.appc.dg.error' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2434,"y":702,"z":"a4e67f56.cb2c9","wires":[["2a4d844.64b3b7c"]]},{"id":"2a4d844.64b3b7c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2593,"y":706,"z":"a4e67f56.cb2c9","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
deleted file mode 100644
index 3a4c7aa..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
+++ /dev/null
@@ -1,1345 +0,0 @@
-[{
-  "id": "9c13e82a.387b38",
-  "type": "dgstart",
-  "name": "DGSTART",
-  "outputs": 1,
-  "x": 131.66665649414062,
-  "y": 116.6666750907898,
-  "z": "214b12db.e4ae8e",
-  "wires": [["c8696732.57b668"]]
-},
-  {
-    "id": "c8696732.57b668",
-    "type": "service-logic",
-    "name": "APPC 2.0.0",
-    "module": "APPC",
-    "version": "2.0.0",
-    "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",
-    "wires": [["11c0a5be.fe5bfa"]]
-  },
-  {
-    "id": "11c0a5be.fe5bfa",
-    "type": "method",
-    "name": "Sync",
-    "xml": "<method rpc='Generic_Sync' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 490.6666564941406,
-    "y": 116.6666750907898,
-    "z": "214b12db.e4ae8e",
-    "wires": [["cb484414.952458"]]
-  },
-  {
-    "id": "9ec6a6d6.7a5678",
-    "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",
-    "wires": [["a4a4499.da795b8",
-      "d4b62675.cc3218",
-      "f40aff31.110c9"]]
-  },
-  {
-    "id": "f40aff31.110c9",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 771.3759498596191,
-    "y": 365.17019033432007,
-    "z": "214b12db.e4ae8e",
-    "wires": [["841d3cc6.f08c7"]]
-  },
-  {
-    "id": "a4a4499.da795b8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 776.3759956359863,
-    "y": 436.947970867157,
-    "z": "214b12db.e4ae8e",
-    "wires": [["b9da4281.1adab"]]
-  },
-  {
-    "id": "d4b62675.cc3218",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 773.598217010498,
-    "y": 500.61465311050415,
-    "z": "214b12db.e4ae8e",
-    "wires": [["88d88ec0.cbcfa"]]
-  },
-  {
-    "id": "2a1906ba.c69e1a",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "2195ead0.db2c66",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "9e646937.3ed6a8",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "88cf09de.c0d5e8",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "841d3cc6.f08c7",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 932.456859588623,
-    "y": 365.05907678604126,
-    "z": "214b12db.e4ae8e",
-    "wires": [["88cf09de.c0d5e8",
-      "2a1906ba.c69e1a",
-      "2195ead0.db2c66",
-      "1aa4df6e.f6da11"]]
-  },
-  {
-    "id": "b9da4281.1adab",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 940.0124244689941,
-    "y": 436.8368649482727,
-    "z": "214b12db.e4ae8e",
-    "wires": [["9e646937.3ed6a8",
-      "2a1906ba.c69e1a",
-      "2195ead0.db2c66",
-      "1aa4df6e.f6da11"]]
-  },
-  {
-    "id": "88d88ec0.cbcfa",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 409.5640525817871,
-    "y": 615.6837515830994,
-    "z": "214b12db.e4ae8e",
-    "wires": [["7732a369.eb726c",
-      "4f4a7a36.c2a284",
-      "d5cea21b.c34aa",
-      "11dcb423.01808c",
-      "6d230a1.4a08cf4",
-      "855ad0e4.d405c",
-      "59566c79.8df204",
-      "872a0177.f9c8f",
-      "aa08d8db.e07148"]]
-  },
-  {
-    "id": "7732a369.eb726c",
-    "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",
-    "wires": [["842b0ba4.2b8248"]]
-  },
-  {
-    "id": "ce31ce3d.765e7",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "9fe7ebb1.f6f948",
-    "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",
-    "wires": [["cd269b5.a716568",
-      "4f80d854.e62828",
-      "83342c8c.51a98"]]
-  },
-  {
-    "id": "842b0ba4.2b8248",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 852.7863121032715,
-    "y": 675.205144405365,
-    "z": "214b12db.e4ae8e",
-    "wires": [["ce31ce3d.765e7",
-      "9fe7ebb1.f6f948",
-      "dd580aa1.a817c8",
-      "4c8c9a0.c6b3768"]]
-  },
-  {
-    "id": "cd269b5.a716568",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1346.5898399353027,
-    "y": 623.2819828987122,
-    "z": "214b12db.e4ae8e",
-    "wires": [["7e006a6b.da6ef4"]]
-  },
-  {
-    "id": "4f80d854.e62828",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1358.034236907959,
-    "y": 676.28204870224,
-    "z": "214b12db.e4ae8e",
-    "wires": [["6c663e2f.d966d"]]
-  },
-  {
-    "id": "83342c8c.51a98",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1368.1451988220215,
-    "y": 728.3930716514587,
-    "z": "214b12db.e4ae8e",
-    "wires": [[]]
-  },
-  {
-    "id": "4f4a7a36.c2a284",
-    "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",
-    "wires": [["25e5bfd2.2129e",
-      "baa57190.f5968"]]
-  },
-  {
-    "id": "d5cea21b.c34aa",
-    "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",
-    "wires": [["3111ae3b.b3f9e2",
-      "f1f93963.7ca2d8"]]
-  },
-  {
-    "id": "f1f93963.7ca2d8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1055.1968002319336,
-    "y": 1375.1795058250427,
-    "z": "214b12db.e4ae8e",
-    "wires": [[]]
-  },
-  {
-    "id": "3111ae3b.b3f9e2",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1050.1968002319336,
-    "y": 1291.1795058250427,
-    "z": "214b12db.e4ae8e",
-    "wires": [["f16ab34d.41c77"]]
-  },
-  {
-    "id": "25e5bfd2.2129e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1060.581470489502,
-    "y": 1218.6410384178162,
-    "z": "214b12db.e4ae8e",
-    "wires": [[]]
-  },
-  {
-    "id": "baa57190.f5968",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1054.581470489502,
-    "y": 1162.6410536766052,
-    "z": "214b12db.e4ae8e",
-    "wires": [["62bc5493.c88cfc"]]
-  },
-  {
-    "id": "7e006a6b.da6ef4",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1497.1454181671143,
-    "y": 623.2819752693176,
-    "z": "214b12db.e4ae8e",
-    "wires": [["f6c71fae.e8d17",
-      "a278106d.b2101",
-      "aac04b94.261c38",
-      "4b77bb4a.9f7014"]]
-  },
-  {
-    "id": "f6c71fae.e8d17",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "6c663e2f.d966d",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1510.4786949157715,
-    "y": 675.1709036827087,
-    "z": "214b12db.e4ae8e",
-    "wires": [["963a5bc6.b3e628",
-      "a278106d.b2101",
-      "aac04b94.261c38",
-      "4b77bb4a.9f7014"]]
-  },
-  {
-    "id": "963a5bc6.b3e628",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "62bc5493.c88cfc",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1223.359302520752,
-    "y": 1163.6410536766052,
-    "z": "214b12db.e4ae8e",
-    "wires": [["fca9379c.f1ba58",
-      "205f706d.16fb1",
-      "15018948.152e47",
-      "3521d3f3.e7bf6c",
-      "4d82212c.2ef21"]]
-  },
-  {
-    "id": "fca9379c.f1ba58",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "f16ab34d.41c77",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1216.9744491577148,
-    "y": 1293.1795058250427,
-    "z": "214b12db.e4ae8e",
-    "wires": [["4adc4f3b.17a16",
-      "205f706d.16fb1",
-      "15018948.152e47",
-      "3521d3f3.e7bf6c",
-      "4d82212c.2ef21"]]
-  },
-  {
-    "id": "4adc4f3b.17a16",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "aac04b94.261c38",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "a278106d.b2101",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "15018948.152e47",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "205f706d.16fb1",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "f5cfbdb3.30a63",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 291.6666603088379,
-    "y": 343.57577085494995,
-    "z": "214b12db.e4ae8e",
-    "wires": [["9ec6a6d6.7a5678",
-      "58cdab19.f47684"]]
-  },
-  {
-    "id": "1aa4df6e.f6da11",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "4b77bb4a.9f7014",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "3521d3f3.e7bf6c",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "58cdab19.f47684",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "11dcb423.01808c",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "6d230a1.4a08cf4",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "855ad0e4.d405c",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "59566c79.8df204",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "872a0177.f9c8f",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n",
-    "comments": "",
-    "x": 711.4660873413086,
-    "y": 1504.8555312156677,
-    "z": "214b12db.e4ae8e",
-    "wires": []
-  },
-  {
-    "id": "dd580aa1.a817c8",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "aa08d8db.e07148",
-    "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",
-    "wires": [["1639668d.25e0d9",
-      "264aed94.5a8e32",
-      "397802b1.358f0e"]]
-  },
-  {
-    "id": "1639668d.25e0d9",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1006.6668586730957,
-    "y": 1425.9999403953552,
-    "z": "214b12db.e4ae8e",
-    "wires": [["a0b721e.ccba5e"]]
-  },
-  {
-    "id": "264aed94.5a8e32",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1008.6668586730957,
-    "y": 1471.0000014305115,
-    "z": "214b12db.e4ae8e",
-    "wires": [["a0b721e.ccba5e"]]
-  },
-  {
-    "id": "397802b1.358f0e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1011.6667366027832,
-    "y": 1521.9999403953552,
-    "z": "214b12db.e4ae8e",
-    "wires": [[]]
-  },
-  {
-    "id": "a0b721e.ccba5e",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1206.3336067199707,
-    "y": 1482.9999403953552,
-    "z": "214b12db.e4ae8e",
-    "wires": [["a2cf5226.8165",
-      "bd7acdda.91a63"]]
-  },
-  {
-    "id": "bd7acdda.91a63",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "a2cf5226.8165",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "4d82212c.2ef21",
-    "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",
-    "wires": [["425e2e54.04ff7",
-      "d2f01dc7.e5e29",
-      "481f9e71.90512"]]
-  },
-  {
-    "id": "425e2e54.04ff7",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1740.8889350891113,
-    "y": 1332.9999403953552,
-    "z": "214b12db.e4ae8e",
-    "wires": [["62fbe5e0.d9cdcc"]]
-  },
-  {
-    "id": "d2f01dc7.e5e29",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1731.8889961242676,
-    "y": 1386.0000014305115,
-    "z": "214b12db.e4ae8e",
-    "wires": [["62fbe5e0.d9cdcc"]]
-  },
-  {
-    "id": "481f9e71.90512",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1733.888874053955,
-    "y": 1435.9999403953552,
-    "z": "214b12db.e4ae8e",
-    "wires": [[]]
-  },
-  {
-    "id": "62fbe5e0.d9cdcc",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1936.5558052062988,
-    "y": 1356.9999403953552,
-    "z": "214b12db.e4ae8e",
-    "wires": [["23d2ce67.52c4d2",
-      "49e01c1c.c64a44"]]
-  },
-  {
-    "id": "49e01c1c.c64a44",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "23d2ce67.52c4d2",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "f6b28639.a1c3a8",
-    "type": "outcome",
-    "name": "Outcome: y",
-    "xml": "<outcome value='y'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1190.6666526794434,
-    "y": 808.1822867393494,
-    "z": "214b12db.e4ae8e",
-    "wires": [["60059d22.c2ba54"]]
-  },
-  {
-    "id": "4c8c9a0.c6b3768",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test='`$Publish_Config`'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1037.6666984558105,
-    "y": 799.5156636238098,
-    "z": "214b12db.e4ae8e",
-    "wires": [["f6b28639.a1c3a8",
-      "6d199d17.82f204"]]
-  },
-  {
-    "id": "60059d22.c2ba54",
-    "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",
-    "wires": [["cdc99515.922c58",
-      "9a6d5a51.faabc8",
-      "9034241c.159aa8"]]
-  },
-  {
-    "id": "cdc99515.922c58",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1690.6669082641602,
-    "y": 840.1825032234192,
-    "z": "214b12db.e4ae8e",
-    "wires": [["7e300025.5253a"]]
-  },
-  {
-    "id": "7e300025.5253a",
-    "type": "execute",
-    "name": "execute CvaasDataIntoContext",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/app/bvc/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",
-    "wires": [["eb8bab96.3c6e98",
-      "46abe9bb.2c0fd8",
-      "ce71ba2a.e1ce38"]]
-  },
-  {
-    "id": "eb8bab96.3c6e98",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2241.1673278808594,
-    "y": 965.1831040382385,
-    "z": "214b12db.e4ae8e",
-    "wires": [["694c898b.ddbd58"]]
-  },
-  {
-    "id": "46abe9bb.2c0fd8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2250.6669998168945,
-    "y": 861.1828625202179,
-    "z": "214b12db.e4ae8e",
-    "wires": [["9fa2a21b.8af7c"]]
-  },
-  {
-    "id": "ce71ba2a.e1ce38",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2257.667266845703,
-    "y": 913.1830716133118,
-    "z": "214b12db.e4ae8e",
-    "wires": [["9fa2a21b.8af7c"]]
-  },
-  {
-    "id": "9034241c.159aa8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1524.9166564941406,
-    "y": 1005.182294845581,
-    "z": "214b12db.e4ae8e",
-    "wires": [["567684cc.50b0dc"]]
-  },
-  {
-    "id": "9a6d5a51.faabc8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1521.9165420532227,
-    "y": 953.4044423103333,
-    "z": "214b12db.e4ae8e",
-    "wires": [["4bc0b87d.970378"]]
-  },
-  {
-    "id": "4bc0b87d.970378",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1661.9975929260254,
-    "y": 955.2935299873352,
-    "z": "214b12db.e4ae8e",
-    "wires": [["3ce78b3b.82fee4",
-      "ce132d3c.9e7bb",
-      "de31ac1.3cad05",
-      "ba52c35d.d0a18"]]
-  },
-  {
-    "id": "567684cc.50b0dc",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1661.553165435791,
-    "y": 1014.0713334083557,
-    "z": "214b12db.e4ae8e",
-    "wires": [["ce132d3c.9e7bb",
-      "de31ac1.3cad05",
-      "ba52c35d.d0a18",
-      "956742c7.415fd"]]
-  },
-  {
-    "id": "ba52c35d.d0a18",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "3ce78b3b.82fee4",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "6d199d17.82f204",
-    "type": "outcome",
-    "name": "Outcome: Y",
-    "xml": "<outcome value='Y'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1191.6667098999023,
-    "y": 860.1822571754456,
-    "z": "214b12db.e4ae8e",
-    "wires": [["60059d22.c2ba54"]]
-  },
-  {
-    "id": "956742c7.415fd",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "694c898b.ddbd58",
-    "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",
-    "wires": [["e96f6416.e57a18",
-      "9939c991.265c38"]]
-  },
-  {
-    "id": "900e8879.a7b3f8",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "4c75663f.43f0d8",
-    "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",
-    "wires": [["a473caa6.56a5f8",
-      "18a86d58.a2caa3",
-      "3498054b.73705a"]]
-  },
-  {
-    "id": "4f4d3434.694adc",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2965.4338912963867,
-    "y": 1122.9491600990295,
-    "z": "214b12db.e4ae8e",
-    "wires": [["8b90be34.c5f61",
-      "cab8f54e.ec65e8",
-      "feccd180.68417",
-      "cd47c223.a0626"]]
-  },
-  {
-    "id": "8b90be34.c5f61",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "feccd180.68417",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "cab8f54e.ec65e8",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "18a86d58.a2caa3",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2745.9338912963867,
-    "y": 1097.9491291046143,
-    "z": "214b12db.e4ae8e",
-    "wires": [["4f4d3434.694adc"]]
-  },
-  {
-    "id": "a473caa6.56a5f8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2754.9335975646973,
-    "y": 1154.9489903450012,
-    "z": "214b12db.e4ae8e",
-    "wires": [["4f4d3434.694adc"]]
-  },
-  {
-    "id": "3498054b.73705a",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2761.933582305908,
-    "y": 1207.9490694999695,
-    "z": "214b12db.e4ae8e",
-    "wires": [[]]
-  },
-  {
-    "id": "9fa2a21b.8af7c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2456.3336868286133,
-    "y": 883.1828720569611,
-    "z": "214b12db.e4ae8e",
-    "wires": [["900e8879.a7b3f8",
-      "8652a63d.1ea618"]]
-  },
-  {
-    "id": "8652a63d.1ea618",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "e96f6416.e57a18",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2254.933277130127,
-    "y": 1124.9486260414124,
-    "z": "214b12db.e4ae8e",
-    "wires": [["4c75663f.43f0d8"]]
-  },
-  {
-    "id": "9939c991.265c38",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2255.9330825805664,
-    "y": 1167.9487557411194,
-    "z": "214b12db.e4ae8e",
-    "wires": [["4c75663f.43f0d8"]]
-  },
-  {
-    "id": "de31ac1.3cad05",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "ce132d3c.9e7bb",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "cb484414.952458",
-    "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",
-    "wires": [["b20f9d10.79243",
-      "c4b37771.d26c18",
-      "b02ba377.938ab",
-      "d871965c.fc6f98"]]
-  },
-  {
-    "id": "c4b37771.d26c18",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1016.6667289733887,
-    "y": 58.99999761581421,
-    "z": "214b12db.e4ae8e",
-    "wires": [["507fcd18.8ae1c4"]]
-  },
-  {
-    "id": "b02ba377.938ab",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1017.6667289733887,
-    "y": 108.99999761581421,
-    "z": "214b12db.e4ae8e",
-    "wires": [["507fcd18.8ae1c4"]]
-  },
-  {
-    "id": "d871965c.fc6f98",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1010.6667289733887,
-    "y": 164.00001287460327,
-    "z": "214b12db.e4ae8e",
-    "wires": [["507fcd18.8ae1c4"]]
-  },
-  {
-    "id": "b20f9d10.79243",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1007.6667900085449,
-    "y": 219.750009059906,
-    "z": "214b12db.e4ae8e",
-    "wires": [["f5cfbdb3.30a63"]]
-  },
-  {
-    "id": "507fcd18.8ae1c4",
-    "type": "block",
-    "name": "block",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1224.3333702087402,
-    "y": 151.99999952316284,
-    "z": "214b12db.e4ae8e",
-    "wires": [["2a1493.66c87b6e",
-      "861e0870.0e6308"]]
-  },
-  {
-    "id": "861e0870.0e6308",
-    "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",
-    "wires": [["b958118a.b4c35"]]
-  },
-  {
-    "id": "2a1493.66c87b6e",
-    "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",
-    "wires": []
-  },
-  {
-    "id": "b958118a.b4c35",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1662.7614707946777,
-    "y": 103.17462110519409,
-    "z": "214b12db.e4ae8e",
-    "wires": [["61a0d1cf.928f8"]]
-  },
-  {
-    "id": "61a0d1cf.928f8",
-    "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",
-    "wires": [[]]
-  },
-  {
-    "id": "cd47c223.a0626",
-    "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",
-    "wires": []
-  }]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.0.json
deleted file mode 100644
index d7ab5a2..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"e5c88bdc.d0f1b8","type":"method","name":"Generic_Terminate","xml":"<method rpc='Generic_Terminate' mode='sync'>\n","comments":"","outputs":1,"x":139,"y":234,"z":"a4e67f56.cb2c9","wires":[["ef72fe12.cfcd5"]]},{"id":"64a60c97.587824","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":139,"y":161,"z":"a4e67f56.cb2c9","wires":[["e5c88bdc.d0f1b8"]]},{"id":"6755c3b2.aaa76c","type":"dgstart","name":"DGSTART","outputs":1,"x":105,"y":67,"z":"a4e67f56.cb2c9","wires":[["64a60c97.587824"]]},{"id":"ef72fe12.cfcd5","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.vfid`\" />","comments":"","outputs":1,"x":223,"y":398,"z":"a4e67f56.cb2c9","wires":[["fdbfcf4e.2d7b2","2f7c0400.250b9c","8cddc38f.7a40e"]]},{"id":"fdbfcf4e.2d7b2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":553.0000152587891,"y":339,"z":"a4e67f56.cb2c9","wires":[["f433b6cb.9cd0e8"]]},{"id":"47c9978b.e11268","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":254.00001525878906,"y":1011.0000610351562,"z":"a4e67f56.cb2c9","wires":[["aed1653d.64dc18","99961634.235f88","76a553b1.7a606c"]]},{"id":"aed1653d.64dc18","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":712.0000152587891,"y":868,"z":"a4e67f56.cb2c9","wires":[["6300ae03.3e269"]]},{"id":"6300ae03.3e269","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":802.0000152587891,"y":697,"z":"a4e67f56.cb2c9","wires":[["4eda765d.043368"]]},{"id":"4eda765d.043368","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"TERMINATING\" />\n","comments":"","outputs":1,"x":943.0000152587891,"y":791,"z":"a4e67f56.cb2c9","wires":[["7d068120.8613d","f2187f0b.202fc"]]},{"id":"7d068120.8613d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1118.000015258789,"y":794,"z":"a4e67f56.cb2c9","wires":[["e362ad10.2e11d"]]},{"id":"2f7c0400.250b9c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":682.0000152587891,"y":235,"z":"a4e67f56.cb2c9","wires":[["56adc02f.e937d"]]},{"id":"dfc00961.e6fbe8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1091.000015258789,"y":287,"z":"a4e67f56.cb2c9","wires":[]},{"id":"4c5b7745.303d88","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":1288.000259399414,"y":1528.000244140625,"z":"a4e67f56.cb2c9","wires":[["dff7c6ea.eb0978","dc1f3aaa.e732e8"]]},{"id":"dff7c6ea.eb0978","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1469.000259399414,"y":1585.000244140625,"z":"a4e67f56.cb2c9","wires":[["5fb4f85a.b03e08"]]},{"id":"6b9fbfd9.cf2c9","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1554.000259399414,"y":1913.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dc1f3aaa.e732e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1470.000259399414,"y":1454.000244140625,"z":"a4e67f56.cb2c9","wires":[["63511836.263ac8"]]},{"id":"f2187f0b.202fc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1118.000015258789,"y":614,"z":"a4e67f56.cb2c9","wires":[["8818bd10.d6877"]]},{"id":"3d92ddfb.8dc4c2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1586.000015258789,"y":525,"z":"a4e67f56.cb2c9","wires":[]},{"id":"6451e1d4.3680a","type":"comment","name":"update VNFCs to terminating","info":"","comments":"","x":864.0000152587891,"y":840,"z":"a4e67f56.cb2c9","wires":[]},{"id":"506b2052.9606c","type":"comment","name":"call south bound to delete VMs","info":"","comments":"","x":1432.000015258789,"y":334,"z":"a4e67f56.cb2c9","wires":[]},{"id":"30134eb1.2eebb2","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":1315.000259399414,"y":1562.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"ebe89a17.2b35b8","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":473,"y":451,"z":"a4e67f56.cb2c9","wires":[]},{"id":"18e86385.97557c","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":378.00001525878906,"y":772,"z":"a4e67f56.cb2c9","wires":[["bcee071d.335558","b4629424.d467e8"]]},{"id":"bcee071d.335558","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":551.0000152587891,"y":677,"z":"a4e67f56.cb2c9","wires":[["a252c9a0.508a08"]]},{"id":"b4629424.d467e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":499.00001525878906,"y":862,"z":"a4e67f56.cb2c9","wires":[["47c9978b.e11268"]]},{"id":"f433b6cb.9cd0e8","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":468.00001525878906,"y":484,"z":"a4e67f56.cb2c9","wires":[["2bc5afad.f4405","88a36565.5b6378"]]},{"id":"2bc5afad.f4405","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":467.00001525878906,"y":571,"z":"a4e67f56.cb2c9","wires":[["18e86385.97557c"]]},{"id":"88a36565.5b6378","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":723.0000152587891,"y":480,"z":"a4e67f56.cb2c9","wires":[["4c58c0ac.8a3ef"]]},{"id":"e362ad10.2e11d","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1251.000015258789,"y":656,"z":"a4e67f56.cb2c9","wires":[["9ec19783.7ab378","473696eb.550988","bd1386b8.54ecc8"]]},{"id":"9ec19783.7ab378","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1407.000015258789,"y":624,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"473696eb.550988","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1416.000015258789,"y":660,"z":"a4e67f56.cb2c9","wires":[["9c0a9e54.14d8"]]},{"id":"bd1386b8.54ecc8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1411.000015258789,"y":697,"z":"a4e67f56.cb2c9","wires":[["735daa43.6c16e4"]]},{"id":"63511836.263ac8","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":1683.000259399414,"y":1524.0002136230469,"z":"a4e67f56.cb2c9","wires":[["1d4ca514.9fd7db","8b41e5e2.b6a818","e61220f4.9537f"]]},{"id":"1d4ca514.9fd7db","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":1860.000259399414,"y":1490.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8b41e5e2.b6a818","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1860.000259399414,"y":1604.000244140625,"z":"a4e67f56.cb2c9","wires":[["8763a75.b2f5c58"]]},{"id":"e61220f4.9537f","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1854.000259399414,"y":1715.000244140625,"z":"a4e67f56.cb2c9","wires":[["2208fca1.c9af34"]]},{"id":"166ff874.3f4048","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":2184.000259399414,"y":1628.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"39941f53.76089","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2198.000259399414,"y":1761.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"9e453cfe.7194d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":830.0000152587891,"y":659,"z":"a4e67f56.cb2c9","wires":[]},{"id":"1d90c18b.5e663e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1784.000015258789,"y":667,"z":"a4e67f56.cb2c9","wires":[]},{"id":"2ef976e.d4afa8a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1746.0003509521484,"y":880,"z":"a4e67f56.cb2c9","wires":[]},{"id":"c65751bd.0458d","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":971.0000152587891,"y":504,"z":"a4e67f56.cb2c9","wires":[]},{"id":"56adc02f.e937d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":800.0000152587891,"y":303,"z":"a4e67f56.cb2c9","wires":[["dfc00961.e6fbe8","acf0fd43.9e66"]]},{"id":"acf0fd43.9e66","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name=\"output.status.message\" value=\"Exception in getting VNF Hierachy\"/>\n","comments":"","outputs":1,"x":1081.000015258789,"y":113,"z":"a4e67f56.cb2c9","wires":[["b33afed0.16dc"]]},{"id":"b33afed0.16dc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1306.000015258789,"y":84,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"4c58c0ac.8a3ef","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":865.0000152587891,"y":446,"z":"a4e67f56.cb2c9","wires":[["c65751bd.0458d","a1e2c80e.64ad08"]]},{"id":"a1e2c80e.64ad08","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Failure in getting VNF Hierachy\"/>\n<parameter name=\"output.status.message\" value=\"Failure in getting VNF Hierachy\"/>","comments":"","outputs":1,"x":931.0000152587891,"y":372,"z":"a4e67f56.cb2c9","wires":[["f137844c.665ea8"]]},{"id":"f137844c.665ea8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1138.000015258789,"y":388,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"a252c9a0.508a08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":670.0000152587891,"y":615,"z":"a4e67f56.cb2c9","wires":[["9e453cfe.7194d","d07dd04b.ad633"]]},{"id":"d07dd04b.ad633","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name=\"output.status.message\" value=\"VM Count is 0\"/>","comments":"","outputs":1,"x":771.0000152587891,"y":543,"z":"a4e67f56.cb2c9","wires":[["c92631ce.23936"]]},{"id":"c92631ce.23936","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":937.0000152587891,"y":603,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8818bd10.d6877","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1433.000015258789,"y":472,"z":"a4e67f56.cb2c9","wires":[["3d92ddfb.8dc4c2","b2f14fef.29f16"]]},{"id":"b2f14fef.29f16","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1658.000015258789,"y":470,"z":"a4e67f56.cb2c9","wires":[["9cabe4f.0b83218"]]},{"id":"9cabe4f.0b83218","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1861.000015258789,"y":473,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"735daa43.6c16e4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1516.999984741211,"y":776,"z":"a4e67f56.cb2c9","wires":[["2ef976e.d4afa8a","61aa63f1.de487c"]]},{"id":"61aa63f1.de487c","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1789.000473022461,"y":793,"z":"a4e67f56.cb2c9","wires":[["cd2515bf.b00448"]]},{"id":"cd2515bf.b00448","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2010.0003814697266,"y":789.0000915527344,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"9c0a9e54.14d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1578.999984741211,"y":665,"z":"a4e67f56.cb2c9","wires":[["1d90c18b.5e663e","c8b4dbe7.dbfbf8"]]},{"id":"c8b4dbe7.dbfbf8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />","comments":"","outputs":1,"x":1774.000015258789,"y":601,"z":"a4e67f56.cb2c9","wires":[["9720fcd3.38685"]]},{"id":"9720fcd3.38685","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1966.000259399414,"y":601,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"8763a75.b2f5c58","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2032.000259399414,"y":1598.000244140625,"z":"a4e67f56.cb2c9","wires":[["166ff874.3f4048","2d936263.c9b0de"]]},{"id":"2208fca1.c9af34","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2032.000259399414,"y":1719.000244140625,"z":"a4e67f56.cb2c9","wires":[["39941f53.76089","64428a52.6aacd4"]]},{"id":"2d936263.c9b0de","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2206.000259399414,"y":1523.000244140625,"z":"a4e67f56.cb2c9","wires":[["5428dfc9.98ca2"]]},{"id":"64428a52.6aacd4","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2226.000259399414,"y":1682.000244140625,"z":"a4e67f56.cb2c9","wires":[["890502f.9d453"]]},{"id":"5428dfc9.98ca2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2426.000259399414,"y":1525.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"890502f.9d453","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2447.000259399414,"y":1677.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"5fb4f85a.b03e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1365.000259399414,"y":1849.000244140625,"z":"a4e67f56.cb2c9","wires":[["6b9fbfd9.cf2c9","12808282.63fedd"]]},{"id":"12808282.63fedd","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1587.000259399414,"y":1846.000244140625,"z":"a4e67f56.cb2c9","wires":[["982395bf.926078"]]},{"id":"982395bf.926078","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1788.000259399414,"y":1847.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"99961634.235f88","type":"execute","name":"execute_TerminateStack","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='terminateStack' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n <parameter name=\"org.onap.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":639.0000152587891,"y":1032,"z":"a4e67f56.cb2c9","wires":[["4c9c8ea6.0754a","dd76694.e3a1398","b8cb00c4.e2276"]]},{"id":"4c9c8ea6.0754a","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":530.0000152587891,"y":1344,"z":"a4e67f56.cb2c9","wires":[["29494781.a54038"]]},{"id":"dd76694.e3a1398","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":825.9999847412109,"y":1123.0000305175781,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"9bbcc3c6.f3fc9","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":984.9999847412109,"y":1206.0000305175781,"z":"a4e67f56.cb2c9","wires":[["816ffef8.3f001","e7013e5c.73cd3","eb94341d.daee38"]]},{"id":"b8ddaca8.31ca2","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1800.999984741211,"y":1151.0000915527344,"z":"a4e67f56.cb2c9","wires":[["745adec2.0c18","386e30ca.c82d7"]]},{"id":"386e30ca.c82d7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1960.000015258789,"y":1085.0001220703125,"z":"a4e67f56.cb2c9","wires":[["5af77541.eebf1c"]]},{"id":"f91f4f00.327fd","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2238.999771118164,"y":1296.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"1a39765.7ec2a8a","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2247.999954223633,"y":1273.0001525878906,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"a65c14b7.f9fc18","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2233.000015258789,"y":1252.0001220703125,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"7b1f1fed.0097","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2109.000015258789,"y":1205.0001220703125,"z":"a4e67f56.cb2c9","wires":[["f91f4f00.327fd","1a39765.7ec2a8a","a65c14b7.f9fc18"]]},{"id":"745adec2.0c18","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1962.000015258789,"y":1213.0001220703125,"z":"a4e67f56.cb2c9","wires":[["7b1f1fed.0097"]]},{"id":"816ffef8.3f001","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n<parameter name=\"output.status.message\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":1240.000015258789,"y":1199,"z":"a4e67f56.cb2c9","wires":[["dde9085f.2ff908"]]},{"id":"dde9085f.2ff908","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1429.000015258789,"y":1191,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"b8cb00c4.e2276","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":803.9999847412109,"y":1174.0001525878906,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"f2b0d1ec.808d1","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":966.0000152587891,"y":1478.666748046875,"z":"a4e67f56.cb2c9","wires":[["a8b2ac3.d27705"]]},{"id":"e7013e5c.73cd3","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":939.0000152587891,"y":1009.3333740234375,"z":"a4e67f56.cb2c9","wires":[["1ed3a2d4.2d0acd"]]},{"id":"e13c6788.af9018","type":"execute","name":"execute_lookupServer","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='lookupServer' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1160.000015258789,"y":1013.3333740234375,"z":"a4e67f56.cb2c9","wires":[["f1d9ce42.3fc2","8a7dbf97.22061"]]},{"id":"422c2173.1d7ab","type":"switchNode","name":"switch_isServerFound","xml":"<switch test='`$serverFound`'>\n","comments":"","outputs":1,"x":1564.6666412353516,"y":1016.3333740234375,"z":"a4e67f56.cb2c9","wires":[["4a611b2.5a488e4","9f456a36.09d8f8","1750b09d.dd507f"]]},{"id":"4a611b2.5a488e4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1765.666519165039,"y":1009.3333740234375,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"9f456a36.09d8f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1760.6666412353516,"y":1078.3333740234375,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"e87932eb.920c2","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":2219.222183227539,"y":793.1111450195312,"z":"a4e67f56.cb2c9","wires":[["626a5a33.1f4184","133e3018.0ed4a"]]},{"id":"626a5a33.1f4184","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2432.222183227539,"y":889.1111755371094,"z":"a4e67f56.cb2c9","wires":[["6b98bf4a.6b6d1"]]},{"id":"84f94e68.c257","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2576.222183227539,"y":1129.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"133e3018.0ed4a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2422.222183227539,"y":717.1111755371094,"z":"a4e67f56.cb2c9","wires":[["61a1ee76.d7abf"]]},{"id":"3b27dd33.3249e2","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":2454.222183227539,"y":816.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"61a1ee76.d7abf","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":2614.222183227539,"y":720.1111755371094,"z":"a4e67f56.cb2c9","wires":[["cbf88535.3cc078","f10274f9.7c6708","b7ffbb29.5e80b8"]]},{"id":"cbf88535.3cc078","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":2839.222183227539,"y":721.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f10274f9.7c6708","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2839.222183227539,"y":835.1111755371094,"z":"a4e67f56.cb2c9","wires":[["97a5cdc3.5b14d"]]},{"id":"b7ffbb29.5e80b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2833.222183227539,"y":946.1111755371094,"z":"a4e67f56.cb2c9","wires":[["83dd288f.4d99b8"]]},{"id":"a93117d7.575f58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>","comments":"","x":3163.222183227539,"y":859.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"576510ce.7be8a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3177.222183227539,"y":992.1111755371094,"z":"a4e67f56.cb2c9","wires":[]},{"id":"97a5cdc3.5b14d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3011.222183227539,"y":829.1111755371094,"z":"a4e67f56.cb2c9","wires":[["a93117d7.575f58","1f9383ac.0e6aec"]]},{"id":"83dd288f.4d99b8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3011.222183227539,"y":950.1111755371094,"z":"a4e67f56.cb2c9","wires":[["576510ce.7be8a","e5f1757c.6e8838"]]},{"id":"1f9383ac.0e6aec","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3143.222183227539,"y":749.1111755371094,"z":"a4e67f56.cb2c9","wires":[["42e84307.cf497c"]]},{"id":"e5f1757c.6e8838","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3205.222183227539,"y":913.1111755371094,"z":"a4e67f56.cb2c9","wires":[["adf0db8.e0f4328"]]},{"id":"42e84307.cf497c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3360.222183227539,"y":749.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"adf0db8.e0f4328","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3384.222183227539,"y":910.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"6b98bf4a.6b6d1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2384.222183227539,"y":1054.1111755371094,"z":"a4e67f56.cb2c9","wires":[["84f94e68.c257","ae3d5f22.e56e9"]]},{"id":"ae3d5f22.e56e9","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2609.222183227539,"y":998.1111755371094,"z":"a4e67f56.cb2c9","wires":[["3da27612.12e46a"]]},{"id":"3da27612.12e46a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2797.222183227539,"y":1002.1111755371094,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f1d9ce42.3fc2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1363.000015258789,"y":1012,"z":"a4e67f56.cb2c9","wires":[["422c2173.1d7ab"]]},{"id":"8a7dbf97.22061","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1352.000015258789,"y":1082,"z":"a4e67f56.cb2c9","wires":[["b8ddaca8.31ca2"]]},{"id":"1ed3a2d4.2d0acd","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1030.000015258789,"y":959,"z":"a4e67f56.cb2c9","wires":[["e13c6788.af9018"]]},{"id":"8cddc38f.7a40e","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":776.0000152587891,"y":60,"z":"a4e67f56.cb2c9","wires":[["56adc02f.e937d"]]},{"id":"a8b2ac3.d27705","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1065.000015258789,"y":1535,"z":"a4e67f56.cb2c9","wires":[["4c5b7745.303d88"]]},{"id":"fcaee4fa.750418","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":859.0000152587891,"y":1532,"z":"a4e67f56.cb2c9","wires":[["f2b0d1ec.808d1"]]},{"id":"29494781.a54038","type":"switchNode","name":"switch","xml":"<switch test='`$TERMINATE_STATUS`'>\n","comments":"","outputs":1,"x":378.00001525878906,"y":1587,"z":"a4e67f56.cb2c9","wires":[["d79d038e.dc79d","b3678f24.77c0d","b71088d3.bcd548"]]},{"id":"b71088d3.bcd548","type":"other","name":"outcome_Stack_NOT_FOUND","xml":"<outcome value='STACK_NOT_FOUND'>\n","comments":"","outputs":1,"x":629.0000152587891,"y":1637,"z":"a4e67f56.cb2c9","wires":[["acf43fdf.f3f61"]]},{"id":"d79d038e.dc79d","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":612.0000152587891,"y":1531,"z":"a4e67f56.cb2c9","wires":[["fcaee4fa.750418"]]},{"id":"b3678f24.77c0d","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":610.0000152587891,"y":1579,"z":"a4e67f56.cb2c9","wires":[["9bbcc3c6.f3fc9"]]},{"id":"eb94341d.daee38","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1201.000015258789,"y":1285,"z":"a4e67f56.cb2c9","wires":[]},{"id":"5af77541.eebf1c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2181.999771118164,"y":1090.000244140625,"z":"a4e67f56.cb2c9","wires":[]},{"id":"f1c2445.9b079b8","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":851.0000152587891,"y":2108,"z":"a4e67f56.cb2c9","wires":[["4e5f0316.5b336c","9f4b4a3.064eeb8"]]},{"id":"9f4b4a3.064eeb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1050.000015258789,"y":2087,"z":"a4e67f56.cb2c9","wires":[["41799e8a.78e08"]]},{"id":"4e5f0316.5b336c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1047.000015258789,"y":2132,"z":"a4e67f56.cb2c9","wires":[["63968449.9d15dc"]]},{"id":"63968449.9d15dc","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1182.000015258789,"y":2136,"z":"a4e67f56.cb2c9","wires":[["f7c574be.4bda68","5b336450.0d264c","f6d95927.d64ee8"]]},{"id":"f7c574be.4bda68","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1334.9998931884766,"y":2155.000244140625,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"5b336450.0d264c","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1347.000015258789,"y":2137,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"f6d95927.d64ee8","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1326.000015258789,"y":2108,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"acf43fdf.f3f61","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":410.00001525878906,"y":1905,"z":"a4e67f56.cb2c9","wires":[["e077bff2.48865","423e8c1d.af2b24"]]},{"id":"e077bff2.48865","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":757.0000152587891,"y":1967.666748046875,"z":"a4e67f56.cb2c9","wires":[["e27653a7.d320a"]]},{"id":"e27653a7.d320a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":821.0000152587891,"y":2033,"z":"a4e67f56.cb2c9","wires":[["f1c2445.9b079b8"]]},{"id":"41799e8a.78e08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1507.000015258789,"y":2083,"z":"a4e67f56.cb2c9","wires":[["9e96b820.10fa68","4bdee93a.d5fd18"]]},{"id":"4bdee93a.d5fd18","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name=\"output.status.message\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":1701.000015258789,"y":2020,"z":"a4e67f56.cb2c9","wires":[["f785dfe9.09653"]]},{"id":"f785dfe9.09653","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1905.000015258789,"y":2021,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"9e96b820.10fa68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1672.000015258789,"y":2143,"z":"a4e67f56.cb2c9","wires":[]},{"id":"1750b09d.dd507f","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1760.000015258789,"y":953,"z":"a4e67f56.cb2c9","wires":[["e87932eb.920c2"]]},{"id":"423e8c1d.af2b24","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":716.0000152587891,"y":2221,"z":"a4e67f56.cb2c9","wires":[["dad63133.72d13","650f38af.5e6678"]]},{"id":"650f38af.5e6678","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":948.0000762939453,"y":2265,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dad63133.72d13","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n<parameter name=\"output.status.message\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":988.0000762939453,"y":2208,"z":"a4e67f56.cb2c9","wires":[["6648d3dd.c3f94c"]]},{"id":"6648d3dd.c3f94c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1209.000015258789,"y":2204,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"76a553b1.7a606c","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":388.7063293457031,"y":1083.9843139648438,"z":"a4e67f56.cb2c9","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.1.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.1.json
deleted file mode 100644
index 5b2491d..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_Generic_Terminate_2.0.1.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"6a91792e.7babd8","type":"method","name":"Generic_Terminate","xml":"<method rpc='Generic_Terminate' mode='sync'>\n","comments":"","outputs":1,"x":148.66665649414062,"y":231,"z":"214d83f7.3c518c","wires":[["8842ebb3.34ae88"]]},{"id":"5b236231.d788cc","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","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.1'>","outputs":1,"x":148.66665649414062,"y":158,"z":"214d83f7.3c518c","wires":[["6a91792e.7babd8"]]},{"id":"40dd126c.6467ac","type":"dgstart","name":"DGSTART","outputs":1,"x":114.66665649414062,"y":64,"z":"214d83f7.3c518c","wires":[["5b236231.d788cc"]]},{"id":"c5b3ed4c.7a51e","type":"execute","name":"execute_getVNF_Hierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy'>\n<parameter name=\"resourceKey\" value=\"`$input.action-identifiers.vnf-id`\" />","comments":"","outputs":1,"x":712.6666564941406,"y":418,"z":"214d83f7.3c518c","wires":[["4167438c.1e614c","5c2b2174.d5d2d","72adec34.6cebc4"]]},{"id":"4167438c.1e614c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1042.6666717529297,"y":359,"z":"214d83f7.3c518c","wires":[["f36ab527.a7f0a8"]]},{"id":"40745781.e26f38","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":743.6666717529297,"y":1031.0000610351562,"z":"214d83f7.3c518c","wires":[["9a947cc5.23ce8","51330ad7.924734","82d02640.710dc8"]]},{"id":"9a947cc5.23ce8","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1201.6666717529297,"y":888,"z":"214d83f7.3c518c","wires":[["a18c1d82.ceb56"]]},{"id":"a18c1d82.ceb56","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":1291.6666717529297,"y":717,"z":"214d83f7.3c518c","wires":[["1f5ac652.ff0a0a"]]},{"id":"1f5ac652.ff0a0a","type":"execute","name":"execute_UpdateAA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"Terminating\" />\n","comments":"","outputs":1,"x":1432.6666717529297,"y":811,"z":"214d83f7.3c518c","wires":[["ba2d3b93.0fc308","e013018e.c2ce6"]]},{"id":"ba2d3b93.0fc308","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1607.6666717529297,"y":814,"z":"214d83f7.3c518c","wires":[["30ec2ffc.29dd4"]]},{"id":"5c2b2174.d5d2d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1171.6666717529297,"y":255,"z":"214d83f7.3c518c","wires":[["7af3024a.0c77ec"]]},{"id":"6f9d109d.47a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1580.6666717529297,"y":307,"z":"214d83f7.3c518c","wires":[]},{"id":"a9d9b6a5.ff7028","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":1777.6669158935547,"y":1548.000244140625,"z":"214d83f7.3c518c","wires":[["f0a60773.983e78","791fa776.b19fa8"]]},{"id":"f0a60773.983e78","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1958.6669158935547,"y":1605.000244140625,"z":"214d83f7.3c518c","wires":[["1418d53d.7f133b"]]},{"id":"db7092d6.8fae","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2043.6669158935547,"y":1933.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"791fa776.b19fa8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1959.6669158935547,"y":1474.000244140625,"z":"214d83f7.3c518c","wires":[["ddbbf603.b53e18"]]},{"id":"e013018e.c2ce6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1607.6666717529297,"y":634,"z":"214d83f7.3c518c","wires":[["47ccb57f.6543ec"]]},{"id":"e72b6702.279708","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2075.6666717529297,"y":545,"z":"214d83f7.3c518c","wires":[]},{"id":"8bf91d02.277ac","type":"comment","name":"update VNFCs to terminating","info":"","comments":"","x":1353.6666717529297,"y":860,"z":"214d83f7.3c518c","wires":[]},{"id":"e269577f.6b4058","type":"comment","name":"call south bound to delete VMs","info":"","comments":"","x":1921.6666717529297,"y":354,"z":"214d83f7.3c518c","wires":[]},{"id":"8b30f8a4.f6e778","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":1804.6669158935547,"y":1582.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"be86022b.82158","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":962.6666564941406,"y":471,"z":"214d83f7.3c518c","wires":[]},{"id":"78588c7a.743e14","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":867.6666717529297,"y":792,"z":"214d83f7.3c518c","wires":[["166c71ac.291f6e","724fce8c.100f6"]]},{"id":"166c71ac.291f6e","type":"other","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1040.6666717529297,"y":697,"z":"214d83f7.3c518c","wires":[["74e7a734.c69f38"]]},{"id":"724fce8c.100f6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":988.6666717529297,"y":882,"z":"214d83f7.3c518c","wires":[["40745781.e26f38"]]},{"id":"f36ab527.a7f0a8","type":"switchNode","name":"switch","xml":"<switch test='`$getVnfHierarchy_result`'>\n","comments":"","outputs":1,"x":957.6666717529297,"y":504,"z":"214d83f7.3c518c","wires":[["605c9bcb.12d854","8eb5283f.78b858"]]},{"id":"605c9bcb.12d854","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":956.6666717529297,"y":591,"z":"214d83f7.3c518c","wires":[["78588c7a.743e14"]]},{"id":"8eb5283f.78b858","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1212.6666717529297,"y":500,"z":"214d83f7.3c518c","wires":[["bc16b835.e67df8"]]},{"id":"30ec2ffc.29dd4","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1740.6666717529297,"y":676,"z":"214d83f7.3c518c","wires":[["486bc0b7.06e2c","6b589062.343aa","46ffb052.ef31d"]]},{"id":"486bc0b7.06e2c","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1896.6666717529297,"y":644,"z":"214d83f7.3c518c","wires":[[]]},{"id":"6b589062.343aa","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1905.6666717529297,"y":680,"z":"214d83f7.3c518c","wires":[["d6575672.8b8888"]]},{"id":"46ffb052.ef31d","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1900.6666717529297,"y":717,"z":"214d83f7.3c518c","wires":[["a6264772.8b5a18"]]},{"id":"ddbbf603.b53e18","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":2172.6669158935547,"y":1544.0002136230469,"z":"214d83f7.3c518c","wires":[["f03cdfd2.9419f","75d0e135.830a5","b144c34e.c13ab"]]},{"id":"f03cdfd2.9419f","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":2349.6669158935547,"y":1510.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"75d0e135.830a5","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2349.6669158935547,"y":1624.000244140625,"z":"214d83f7.3c518c","wires":[["8e0f8ac1.b9e7e8"]]},{"id":"b144c34e.c13ab","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2343.6669158935547,"y":1735.000244140625,"z":"214d83f7.3c518c","wires":[["2ae8e8ce.c451c8"]]},{"id":"6b97d665.4e5aa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2673.6669158935547,"y":1648.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"ffc50795.32ef28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2687.6669158935547,"y":1781.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"79a07e38.a86d4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1319.6666717529297,"y":679,"z":"214d83f7.3c518c","wires":[]},{"id":"f4d2923.3dec37","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2273.6666717529297,"y":687,"z":"214d83f7.3c518c","wires":[]},{"id":"4a7e04c9.bf41cc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2235.667007446289,"y":900,"z":"214d83f7.3c518c","wires":[]},{"id":"2adb8b66.3f8504","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1460.6666717529297,"y":524,"z":"214d83f7.3c518c","wires":[]},{"id":"7af3024a.0c77ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1289.6666717529297,"y":323,"z":"214d83f7.3c518c","wires":[["6f9d109d.47a","ebf5dd23.4a38f"]]},{"id":"ebf5dd23.4a38f","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Exception in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Exception in getting VNF Hierachy\"/>\n","comments":"","outputs":1,"x":1570.6666717529297,"y":133,"z":"214d83f7.3c518c","wires":[["c956679b.bab7b8"]]},{"id":"c956679b.bab7b8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1795.6666717529297,"y":104,"z":"214d83f7.3c518c","wires":[[]]},{"id":"bc16b835.e67df8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1354.6666717529297,"y":466,"z":"214d83f7.3c518c","wires":[["2adb8b66.3f8504","a41aef94.7e09"]]},{"id":"a41aef94.7e09","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"Failure in getting VNF Hierachy\"/>\n<parameter name='output.status.message' value=\"Failure in getting VNF Hierachy\"/>\n\n","comments":"","outputs":1,"x":1420.6666717529297,"y":392,"z":"214d83f7.3c518c","wires":[["109fc3cc.165b8c"]]},{"id":"109fc3cc.165b8c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1627.6666717529297,"y":408,"z":"214d83f7.3c518c","wires":[[]]},{"id":"74e7a734.c69f38","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1159.6666717529297,"y":635,"z":"214d83f7.3c518c","wires":[["79a07e38.a86d4","1fdafa81.05cb55"]]},{"id":"1fdafa81.05cb55","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"VM Count is 0\"/>\n<parameter name='output.status.message' value=\"VM Count is 0\"/>\n\n","comments":"","outputs":1,"x":1260.6666717529297,"y":563,"z":"214d83f7.3c518c","wires":[["a638cc12.c03da"]]},{"id":"a638cc12.c03da","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1426.6666717529297,"y":623,"z":"214d83f7.3c518c","wires":[[]]},{"id":"47ccb57f.6543ec","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1922.6666717529297,"y":492,"z":"214d83f7.3c518c","wires":[["e72b6702.279708","203420f8.4a6c8"]]},{"id":"203420f8.4a6c8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Exception in AAI Update for vnfc '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":2147.6666717529297,"y":490,"z":"214d83f7.3c518c","wires":[["81561833.a0f998"]]},{"id":"81561833.a0f998","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2350.6666717529297,"y":493,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a6264772.8b5a18","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2006.6666412353516,"y":796,"z":"214d83f7.3c518c","wires":[["4a7e04c9.bf41cc","d22c813.a8fe48"]]},{"id":"d22c813.a8fe48","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating AAI for '+$VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":2278.6671295166016,"y":813,"z":"214d83f7.3c518c","wires":[["9df8c65a.d36ae8"]]},{"id":"9df8c65a.d36ae8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2499.667037963867,"y":809.0000915527344,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d6575672.8b8888","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2068.6666412353516,"y":685,"z":"214d83f7.3c518c","wires":[["f4d2923.3dec37","d0f739a9.299bf8"]]},{"id":"d0f739a9.299bf8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI'+ $VNF.VM[$i].VNFC`\" />\n\n","comments":"","outputs":1,"x":2263.6666717529297,"y":621,"z":"214d83f7.3c518c","wires":[["bede9367.77c9d"]]},{"id":"bede9367.77c9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2455.6669158935547,"y":621,"z":"214d83f7.3c518c","wires":[[]]},{"id":"8e0f8ac1.b9e7e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2521.6669158935547,"y":1618.000244140625,"z":"214d83f7.3c518c","wires":[["6b97d665.4e5aa8","27493e98.52c6e2"]]},{"id":"2ae8e8ce.c451c8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2521.6669158935547,"y":1739.000244140625,"z":"214d83f7.3c518c","wires":[["ffc50795.32ef28","49dfea1b.954844"]]},{"id":"27493e98.52c6e2","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":2695.6669158935547,"y":1543.000244140625,"z":"214d83f7.3c518c","wires":[["3265161a.da4fda"]]},{"id":"49dfea1b.954844","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":2715.6669158935547,"y":1702.000244140625,"z":"214d83f7.3c518c","wires":[["a931d97f.0a8ef8"]]},{"id":"3265161a.da4fda","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2915.6669158935547,"y":1545.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a931d97f.0a8ef8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2936.6669158935547,"y":1697.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"1418d53d.7f133b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1854.6669158935547,"y":1869.000244140625,"z":"214d83f7.3c518c","wires":[["db7092d6.8fae","d2c04b2.c7333b8"]]},{"id":"d2c04b2.c7333b8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in deleting from AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":2076.6669158935547,"y":1866.000244140625,"z":"214d83f7.3c518c","wires":[["76c8bb58.d4a2b4"]]},{"id":"76c8bb58.d4a2b4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2277.6669158935547,"y":1867.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"51330ad7.924734","type":"execute","name":"execute_TerminateStack","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='terminateStack' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[0].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n <parameter name=\"org.onap.appc.stack.id\" value=\"`$VNF.heat-stack-id`\"/>","comments":"","outputs":1,"x":1128.6666717529297,"y":1052,"z":"214d83f7.3c518c","wires":[["8014c3bc.7e994","9518b74c.9dfbe8","500bd329.f4843c"]]},{"id":"8014c3bc.7e994","type":"outcome","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1019.6666717529297,"y":1364,"z":"214d83f7.3c518c","wires":[["e36fc9a0.8f4758"]]},{"id":"9518b74c.9dfbe8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1315.6666412353516,"y":1143.0000305175781,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"f1cff1ca.4f3fa","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1474.6666412353516,"y":1226.0000305175781,"z":"214d83f7.3c518c","wires":[["d26c7cdb.1a1c1","e21c7013.2a511","4e395d8c.0e8654"]]},{"id":"bffd5141.6c547","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":2290.6666412353516,"y":1171.0000915527344,"z":"214d83f7.3c518c","wires":[["13d1960d.9c176a","ee50c4be.2e9d28"]]},{"id":"ee50c4be.2e9d28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2449.6666717529297,"y":1105.0001220703125,"z":"214d83f7.3c518c","wires":[["6876f9ee.88d068"]]},{"id":"104f28b8.5f4c67","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":2728.6664276123047,"y":1316.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"2129246.f55abdc","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":2737.6666107177734,"y":1293.0001525878906,"z":"214d83f7.3c518c","wires":[[]]},{"id":"75bf7111.51ae5","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2722.6666717529297,"y":1272.0001220703125,"z":"214d83f7.3c518c","wires":[[]]},{"id":"b334397d.c3d958","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":2598.6666717529297,"y":1225.0001220703125,"z":"214d83f7.3c518c","wires":[["104f28b8.5f4c67","2129246.f55abdc","75bf7111.51ae5"]]},{"id":"13d1960d.9c176a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2451.6666717529297,"y":1233.0001220703125,"z":"214d83f7.3c518c","wires":[["b334397d.c3d958"]]},{"id":"d26c7cdb.1a1c1","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Error occured while terminating Stack '+$VNF.heat-stack-id`\"/>\n","comments":"","outputs":1,"x":1729.6666717529297,"y":1219,"z":"214d83f7.3c518c","wires":[["8be889a9.6d6c68"]]},{"id":"8be889a9.6d6c68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1918.6666717529297,"y":1211,"z":"214d83f7.3c518c","wires":[[]]},{"id":"500bd329.f4843c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1293.6666412353516,"y":1194.0001525878906,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"4a03d8fe.d47068","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1455.6666717529297,"y":1498.666748046875,"z":"214d83f7.3c518c","wires":[["6b7368e3.64b308"]]},{"id":"e21c7013.2a511","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1428.6666717529297,"y":1029.3333740234375,"z":"214d83f7.3c518c","wires":[["7b636d61.d0b554"]]},{"id":"7099d9d3.ce2a88","type":"execute","name":"execute_lookupServer","xml":"<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='lookupServer' >\n <parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n <parameter name=\"org.onap.appc.instance.url\" value=\"`$VNF.VM[$i].URL`\" />\n <parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n","comments":"","outputs":1,"x":1649.6666717529297,"y":1033.3333740234375,"z":"214d83f7.3c518c","wires":[["d40d4181.f4c28","e3a51c64.b39b9"]]},{"id":"7a853c33.9204b4","type":"switchNode","name":"switch_isServerFound","xml":"<switch test='`$serverFound`'>\n","comments":"","outputs":1,"x":2054.333297729492,"y":1036.3333740234375,"z":"214d83f7.3c518c","wires":[["ba8d600.0a405a","dec7ed8e.6bb98","f0ec0e5b.68c6"]]},{"id":"ba8d600.0a405a","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2255.3331756591797,"y":1029.3333740234375,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"dec7ed8e.6bb98","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2250.333297729492,"y":1098.3333740234375,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"a8c9d533.157048","type":"execute","name":"execute_Delete_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='deleteResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n","comments":"","outputs":1,"x":2708.8888397216797,"y":813.1111450195312,"z":"214d83f7.3c518c","wires":[["b85685cd.59cc58","adbd6019.dddcf"]]},{"id":"b85685cd.59cc58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2921.8888397216797,"y":909.1111755371094,"z":"214d83f7.3c518c","wires":[["a26d7ad7.fc3678"]]},{"id":"51877c7e.0ed344","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3065.8888397216797,"y":1149.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"adbd6019.dddcf","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2911.8888397216797,"y":737.1111755371094,"z":"214d83f7.3c518c","wires":[["a32e8ff0.fd949"]]},{"id":"6b1dcaae.a26de4","type":"comment","name":"Delete VNFCs from AA&I","info":"","comments":"","x":2943.8888397216797,"y":836.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"a32e8ff0.fd949","type":"switchNode","name":"switch","xml":"<switch test='`$deleteResource_result`'>\n","comments":"","outputs":1,"x":3103.8888397216797,"y":740.1111755371094,"z":"214d83f7.3c518c","wires":[["6367d45e.f568bc","a2b057d0.ae5338","af8908d5.a293b8"]]},{"id":"6367d45e.f568bc","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>","comments":"","outputs":1,"x":3328.8888397216797,"y":741.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a2b057d0.ae5338","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":3328.8888397216797,"y":855.1111755371094,"z":"214d83f7.3c518c","wires":[["2e777347.c58bac"]]},{"id":"af8908d5.a293b8","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":3322.8888397216797,"y":966.1111755371094,"z":"214d83f7.3c518c","wires":[["d3aee095.4eaad"]]},{"id":"b0455566.ea43d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3652.8888397216797,"y":879.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"8320aaf5.fac488","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":3666.8888397216797,"y":1012.1111755371094,"z":"214d83f7.3c518c","wires":[]},{"id":"2e777347.c58bac","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3500.8888397216797,"y":849.1111755371094,"z":"214d83f7.3c518c","wires":[["b0455566.ea43d8","c013a213.b6497"]]},{"id":"d3aee095.4eaad","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3500.8888397216797,"y":970.1111755371094,"z":"214d83f7.3c518c","wires":[["8320aaf5.fac488","fc0ad0dd.1a778"]]},{"id":"c013a213.b6497","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'VNFC not found in AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>","comments":"","outputs":1,"x":3632.8888397216797,"y":769.1111755371094,"z":"214d83f7.3c518c","wires":[["92ed3d58.93848"]]},{"id":"fc0ad0dd.1a778","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updating VNFC in AAI after terminate for '+$VNF.VM[$i].VNFC`\"/>\n","comments":"","outputs":1,"x":3694.8888397216797,"y":933.1111755371094,"z":"214d83f7.3c518c","wires":[["d9ca4a14.fc8388"]]},{"id":"92ed3d58.93848","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3849.8888397216797,"y":769.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d9ca4a14.fc8388","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3873.8888397216797,"y":930.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"a26d7ad7.fc3678","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2873.8888397216797,"y":1074.1111755371094,"z":"214d83f7.3c518c","wires":[["51877c7e.0ed344","63fbb548.bd5b9c"]]},{"id":"63fbb548.bd5b9c","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in deleting from AAI after terminate for'+ $VNF.VM[$i].VNFC`\"/>\n\n","comments":"","outputs":1,"x":3098.8888397216797,"y":1018.1111755371094,"z":"214d83f7.3c518c","wires":[["fc4ad188.46539"]]},{"id":"fc4ad188.46539","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3286.8888397216797,"y":1022.1111755371094,"z":"214d83f7.3c518c","wires":[[]]},{"id":"d40d4181.f4c28","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1852.6666717529297,"y":1032,"z":"214d83f7.3c518c","wires":[["7a853c33.9204b4"]]},{"id":"e3a51c64.b39b9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1841.6666717529297,"y":1102,"z":"214d83f7.3c518c","wires":[["bffd5141.6c547"]]},{"id":"7b636d61.d0b554","type":"block","name":"block","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1519.6666717529297,"y":979,"z":"214d83f7.3c518c","wires":[["7099d9d3.ce2a88"]]},{"id":"72adec34.6cebc4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1265.6666717529297,"y":80,"z":"214d83f7.3c518c","wires":[["7af3024a.0c77ec"]]},{"id":"6b7368e3.64b308","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1554.6666717529297,"y":1555,"z":"214d83f7.3c518c","wires":[["a9d9b6a5.ff7028"]]},{"id":"621d1ea9.529a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1356.6665954589844,"y":1548,"z":"214d83f7.3c518c","wires":[["4a03d8fe.d47068"]]},{"id":"e36fc9a0.8f4758","type":"switchNode","name":"switch","xml":"<switch test='`$TERMINATE_STATUS`'>\n","comments":"","outputs":1,"x":867.6666717529297,"y":1607,"z":"214d83f7.3c518c","wires":[["d112b421.f478c8","dd33deb1.aac3a","be14d688.32f998"]]},{"id":"be14d688.32f998","type":"other","name":"outcome_Stack_NOT_FOUND","xml":"<outcome value='STACK_NOT_FOUND'>\n","comments":"","outputs":1,"x":1118.6666717529297,"y":1657,"z":"214d83f7.3c518c","wires":[["54e72492.4b6c5c"]]},{"id":"d112b421.f478c8","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1101.6666717529297,"y":1551,"z":"214d83f7.3c518c","wires":[["30776976.0fc246"]]},{"id":"dd33deb1.aac3a","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":1099.6666717529297,"y":1599,"z":"214d83f7.3c518c","wires":[["f1cff1ca.4f3fa"]]},{"id":"4e395d8c.0e8654","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1690.6666717529297,"y":1305,"z":"214d83f7.3c518c","wires":[]},{"id":"6876f9ee.88d068","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2671.6664276123047,"y":1110.000244140625,"z":"214d83f7.3c518c","wires":[]},{"id":"43a0f845.a872c8","type":"execute","name":"execute_Update_AA&I","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='postResource'>\n<parameter name=\"resourceType\" value=\"vnfc\" />\n<parameter name=\"prefix\" value=\"vnfc\" />\n<parameter name=\"resourceKey\" value='vnfc-name = $VNF.VM[$i].VNFC' />\n<parameter name=\"attributeName\" value=\"orchestration-status\" />\n<parameter name=\"attributeValue\" value=\"ERROR\" />\n","comments":"","outputs":1,"x":1340.6666717529297,"y":2128,"z":"214d83f7.3c518c","wires":[["3294635e.27511c","b1093d6.01027c"]]},{"id":"b1093d6.01027c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1539.6666717529297,"y":2107,"z":"214d83f7.3c518c","wires":[["8dd7506b.ff07f"]]},{"id":"3294635e.27511c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1536.6666717529297,"y":2152,"z":"214d83f7.3c518c","wires":[["33c89bc.80ab564"]]},{"id":"33c89bc.80ab564","type":"switchNode","name":"switch","xml":"<switch test='`$postResource_result`'>\n","comments":"","outputs":1,"x":1671.6666717529297,"y":2156,"z":"214d83f7.3c518c","wires":[["4c727a1.c013684","c7169490.8b0688","555157fd.482568"]]},{"id":"4c727a1.c013684","type":"outcome","name":"FAILURE","xml":"<outcome value='FAILURE'>\n","comments":"","outputs":1,"x":1824.6665496826172,"y":2175.000244140625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"c7169490.8b0688","type":"outcome","name":"NOT_FOUND","xml":"<outcome value='NOT_FOUND'>\n","comments":"","outputs":1,"x":1836.6666717529297,"y":2157,"z":"214d83f7.3c518c","wires":[[]]},{"id":"555157fd.482568","type":"outcome","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":1815.6666717529297,"y":2128,"z":"214d83f7.3c518c","wires":[[]]},{"id":"54e72492.4b6c5c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":899.6666717529297,"y":1925,"z":"214d83f7.3c518c","wires":[["402e577a.9942b8","1e80e12b.08e96f"]]},{"id":"402e577a.9942b8","type":"for","name":"for_each_VMs","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >","comments":"","outputs":1,"x":1246.6666717529297,"y":1987.666748046875,"z":"214d83f7.3c518c","wires":[["f67c30dc.e3327"]]},{"id":"f67c30dc.e3327","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1310.6666717529297,"y":2053,"z":"214d83f7.3c518c","wires":[["43a0f845.a872c8"]]},{"id":"8dd7506b.ff07f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1996.6666717529297,"y":2103,"z":"214d83f7.3c518c","wires":[["5519adf3.6b21c4","62c19bb2.6e4ff4"]]},{"id":"62c19bb2.6e4ff4","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n<parameter name='output.status.message' value=\"`'Failure in updatig Error in AAI for '+$VNF.VM[$i].VNFC`\"/>\n\n\n","comments":"","outputs":1,"x":2190.6666717529297,"y":2040,"z":"214d83f7.3c518c","wires":[["b88c942f.647928"]]},{"id":"b88c942f.647928","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2394.6666717529297,"y":2041,"z":"214d83f7.3c518c","wires":[[]]},{"id":"5519adf3.6b21c4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2161.6666717529297,"y":2163,"z":"214d83f7.3c518c","wires":[]},{"id":"f0ec0e5b.68c6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2249.6666717529297,"y":973,"z":"214d83f7.3c518c","wires":[["a8c9d533.157048"]]},{"id":"1e80e12b.08e96f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1205.6666717529297,"y":2241,"z":"214d83f7.3c518c","wires":[["b275796.53f2988","4c597638.4430e8"]]},{"id":"4c597638.4430e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1437.666732788086,"y":2285,"z":"214d83f7.3c518c","wires":[]},{"id":"b275796.53f2988","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n<parameter name='output.status.message' value=\"`'Stack not found with id: '+$VNF.heat-stack-id`\"/>\n","comments":"","outputs":1,"x":1477.666732788086,"y":2228,"z":"214d83f7.3c518c","wires":[["6f875274.e7da5c"]]},{"id":"6f875274.e7da5c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1698.6666717529297,"y":2224,"z":"214d83f7.3c518c","wires":[[]]},{"id":"82d02640.710dc8","type":"update","name":"update","xml":"<update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' key=\"UPDATE UPLOAD_CONFIG SET PENDING_DELETE='Y' where VNF_ID = $input.action-identifiers.vnf-id\">","comments":"","outputs":1,"x":487.4444274902344,"y":1245.8418579101562,"z":"214d83f7.3c518c","wires":[["f2a83f28.727f8","e85986a4.fe52f8"]]},{"id":"e85986a4.fe52f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":651.0158538818359,"y":1183.6987915039062,"z":"214d83f7.3c518c","wires":[["1dbbd253.259b4e"]]},{"id":"f2a83f28.727f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":645.7062225341797,"y":1290.1268920898438,"z":"214d83f7.3c518c","wires":[["5cfca817.a09e08"]]},{"id":"1dbbd253.259b4e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":820.4444427490234,"y":1184.8577270507812,"z":"214d83f7.3c518c","wires":[["5cfca817.a09e08","eb213ae1.5247d8"]]},{"id":"5cfca817.a09e08","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":907.3729934692383,"y":1289.9843034744263,"z":"214d83f7.3c518c","wires":[]},{"id":"d95314ce.20c6c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1021.047607421875,"y":1196.7144775390625,"z":"214d83f7.3c518c","wires":[[]]},{"id":"eb213ae1.5247d8","type":"execute","name":"execute_SendUEBEvent","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`'SQL Exception : Unable to execute Update query for  '+$input.action-identifiers.vnf-id`\"/>\n<parameter name='output.status.message' value=\"`'SQL Exception : Unable to execute Update query for  '+$input.action-identifiers.vnf-id`\"/>\n","comments":"","outputs":1,"x":980.2959442138672,"y":1123.273681640625,"z":"214d83f7.3c518c","wires":[["d95314ce.20c6c8"]]},{"id":"8842ebb3.34ae88","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":364.33331298828125,"y":322.8888854980469,"z":"214d83f7.3c518c","wires":[["78b42273.8539ac","20f2de7b.a00212","45f44361.d41d9c"]]},{"id":"78b42273.8539ac","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":592.3333435058594,"y":365.88885498046875,"z":"214d83f7.3c518c","wires":[["c5b3ed4c.7a51e"]]},{"id":"73d772ff.d3cd6c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":486.99999618530273,"y":651.6666946411133,"z":"214d83f7.3c518c","wires":[]},{"id":"40aa2873.9839d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":275.6667175292969,"y":577.1429710388184,"z":"214d83f7.3c518c","wires":[["73d772ff.d3cd6c","7bb5a0a6.e48e1"]]},{"id":"7bb5a0a6.e48e1","type":"execute","name":"Report_Error_Flattening_Payload_Json","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":564.5714111328125,"y":504.5238914489746,"z":"214d83f7.3c518c","wires":[["6772c7b9.c47d68"]]},{"id":"6772c7b9.c47d68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":649.8572235107422,"y":575.9524984359741,"z":"214d83f7.3c518c","wires":[[]]},{"id":"20f2de7b.a00212","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":100,"y":578.6666679382324,"z":"214d83f7.3c518c","wires":[["40aa2873.9839d8"]]},{"id":"d0048652.b34e78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","x":494,"y":874.666690826416,"z":"214d83f7.3c518c","wires":[]},{"id":"1b04dee7.d382d1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":282.66672134399414,"y":800.1429672241211,"z":"214d83f7.3c518c","wires":[["d0048652.b34e78","1bd902de.9423ad"]]},{"id":"1bd902de.9423ad","type":"execute","name":"Report_Error_Loading_Json_Flattening_Plugin","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","outputs":1,"x":571.5714149475098,"y":727.5238876342773,"z":"214d83f7.3c518c","wires":[["f2afc01e.a912c"]]},{"id":"f2afc01e.a912c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":656.8572273254395,"y":798.9524946212769,"z":"214d83f7.3c518c","wires":[[]]},{"id":"45f44361.d41d9c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":107,"y":798.6666679382324,"z":"214d83f7.3c518c","wires":[["1b04dee7.d382d1"]]},{"id":"30776976.0fc246","type":"execute","name":"Report_Success_in_Terminate","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"TERMINATE event executed successfully\" />","comments":"","outputs":1,"x":1212.6666259765625,"y":1419.0000610351562,"z":"214d83f7.3c518c","wires":[["8e5bf1b1.4b98e","3651cf1b.ebe7d"]]},{"id":"8e5bf1b1.4b98e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1283.6666564941406,"y":1486.6666641235352,"z":"214d83f7.3c518c","wires":[["621d1ea9.529a"]]},{"id":"3651cf1b.ebe7d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1480.6665954589844,"y":1416.6666870117188,"z":"214d83f7.3c518c","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_GetRunningConfig_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_GetRunningConfig_2.0.0.json
deleted file mode 100644
index ef0e565..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_GetRunningConfig_2.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"2bf5503c.d388e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":664.888916015625,"y":58.25000762939453,"z":"276d1f6b.9bb71","wires":[["dbafdb1b.934f58"]]},{"id":"faf55a2.8a3cca8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":749.138916015625,"y":374.75,"z":"276d1f6b.9bb71","wires":[["b59140c4.f0d26"]]},{"id":"5a7e4d0c.a3ad34","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":745.138916015625,"y":427.5,"z":"276d1f6b.9bb71","wires":[["eda2123c.64453"]]},{"id":"3371a22a.28dfee","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":667.888916015625,"y":127.25,"z":"276d1f6b.9bb71","wires":[["577dc0de.87c37"]]},{"id":"c372101a.aa5ea","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":665.1388549804688,"y":278.50000762939453,"z":"276d1f6b.9bb71","wires":[["2cc0ecf5.2756c4"]]},{"id":"feb957d9.9b3838","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":659.1388549804688,"y":213.25000762939453,"z":"276d1f6b.9bb71","wires":[["48d059a1.2c1378"]]},{"id":"757aad86.e63454","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":737.388916015625,"y":472.75,"z":"276d1f6b.9bb71","wires":[["cbdc9a91.622178"]]},{"id":"c6746ea4.d8171","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":736.888916015625,"y":523.75,"z":"276d1f6b.9bb71","wires":[["fbb83850.3ab008"]]},{"id":"4ac10f26.bb958","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1406.888916015625,"y":608.0000076293945,"z":"276d1f6b.9bb71","wires":[["8f213625.b48068"]]},{"id":"202e4abf.4f39b6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1411.638916015625,"y":706.5000076293945,"z":"276d1f6b.9bb71","wires":[["db7afb3c.2c58c8"]]},{"id":"15804f82.f28b4","type":"success","name":"multipleRunningConfig","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":859.388916015625,"y":579.0000076293945,"z":"276d1f6b.9bb71","wires":[["64a22d10.d8c794"]]},{"id":"a20d1d4b.9026d","type":"get-resource","name":"Retrieve device credentials","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"select USER_NAME , PASSWORD , PORT_NUMBER from DEVICE_AUTHENTICATION where VNF_TYPE = $vnf-type \" >\n<parameter name=\"nodeName\" value=\"retrieveDeviceCredentials\" />\n","comments":"","outputs":1,"x":429.63897705078125,"y":123,"z":"276d1f6b.9bb71","wires":[["2bf5503c.d388e","3371a22a.28dfee","d3311276.7aeb5"]]},{"id":"b39573b0.7834d","type":"call","name":"Call device interfacing DG","xml":"<call rpc='`$dg-rpc`' module = '`$module`'  mode='sync'>\n<parameter name=\"nodeName\" value=\"callInterfacingDG\" />\n","comments":"","outputs":1,"x":479.888916015625,"y":428.75,"z":"276d1f6b.9bb71","wires":[["faf55a2.8a3cca8","5a7e4d0c.a3ad34","27a86a4d.b60b06"]]},{"id":"26e12fcf.61188","type":"get-resource","name":"Get device interfacing DG","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"select dg_rpc , module , protocol from DEVICE_INTERFACE_PROTOCOL where VNF_TYPE = $vnf-type and DG_RPC is not null \" >\n<parameter name=\"nodeName\" value=\"getDeviceInterfacingDG\" />\n","comments":"","outputs":1,"x":406.638916015625,"y":277.75000762939453,"z":"276d1f6b.9bb71","wires":[["c372101a.aa5ea","feb957d9.9b3838","7730960.662fc6c"]]},{"id":"d1f75432.3fab98","type":"get-resource","name":"Check if running config exists","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"select count(1) as value from UPLOAD_CONFIG where VNF_ID = $input.action-identifiers.vnf-id and ( if ( $vnfc-type = '' , VNFC_TYPE is NULL OR VNFC_TYPE = '' , VNFC_TYPE = $vnfc-type ) ) and HOST_IP_ADDRESS = $host-ip-address and CONFIG_INDICATOR = 'Running' AND (pending_delete IS NULL OR pending_delete != 'Y') \" force='true' pfx='runningConfig.count'>\n<parameter name=\"nodeName\" value=\"getDBRunningConf\" />\n","comments":"","outputs":1,"x":439.8889465332031,"y":562.5,"z":"276d1f6b.9bb71","wires":[["757aad86.e63454","c6746ea4.d8171","df801ff7.3334"]]},{"id":"6624b792.a4c4e8","type":"save","name":"Insert configuration","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,  PENDING_DELETE,  CONTENT ) VALUES ( $input.common-header.request-id , $input.common-header.originator-id , $service-description , $input.action , $input.action-identifiers.vnf-id , $vnf-name , $vm-name , $vnf-type , $vnfc-type , $host-ip-address , 'Running' , NULL , $device-running-config ) \" force='true' >\n<parameter name=\"nodeName\" value=\"InsertConfiguration\" />\n","comments":"","outputs":1,"x":1198.638916015625,"y":619.2500076293945,"z":"276d1f6b.9bb71","wires":[["4ac10f26.bb958","b2654dc9.f9d45"]]},{"id":"11aa7b01.78e3c5","type":"save","name":"Update configuration","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"update UPLOAD_CONFIG set CONTENT = $device-running-config , REQUEST_ID = $input.common-header.request-id , ORIGINATOR_ID = $input.common-header.originator-id ,  SERVICE_DESCRIPTION = $service-description , ACTION = $input.action , UPLOAD_DATE = CURRENT_TIMESTAMP  where VNF_ID = $input.action-identifiers.vnf-id and ( if ( $vnfc-type = '' , VNFC_TYPE is NULL OR VNFC_TYPE = '' , VNFC_TYPE = $vnfc-type ) ) and HOST_IP_ADDRESS = $host-ip-address and CONFIG_INDICATOR = 'Running' AND (pending_delete IS NULL OR pending_delete != 'Y') \" force='true' pfx='update'>\n<parameter name=\"nodeName\" value=\"updateConfiguration\" />\n","comments":"","outputs":1,"x":1198.1389045715332,"y":716,"z":"276d1f6b.9bb71","wires":[["202e4abf.4f39b6","5fee9fb0.f2325"]]},{"id":"2dbbd306.12300c","type":"switchNode","name":"switch","xml":"<switch test='`$runningConfig.count.value`'>\n","comments":"","outputs":1,"x":650.6389122009277,"y":614.2500095367432,"z":"276d1f6b.9bb71","wires":[["15804f82.f28b4","ede96b3d.4c0f28","c37b362b.01c868"]]},{"id":"c183af40.7e96b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":164.38891983032227,"y":235.50000381469727,"z":"276d1f6b.9bb71","wires":[["a20d1d4b.9026d","b696a7db.8ca138"]]},{"id":"d3311276.7aeb5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":477.13885498046875,"y":187.00000762939453,"z":"276d1f6b.9bb71","wires":[["26e12fcf.61188"]]},{"id":"27a86a4d.b60b06","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":441.63885498046875,"y":499.75,"z":"276d1f6b.9bb71","wires":[["d1f75432.3fab98"]]},{"id":"7730960.662fc6c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":263.1387939453125,"y":353.5,"z":"276d1f6b.9bb71","wires":[["29603b9a.2c5b84"]]},{"id":"df801ff7.3334","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":479.38885498046875,"y":664.75,"z":"276d1f6b.9bb71","wires":[["2dbbd306.12300c"]]},{"id":"b2654dc9.f9d45","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1408.638916015625,"y":657.2500076293945,"z":"276d1f6b.9bb71","wires":[["e8b89f13.0bbb4"]]},{"id":"35b04eb6.6d2212","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1024.638916015625,"y":631.2500076293945,"z":"276d1f6b.9bb71","wires":[["6624b792.a4c4e8"]]},{"id":"5fee9fb0.f2325","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1411.388916015625,"y":772.5000305175781,"z":"276d1f6b.9bb71","wires":[["e8b89f13.0bbb4"]]},{"id":"ed19ec7d.1ee2b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1026.138916015625,"y":694.5000076293945,"z":"276d1f6b.9bb71","wires":[["11aa7b01.78e3c5"]]},{"id":"ede96b3d.4c0f28","type":"success","name":"noRunningConfig","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":850.638916015625,"y":630.0000076293945,"z":"276d1f6b.9bb71","wires":[["35b04eb6.6d2212"]]},{"id":"c37b362b.01c868","type":"failure","name":"runningConfigExists","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":854.138916015625,"y":695.0000076293945,"z":"276d1f6b.9bb71","wires":[["ed19ec7d.1ee2b"]]},{"id":"4896d6e4.5270f8","type":"method","name":"GetRunningConfig","xml":"<method rpc='GetRunningConfig' mode='sync'>\n","comments":"","outputs":1,"x":154.888916015625,"y":152,"z":"276d1f6b.9bb71","wires":[["c183af40.7e96b"]]},{"id":"13a41622.3f89ca","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":291.88890838623047,"y":67.25000190734863,"z":"276d1f6b.9bb71","wires":[["4896d6e4.5270f8"]]},{"id":"b696a7db.8ca138","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":144.88894653320312,"y":441.5,"z":"276d1f6b.9bb71","wires":[]},{"id":"251494ff.29474c","type":"dgstart","name":"DGSTART","outputs":1,"x":124.3889045715332,"y":68,"z":"276d1f6b.9bb71","wires":[["13a41622.3f89ca"]]},{"id":"dbafdb1b.934f58","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":839.888916015625,"y":59.750003814697266,"z":"276d1f6b.9bb71","wires":[["c5226259.21e3e","2490a85b.6f7c38","253f5533.50173a"]]},{"id":"c5226259.21e3e","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value='Error while retrieving device credentials' />\n","comments":"","x":1046.388916015625,"y":46,"z":"276d1f6b.9bb71","wires":[]},{"id":"577dc0de.87c37","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":844.638916015625,"y":126.25,"z":"276d1f6b.9bb71","wires":[["920835f9.5449d8","2490a85b.6f7c38","253f5533.50173a"]]},{"id":"920835f9.5449d8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Device credentials not found for the ' + $vnf-type `\"/>\n","comments":"","x":1048.388916015625,"y":85.5,"z":"276d1f6b.9bb71","wires":[]},{"id":"48d059a1.2c1378","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":839.388916015625,"y":196.25000762939453,"z":"276d1f6b.9bb71","wires":[["ed173feb.0d45f","253f5533.50173a","2490a85b.6f7c38"]]},{"id":"2cc0ecf5.2756c4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":843.388916015625,"y":252.50000762939453,"z":"276d1f6b.9bb71","wires":[["e5af31d.d7d11d","253f5533.50173a","2490a85b.6f7c38"]]},{"id":"ed173feb.0d45f","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value='Error while getting device interfacing DG details' />\n","comments":"","x":1053.3889045715332,"y":133.00000762939453,"z":"276d1f6b.9bb71","wires":[]},{"id":"e5af31d.d7d11d","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Device Interfacing DG mapping not found for the ' + $vnf-type `\" />\n","comments":"","x":1051.138916015625,"y":176.00000762939453,"z":"276d1f6b.9bb71","wires":[]},{"id":"253f5533.50173a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='`$node-error-message`' />","comments":"","x":1079.138916015625,"y":271.25000762939453,"z":"276d1f6b.9bb71","wires":[]},{"id":"b59140c4.f0d26","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":910.638916015625,"y":325,"z":"276d1f6b.9bb71","wires":[["11ce3fcd.175be","9a30398b.6a1268","81b0e59d.dd52a8"]]},{"id":"eda2123c.64453","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":924.638916015625,"y":410.25,"z":"276d1f6b.9bb71","wires":[["e924feb9.1fc4b","9a30398b.6a1268","81b0e59d.dd52a8"]]},{"id":"11ce3fcd.175be","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`$error-message`\"/>\n","comments":"","x":1178.638916015625,"y":316.5,"z":"276d1f6b.9bb71","wires":[]},{"id":"e924feb9.1fc4b","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value='Device Interfacing DG not found' />\n","comments":"","x":1180.638916015625,"y":359.75,"z":"276d1f6b.9bb71","wires":[]},{"id":"fbb83850.3ab008","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":941.138916015625,"y":522.75,"z":"276d1f6b.9bb71","wires":[["9897d37f.3e86f","81b0e59d.dd52a8","9a30398b.6a1268"]]},{"id":"cbdc9a91.622178","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":939.888916015625,"y":468.25,"z":"276d1f6b.9bb71","wires":[["1dd1ceae.7c5731","81b0e59d.dd52a8","9a30398b.6a1268"]]},{"id":"1dd1ceae.7c5731","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while quering the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\"/>\n","comments":"","x":1179.388916015625,"y":404.25,"z":"276d1f6b.9bb71","wires":[]},{"id":"9897d37f.3e86f","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while quering the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\" />\n","comments":"","x":1179.638916015625,"y":444.25,"z":"276d1f6b.9bb71","wires":[]},{"id":"81b0e59d.dd52a8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='`$node-error-message`' />","comments":"","x":1187.138916015625,"y":543.5,"z":"276d1f6b.9bb71","wires":[]},{"id":"64a22d10.d8c794","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1577.638916015625,"y":576.7500076293945,"z":"276d1f6b.9bb71","wires":[["d55829a0.692118","53f66547.a56dac","75356e6f.a67ac"]]},{"id":"d55829a0.692118","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value='More than one running configuration available for a VNFC' />\n","comments":"","x":1803.388916015625,"y":530.2500610351562,"z":"276d1f6b.9bb71","wires":[]},{"id":"53f66547.a56dac","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='`$node-error-message`' />","comments":"","x":1802.638916015625,"y":710.0000305175781,"z":"276d1f6b.9bb71","wires":[]},{"id":"8f213625.b48068","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1582.138916015625,"y":632.75,"z":"276d1f6b.9bb71","wires":[["b2368a5.6789578","53f66547.a56dac","75356e6f.a67ac"]]},{"id":"b2368a5.6789578","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while updating the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\" />\n","comments":"","x":1806.638916015625,"y":575.2500305175781,"z":"276d1f6b.9bb71","wires":[]},{"id":"db7afb3c.2c58c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1582.638916015625,"y":693.25,"z":"276d1f6b.9bb71","wires":[["cc111001.f32a8","53f66547.a56dac","75356e6f.a67ac"]]},{"id":"cc111001.f32a8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while updating the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\" />\n","comments":"","x":1807.388916015625,"y":621.2500305175781,"z":"276d1f6b.9bb71","wires":[]},{"id":"2490a85b.6f7c38","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=\"`$node-error-message`\"/>\n","comments":"","outputs":1,"x":1070.888916015625,"y":227.25000762939453,"z":"276d1f6b.9bb71","wires":[[]]},{"id":"9a30398b.6a1268","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=\"`$node-error-message`\"/>\n","comments":"","outputs":1,"x":1186.888916015625,"y":499.25,"z":"276d1f6b.9bb71","wires":[[]]},{"id":"75356e6f.a67ac","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=\"`$node-error-message`\"/>\n","comments":"","outputs":1,"x":1800.888916015625,"y":663.2500305175781,"z":"276d1f6b.9bb71","wires":[[]]},{"id":"21660aea.e01ea6","type":"set","name":"set DG parameters","xml":"<set>\n<parameter name='config.vnf-type' value=\"`$vnf-type`\" />\n<parameter name='config.vnf-name' value=\"`$vnf-name`\" />\n<parameter name='config.protocol' value=\"`$protocol`\" />\n<parameter name='config.host-ip-address' value=\"`$host-ip-address`\" />\n<parameter name='config.user-name' value=\"`$USER-NAME`\" />\n<parameter name='config.password' value=\"`$PASSWORD`\" />\n<parameter name='config.port-number' value=\"`$PORT-NUMBER`\" />","comments":"","x":585.888916015625,"y":330,"z":"276d1f6b.9bb71","wires":[]},{"id":"29603b9a.2c5b84","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":395.888916015625,"y":353,"z":"276d1f6b.9bb71","wires":[["21660aea.e01ea6","b39573b0.7834d"]]},{"id":"e8b89f13.0bbb4","type":"get-resource","name":"Get Running Config Id","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"select UPLOAD_CONFIG_ID from UPLOAD_CONFIG where VNF_ID = $input.action-identifiers.vnf-id and ( if ( $vnfc-type = '' , VNFC_TYPE is NULL OR VNFC_TYPE = '' , VNFC_TYPE = $vnfc-type ) ) and HOST_IP_ADDRESS = $host-ip-address and CONFIG_INDICATOR = 'Running' AND (pending_delete IS NULL OR pending_delete != 'Y') \" force='true' pfx='runningConfig'>\n","comments":"","outputs":1,"x":1648.888916015625,"y":779.3333435058594,"z":"276d1f6b.9bb71","wires":[["ab251259.3d74","d14179e1.547d98","aec5de94.0b1ee"]]},{"id":"ab251259.3d74","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2001.388916015625,"y":733.5833740234375,"z":"276d1f6b.9bb71","wires":[["bf29ea96.6ffa68"]]},{"id":"d14179e1.547d98","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1993.888916015625,"y":793.5833740234375,"z":"276d1f6b.9bb71","wires":[["e27c0f02.9b77"]]},{"id":"bf29ea96.6ffa68","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2158.8885498046875,"y":732.0833740234375,"z":"276d1f6b.9bb71","wires":[["5b24ae34.dd7d9","dfd2268c.d462e8","babb2c3a.ce283"]]},{"id":"5b24ae34.dd7d9","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while quering the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\"/>\n","comments":"","x":2393.3887939453125,"y":673.0833740234375,"z":"276d1f6b.9bb71","wires":[]},{"id":"babb2c3a.ce283","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=\"`$node-error-message`\"/>\n","comments":"","outputs":1,"x":2384.8885498046875,"y":772.0833740234375,"z":"276d1f6b.9bb71","wires":[[]]},{"id":"e27c0f02.9b77","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2159.1387939453125,"y":794.5833740234375,"z":"276d1f6b.9bb71","wires":[["cf88cbf8.678fd8","dfd2268c.d462e8","babb2c3a.ce283"]]},{"id":"dfd2268c.d462e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='`$node-error-message`' />","comments":"","x":2400.1385498046875,"y":827.3333740234375,"z":"276d1f6b.9bb71","wires":[]},{"id":"aec5de94.0b1ee","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1985.388671875,"y":861.5833740234375,"z":"276d1f6b.9bb71","wires":[[]]},{"id":"cf88cbf8.678fd8","type":"set","name":"Set error message","xml":"<set>\n<parameter name='node-error-message' value=\"`'Error while quering the running configuration in the repository for vnf-id:' + $input.action-identifiers.vnf-id + ' and Host-ip-address:' + $host-ip-address `\" />\n","comments":"","x":2400.6387939453125,"y":723.0833740234375,"z":"276d1f6b.9bb71","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_SWITCH_Restart_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_SWITCH_Restart_2.0.0.json
deleted file mode 100644
index 4ad2d6b..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_SWITCH_Restart_2.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"1a937537.26e25b","type":"dgstart","name":"DGSTART","outputs":1,"x":128,"y":84,"z":"766912fd.5b210c","wires":[["cb060236.e98d1"]]},{"id":"cb060236.e98d1","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":132,"y":174,"z":"766912fd.5b210c","wires":[["40de1ddd.58f674"]]},{"id":"40de1ddd.58f674","type":"method","name":"SWITCH_Restart","xml":"<method rpc='SWITCH_Restart' mode='sync'>\n","comments":"","outputs":1,"x":153,"y":260,"z":"766912fd.5b210c","wires":[["5b95ace9.c583d4"]]},{"id":"ec6eb90f.cac088","type":"execute","name":"execute","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='waitMethod' >\n<parameter name=\"waitTime\" value=\"60000\" />\n","comments":"","outputs":1,"x":549,"y":260,"z":"766912fd.5b210c","wires":[["db7e112d.9bbe4","6aa99cde.cd13f4"]]},{"id":"5b95ace9.c583d4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":364,"y":260,"z":"766912fd.5b210c","wires":[["ec6eb90f.cac088"]]},{"id":"db7e112d.9bbe4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":725,"y":218,"z":"766912fd.5b210c","wires":[["d79b02d0.df76d"]]},{"id":"d79b02d0.df76d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":910,"y":252,"z":"766912fd.5b210c","wires":[]},{"id":"6aa99cde.cd13f4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":726,"y":283,"z":"766912fd.5b210c","wires":[["d79b02d0.df76d"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.0.json
deleted file mode 100644
index 9e35200..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"f0a14063.49fef","type":"dgstart","name":"DGSTART","outputs":1,"x":144.66665649414062,"y":113,"z":"a4e67f56.cb2c9","wires":[["71609fd4.fe5e7"]]},{"id":"71609fd4.fe5e7","type":"service-logic","name":"APPC 2.0.0.0","module":"APPC","version":"2.0.0.0","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.0'>","outputs":1,"x":187.66665649414062,"y":161,"z":"a4e67f56.cb2c9","wires":[["7a306dce.e01f54"]]},{"id":"7a306dce.e01f54","type":"method","name":"VSBG_Test","xml":"<method rpc='VSBG_Test' mode='sync'>\n","comments":"","outputs":1,"x":233.66665649414062,"y":213,"z":"a4e67f56.cb2c9","wires":[["33d1bd3b.3839b2"]]},{"id":"f8461bde.e321d8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":1050.3810119628906,"y":819.5714111328125,"z":"a4e67f56.cb2c9","wires":[]},{"id":"dcf02cbe.eaddb","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":642.6666564941406,"y":522,"z":"a4e67f56.cb2c9","wires":[["f5fa430a.9e4f7","1de49110.b5b6cf"]]},{"id":"1de49110.b5b6cf","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":948.4444274902344,"y":475.77777099609375,"z":"a4e67f56.cb2c9","wires":[["460816d8.46ee68"]]},{"id":"f5fa430a.9e4f7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":956.3334045410156,"y":702.22216796875,"z":"a4e67f56.cb2c9","wires":[["f8461bde.e321d8"]]},{"id":"460816d8.46ee68","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1058.4604187011719,"y":545.7619018554688,"z":"a4e67f56.cb2c9","wires":[["4160821.27be47c"]]},{"id":"39bde04b.627fc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>","comments":"","x":1192.6665344238281,"y":702.857177734375,"z":"a4e67f56.cb2c9","wires":[]},{"id":"4160821.27be47c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1128.2380676269531,"y":645.4285888671875,"z":"a4e67f56.cb2c9","wires":[["39bde04b.627fc"]]},{"id":"33d1bd3b.3839b2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":285.6666564941406,"y":264.0000305175781,"z":"a4e67f56.cb2c9","wires":[["23f9f2ae.ed9cde","ea3be85c.c64088"]]},{"id":"ea3be85c.c64088","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":440.6665344238281,"y":312.00006103515625,"z":"a4e67f56.cb2c9","wires":[["d5e1f466.c9bfe8","cd5322eb.78cc6"]]},{"id":"23f9f2ae.ed9cde","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$org.onap.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":455.6666564941406,"y":259.0000305175781,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"cd5322eb.78cc6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":707.6666564941406,"y":260.3332824707031,"z":"a4e67f56.cb2c9","wires":[["a7848345.ee52c"]]},{"id":"d5e1f466.c9bfe8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":459.6666564941406,"y":379.9999694824219,"z":"a4e67f56.cb2c9","wires":[["82d20977.7a5348"]]},{"id":"a7848345.ee52c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":874.6666564941406,"y":259.3332824707031,"z":"a4e67f56.cb2c9","wires":[]},{"id":"ed1b86af.b4bf98","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":716.6666564941406,"y":445,"z":"a4e67f56.cb2c9","wires":[[]]},{"id":"82d20977.7a5348","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":512.6666564941406,"y":445,"z":"a4e67f56.cb2c9","wires":[["ed1b86af.b4bf98","dcf02cbe.eaddb"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.1.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.1.json
deleted file mode 100644
index 6b2b64b..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSBG_Test_2.0.0.1.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"3a3db435.c14d7c","type":"dgstart","name":"DGSTART","outputs":1,"x":2774.666748046875,"y":111.66666412353516,"z":"a8867a54.b68aa8","wires":[["427b0879.a63f58"]]},{"id":"427b0879.a63f58","type":"service-logic","name":"APPC 2.0.0.1","module":"APPC","version":"2.0.0.1","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.1'>","outputs":1,"x":2817.666748046875,"y":159.66666412353516,"z":"a8867a54.b68aa8","wires":[["3d555498.3ca7bc"]]},{"id":"3d555498.3ca7bc","type":"method","name":"VSBG_Test","xml":"<method rpc='VSBG_Test' mode='sync'>\n","comments":"","outputs":1,"x":2863.666748046875,"y":211.66666412353516,"z":"a8867a54.b68aa8","wires":[["231dec0e.0771c4"]]},{"id":"d736d249.7d49d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":3697.381103515625,"y":960.2380599975586,"z":"a8867a54.b68aa8","wires":[]},{"id":"b8218641.e8a788","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":3289.666748046875,"y":662.6666488647461,"z":"a8867a54.b68aa8","wires":[["b0b4fe67.6a463","9e903785.2aab28"]]},{"id":"9e903785.2aab28","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3595.4445190429688,"y":616.4444198608398,"z":"a8867a54.b68aa8","wires":[["834e02e0.1b95d"]]},{"id":"b0b4fe67.6a463","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3603.33349609375,"y":842.8888168334961,"z":"a8867a54.b68aa8","wires":[["d736d249.7d49d"]]},{"id":"834e02e0.1b95d","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":3705.4605102539062,"y":686.4285507202148,"z":"a8867a54.b68aa8","wires":[["dbbfce3e.4a9d7"]]},{"id":"7ef22aa1.c2f8f4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>","comments":"","x":3839.6666259765625,"y":843.5238265991211,"z":"a8867a54.b68aa8","wires":[]},{"id":"dbbfce3e.4a9d7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3775.2381591796875,"y":786.0952377319336,"z":"a8867a54.b68aa8","wires":[["7ef22aa1.c2f8f4"]]},{"id":"19fa898d.6ab716","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2932.666748046875,"y":404.6666793823242,"z":"a8867a54.b68aa8","wires":[["bae44e29.4cfa5","ff4aa6b.9a66558"]]},{"id":"ff4aa6b.9a66558","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":3087.6666259765625,"y":452.66670989990234,"z":"a8867a54.b68aa8","wires":[["4284b163.4ffc1","4c1b9cb6.5050f4"]]},{"id":"bae44e29.4cfa5","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":3102.666748046875,"y":399.6666793823242,"z":"a8867a54.b68aa8","wires":[]},{"id":"4c1b9cb6.5050f4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3354.666748046875,"y":400.9999313354492,"z":"a8867a54.b68aa8","wires":[["a29a3ba4.2bd308"]]},{"id":"4284b163.4ffc1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3106.666748046875,"y":520.666618347168,"z":"a8867a54.b68aa8","wires":[["94c7df7b.7fbd"]]},{"id":"a29a3ba4.2bd308","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":3521.666748046875,"y":399.9999313354492,"z":"a8867a54.b68aa8","wires":[]},{"id":"f5661947.16b088","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":3363.666748046875,"y":585.6666488647461,"z":"a8867a54.b68aa8","wires":[]},{"id":"94c7df7b.7fbd","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":3159.666748046875,"y":585.6666488647461,"z":"a8867a54.b68aa8","wires":[["f5661947.16b088","b8218641.e8a788"]]},{"id":"231dec0e.0771c4","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":2929.666748046875,"y":266.6666488647461,"z":"a8867a54.b68aa8","wires":[["c986922d.bf1bc","8a7c3f37.20d9"]]},{"id":"c986922d.bf1bc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2996.6666564941406,"y":338.66666412353516,"z":"a8867a54.b68aa8","wires":[["19fa898d.6ab716"]]},{"id":"8a7c3f37.20d9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3246.6666564941406,"y":286.66666412353516,"z":"a8867a54.b68aa8","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSRX_ConfigModify_2.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSRX_ConfigModify_2.0.0.json
deleted file mode 100644
index d7cae8c..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/APPC_method_VSRX_ConfigModify_2.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"7f8764e7.1c542c","type":"dgstart","name":"DGSTART","outputs":1,"x":140.88888549804688,"y":58,"z":"e3f97b79.d3ae78","wires":[["b994e559.02dd38"]]},{"id":"b994e559.02dd38","type":"service-logic","name":"APPC 2.0.0","module":"APPC","version":"2.0.0","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":133.88888549804688,"y":112,"z":"e3f97b79.d3ae78","wires":[["e64a43a7.d28a6"]]},{"id":"e64a43a7.d28a6","type":"method","name":"VSRX_ConfigModify","xml":"<method rpc='VSRX_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":159.88888549804688,"y":176,"z":"e3f97b79.d3ae78","wires":[["755b14f2.231e2c"]]},{"id":"8755712f.5d5e2","type":"execute","name":"execute_getVnfHierarchy","xml":"<execute plugin='org.onap.appc.dg.util.ExecuteNodeAction' method='getVnfHierarchy' >\n<parameter name=\"resourceKey\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"nodeName\" value=\"execute_getVnfHierarchy\" />\n","comments":"","outputs":1,"x":340.4343566894531,"y":217.27272033691406,"z":"e3f97b79.d3ae78","wires":[["744bf594.91468c","9a95025e.3abb7"]]},{"id":"744bf594.91468c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1121.2524108886719,"y":86,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"9a95025e.3abb7","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":354.7978820800781,"y":319.3636474609375,"z":"e3f97b79.d3ae78","wires":[["ddc0dcdd.0c53c"]]},{"id":"4c4b034a.d05dbc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1657.8888854980469,"y":531,"z":"e3f97b79.d3ae78","wires":[["dde156a3.5b7258","9bd7e953.2d6638"]]},{"id":"9bd7e953.2d6638","type":"execute","name":"execute_DCAEReporterPlugin","xml":"<execute plugin='org.onap.appc.dg.util.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"`$org.onap.appc.apiversion`\"/>\n<parameter name=\"eventId\" value=\"`$org.onap.appc.vfid`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />","comments":"","outputs":1,"x":1872.8888854980469,"y":444,"z":"e3f97b79.d3ae78","wires":[["954a79a7.253398"]]},{"id":"dde156a3.5b7258","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":1837.8888854980469,"y":620,"z":"e3f97b79.d3ae78","wires":[]},{"id":"ddc0dcdd.0c53c","type":"switchNode","name":"switch","xml":"<switch test='`$VNF.VMCount`'>\n","comments":"","outputs":1,"x":339.6161804199219,"y":393.5454406738281,"z":"e3f97b79.d3ae78","wires":[["d4d84951.bf4a78","ea6e2bf0.9bfc18"]]},{"id":"d4d84951.bf4a78","type":"outcome","name":"outcome_0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1115.6163024902344,"y":147.5454864501953,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"ea6e2bf0.9bfc18","type":"outcome","name":"outcome_other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":321.9798278808594,"y":498.9999694824219,"z":"e3f97b79.d3ae78","wires":[["e37888a7.55e2e8"]]},{"id":"e37888a7.55e2e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":406.25250244140625,"y":588.2727661132812,"z":"e3f97b79.d3ae78","wires":[["222d615a.833e5e","b3c1f8d8.d04008"]]},{"id":"222d615a.833e5e","type":"for","name":"foreach_vnfc","xml":"<for index=\"i\" start=\"0\" end=\"`$VNF.VMCount`\" >\n","comments":"","outputs":1,"x":527.5252990722656,"y":454.36358642578125,"z":"e3f97b79.d3ae78","wires":[["c8281303.b9663"]]},{"id":"c8281303.b9663","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":561.8889465332031,"y":389.181884765625,"z":"e3f97b79.d3ae78","wires":[["1cae10ed.8218ff"]]},{"id":"1cae10ed.8218ff","type":"execute","name":"execute_retrieveVMConfiguration","xml":"<execute plugin='org.onap.appc.dg.util.NetconfDBPlugin' method='retrieveVMDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"resourceKey\" value=\"`$VNF.VM[$i].vserver.vserver-name`\" />\n<parameter name=\"nodeName\" value=\"execute_retrieveVMConfiguration\" />\n","comments":"","outputs":1,"x":863.8890075683594,"y":303.36370849609375,"z":"e3f97b79.d3ae78","wires":[["42069768.bd0c68","a68e4eae.2af27"]]},{"id":"a68e4eae.2af27","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":853.7980041503906,"y":354.6363525390625,"z":"e3f97b79.d3ae78","wires":[["54fcb6c2.027148"]]},{"id":"42069768.bd0c68","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1201.3433532714844,"y":366.45458984375,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"6592a286.b317ec","type":"execute","name":"execute_modifyConfiguration","xml":"<execute plugin='org.onap.appc.dg.util.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n<parameter name=\"nodeName\" value=\"execute_modifyConfiguration\" />\n","comments":"","outputs":1,"x":857.5253601074219,"y":566.3637084960938,"z":"e3f97b79.d3ae78","wires":[["fc1e7228.fbd9d","de949f48.36d61"]]},{"id":"fc1e7228.fbd9d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":877.0707702636719,"y":629.0908813476562,"z":"e3f97b79.d3ae78","wires":[["c3d5b7e7.9a2a58"]]},{"id":"de949f48.36d61","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1203.3435974121094,"y":500.27276611328125,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"b3c1f8d8.d04008","type":"execute","name":"execute_saveConfig","xml":"<execute plugin='org.onap.appc.dg.util.ConfigurationManagerPlugin' method='saveConfiguration' >\n<parameter name=\"fullConfig\" value=\"`$fullConfig`\" />\n<parameter name=\"nodeName\" value=\"execute_saveConfig\" />\n","comments":"","outputs":1,"x":468.7979431152344,"y":882.4546203613281,"z":"e3f97b79.d3ae78","wires":[["86fd9c6b.47858","a6e93d4e.a3791"]]},{"id":"a6e93d4e.a3791","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1171.5252685546875,"y":877.3636779785156,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"98ac5c02.6be86","type":"execute","name":"execute_readConfiguration","xml":"<execute plugin='org.onap.appc.dg.util.NetconfClientPlugin' method='getConfig' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"current\" />\n<parameter name=\"nodeName\" value=\"execute_readConfiguration\" />\n\n","comments":"","outputs":1,"x":734.2525939941406,"y":813.1817321777344,"z":"e3f97b79.d3ae78","wires":[["a985fa15.5d4168","a6e93d4e.a3791"]]},{"id":"54fcb6c2.027148","type":"execute","name":"execute_retrieveConfigFile","xml":"<execute plugin='org.onap.appc.dg.util.NetconfDBPlugin' method='retrieveConfigFile' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"nodeName\" value=\"execute_retrieveConfigFile\" />\n\n","comments":"","outputs":1,"x":847.8888854980469,"y":433,"z":"e3f97b79.d3ae78","wires":[["6ad14a83.ded604","858e63d7.b08b9"]]},{"id":"858e63d7.b08b9","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":853.8888854980469,"y":493,"z":"e3f97b79.d3ae78","wires":[["6592a286.b317ec"]]},{"id":"6ad14a83.ded604","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1206.8888854980469,"y":431,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"ded29ca9.c326a","type":"switchNode","name":"switch","xml":"<switch test='`$getConfig_Result`'>\n","comments":"","outputs":1,"x":1055.8889465332031,"y":734.000244140625,"z":"e3f97b79.d3ae78","wires":[["611ee584.7de67c","853375ef.cefa58"]]},{"id":"611ee584.7de67c","type":"outcome","name":"outcome_failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1236.8888854980469,"y":568,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"853375ef.cefa58","type":"outcome","name":"outcome_Success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":1258.8889465332031,"y":692.0000305175781,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"755b14f2.231e2c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":132.38888549804688,"y":255,"z":"e3f97b79.d3ae78","wires":[["205284fd.d2df5c","8755712f.5d5e2"]]},{"id":"205284fd.d2df5c","type":"execute","name":"ctxCleanup","xml":"<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n","comments":"","outputs":1,"x":136.88888549804688,"y":348,"z":"e3f97b79.d3ae78","wires":[["3023e302.ead02c"]]},{"id":"3023e302.ead02c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":132.88888549804688,"y":431,"z":"e3f97b79.d3ae78","wires":[["88bef30b.130ef"]]},{"id":"88bef30b.130ef","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":120.38888549804688,"y":564,"z":"e3f97b79.d3ae78","wires":[]},{"id":"827f8b54.a2f738","type":"switchNode","name":"switch","xml":"<switch test='`$saveConfigResult`'>\n","comments":"","outputs":1,"x":752.388916015625,"y":941.0000305175781,"z":"e3f97b79.d3ae78","wires":[["4091b575.ef1d7c","28989f20.c2934"]]},{"id":"4091b575.ef1d7c","type":"outcome","name":"outcome_Success","xml":"<outcome value='Success'>\n","comments":"","outputs":1,"x":857.3888854980469,"y":1008,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"28989f20.c2934","type":"outcome","name":"outcome_failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1200.3888854980469,"y":946,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"954a79a7.253398","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2100.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[["428f2b9f.d074b4"]]},{"id":"428f2b9f.d074b4","type":"execute","name":"ctxCleanup","xml":"<execute plugin='org.onap.appc.dg.util.DGPayloadCleanupPlugin' method='cleanup' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"conf-id\" value=\"`$org.onap.appc.confid`\" />\n","comments":"","outputs":1,"x":2264.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[["da6af38.2701c1"]]},{"id":"da6af38.2701c1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2437.888885498047,"y":445,"z":"e3f97b79.d3ae78","wires":[[]]},{"id":"c3d5b7e7.9a2a58","type":"execute","name":"execute_commitConfiguration","xml":"<execute plugin='org.onap.appc.dg.util.NetconfClientPlugin' method='commitConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"nodeName\" value=\"execute_commitConfiguration\" />\n","comments":"","outputs":1,"x":755.8889465332031,"y":689.0000915527344,"z":"e3f97b79.d3ae78","wires":[["75565b82.5ba9e4","e2ff07e0.f33ec8"]]},{"id":"75565b82.5ba9e4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1208.8888854980469,"y":640,"z":"e3f97b79.d3ae78","wires":[["4c4b034a.d05dbc"]]},{"id":"e2ff07e0.f33ec8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":735.8889465332031,"y":747.0001525878906,"z":"e3f97b79.d3ae78","wires":[["98ac5c02.6be86"]]},{"id":"86fd9c6b.47858","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":602,"y":949.3333435058594,"z":"e3f97b79.d3ae78","wires":[["827f8b54.a2f738"]]},{"id":"a985fa15.5d4168","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":931.8889465332031,"y":772.3333435058594,"z":"e3f97b79.d3ae78","wires":[["ded29ca9.c326a"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_Backup.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_Backup.json
deleted file mode 100644
index 88f10cf..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_Backup.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
-    {
-        "id": "a3099a78.6e69b8",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 106,
-        "y": 85,
-        "z": "961baaa6.a27258",
-        "wires": [
-            [
-                "828db90b.8f9a98"
-            ]
-        ]
-    },
-    {
-        "id": "828db90b.8f9a98",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 212,
-        "y": 142,
-        "z": "961baaa6.a27258",
-        "wires": [
-            [
-                "aad933dd.444b9"
-            ]
-        ]
-    },
-    {
-        "id": "aad933dd.444b9",
-        "type": "method",
-        "name": "VNF_Backup",
-        "xml": "<method rpc='VNF_Backup' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 303,
-        "y": 204,
-        "z": "961baaa6.a27258",
-        "wires": [
-            [
-                "a8f4edf0.5d8c2"
-            ]
-        ]
-    },
-    {
-        "id": "a8f4edf0.5d8c2",
-        "type": "execute",
-        "name": "execute: handleUpgradeStub",
-        "xml": "<execute plugin='org.onap.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 419,
-        "y": 264,
-        "z": "961baaa6.a27258",
-        "wires": [
-            [
-                "133b1b36.ea26a5",
-                "73f403bf.cc84fc"
-            ]
-        ]
-    },
-    {
-        "id": "133b1b36.ea26a5",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 639,
-        "y": 241,
-        "z": "961baaa6.a27258",
-        "wires": [
-            [
-                "57a5901.f38057"
-            ]
-        ]
-    },
-    {
-        "id": "73f403bf.cc84fc",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 637,
-        "y": 288,
-        "z": "961baaa6.a27258",
-        "wires": [
-            [
-                "b63d970d.810598"
-            ]
-        ]
-    },
-    {
-        "id": "57a5901.f38057",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value=\"For testing only... success in Backup\" />\n",
-        "comments": "",
-        "x": 825,
-        "y": 241,
-        "z": "961baaa6.a27258",
-        "wires": []
-    },
-    {
-        "id": "b63d970d.810598",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"500\" />\n<parameter name='error-message' value=\"For testing only... failure in Backup\" />\n",
-        "comments": "",
-        "x": 823,
-        "y": 289,
-        "z": "961baaa6.a27258",
-        "wires": []
-    }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_HealthCheck.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_HealthCheck.json
deleted file mode 100644
index 0260bd8..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_HealthCheck.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
-    {
-        "id": "9b0d47e6.16eff8",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 238,
-        "y": 137,
-        "z": "3db25098.787c1",
-        "wires": [
-            [
-                "cc93a914.9f00f8"
-            ]
-        ]
-    },
-    {
-        "id": "cc93a914.9f00f8",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 361,
-        "y": 195,
-        "z": "3db25098.787c1",
-        "wires": [
-            [
-                "3652cb36.ce8014"
-            ]
-        ]
-    },
-    {
-        "id": "3652cb36.ce8014",
-        "type": "method",
-        "name": "VNF_HealthCheck",
-        "xml": "<method rpc='VNF_HealthCheck' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 452,
-        "y": 257,
-        "z": "3db25098.787c1",
-        "wires": [
-            [
-                "f1d1c6be.6d74e8"
-            ]
-        ]
-    },
-    {
-        "id": "f1d1c6be.6d74e8",
-        "type": "execute",
-        "name": "execute: handleUpgradeStub",
-        "xml": "<execute plugin='org.onap.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 568,
-        "y": 317,
-        "z": "3db25098.787c1",
-        "wires": [
-            [
-                "e3d4660c.ea71e8",
-                "4c962a0d.b1d5c4"
-            ]
-        ]
-    },
-    {
-        "id": "e3d4660c.ea71e8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 788,
-        "y": 294,
-        "z": "3db25098.787c1",
-        "wires": [
-            [
-                "668719c4.5a7da8"
-            ]
-        ]
-    },
-    {
-        "id": "4c962a0d.b1d5c4",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 786,
-        "y": 341,
-        "z": "3db25098.787c1",
-        "wires": [
-            [
-                "1ec055ee.ff19ca"
-            ]
-        ]
-    },
-    {
-        "id": "668719c4.5a7da8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value=\"For testing only... success in HealthCheck\" />",
-        "comments": "",
-        "x": 974,
-        "y": 294,
-        "z": "3db25098.787c1",
-        "wires": []
-    },
-    {
-        "id": "1ec055ee.ff19ca",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"500\" />\n<parameter name='error-message' value=\"For testing only... failure in HealthCheck\" />\n",
-        "comments": "",
-        "x": 972,
-        "y": 342,
-        "z": "3db25098.787c1",
-        "wires": []
-    }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json
deleted file mode 100644
index 9ca2fff..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json
+++ /dev/null
@@ -1,95 +0,0 @@
-[{
-    "id": "7d1b4b8f.e55c64",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 307.5182189941406,
-    "y": 217.5229034423828,
-    "z": "6453d20e.8e95fc",
-    "wires": [["df0b70e0.0c6d3"]]
-},
-    {
-        "id": "df0b70e0.0c6d3",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 430.5182189941406,
-        "y": 275.5229034423828,
-        "z": "6453d20e.8e95fc",
-        "wires": [["80234fd5.24a4f"]]
-    },
-    {
-        "id": "80234fd5.24a4f",
-        "type": "method",
-        "name": "VNF_PreUpgradeHealthCheck",
-        "xml": "<method rpc='VNF_UpgradePreconditionCheck' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 521.5182189941406,
-        "y": 337.5229034423828,
-        "z": "6453d20e.8e95fc",
-        "wires": [["a3be2603.6810f8"]]
-    },
-    {
-        "id": "a3be2603.6810f8",
-        "type": "execute",
-        "name": "execute: handleUpgradeStub",
-        "xml": "<execute plugin='org.onap.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 637.5182189941406,
-        "y": 397.5229034423828,
-        "z": "6453d20e.8e95fc",
-        "wires": [["3da04637.67170a",
-            "5eb01780.4fd2f8"]]
-    },
-    {
-        "id": "3da04637.67170a",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 857.5182189941406,
-        "y": 374.5229034423828,
-        "z": "6453d20e.8e95fc",
-        "wires": [["a000f105.13a86"]]
-    },
-    {
-        "id": "5eb01780.4fd2f8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 855.5182189941406,
-        "y": 421.5229034423828,
-        "z": "6453d20e.8e95fc",
-        "wires": [["fdd8c081.07a7e"]]
-    },
-    {
-        "id": "a000f105.13a86",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value=\"For testing only... success in PreUpgradeHealthCheck\" />",
-        "comments": "",
-        "x": 1043.5182189941406,
-        "y": 374.5229034423828,
-        "z": "6453d20e.8e95fc",
-        "wires": []
-    },
-    {
-        "id": "fdd8c081.07a7e",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"For testing only... failure in PreUpgradeHealthCheck\" />\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"For testing only... failure in PreUpgradeHealthCheck\" />\n",
-        "comments": "",
-        "x": 1041.5182189941406,
-        "y": 422.5229034423828,
-        "z": "6453d20e.8e95fc",
-        "wires": []
-    }]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json
deleted file mode 100644
index 732a133..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json
+++ /dev/null
@@ -1,95 +0,0 @@
-[{
-    "id": "69db81ef.ba444",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 268.5182189941406,
-    "y": 169.5229034423828,
-    "z": "f1bd34c4.1f4c58",
-    "wires": [["ef3e4d0d.b0fab"]]
-},
-    {
-        "id": "ef3e4d0d.b0fab",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 374.5182189941406,
-        "y": 226.5229034423828,
-        "z": "f1bd34c4.1f4c58",
-        "wires": [["b30be360.1439e"]]
-    },
-    {
-        "id": "b30be360.1439e",
-        "type": "method",
-        "name": "VNF_UploadNewVersion",
-        "xml": "<method rpc='VNF_UploadNewVersion' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 465.5182189941406,
-        "y": 288.5229034423828,
-        "z": "f1bd34c4.1f4c58",
-        "wires": [["dc3e3baf.d4f3d8"]]
-    },
-    {
-        "id": "dc3e3baf.d4f3d8",
-        "type": "execute",
-        "name": "execute: handleUpgradeStub",
-        "xml": "<execute plugin='org.onap.appc.dg.util.UpgradeStubNode' method='handleUpgradeStub' >\n<parameter name=\"failureIndicator\" value=\"`$failureIndicator`\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 581.5182189941406,
-        "y": 348.5229034423828,
-        "z": "f1bd34c4.1f4c58",
-        "wires": [["12490bb0.1ac3c4",
-            "75432d77.5dd7c4"]]
-    },
-    {
-        "id": "12490bb0.1ac3c4",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 801.5182189941406,
-        "y": 325.5229034423828,
-        "z": "f1bd34c4.1f4c58",
-        "wires": [["8632c267.27b45"]]
-    },
-    {
-        "id": "75432d77.5dd7c4",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 799.5182189941406,
-        "y": 372.5229034423828,
-        "z": "f1bd34c4.1f4c58",
-        "wires": [["6fdbe1aa.4a1fb"]]
-    },
-    {
-        "id": "8632c267.27b45",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value=\"For testing only... success in UploadNewVersion\" />\n",
-        "comments": "",
-        "x": 987.5182189941406,
-        "y": 325.5229034423828,
-        "z": "f1bd34c4.1f4c58",
-        "wires": []
-    },
-    {
-        "id": "6fdbe1aa.4a1fb",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"For testing only... failure in UploadNewVersion\" />\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value=\"For testing only... failure in UploadNewVersion\" />\n",
-        "comments": "",
-        "x": 985.5182189941406,
-        "y": 373.5229034423828,
-        "z": "f1bd34c4.1f4c58",
-        "wires": []
-    }]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
deleted file mode 100644
index 24bc897..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
+++ /dev/null
@@ -1,305 +0,0 @@
-[{
-    "id": "9fdda929.817f18",
-    "type": "execute",
-    "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 335.75,
-    "y": 198,
-    "z": "d59c8e6f.e6d1",
-    "wires": [["d2011202.234fc",
-        "f4646626.6d10f8"]]
-},
-    {
-        "id": "4b5f0d0b.654314",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 93.75,
-        "y": 49,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["e8f79554.affab8"]]
-    },
-    {
-        "id": "e8f79554.affab8",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 192.75,
-        "y": 98,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["32140628.22792a"]]
-    },
-    {
-        "id": "32140628.22792a",
-        "type": "method",
-        "name": "VSCP_HealthCheck",
-        "xml": "<method rpc='VSCP_HealthCheck' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 269.75,
-        "y": 146,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["9fdda929.817f18"]]
-    },
-    {
-        "id": "581fe014.8acd7",
-        "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",
-        "comments": "",
-        "x": 1841.5189590454102,
-        "y": 328.46160793304443,
-        "z": "d59c8e6f.e6d1",
-        "wires": []
-    },
-    {
-        "id": "af383d0c.3970d",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='400' />\n",
-        "comments": "",
-        "x": 1262.7498168945312,
-        "y": 586.0000305175781,
-        "z": "d59c8e6f.e6d1",
-        "wires": []
-    },
-    {
-        "id": "3ccf5e6c.e15652",
-        "type": "execute",
-        "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1499.2882461547852,
-        "y": 327.61541652679443,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["de153cb7.0f1db"]]
-    },
-    {
-        "id": "fb5b14.140314f",
-        "type": "execute",
-        "name": "execute: retrieveConnectionDetails",
-        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 857.7498779296875,
-        "y": 427.0000305175781,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["94a1a9e3.305a48",
-            "cb8b27ea.275788"]]
-    },
-    {
-        "id": "cb8b27ea.275788",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1097.7498474121094,
-        "y": 427.0000305175781,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["f82f2d66.fbc2d"]]
-    },
-    {
-        "id": "725be398.327c2c",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='error-message' value='Failed to retrieve SSH credentials' />\n",
-        "comments": "",
-        "x": 1427.7497940063477,
-        "y": 242.00006008148193,
-        "z": "d59c8e6f.e6d1",
-        "wires": []
-    },
-    {
-        "id": "94a1a9e3.305a48",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1105.7498168945312,
-        "y": 471.0000305175781,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["bcfe699a.fbac68"]]
-    },
-    {
-        "id": "7e68246c.ade0ec",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1100.7498168945312,
-        "y": 542.0000305175781,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["cdb71eae.de0b6"]]
-    },
-    {
-        "id": "1fb23591.978aca",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1101.7498168945312,
-        "y": 587.0000305175781,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["af383d0c.3970d"]]
-    },
-    {
-        "id": "93204e17.d82ec",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='error-message' value='SSH command execution failure' />\n",
-        "comments": "",
-        "x": 1427.4420547485352,
-        "y": 284.0001211166382,
-        "z": "d59c8e6f.e6d1",
-        "wires": []
-    },
-    {
-        "id": "bcfe699a.fbac68",
-        "type": "execute",
-        "name": "executeTest",
-        "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executeTest'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 940.7498474121094,
-        "y": 543.0000305175781,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["7e68246c.ade0ec",
-            "1fb23591.978aca"]]
-    },
-    {
-        "id": "f82f2d66.fbc2d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1233.9805603027344,
-        "y": 425.8462219238281,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["725be398.327c2c",
-            "3ccf5e6c.e15652"]]
-    },
-    {
-        "id": "cdb71eae.de0b6",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1229.2882080078125,
-        "y": 542.615478515625,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["93204e17.d82ec",
-            "3ccf5e6c.e15652"]]
-    },
-    {
-        "id": "d2011202.234fc",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 566.7498779296875,
-        "y": 217,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["32c2c94.c91df36"]]
-    },
-    {
-        "id": "f4646626.6d10f8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 561.7498779296875,
-        "y": 171,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["3ccf5e6c.e15652"]]
-    },
-    {
-        "id": "d8b9aa6d.465a98",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 758.083251953125,
-        "y": 343.66668701171875,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["fb5b14.140314f"]]
-    },
-    {
-        "id": "a3588880.9675d8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 747.083251953125,
-        "y": 298.6667175292969,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["3ccf5e6c.e15652"]]
-    },
-    {
-        "id": "32c2c94.c91df36",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 313.0832824707031,
-        "y": 264.666748046875,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["643ff002.2addb",
-            "ec1d66f4.142a18"]]
-    },
-    {
-        "id": "643ff002.2addb",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t",
-        "comments": "",
-        "x": 495.083251953125,
-        "y": 273.666748046875,
-        "z": "d59c8e6f.e6d1",
-        "wires": []
-    },
-    {
-        "id": "ec1d66f4.142a18",
-        "type": "execute",
-        "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 534.0831298828125,
-        "y": 327.6667785644531,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["a3588880.9675d8",
-            "d8b9aa6d.465a98"]]
-    },
-    {
-        "id": "de153cb7.0f1db",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1698.7500381469727,
-        "y": 328.9999990463257,
-        "z": "d59c8e6f.e6d1",
-        "wires": [["581fe014.8acd7"]]
-    }]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
deleted file mode 100644
index 30dad30..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
+++ /dev/null
@@ -1,255 +0,0 @@
-[{
-    "id": "e30b7047.c8c7b",
-    "type": "execute",
-    "name": "execute: flatAndAddToContext",
-    "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 473.75,
-    "y": 315,
-    "z": "822325c1.dd7df8",
-    "wires": [["32e6aaee.9b6a36",
-        "e32b0726.3df2c8"]]
-},
-    {
-        "id": "32e6aaee.9b6a36",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 693.7499694824219,
-        "y": 349,
-        "z": "822325c1.dd7df8",
-        "wires": [["83239337.5a415"]]
-    },
-    {
-        "id": "e32b0726.3df2c8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 682.7499694824219,
-        "y": 301,
-        "z": "822325c1.dd7df8",
-        "wires": [["52e82bf7.a1e6b4"]]
-    },
-    {
-        "id": "eb520291.dd81f",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 178.75,
-        "y": 140,
-        "z": "822325c1.dd7df8",
-        "wires": [["7d65d4d5.ab461c"]]
-    },
-    {
-        "id": "7d65d4d5.ab461c",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 284.75,
-        "y": 197,
-        "z": "822325c1.dd7df8",
-        "wires": [["37c9d8bc.8d9b88"]]
-    },
-    {
-        "id": "37c9d8bc.8d9b88",
-        "type": "method",
-        "name": "VSCP_LiveUpgrade",
-        "xml": "<method rpc='VSCP_LiveUpgrade' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 375.75,
-        "y": 258.99999237060547,
-        "z": "822325c1.dd7df8",
-        "wires": [["e30b7047.c8c7b"]]
-    },
-    {
-        "id": "804247b9.b06658",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value=\"success in Upgrade\" />\n",
-        "comments": "",
-        "x": 1280.1944198608398,
-        "y": 766.6666898727417,
-        "z": "822325c1.dd7df8",
-        "wires": []
-    },
-    {
-        "id": "52e82bf7.a1e6b4",
-        "type": "execute",
-        "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1100.638900756836,
-        "y": 327.9999599456787,
-        "z": "822325c1.dd7df8",
-        "wires": [["83a57cf0.ab1d9"]]
-    },
-    {
-        "id": "d4e3b7fe.4d6b28",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
-        "comments": "",
-        "x": 1452.41650390625,
-        "y": 328.44439697265625,
-        "z": "822325c1.dd7df8",
-        "wires": []
-    },
-    {
-        "id": "6711af89.05acc",
-        "type": "execute",
-        "name": "execute: liveUpgrade",
-        "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='liveUpgrade' >\n<parameter name=\"upgrade-version\" value=\"`$upgrade-version`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"Skip-execution-installer-bin-file\" value=\"`$Skip-execution-installer-bin-file`\" />\n<parameter name=\"Skip-deploy\" value=\"`$Skip-deploy`\" />\n<parameter name=\"timeout\" value=\"`$timeout`\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 919.5277938842773,
-        "y": 716.8888883590698,
-        "z": "822325c1.dd7df8",
-        "wires": [["c3be342b.05c078",
-            "174e8a05.944846"]]
-    },
-    {
-        "id": "174e8a05.944846",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1108.1944198608398,
-        "y": 716.6666593551636,
-        "z": "822325c1.dd7df8",
-        "wires": [["52e82bf7.a1e6b4"]]
-    },
-    {
-        "id": "c3be342b.05c078",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1113.1944198608398,
-        "y": 767.6666898727417,
-        "z": "822325c1.dd7df8",
-        "wires": [["804247b9.b06658"]]
-    },
-    {
-        "id": "9e7f2be9.363dc8",
-        "type": "execute",
-        "name": "execute: retrieveConnectionDetails",
-        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 828.0833129882812,
-        "y": 606.222282409668,
-        "z": "822325c1.dd7df8",
-        "wires": [["beb31231.140ba",
-            "e66ec871.d79678"]]
-    },
-    {
-        "id": "beb31231.140ba",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1043.75,
-        "y": 583.0000228881836,
-        "z": "822325c1.dd7df8",
-        "wires": [["52e82bf7.a1e6b4"]]
-    },
-    {
-        "id": "e66ec871.d79678",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1044.9722862243652,
-        "y": 632.2222585678101,
-        "z": "822325c1.dd7df8",
-        "wires": [["6711af89.05acc"]]
-    },
-    {
-        "id": "36c1a02b.a44c5",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 856.7499694824219,
-        "y": 515,
-        "z": "822325c1.dd7df8",
-        "wires": [["9e7f2be9.363dc8"]]
-    },
-    {
-        "id": "ae425047.deb98",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 859.7499694824219,
-        "y": 463.00001525878906,
-        "z": "822325c1.dd7df8",
-        "wires": [["52e82bf7.a1e6b4"]]
-    },
-    {
-        "id": "83239337.5a415",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 532.7500305175781,
-        "y": 424.00001525878906,
-        "z": "822325c1.dd7df8",
-        "wires": [["130fd187.c9cb5e",
-            "2cd2b34d.4a7c9c"]]
-    },
-    {
-        "id": "130fd187.c9cb5e",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t",
-        "comments": "",
-        "x": 698.75,
-        "y": 424.0000228881836,
-        "z": "822325c1.dd7df8",
-        "wires": []
-    },
-    {
-        "id": "2cd2b34d.4a7c9c",
-        "type": "execute",
-        "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 653.7500152587891,
-        "y": 491.0000686645508,
-        "z": "822325c1.dd7df8",
-        "wires": [["ae425047.deb98",
-            "36c1a02b.a44c5"]]
-    },
-    {
-        "id": "83a57cf0.ab1d9",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1299.75,
-        "y": 328,
-        "z": "822325c1.dd7df8",
-        "wires": [["d4e3b7fe.4d6b28"]]
-    }]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
deleted file mode 100644
index d9cfd0d..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
+++ /dev/null
@@ -1,329 +0,0 @@
-[{
-    "id": "64f09cfb.65f934",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 123.75,
-    "y": 96,
-    "z": "c82a79e8.e87b78",
-    "wires": [["89378c24.7257"]]
-},
-    {
-        "id": "89378c24.7257",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 289.75000381469727,
-        "y": 97.00000762939453,
-        "z": "c82a79e8.e87b78",
-        "wires": [["ba19fcdd.41804"]]
-    },
-    {
-        "id": "ba19fcdd.41804",
-        "type": "method",
-        "name": "VSCP_SoftwareUpload",
-        "xml": "<method rpc='VSCP_SoftwareUpload' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 340.75000381469727,
-        "y": 151.9999771118164,
-        "z": "c82a79e8.e87b78",
-        "wires": [["5ec41e43.b3427"]]
-    },
-    {
-        "id": "d64712c6.1e102",
-        "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'/>",
-        "comments": "",
-        "x": 2084.75,
-        "y": 330.0001220703125,
-        "z": "c82a79e8.e87b78",
-        "wires": []
-    },
-    {
-        "id": "c7104b30.9f8748",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='400' />\n",
-        "comments": "",
-        "x": 2017.749912261963,
-        "y": 678.000129699707,
-        "z": "c82a79e8.e87b78",
-        "wires": []
-    },
-    {
-        "id": "1d1d05aa.1712aa",
-        "type": "execute",
-        "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1722.749942779541,
-        "y": 332.00012969970703,
-        "z": "c82a79e8.e87b78",
-        "wires": [["a7d06ef5.ab8e1"]]
-    },
-    {
-        "id": "457ba9cf.7006a8",
-        "type": "execute",
-        "name": "execute: retrieveConnectionDetails",
-        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1236.7498512268066,
-        "y": 667.0001831054688,
-        "z": "c82a79e8.e87b78",
-        "wires": [["c5cf7972.aa19a8",
-            "3fd4e7ce.48fc38"]]
-    },
-    {
-        "id": "3fd4e7ce.48fc38",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1524.7498512268066,
-        "y": 655.0001373291016,
-        "z": "c82a79e8.e87b78",
-        "wires": [["1d1d05aa.1712aa"]]
-    },
-    {
-        "id": "c5cf7972.aa19a8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1537.7498512268066,
-        "y": 702.0001373291016,
-        "z": "c82a79e8.e87b78",
-        "wires": [["6a8d06b2.533f18"]]
-    },
-    {
-        "id": "92a57ed9.e2bc2",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1845.749912261963,
-        "y": 636.000129699707,
-        "z": "c82a79e8.e87b78",
-        "wires": [["1d1d05aa.1712aa"]]
-    },
-    {
-        "id": "9c548b9d.bbb638",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1852.749912261963,
-        "y": 678.000129699707,
-        "z": "c82a79e8.e87b78",
-        "wires": [["c7104b30.9f8748"]]
-    },
-    {
-        "id": "6a8d06b2.533f18",
-        "type": "execute",
-        "name": "executeUpload",
-        "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executeUpload'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"source-file-url\" value=\"`$source-file-url`\" />\n<parameter name=\"timeout\" value=\"`$timeout`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1714.7499732971191,
-        "y": 666.0001373291016,
-        "z": "c82a79e8.e87b78",
-        "wires": [["92a57ed9.e2bc2",
-            "9c548b9d.bbb638"]]
-    },
-    {
-        "id": "4ad2faef.9c5264",
-        "type": "call",
-        "name": "call_VSCP_UpgradePreconditionCheck",
-        "xml": "<call rpc='VSCP_UpgradePreconditionCheck' mode='sync' version='2.0.0.0' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 759.749942779541,
-        "y": 423.0000991821289,
-        "z": "c82a79e8.e87b78",
-        "wires": [["5788fb68.1d3114",
-            "5289eab5.3ed8d4"]]
-    },
-    {
-        "id": "5788fb68.1d3114",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 983.749942779541,
-        "y": 403.0000991821289,
-        "z": "c82a79e8.e87b78",
-        "wires": [["1d1d05aa.1712aa"]]
-    },
-    {
-        "id": "5289eab5.3ed8d4",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 989.749942779541,
-        "y": 456.0000991821289,
-        "z": "c82a79e8.e87b78",
-        "wires": [["e9d1e289.2189c"]]
-    },
-    {
-        "id": "5ec41e43.b3427",
-        "type": "execute",
-        "name": "execute: flatAndAddToContext",
-        "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 418.74997329711914,
-        "y": 201.9999771118164,
-        "z": "c82a79e8.e87b78",
-        "wires": [["ecbcc2c5.a3e3",
-            "315df407.1e37bc"]]
-    },
-    {
-        "id": "315df407.1e37bc",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 642.7498207092285,
-        "y": 224.00000762939453,
-        "z": "c82a79e8.e87b78",
-        "wires": [["8a0677d8.02aee8"]]
-    },
-    {
-        "id": "ecbcc2c5.a3e3",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 635.749942779541,
-        "y": 174.00000762939453,
-        "z": "c82a79e8.e87b78",
-        "wires": [["1d1d05aa.1712aa"]]
-    },
-    {
-        "id": "f6093e6d.21ba",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 798.7499122619629,
-        "y": 362.0000228881836,
-        "z": "c82a79e8.e87b78",
-        "wires": [["4ad2faef.9c5264"]]
-    },
-    {
-        "id": "5757eca4.d4a414",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 801.7499122619629,
-        "y": 310.00003814697266,
-        "z": "c82a79e8.e87b78",
-        "wires": [["1d1d05aa.1712aa"]]
-    },
-    {
-        "id": "8a0677d8.02aee8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 474.74997329711914,
-        "y": 271.00003814697266,
-        "z": "c82a79e8.e87b78",
-        "wires": [["54f1eab.e4bcc14",
-            "a7c355e0.0616b8"]]
-    },
-    {
-        "id": "54f1eab.e4bcc14",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t",
-        "comments": "",
-        "x": 640.749942779541,
-        "y": 271.0000686645508,
-        "z": "c82a79e8.e87b78",
-        "wires": []
-    },
-    {
-        "id": "a7c355e0.0616b8",
-        "type": "execute",
-        "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 595.7499580383301,
-        "y": 338.0000915527344,
-        "z": "c82a79e8.e87b78",
-        "wires": [["5757eca4.d4a414",
-            "f6093e6d.21ba"]]
-    },
-    {
-        "id": "e9d1e289.2189c",
-        "type": "execute",
-        "name": "execute: retrieveConnectionDetails",
-        "xml": "<execute plugin='org.onap.appc.dg.ssh.SshDBPlugin' method='retrieveConnectionDetails' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name='vnf-type' value=\"`$aai.input.data.vnf-type`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1190.0832710266113,
-        "y": 558.0001220703125,
-        "z": "c82a79e8.e87b78",
-        "wires": [["98e434ab.bc9368",
-            "c4bcc02d.c078d"]]
-    },
-    {
-        "id": "98e434ab.bc9368",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1425.749942779541,
-        "y": 519.0000381469727,
-        "z": "c82a79e8.e87b78",
-        "wires": [["1d1d05aa.1712aa"]]
-    },
-    {
-        "id": "c4bcc02d.c078d",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1428.7498817443848,
-        "y": 574.0000991821289,
-        "z": "c82a79e8.e87b78",
-        "wires": [["457ba9cf.7006a8"]]
-    },
-    {
-        "id": "a7d06ef5.ab8e1",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1932.75,
-        "y": 331,
-        "z": "c82a79e8.e87b78",
-        "wires": [["d64712c6.1e102"]]
-    }]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json
deleted file mode 100644
index 2fb4fc8..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json
+++ /dev/null
@@ -1,231 +0,0 @@
-[
-    {
-        "id": "ce2213a9.8b1db",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 113,
-        "y": 70,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "c59f5d5e.ea6f8"
-            ]
-        ]
-    },
-    {
-        "id": "c59f5d5e.ea6f8",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 186,
-        "y": 123.99999237060547,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "933cde30.9a082"
-            ]
-        ]
-    },
-    {
-        "id": "933cde30.9a082",
-        "type": "method",
-        "name": "VSCP_UpgradePreconditionCheck",
-        "xml": "<method rpc='VSCP_UpgradePreconditionCheck' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 301,
-        "y": 174.99999237060547,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "d55c4630.1bcfc8"
-            ]
-        ]
-    },
-    {
-        "id": "d55c4630.1bcfc8",
-        "type": "call",
-        "name": "call_VSCP_HealthCheck",
-        "xml": "<call rpc='VSCP_HealthCheck' mode='sync' version='2.0.0.0' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 347,
-        "y": 239.99999237060547,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "77b0172.d053ce8",
-                "136d1da3.0df512"
-            ]
-        ]
-    },
-    {
-        "id": "136d1da3.0df512",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 549.9999694824219,
-        "y": 286.99999237060547,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "85331eac.44b8c"
-            ]
-        ]
-    },
-    {
-        "id": "77b0172.d053ce8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 541.9999694824219,
-        "y": 239.99999237060547,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "631a551d.c6b7bc"
-            ]
-        ]
-    },
-    {
-        "id": "631a551d.c6b7bc",
-        "type": "execute",
-        "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$error-message`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 986,
-        "y": 345.9999694824219,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "8d35aa54.0046a8"
-            ]
-        ]
-    },
-    {
-        "id": "1290b9ad.560676",
-        "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",
-        "comments": "",
-        "x": 1343,
-        "y": 346.0000305175781,
-        "z": "3adbb6b3.ff597a",
-        "wires": []
-    },
-    {
-        "id": "85331eac.44b8c",
-        "type": "execute",
-        "name": "Execute: PreUpgradeHealthCheck",
-        "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executePreUpgradeHealthCheck'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 311.9999694824219,
-        "y": 384.0000305175781,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "668bbccc.14b154",
-                "4e1ac240.56a37c"
-            ]
-        ]
-    },
-    {
-        "id": "4e1ac240.56a37c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 551,
-        "y": 398.0000305175781,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "5d443bdd.126684"
-            ]
-        ]
-    },
-    {
-        "id": "668bbccc.14b154",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 548,
-        "y": 344,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "6efa56e5.3d01c8"
-            ]
-        ]
-    },
-    {
-        "id": "5d443bdd.126684",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='400' />\n",
-        "comments": "",
-        "x": 731,
-        "y": 401.0000305175781,
-        "z": "3adbb6b3.ff597a",
-        "wires": []
-    },
-    {
-        "id": "6efa56e5.3d01c8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 716,
-        "y": 345,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "631a551d.c6b7bc",
-                "d51f8ea3.b2afc"
-            ]
-        ]
-    },
-    {
-        "id": "8d35aa54.0046a8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1192,
-        "y": 346,
-        "z": "3adbb6b3.ff597a",
-        "wires": [
-            [
-                "1290b9ad.560676"
-            ]
-        ]
-    },
-    {
-        "id": "d51f8ea3.b2afc",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='error-message' value='Failed to retrieve SSH credentials' />\n",
-        "comments": "",
-        "x": 911,
-        "y": 297,
-        "z": "3adbb6b3.ff597a",
-        "wires": []
-    }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_and_return.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_and_return.json
deleted file mode 100644
index 70ee059..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_and_return.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"5fdd08f1.982a98","type":"switchNode","name":"is acquire require","xml":"<switch test='`$acquire.require`'>\n","comments":"","outputs":1,"x":532,"y":324,"z":"51e00a00.88b9e8","wires":[["1d5eab1d.936385","864c1c72.71594"]]},{"id":"dd2cefe0.be872","type":"execute","name":"execute: release","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='`$release.method`' >\n    <parameter name=\"asset-uuid\" value=\"`$aai.asset.tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$aai.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":900,"y":451,"z":"51e00a00.88b9e8","wires":[["d1f89179.86ed"]]},{"id":"d3806cd9.326f1","type":"execute","name":"execute: acquire","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='`$acquire.method`' >\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"acquire.response\" />\n\t<parameter name=\"assignment-group\" value=\"`$model.uuid`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" /> \n","comments":"","outputs":1,"x":907,"y":324,"z":"51e00a00.88b9e8","wires":[["9e04b714.89eea8","ffdbc354.ec818"]]},{"id":"fa71882b.ad0308","type":"dgstart","name":"DGSTART","outputs":1,"x":116,"y":95,"z":"51e00a00.88b9e8","wires":[["72f7a965.7b0338"]]},{"id":"72f7a965.7b0338","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.0.0","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-API' version='2.0.0.0'>","outputs":1,"x":302,"y":95,"z":"51e00a00.88b9e8","wires":[["c8121155.0e863"]]},{"id":"c8121155.0e863","type":"method","name":"acquire and return","xml":"<method rpc='acquire_and_return' mode='sync'>\n","comments":"","outputs":1,"x":207,"y":222,"z":"51e00a00.88b9e8","wires":[["2cf4ee46.9e9812"]]},{"id":"ffdbc354.ec818","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1075,"y":372,"z":"51e00a00.88b9e8","wires":[["ba99ecd9.52b1a"]]},{"id":"ba99ecd9.52b1a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='`$acquire.error.error-code`' />\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value='`$acquire.error.error-message`' />\n","comments":"","x":1231,"y":372,"z":"51e00a00.88b9e8","wires":[]},{"id":"71fdcba3.fa02a4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"license.key\" value=\"`$license.key`\" />\n<parameter name=\"asset-tag\" value=\"`$asset-tag`\" />","comments":"","x":526,"y":552,"z":"51e00a00.88b9e8","wires":[]},{"id":"be30ea04.30ba18","type":"set","name":"set","xml":"<set>\n<parameter name='asset-tag' value='`$acquire.response.software-asset-tag-uuid`' />\n<parameter name='license-key' value='`$acquire.response.license-key`' />","comments":"","x":1227,"y":329,"z":"51e00a00.88b9e8","wires":[[]]},{"id":"2cf4ee46.9e9812","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":229,"y":415,"z":"51e00a00.88b9e8","wires":[["5fdd08f1.982a98","9c2b745a.41c1e8","71fdcba3.fa02a4"]]},{"id":"9c2b745a.41c1e8","type":"switchNode","name":"is release require","xml":"<switch test='`$release.require`'>\n","comments":"","outputs":1,"x":531,"y":451,"z":"51e00a00.88b9e8","wires":[["98ecbe52.b3c3a"]]},{"id":"9e04b714.89eea8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1080,"y":324,"z":"51e00a00.88b9e8","wires":[["be30ea04.30ba18"]]},{"id":"1d5eab1d.936385","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":709,"y":324,"z":"51e00a00.88b9e8","wires":[["d3806cd9.326f1"]]},{"id":"98ecbe52.b3c3a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":710,"y":451,"z":"51e00a00.88b9e8","wires":[["dd2cefe0.be872"]]},{"id":"d1f89179.86ed","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1072,"y":451,"z":"51e00a00.88b9e8","wires":[["30302a1c.1276c6"]]},{"id":"30302a1c.1276c6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='`$acquire.error.error-code`' />\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value='`$acquire.error.error-message`' />","comments":"","x":1228,"y":451,"z":"51e00a00.88b9e8","wires":[]},{"id":"864c1c72.71594","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":722,"y":264,"z":"51e00a00.88b9e8","wires":[["bbc3ed4a.b47c5"]]},{"id":"bbc3ed4a.b47c5","type":"set","name":"set","xml":"<set>\n<parameter name='asset-tag' value='' />\n<parameter name='license-key' value='' />","comments":"","x":888,"y":264,"z":"51e00a00.88b9e8","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json
deleted file mode 100644
index 64c31bd..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"b1ce6dcf.35732","type":"dgstart","name":"DGSTART","outputs":1,"x":188,"y":50,"z":"150446f3.d47aa9","wires":[["174ee6ca.1ed6a9"]]},{"id":"174ee6ca.1ed6a9","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.0.0","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-API' version='2.0.0.0'>","outputs":1,"x":350,"y":50,"z":"150446f3.d47aa9","wires":[["f19dcf10.eaeb9"]]},{"id":"f19dcf10.eaeb9","type":"method","name":"Method: Acquire License","xml":"<method rpc='acquire_license' mode='sync'>\n","comments":"","outputs":1,"x":581,"y":50,"z":"150446f3.d47aa9","wires":[["9ce11364.ca14f"]]},{"id":"9d436678.79ec78","type":"execute","name":"execute: retrieveLicenseModel","xml":"<execute plugin='org.onap.appc.dg.licmgr.LicenseManagerPlugin' method='retrieveLicenseModel' >\n<parameter name=\"org.onap.appc.vftype\" value=\"`$aai.input.data.vnf-type`\" />\n<parameter name=\"org.onap.appc.resource-version\" value=\"`$aai.input.data.persona-model-version`\" />\n\n","comments":"","outputs":1,"x":514,"y":350,"z":"150446f3.d47aa9","wires":[["b03a6327.d8941"]]},{"id":"f5ad1877.f5fb08","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1239,"y":217,"z":"150446f3.d47aa9","wires":[[]]},{"id":"25ece2ae.1fed4e","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":959,"y":274,"z":"150446f3.d47aa9","wires":[["f5ad1877.f5fb08","4d4a5b49.2afb94"]]},{"id":"4d4a5b49.2afb94","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1188,"y":274,"z":"150446f3.d47aa9","wires":[]},{"id":"4a0353c8.2d471c","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData'>","comments":"","outputs":1,"x":480,"y":274,"z":"150446f3.d47aa9","wires":[["b03a6327.d8941"]]},{"id":"972dd4cd.52e478","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":436,"y":210,"z":"150446f3.d47aa9","wires":[]},{"id":"9ce11364.ca14f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":209,"y":274,"z":"150446f3.d47aa9","wires":[["972dd4cd.52e478","4a0353c8.2d471c","9d436678.79ec78","79795ed2.80425","99224f0e.1687b","d5060181.3d546"]]},{"id":"b03a6327.d8941","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":785,"y":274,"z":"150446f3.d47aa9","wires":[["25ece2ae.1fed4e"]]},{"id":"d8eca0a4.77181","type":"call","name":"acquire entitlement","xml":"<call module='Appc-API' version='2.0.0.0' rpc='acquire_and_return' mode='sync' >\n","comments":"","outputs":1,"x":1048,"y":426,"z":"150446f3.d47aa9","wires":[["5f4740fc.82243","e9c2ecda.2a739"]]},{"id":"bc1e02ed.46d83","type":"set","name":"set for entitlement","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.entitlement.pool.uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.entitlement-assignment-group-uuid`' />\n\t<parameter name='aai.asset.tag' value='`$aai.input.data.entitlement-resource-uuid`' />\n\t<parameter name='acquire.require' value='`$is.acquire-entitlement.require`' />\n\t<parameter name='release.require' value='`$is.release-entitlement.require`' />\n\t<parameter name='acquire.method' value='acquireEntitlement' />\n\t<parameter name='release.method' value='releaseEntitlement' />","comments":"","x":1061,"y":371,"z":"150446f3.d47aa9","wires":[]},{"id":"79795ed2.80425","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":459,"y":601,"z":"150446f3.d47aa9","wires":[]},{"id":"f26c05b5.ce1df8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":839,"y":426,"z":"150446f3.d47aa9","wires":[["bc1e02ed.46d83","d8eca0a4.77181"]]},{"id":"ed1a5e9a.1ca9d","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":838,"y":519,"z":"150446f3.d47aa9","wires":[["5791d93f.9c9838","4f84efd3.d3e91"]]},{"id":"5791d93f.9c9838","type":"set","name":"set for license","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.license.key.uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.license-assignment-group-uuid`' />\n\t<parameter name='aai.asset.tag' value='`$aai.input.data.license-key-uuid`' />\n\t<parameter name='acquire.require' value='`$is.acquire-license.require`' />\n\t<parameter name='release.require' value='`$is.release-license.require`' />\n\t<parameter name='acquire.method' value='acquireLicense' />\n\t<parameter name='release.method' value='releaseLicense' />","comments":"","x":1056,"y":519,"z":"150446f3.d47aa9","wires":[]},{"id":"4f84efd3.d3e91","type":"call","name":"acquire license","xml":"<call module='Appc-API' version='2.0.0.0' rpc='acquire_and_return' mode='sync' >\n","comments":"","outputs":1,"x":1054,"y":593,"z":"150446f3.d47aa9","wires":[["1676c3bf.6ae81c","921d09c2.070c98"]]},{"id":"5f4740fc.82243","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1259,"y":391,"z":"150446f3.d47aa9","wires":[["a4badb8.6948e28"]]},{"id":"e9c2ecda.2a739","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1258,"y":460,"z":"150446f3.d47aa9","wires":[["ef554789.af5fd8"]]},{"id":"9832f22b.c3486","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1885,"y":459,"z":"150446f3.d47aa9","wires":[[]]},{"id":"ef554789.af5fd8","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1576,"y":459,"z":"150446f3.d47aa9","wires":[["9832f22b.c3486","b3985ada.5fad68","8a8cc770.dfc4c8"]]},{"id":"b3985ada.5fad68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1832,"y":500,"z":"150446f3.d47aa9","wires":[]},{"id":"a4badb8.6948e28","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='`$model.uuid`' />\n\n","comments":"","outputs":1,"x":1438,"y":391,"z":"150446f3.d47aa9","wires":[["5759c209.a4dc6c","48280ad5.075c64"]]},{"id":"5759c209.a4dc6c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1637,"y":346,"z":"150446f3.d47aa9","wires":[["9fb59e95.cd2ae"]]},{"id":"8a8cc770.dfc4c8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1814,"y":413,"z":"150446f3.d47aa9","wires":[]},{"id":"1676c3bf.6ae81c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1259,"y":551,"z":"150446f3.d47aa9","wires":[["e6077b1c.676d68"]]},{"id":"80af8413.c41af8","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1752,"y":693,"z":"150446f3.d47aa9","wires":[[]]},{"id":"cf0d6944.da2e48","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1443,"y":644,"z":"150446f3.d47aa9","wires":[["80af8413.c41af8","424183e2.2fe76c","a2997968.151ab8"]]},{"id":"424183e2.2fe76c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1701,"y":742,"z":"150446f3.d47aa9","wires":[]},{"id":"921d09c2.070c98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1264,"y":644,"z":"150446f3.d47aa9","wires":[["cf0d6944.da2e48"]]},{"id":"e6077b1c.676d68","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='`$model.uuid`' />\n\t<parameter name='aai.input.data.license-key' value='`$license-key`' />\n","comments":"","outputs":1,"x":1442,"y":551,"z":"150446f3.d47aa9","wires":[["baf4e318.6218b","996a1b70.ae33c8"]]},{"id":"baf4e318.6218b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1632,"y":551,"z":"150446f3.d47aa9","wires":[["a692c8c6.e23748"]]},{"id":"a2997968.151ab8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1684,"y":644,"z":"150446f3.d47aa9","wires":[]},{"id":"73130c00.837904","type":"execute","name":"execute: release","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseEntitlement' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$model.entitlement.pool.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\"/>\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":2002,"y":300,"z":"150446f3.d47aa9","wires":[[]]},{"id":"9fb59e95.cd2ae","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1798,"y":346,"z":"150446f3.d47aa9","wires":[["73130c00.837904","870b44ac.4f4af8","78617f1c.8bb0e"]]},{"id":"870b44ac.4f4af8","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2044,"y":346,"z":"150446f3.d47aa9","wires":[[]]},{"id":"78617f1c.8bb0e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1992,"y":394,"z":"150446f3.d47aa9","wires":[]},{"id":"48280ad5.075c64","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1643,"y":391,"z":"150446f3.d47aa9","wires":[[]]},{"id":"a692c8c6.e23748","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1789,"y":551,"z":"150446f3.d47aa9","wires":[["791287e7.f44278","e7d0dd25.7a0c6","a8028f31.101f4"]]},{"id":"791287e7.f44278","type":"execute","name":"execute: release","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseLicense' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$model.license.key.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":2042,"y":551,"z":"150446f3.d47aa9","wires":[[]]},{"id":"e7d0dd25.7a0c6","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2081,"y":600,"z":"150446f3.d47aa9","wires":[[]]},{"id":"a8028f31.101f4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":2033,"y":655,"z":"150446f3.d47aa9","wires":[]},{"id":"996a1b70.ae33c8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1637,"y":591,"z":"150446f3.d47aa9","wires":[[]]},{"id":"99224f0e.1687b","type":"switchNode","name":"entitlement require?","xml":"<switch test='`$is.aai-entitlement-update.require`'>\n","comments":"","outputs":1,"x":483,"y":426,"z":"150446f3.d47aa9","wires":[["9b0d5a39.63ece8"]]},{"id":"d5060181.3d546","type":"switchNode","name":"license require?","xml":"<switch test='`$is.aai-license-update.require`'>\n","comments":"","outputs":1,"x":475,"y":519,"z":"150446f3.d47aa9","wires":[["75b1fcca.18edd4"]]},{"id":"9b0d5a39.63ece8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":665,"y":426,"z":"150446f3.d47aa9","wires":[["f26c05b5.ce1df8"]]},{"id":"75b1fcca.18edd4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":662,"y":519,"z":"150446f3.d47aa9","wires":[["ed1a5e9a.1ca9d"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json
deleted file mode 100644
index 54fceda..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"26263816.d709e8","type":"dgstart","name":"DGSTART","outputs":1,"x":158,"y":73,"z":"a2800b0.adcd2f8","wires":[["84a7e8cd.6a93a8"]]},{"id":"84a7e8cd.6a93a8","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.0.0","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-API' version='2.0.0.0'>","outputs":1,"x":320,"y":73,"z":"a2800b0.adcd2f8","wires":[["144b76ae.ab2f69"]]},{"id":"144b76ae.ab2f69","type":"method","name":"Method: Legacy Operation","xml":"<method rpc='legacy_operation' mode='sync'>\n","comments":"","outputs":1,"x":551,"y":73,"z":"a2800b0.adcd2f8","wires":[["fc80f6e2.339178"]]},{"id":"fc80f6e2.339178","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":234,"y":257,"z":"a2800b0.adcd2f8","wires":[["9eddb683.5db478","c3ead607.5a1818","a0c31fb9.980eb"]]},{"id":"9eddb683.5db478","type":"call","name":"call: legacy-operation-all","xml":"<call module='APPC' rpc='topology-operation-all' version='2.0.0' mode='sync' >\n","comments":"","outputs":1,"x":512,"y":322,"z":"a2800b0.adcd2f8","wires":[["a6c9fcec.35ea7","f4f22d6f.b464"]]},{"id":"c3ead607.5a1818","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":479,"y":444,"z":"a2800b0.adcd2f8","wires":[]},{"id":"f4f22d6f.b464","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":740,"y":370,"z":"a2800b0.adcd2f8","wires":[["da7dbd7.b82e74"]]},{"id":"a6c9fcec.35ea7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":736,"y":278,"z":"a2800b0.adcd2f8","wires":[["9b5ac116.42a4c"]]},{"id":"da7dbd7.b82e74","type":"execute","name":"Map Positive Response","xml":"<execute plugin='org.onap.appc.dg.common.LegacyUtil' method='convertPositiveResponse' >\n","comments":"","outputs":1,"x":917,"y":370,"z":"a2800b0.adcd2f8","wires":[["5318008f.8818d"]]},{"id":"5318008f.8818d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1120,"y":370,"z":"a2800b0.adcd2f8","wires":[[]]},{"id":"1a5b7135.777c5f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='SvcLogic.status.code' value='`$error-code`' />\n<parameter name='org.onap.appc.dg.error' value='`$error-message`' />\n<parameter name='dg.status.message.param.errorMsg' value='`$error-message`' />\n","comments":"","x":1252,"y":278,"z":"a2800b0.adcd2f8","wires":[]},{"id":"a0c31fb9.980eb","type":"execute","name":"Prepare Request","xml":"<execute plugin='org.onap.appc.dg.common.LegacyUtil' method='prepareRequest' >\n","comments":"","outputs":1,"x":481,"y":215,"z":"a2800b0.adcd2f8","wires":[[]]},{"id":"9b5ac116.42a4c","type":"execute","name":"Map Negative Response","xml":"<execute plugin='org.onap.appc.dg.common.LegacyUtil' method='convertNegativeResponse' >\n","comments":"","outputs":1,"x":913,"y":278,"z":"a2800b0.adcd2f8","wires":[["4b6e2869.5987d8"]]},{"id":"4b6e2869.5987d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1101,"y":278,"z":"a2800b0.adcd2f8","wires":[["1a5b7135.777c5f"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json
deleted file mode 100644
index a9654d4..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"a821f6e8.704ae8","type":"dgstart","name":"DGSTART","outputs":1,"x":114,"y":76,"z":"5c9ed2bf.7c802c","wires":[["225e9571.40dc9a"]]},{"id":"225e9571.40dc9a","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.0.0","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-API' version='2.0.0.0'>","outputs":1,"x":276,"y":76,"z":"5c9ed2bf.7c802c","wires":[["658f8fd3.71418"]]},{"id":"658f8fd3.71418","type":"method","name":"Method: Return License","xml":"<method rpc='return_license' mode='sync'>\n","comments":"","outputs":1,"x":189,"y":205,"z":"5c9ed2bf.7c802c","wires":[["a1a70803.7a2338"]]},{"id":"757e67b1.7b4918","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1157,"y":285,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"2a6a83b8.dd656c","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":850,"y":323,"z":"5c9ed2bf.7c802c","wires":[["757e67b1.7b4918","f7406078.502ba"]]},{"id":"f7406078.502ba","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1211,"y":330,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"b37c3449.de61c8","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":403,"y":324,"z":"5c9ed2bf.7c802c","wires":[["7b5ad420.2cdf2c"]]},{"id":"564c423c.4579bc","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$input.action-identifiers.vnf-id`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":359,"y":268,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"a1a70803.7a2338","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":135,"y":300,"z":"5c9ed2bf.7c802c","wires":[["564c423c.4579bc","b37c3449.de61c8","fa5b213.83780e","fb350ce9.a1d8a","d7e6d28b.9fa3f"]]},{"id":"7b5ad420.2cdf2c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":591,"y":324,"z":"5c9ed2bf.7c802c","wires":[["2a6a83b8.dd656c"]]},{"id":"88061c98.c83f4","type":"set","name":"set for entitlement","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.entitlement.pool.uuid`' />\n\t<parameter name=\"asset-tag\" value='`$aai.input.data.entitlement-resource-uuid`' />\n\t<parameter name='aai.uuid' value='`$aai.input.data.entitlement-assignment-group-uuid`' />\n\t<parameter name='acquire.method' value='acquireEntitlement' />\n\t<parameter name='release.method' value='releaseEntitlement' />\n","comments":"","x":916,"y":406,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"fa5b213.83780e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":328,"y":739,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"7a6a9664.4a3d48","type":"set","name":"set for license","xml":"<set>\n\t<parameter name='model.uuid' value='`$model.license.key.uuid`' />\n\t<parameter name=\"asset-tag\" value=\"`$aai.input.data.license-key-uuid`\" />\n\t<parameter name=\"license-key\" value=\"`$aai.input.data.license-key`\" />\n\t<parameter name='aai.uuid' value='`$aai.input.data.license-assignment-group-uuid`' />\n\t<parameter name='acquire.method' value='acquireLicense' />\n\t<parameter name='release.method' value='releaseLicense' />","comments":"","x":927,"y":557,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"1e6af15c.6796df","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1147,"y":445,"z":"5c9ed2bf.7c802c","wires":[["5d49cf70.976ff"]]},{"id":"6aee4a8f.8f3c54","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1190,"y":529,"z":"5c9ed2bf.7c802c","wires":[["90c41eec.6a507"]]},{"id":"6f553242.ed52ec","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1856,"y":489,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"90c41eec.6a507","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1546,"y":530,"z":"5c9ed2bf.7c802c","wires":[["6f553242.ed52ec","d863be45.ce93a","a2f6bf78.eaf73"]]},{"id":"d863be45.ce93a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1805,"y":529,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"db23792b.9aee08","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='' />\n\n","comments":"","outputs":1,"x":936,"y":466,"z":"5c9ed2bf.7c802c","wires":[["1e6af15c.6796df","6aee4a8f.8f3c54"]]},{"id":"c5c3ef8a.d28ec","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1537,"y":388,"z":"5c9ed2bf.7c802c","wires":[["3f58fb6b.831104"]]},{"id":"a2f6bf78.eaf73","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1788,"y":448,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"a75a3561.3c2d78","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1164,"y":617,"z":"5c9ed2bf.7c802c","wires":[["ff5b8e7e.ddf91"]]},{"id":"475bc485.88a2bc","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1857,"y":737,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"17f18b32.25fa65","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1500,"y":741,"z":"5c9ed2bf.7c802c","wires":[["475bc485.88a2bc","fa1ced45.a923e","ba4f55b0.15deb8"]]},{"id":"fa1ced45.a923e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$acquire.error.error-message`' />\n","comments":"","x":1810,"y":784,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"56ccaad7.0d0aa4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1247,"y":741,"z":"5c9ed2bf.7c802c","wires":[["17f18b32.25fa65"]]},{"id":"43cbdeae.fd16a","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='' />\n\t<parameter name='aai.input.data.license-key' value='' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='' />\n","comments":"","outputs":1,"x":950,"y":642,"z":"5c9ed2bf.7c802c","wires":[["a75a3561.3c2d78","56ccaad7.0d0aa4"]]},{"id":"32399c86.40db54","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1546,"y":617,"z":"5c9ed2bf.7c802c","wires":[["ce6a4c39.04928"]]},{"id":"ba4f55b0.15deb8","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.dg.error' value='`$acquire.error.error-message`' />\n","comments":"","x":1785,"y":692,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"5d49cf70.976ff","type":"execute","name":"execute: release entitlement","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseEntitlement' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$aai.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":1350,"y":445,"z":"5c9ed2bf.7c802c","wires":[["c5c3ef8a.d28ec","37b2a9ad.9b5076"]]},{"id":"9146d0a1.0e3d3","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":2021,"y":365,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"f839a87a.b2dfa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1972,"y":425,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"37b2a9ad.9b5076","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1551,"y":469,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"ff5b8e7e.ddf91","type":"execute","name":"execute: release license","xml":"<execute plugin='org.openecomp.sdnc.sli.plugin.altsTools.AltsTools' method='releaseLicense' >\n    <parameter name=\"asset-uuid\" value=\"`$asset-tag`\" />\n\t<parameter name=\"assignment-group\" value=\"`$aai.uuid`\" />\n\t<parameter name=\"error-prefix\" value=\"acquire.error\" />\n\t<parameter name=\"prefix\" value=\"release.response\" />\n\t<parameter name=\"hostname\" value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />\n","comments":"","outputs":1,"x":1352,"y":617,"z":"5c9ed2bf.7c802c","wires":[["32399c86.40db54","97e9c364.5a077"]]},{"id":"1ff85d4c.b7dcb3","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1978,"y":617,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"2221e1ef.b87a1e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-message' value='`$org.onap.appc.dg.error`' />\n","comments":"","x":1966,"y":669,"z":"5c9ed2bf.7c802c","wires":[]},{"id":"97e9c364.5a077","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1571,"y":671,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"57f1d3d6.35cebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":715,"y":432,"z":"5c9ed2bf.7c802c","wires":[["88061c98.c83f4","db23792b.9aee08"]]},{"id":"4e053a22.9bacc4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":724,"y":557,"z":"5c9ed2bf.7c802c","wires":[["7a6a9664.4a3d48","43cbdeae.fd16a"]]},{"id":"3f58fb6b.831104","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1724,"y":365,"z":"5c9ed2bf.7c802c","wires":[["8bea9f7.6b8d26","9146d0a1.0e3d3","f839a87a.b2dfa8"]]},{"id":"ce6a4c39.04928","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1713,"y":617,"z":"5c9ed2bf.7c802c","wires":[["1ff85d4c.b7dcb3","2221e1ef.b87a1e","579d777b.8d2698"]]},{"id":"fb350ce9.a1d8a","type":"switchNode","name":"release entitlement?","xml":"<switch test='`$is.release-entitlement.require`'>\n","comments":"","outputs":1,"x":381,"y":432,"z":"5c9ed2bf.7c802c","wires":[["97efa41.9e60358"]]},{"id":"97efa41.9e60358","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":555,"y":432,"z":"5c9ed2bf.7c802c","wires":[["57f1d3d6.35cebc"]]},{"id":"d7e6d28b.9fa3f","type":"switchNode","name":"release license?","xml":"<switch test='`$is.release-license.require`'>\n","comments":"","outputs":1,"x":374,"y":557,"z":"5c9ed2bf.7c802c","wires":[["ea6be629.2eb328"]]},{"id":"ea6be629.2eb328","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":548,"y":557,"z":"5c9ed2bf.7c802c","wires":[["4e053a22.9bacc4"]]},{"id":"8bea9f7.6b8d26","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.entitlement-resource-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.entitlement-assignment-group-uuid' value='`$aai.uuid`' />\n\n","comments":"","outputs":1,"x":1996,"y":307,"z":"5c9ed2bf.7c802c","wires":[[]]},{"id":"579d777b.8d2698","type":"execute","name":"execute: postVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='postGenericVnfData' >\n\t<parameter name='aai.input.data.license-key-uuid' value='`$asset-tag`' />\n\t<parameter name='aai.input.data.license-key' value='`$license-key`' />\n\t<parameter name='aai.input.data.license-assignment-group-uuid' value='`$aai.uuid`' />\n","comments":"","outputs":1,"x":1964,"y":566,"z":"5c9ed2bf.7c802c","wires":[[]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_test_acquire_license.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_test_acquire_license.json
deleted file mode 100644
index d60d452..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_test_acquire_license.json
+++ /dev/null
@@ -1,95 +0,0 @@
-[{
-  "id": "1f585ed.21154a1",
-  "type": "dgstart",
-  "name": "DGSTART",
-  "outputs": 1,
-  "x": 273.5182189941406,
-  "y": 642.9733276367188,
-  "z": "a8867a54.b68aa8",
-  "wires": [["26331bcc.5e4d34"]]
-},
-  {
-    "id": "26331bcc.5e4d34",
-    "type": "service-logic",
-    "name": "Appc-API 2.0.0.0",
-    "module": "Appc-API",
-    "version": "2.0.0.0",
-    "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-API' version='2.0.0.0'>",
-    "outputs": 1,
-    "x": 435.5182189941406,
-    "y": 642.9733276367188,
-    "z": "a8867a54.b68aa8",
-    "wires": [["af901d18.170e1"]]
-  },
-  {
-    "id": "af901d18.170e1",
-    "type": "method",
-    "name": "Method: Test Acquire License",
-    "xml": "<method rpc='test_acquire_license' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 669.5182189941406,
-    "y": 642.9733276367188,
-    "z": "a8867a54.b68aa8",
-    "wires": [["eea893d.1c1f87"]]
-  },
-  {
-    "id": "eea893d.1c1f87",
-    "type": "call",
-    "name": "call",
-    "xml": "<call module='Appc-API' rpc='acquire_license' version='2.0.0.0' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 558.5182189941406,
-    "y": 814.9733276367188,
-    "z": "a8867a54.b68aa8",
-    "wires": [["123a4493.e2fdeb",
-      "c7a4a585.615bc8"]]
-  },
-  {
-    "id": "123a4493.e2fdeb",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 764.5182189941406,
-    "y": 776.9733276367188,
-    "z": "a8867a54.b68aa8",
-    "wires": [["8eac6bd.c7e3698"]]
-  },
-  {
-    "id": "c7a4a585.615bc8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 782.5182189941406,
-    "y": 880.9733276367188,
-    "z": "a8867a54.b68aa8",
-    "wires": [["3c9cd402.4858fc"]]
-  },
-  {
-    "id": "8eac6bd.c7e3698",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='test _failed' />\n<parameter name='error-message' value='test failed' />\n<parameter name='output.status.code' value='401'/>\n<parameter name='output.status.message' value='test failed' />\n",
-    "comments": "",
-    "x": 950.5182189941406,
-    "y": 752.9733276367188,
-    "z": "a8867a54.b68aa8",
-    "wires": []
-  },
-  {
-    "id": "3c9cd402.4858fc",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>",
-    "comments": "",
-    "x": 977.5182189941406,
-    "y": 928.9733276367188,
-    "z": "a8867a54.b68aa8",
-    "wires": []
-  }]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_test_return_license.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_test_return_license.json
deleted file mode 100644
index 61f7823..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_2.0.0.0_method_test_return_license.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"d93a521f.dda3e","type":"dgstart","name":"DGSTART","outputs":1,"x":197,"y":138,"z":"4f222e2c.956b4","wires":[["975aabef.83e3a8"]]},{"id":"975aabef.83e3a8","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.0.0","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-API' version='2.0.0.0'>","outputs":1,"x":359,"y":138,"z":"4f222e2c.956b4","wires":[["9f9cc5c9.5af018"]]},{"id":"9f9cc5c9.5af018","type":"method","name":"Method: Test Acquire License","xml":"<method rpc='test_return_license' mode='sync'>\n","comments":"","outputs":1,"x":593,"y":138,"z":"4f222e2c.956b4","wires":[["2583bf34.8b519"]]},{"id":"2583bf34.8b519","type":"call","name":"call","xml":"<call module='Appc-API' rpc='return_license' version='2.0.0.0' mode='sync' >\n","comments":"","outputs":1,"x":482,"y":310,"z":"4f222e2c.956b4","wires":[["c2cc27ed.bf8738","4fa42394.3007fc"]]},{"id":"c2cc27ed.bf8738","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":688,"y":272,"z":"4f222e2c.956b4","wires":[["36221376.21b87c"]]},{"id":"4fa42394.3007fc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":706,"y":376,"z":"4f222e2c.956b4","wires":[["a6e7fd7c.d99bb"]]},{"id":"36221376.21b87c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='test _failed' />\n<parameter name='error-message' value='test failed' />\n","comments":"","x":874,"y":248,"z":"4f222e2c.956b4","wires":[]},{"id":"a6e7fd7c.d99bb","type":"returnSuccess","name":"return success","xml":"<return status='success'>","comments":"","x":901,"y":424,"z":"4f222e2c.956b4","wires":[]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json
deleted file mode 100644
index 6b2b001..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"763764f9.79221c","type":"execute","name":"execute: retrieveDSConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n","comments":"","outputs":1,"x":395.9444122314453,"y":491.0000457763672,"z":"fb913a7d.732918","wires":[["2539510.b9781b","2e1dc2b0.977cce"]]},{"id":"2539510.b9781b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":628.6111602783203,"y":549.2222442626953,"z":"fb913a7d.732918","wires":[["4d592641.1595d8"]]},{"id":"2e1dc2b0.977cce","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":625.7221832275391,"y":513.7778167724609,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"4d592641.1595d8","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":630.3888702392578,"y":613.2222137451172,"z":"fb913a7d.732918","wires":[["7c24254c.c9cb7c","7b464568.a7055c"]]},{"id":"7c24254c.c9cb7c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":859.9444122314453,"y":578.4444732666016,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"7b464568.a7055c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":856.2779083251953,"y":625.2222137451172,"z":"fb913a7d.732918","wires":[["b09004a6.ff6eb8"]]},{"id":"b09004a6.ff6eb8","type":"execute","name":"execute: modifyConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n","comments":"","outputs":1,"x":723.0556182861328,"y":707.5554962158203,"z":"fb913a7d.732918","wires":[["f7c16fb0.faea8","bca9252e.3c05d8"]]},{"id":"f7c16fb0.faea8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":940.9444122314453,"y":687.8889312744141,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"bca9252e.3c05d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":945.1667022705078,"y":731.7777862548828,"z":"fb913a7d.732918","wires":[["5c0381d4.bfb8a"]]},{"id":"cbb153f7.c399","type":"execute","name":"execute: backupConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n","comments":"","outputs":1,"x":850.2776641845703,"y":927.9999542236328,"z":"fb913a7d.732918","wires":[["d8669e30.15c2d","579be757.32a7d8"]]},{"id":"d8669e30.15c2d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1059.3888702392578,"y":903.7777862548828,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"579be757.32a7d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1063.9445343017578,"y":948.3333282470703,"z":"fb913a7d.732918","wires":[["a45f0f06.775bf"]]},{"id":"a45f0f06.775bf","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n \t<parameter name='error-code' value='200' />","comments":"","x":1358.5001678466797,"y":947.4445037841797,"z":"fb913a7d.732918","wires":[]},{"id":"eca6713a.6394e","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1240.1667938232422,"y":520.3333740234375,"z":"fb913a7d.732918","wires":[["b7cefeae.7ab6c"]]},{"id":"5c0381d4.bfb8a","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":728.6110992431641,"y":797.0000839233398,"z":"fb913a7d.732918","wires":[["420c3d12.5c9364","32e323ab.c2e17c"]]},{"id":"32e323ab.c2e17c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":959.3888702392578,"y":832.7778549194336,"z":"fb913a7d.732918","wires":[["eca6713a.6394e"]]},{"id":"420c3d12.5c9364","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":956.2778472900391,"y":870.2222518920898,"z":"fb913a7d.732918","wires":[["cbb153f7.c399"]]},{"id":"91ad9785.d2b408","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1590.7541046142578,"y":521.857177734375,"z":"fb913a7d.732918","wires":[]},{"id":"4edf3002.1258d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":238.6111297607422,"y":356.9999694824219,"z":"fb913a7d.732918","wires":[["20a6444f.9a5ebc"]]},{"id":"a15e7bed.f739b8","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":254.6110076904297,"y":293.00006103515625,"z":"fb913a7d.732918","wires":[["4edf3002.1258d","3e864fff.be3c7"]]},{"id":"db7b3768.a07988","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":187.6111297607422,"y":232.00003051757812,"z":"fb913a7d.732918","wires":[["a15e7bed.f739b8","f2b5aee5.b9b0d"]]},{"id":"3e864fff.be3c7","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":569.6111297607422,"y":286.3332824707031,"z":"fb913a7d.732918","wires":[["be8ced87.d162c"]]},{"id":"f2b5aee5.b9b0d","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value='`$org.onap.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":412.6111297607422,"y":169.00003051757812,"z":"fb913a7d.732918","wires":[]},{"id":"88e1659f.7fb148","type":"method","name":"VSBG_ConfigModify","xml":"<method rpc='VSBG_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":145.5,"y":167.77777099609375,"z":"fb913a7d.732918","wires":[["db7b3768.a07988"]]},{"id":"be8ced87.d162c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":724.6111297607422,"y":286.3332824707031,"z":"fb913a7d.732918","wires":[]},{"id":"bf1e84f5.1bc6d8","type":"service-logic","name":"Appc-API 2.0.0.0","module":"Appc-API","version":"2.0.0.0","comments":"test service logic","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-API' version='2.0.0.0'>","outputs":1,"x":86.5,"y":123.55555725097656,"z":"fb913a7d.732918","wires":[["88e1659f.7fb148"]]},{"id":"61be8d43.488194","type":"dgstart","name":"DGSTART","outputs":1,"x":75.61112976074219,"y":50,"z":"fb913a7d.732918","wires":[["bf1e84f5.1bc6d8"]]},{"id":"d521598b.c7a468","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":528.6111297607422,"y":426,"z":"fb913a7d.732918","wires":[]},{"id":"20a6444f.9a5ebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":303.6111297607422,"y":427,"z":"fb913a7d.732918","wires":[["d521598b.c7a468","763764f9.79221c"]]},{"id":"b7cefeae.7ab6c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1441.9444122314453,"y":522,"z":"fb913a7d.732918","wires":[["91ad9785.d2b408"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json
deleted file mode 100644
index 2ca1972..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"6e90cbf4.57f244","type":"execute","name":"execute: retrieveDSConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n","comments":"","outputs":1,"x":459.9444122314453,"y":572.0000457763672,"z":"2154d119.c59cae","wires":[["38318271.82e40e","5435f9ee.d438b8"]]},{"id":"38318271.82e40e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":691.6111602783203,"y":630.2222366333008,"z":"2154d119.c59cae","wires":[["a5fd395b.4ff8d8"]]},{"id":"5435f9ee.d438b8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":688.7221832275391,"y":594.7778091430664,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"a5fd395b.4ff8d8","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":693.3888702392578,"y":694.2222061157227,"z":"2154d119.c59cae","wires":[["7649ccd1.4bdf84","740ae685.f59378"]]},{"id":"7649ccd1.4bdf84","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":922.9444122314453,"y":659.444465637207,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"740ae685.f59378","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":919.2779083251953,"y":706.2222061157227,"z":"2154d119.c59cae","wires":[["3efc3f7e.f0b8a"]]},{"id":"3efc3f7e.f0b8a","type":"execute","name":"execute: modifyConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n","comments":"","outputs":1,"x":786.0556182861328,"y":788.5554885864258,"z":"2154d119.c59cae","wires":[["25e0354c.1ecdca","1da66879.acaae8"]]},{"id":"25e0354c.1ecdca","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1003.9444122314453,"y":768.8889236450195,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"1da66879.acaae8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1008.1667022705078,"y":812.7777786254883,"z":"2154d119.c59cae","wires":[["ed4bb0ee.a817b"]]},{"id":"4cf1e455.d66afc","type":"execute","name":"execute: backupConfiguration","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n","comments":"","outputs":1,"x":913.2776641845703,"y":1008.9999465942383,"z":"2154d119.c59cae","wires":[["b404baeb.0bde98","9b814969.6f3608"]]},{"id":"b404baeb.0bde98","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1122.3888702392578,"y":984.7777786254883,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"9b814969.6f3608","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1126.9445343017578,"y":1029.3333206176758,"z":"2154d119.c59cae","wires":[["e3c4236.d2566e"]]},{"id":"e3c4236.d2566e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n \t<parameter name='error-code' value='200' />","comments":"","x":1421.5001678466797,"y":1028.4444961547852,"z":"2154d119.c59cae","wires":[]},{"id":"7849e9fc.2f1158","type":"execute","name":"execute: handleErrorToDCAE","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n","comments":"","outputs":1,"x":1303.1667938232422,"y":601.333366394043,"z":"2154d119.c59cae","wires":[["c37ed5f7.c740d8"]]},{"id":"9dbac36f.19414","type":"execute","name":"execute: operationStateValidation","xml":"<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n","comments":"","outputs":1,"x":783.6110992431641,"y":926.0000839233398,"z":"2154d119.c59cae","wires":[["ee5204f1.5fc5a8","f3c87dda.9f642"]]},{"id":"f3c87dda.9f642","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1022.3888702392578,"y":913.7778472900391,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"ee5204f1.5fc5a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1019.2778472900391,"y":951.2222442626953,"z":"2154d119.c59cae","wires":[["4cf1e455.d66afc"]]},{"id":"31e43d90.09d0a2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n","comments":"","x":1654.7541046142578,"y":600.857177734375,"z":"2154d119.c59cae","wires":[]},{"id":"be651903.a128e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":301.6111297607422,"y":437.99996185302734,"z":"2154d119.c59cae","wires":[["ab704a00.f6bbb8"]]},{"id":"a790a4ce.9e7338","type":"execute","name":"execute: getVNFData","xml":"<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >","comments":"","outputs":1,"x":317.6110076904297,"y":374.0000534057617,"z":"2154d119.c59cae","wires":[["be651903.a128e8","c1565864.3b15e8"]]},{"id":"77c31558.fceebc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":250.6111297607422,"y":313.0000228881836,"z":"2154d119.c59cae","wires":[["a790a4ce.9e7338","2404d9f.4f73826"]]},{"id":"c1565864.3b15e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":632.6111297607422,"y":367.3332748413086,"z":"2154d119.c59cae","wires":[["5c6f5002.5ff8"]]},{"id":"2404d9f.4f73826","type":"set","name":"set","xml":"<set>\n\t<parameter name='aai.vnfID' value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t","comments":"","x":450.6111297607422,"y":271.0000228881836,"z":"2154d119.c59cae","wires":[]},{"id":"595cefd2.9c438","type":"method","name":"VSBG_ConfigModify","xml":"<method rpc='VSBG_ConfigModify' mode='sync'>\n","comments":"","outputs":1,"x":145.5,"y":155.77777099609375,"z":"2154d119.c59cae","wires":[["e9fea7b9.249258"]]},{"id":"5c6f5002.5ff8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\n","comments":"","x":787.6111297607422,"y":367.3332748413086,"z":"2154d119.c59cae","wires":[]},{"id":"47fccc9e.8c4124","type":"service-logic","name":"Appc-API 2.0.0.1","module":"Appc-API","version":"2.0.0.1","comments":"test service logic","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-API' version='2.0.0.1'>","outputs":1,"x":86.5,"y":111.55555725097656,"z":"2154d119.c59cae","wires":[["595cefd2.9c438"]]},{"id":"b1b41791.e43b18","type":"dgstart","name":"DGSTART","outputs":1,"x":75.61112976074219,"y":38,"z":"2154d119.c59cae","wires":[["47fccc9e.8c4124"]]},{"id":"62fb4de8.cacb14","type":"set","name":"set","xml":"<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />","comments":"","x":591.6111297607422,"y":506.99999237060547,"z":"2154d119.c59cae","wires":[]},{"id":"ab704a00.f6bbb8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":366.6111297607422,"y":507.99999237060547,"z":"2154d119.c59cae","wires":[["62fb4de8.cacb14","6e90cbf4.57f244"]]},{"id":"e9fea7b9.249258","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":231.2777557373047,"y":229.6666488647461,"z":"2154d119.c59cae","wires":[["1b3a064b.30350a","7eab1cec.af2814"]]},{"id":"1b3a064b.30350a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":243.9444122314453,"y":273.6666488647461,"z":"2154d119.c59cae","wires":[["77c31558.fceebc"]]},{"id":"7eab1cec.af2814","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":470.9444122314453,"y":130.66666412353516,"z":"2154d119.c59cae","wires":[[]]},{"id":"ed4bb0ee.a817b","type":"execute","name":"Report_Success_in_ModifyConfig","xml":"<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"ModifyConfig event executed successfully\" />","comments":"","outputs":1,"x":766.9443511962891,"y":843.6667098999023,"z":"2154d119.c59cae","wires":[["2c09cc84.3d9894","f4239d49.350f8"]]},{"id":"2c09cc84.3d9894","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":704.9444122314453,"y":892.6667098999023,"z":"2154d119.c59cae","wires":[["9dbac36f.19414"]]},{"id":"f4239d49.350f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1027.9444122314453,"y":859.6667098999023,"z":"2154d119.c59cae","wires":[["7849e9fc.2f1158"]]},{"id":"c37ed5f7.c740d8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1506.9444122314453,"y":601,"z":"2154d119.c59cae","wires":[["31e43d90.09d0a2"]]}]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.0.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.0.json
deleted file mode 100644
index b6e1c2c..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.0.json
+++ /dev/null
@@ -1,467 +0,0 @@
-[
-    {
-        "id": "4656b037.e2db1",
-        "type": "execute",
-        "name": "execute: retrieveDSConfiguration",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 429,
-        "y": 501.0000457763672,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "7c94ad7f.ddeef4",
-                "d18a7ed4.46878"
-            ]
-        ]
-    },
-    {
-        "id": "7c94ad7f.ddeef4",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 661.666748046875,
-        "y": 559.2222442626953,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "e4f5112d.b940f"
-            ]
-        ]
-    },
-    {
-        "id": "d18a7ed4.46878",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 658.7777709960938,
-        "y": 523.7778167724609,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "730fdfb2.bc4ac"
-            ]
-        ]
-    },
-    {
-        "id": "e4f5112d.b940f",
-        "type": "execute",
-        "name": "execute: operationStateValidation",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 663.4444580078125,
-        "y": 623.2222137451172,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "35201542.06c74a",
-                "a9f06492.7b18f8"
-            ]
-        ]
-    },
-    {
-        "id": "35201542.06c74a",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 893,
-        "y": 588.4444732666016,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "730fdfb2.bc4ac"
-            ]
-        ]
-    },
-    {
-        "id": "a9f06492.7b18f8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 889.33349609375,
-        "y": 635.2222137451172,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "a1def214.72c9f"
-            ]
-        ]
-    },
-    {
-        "id": "a1def214.72c9f",
-        "type": "execute",
-        "name": "execute: modifyConfiguration",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 756.1112060546875,
-        "y": 717.5554962158203,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "dabc9fbe.f4a4c",
-                "2f7de431.9dcc5c"
-            ]
-        ]
-    },
-    {
-        "id": "dabc9fbe.f4a4c",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 974,
-        "y": 697.8889312744141,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "730fdfb2.bc4ac"
-            ]
-        ]
-    },
-    {
-        "id": "2f7de431.9dcc5c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 978.2222900390625,
-        "y": 741.7777862548828,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "abf49643.479788"
-            ]
-        ]
-    },
-    {
-        "id": "69e22825.1a9578",
-        "type": "execute",
-        "name": "execute: backupConfiguration",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 883.333251953125,
-        "y": 937.9999542236328,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "b5f96af2.6d5348",
-                "15423273.a5c17e"
-            ]
-        ]
-    },
-    {
-        "id": "b5f96af2.6d5348",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1092.4444580078125,
-        "y": 913.7777862548828,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "730fdfb2.bc4ac"
-            ]
-        ]
-    },
-    {
-        "id": "15423273.a5c17e",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1097.0001220703125,
-        "y": 958.3333282470703,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "ac445d75.b35fd"
-            ]
-        ]
-    },
-    {
-        "id": "ac445d75.b35fd",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n \t<parameter name='error-code' value='200' />",
-        "comments": "",
-        "x": 1391.5557556152344,
-        "y": 957.4445037841797,
-        "z": "8772abb6.d7dd88",
-        "wires": []
-    },
-    {
-        "id": "730fdfb2.bc4ac",
-        "type": "execute",
-        "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1273.2223815917969,
-        "y": 530.3333740234375,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "9a42aa6d.290838"
-            ]
-        ]
-    },
-    {
-        "id": "abf49643.479788",
-        "type": "execute",
-        "name": "execute: operationStateValidation",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 761.6666870117188,
-        "y": 807.0000839233398,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "746900e1.b7f5e",
-                "b0dd5eed.14649"
-            ]
-        ]
-    },
-    {
-        "id": "b0dd5eed.14649",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 992.4444580078125,
-        "y": 842.7778549194336,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "730fdfb2.bc4ac"
-            ]
-        ]
-    },
-    {
-        "id": "746900e1.b7f5e",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 989.3334350585938,
-        "y": 880.2222518920898,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "69e22825.1a9578"
-            ]
-        ]
-    },
-    {
-        "id": "a8a21041.bd0a1",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
-        "comments": "",
-        "x": 1623.8096923828125,
-        "y": 531.857177734375,
-        "z": "8772abb6.d7dd88",
-        "wires": []
-    },
-    {
-        "id": "91583cc2.3251b",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 271.6667175292969,
-        "y": 366.9999694824219,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "3fbc31b8.20cc9e"
-            ]
-        ]
-    },
-    {
-        "id": "3724e729.81d9f8",
-        "type": "execute",
-        "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 287.6665954589844,
-        "y": 303.00006103515625,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "91583cc2.3251b",
-                "a831e33d.80111"
-            ]
-        ]
-    },
-    {
-        "id": "7beb016e.80f5c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 220.66671752929688,
-        "y": 242.00003051757812,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "3724e729.81d9f8",
-                "a9055b0c.089ba8"
-            ]
-        ]
-    },
-    {
-        "id": "a831e33d.80111",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 602.6667175292969,
-        "y": 296.3332824707031,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "48500897.5057c8"
-            ]
-        ]
-    },
-    {
-        "id": "a9055b0c.089ba8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n\t<parameter name='aai.vnfID' value='`$org.onap.appc.vfid`' />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t",
-        "comments": "",
-        "x": 445.6667175292969,
-        "y": 179.00003051757812,
-        "z": "8772abb6.d7dd88",
-        "wires": []
-    },
-    {
-        "id": "bbd9ee82.bfb84",
-        "type": "method",
-        "name": "vSBG ModifyConfig",
-        "xml": "<method rpc='VSBG_ModifyConfig' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 178.5555877685547,
-        "y": 177.77777099609375,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "7beb016e.80f5c"
-            ]
-        ]
-    },
-    {
-        "id": "48500897.5057c8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\n",
-        "comments": "",
-        "x": 757.6667175292969,
-        "y": 296.3332824707031,
-        "z": "8772abb6.d7dd88",
-        "wires": []
-    },
-    {
-        "id": "92c5ec09.df24c",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.0",
-        "module": "Appc-API",
-        "version": "2.0.0.0",
-        "comments": "test service logic",
-        "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-API' version='2.0.0.0'>",
-        "outputs": 1,
-        "x": 119.55558776855469,
-        "y": 133.55555725097656,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "bbd9ee82.bfb84"
-            ]
-        ]
-    },
-    {
-        "id": "53ba362a.aa5b48",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 108.66671752929688,
-        "y": 60,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "92c5ec09.df24c"
-            ]
-        ]
-    },
-    {
-        "id": "6f262e5b.8106d",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />",
-        "comments": "",
-        "x": 561.6667175292969,
-        "y": 436,
-        "z": "8772abb6.d7dd88",
-        "wires": []
-    },
-    {
-        "id": "3fbc31b8.20cc9e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 336.6667175292969,
-        "y": 437,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "6f262e5b.8106d",
-                "4656b037.e2db1"
-            ]
-        ]
-    },
-    {
-        "id": "9a42aa6d.290838",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1475,
-        "y": 532,
-        "z": "8772abb6.d7dd88",
-        "wires": [
-            [
-                "a8a21041.bd0a1"
-            ]
-        ]
-    }
-]
diff --git a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.1.json b/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.1.json
deleted file mode 100644
index 6787a52..0000000
--- a/platform-logic/appc/src/main/json/dg-loader-dgs/Dispatcher-DG/Appc-API_method_VSBG_ModifyConfig_2.0.0.1.json
+++ /dev/null
@@ -1,563 +0,0 @@
-[
-    {
-        "id": "7803fc.b785cc04",
-        "type": "execute",
-        "name": "execute: retrieveDSConfiguration",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfDBPlugin' method='retrieveDSConfiguration' >\n<parameter name=\"configuration-file-name\" value=\"`$configuration-file-name`\" />\n<parameter name=\"vnf-type\" value=\"`$vnf-type`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 497,
-        "y": 602.0000457763672,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e9707cd1.b397e",
-                "b9dd9161.84c4"
-            ]
-        ]
-    },
-    {
-        "id": "e9707cd1.b397e",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 728.666748046875,
-        "y": 660.2222366333008,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "41d228d8.8ed518"
-            ]
-        ]
-    },
-    {
-        "id": "b9dd9161.84c4",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 725.7777709960938,
-        "y": 624.7778091430664,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e305119d.ed993"
-            ]
-        ]
-    },
-    {
-        "id": "41d228d8.8ed518",
-        "type": "execute",
-        "name": "execute: operationStateValidation",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 730.4444580078125,
-        "y": 724.2222061157227,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "a9ebbdb4.61508",
-                "9dc375e3.ffd028"
-            ]
-        ]
-    },
-    {
-        "id": "a9ebbdb4.61508",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 960,
-        "y": 689.444465637207,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e305119d.ed993"
-            ]
-        ]
-    },
-    {
-        "id": "9dc375e3.ffd028",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 956.33349609375,
-        "y": 736.2222061157227,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e6a1550.e281ca8"
-            ]
-        ]
-    },
-    {
-        "id": "e6a1550.e281ca8",
-        "type": "execute",
-        "name": "execute: modifyConfiguration",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='modifyConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"file-content\" value=\"`$file-content`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 823.1112060546875,
-        "y": 818.5554885864258,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "60608be7.4c01b4",
-                "1891f46a.8b267c"
-            ]
-        ]
-    },
-    {
-        "id": "60608be7.4c01b4",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1041,
-        "y": 798.8889236450195,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e305119d.ed993"
-            ]
-        ]
-    },
-    {
-        "id": "1891f46a.8b267c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1045.2222900390625,
-        "y": 842.7777786254883,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "2c1a225a.7bc46e"
-            ]
-        ]
-    },
-    {
-        "id": "fb0deae.818b418",
-        "type": "execute",
-        "name": "execute: backupConfiguration",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='backupConfiguration' >\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 950.333251953125,
-        "y": 1038.9999465942383,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "b5901988.ad9d58",
-                "4a35b9ce.b82b38"
-            ]
-        ]
-    },
-    {
-        "id": "b5901988.ad9d58",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1159.4444580078125,
-        "y": 1014.7777786254883,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e305119d.ed993"
-            ]
-        ]
-    },
-    {
-        "id": "4a35b9ce.b82b38",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1164.0001220703125,
-        "y": 1059.3333206176758,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "fd7e26ec.f67a88"
-            ]
-        ]
-    },
-    {
-        "id": "fd7e26ec.f67a88",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n \t<parameter name='error-code' value='200' />",
-        "comments": "",
-        "x": 1458.5557556152344,
-        "y": 1058.4444961547852,
-        "z": "b4822c6c.4b863",
-        "wires": []
-    },
-    {
-        "id": "e305119d.ed993",
-        "type": "execute",
-        "name": "execute: handleErrorToDCAE",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"org.onap.appc.dg.error\" value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.message' value=\"`$org.onap.appc.dg.error`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1340.2223815917969,
-        "y": 631.333366394043,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "354c4873.8508a8"
-            ]
-        ]
-    },
-    {
-        "id": "8c61f324.ae24",
-        "type": "execute",
-        "name": "execute: operationStateValidation",
-        "xml": "<execute plugin='org.onap.appc.dg.netconf.NetconfClientPlugin' method='operationStateValidation' >\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.vftype\" value=\"`$vnf-type`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 820.6666870117188,
-        "y": 956.0000839233398,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e5e25242.4d628",
-                "873a0a33.5a6f68"
-            ]
-        ]
-    },
-    {
-        "id": "873a0a33.5a6f68",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1059.4444580078125,
-        "y": 943.7778472900391,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e305119d.ed993"
-            ]
-        ]
-    },
-    {
-        "id": "e5e25242.4d628",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1056.3334350585938,
-        "y": 981.2222442626953,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "fb0deae.818b418"
-            ]
-        ]
-    },
-    {
-        "id": "1a23a9aa.d63826",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value=\"401\" />\n<parameter name='error-message' value=\"`$org.onap.appc.dg.error`\" />\n<parameter name='output.status.code' value='401'/>\n",
-        "comments": "",
-        "x": 1691.8096923828125,
-        "y": 630.857177734375,
-        "z": "b4822c6c.4b863",
-        "wires": []
-    },
-    {
-        "id": "2e25a000.04c5c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 338.6667175292969,
-        "y": 467.99996185302734,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "bb5aec54.cbbe6"
-            ]
-        ]
-    },
-    {
-        "id": "12f26606.82d0fa",
-        "type": "execute",
-        "name": "execute: getVNFData",
-        "xml": "<execute plugin='org.onap.appc.dg.aai.AAIPlugin' method='getGenericVnfData' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 354.6665954589844,
-        "y": 404.0000534057617,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "2e25a000.04c5c",
-                "85e8fad3.0a8fd8"
-            ]
-        ]
-    },
-    {
-        "id": "538c4326.ceed4c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 287.6667175292969,
-        "y": 343.0000228881836,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "12f26606.82d0fa",
-                "a8e2d4ed.3f69c8"
-            ]
-        ]
-    },
-    {
-        "id": "85e8fad3.0a8fd8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 669.6667175292969,
-        "y": 397.3332748413086,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "5efd9802.fe2b28"
-            ]
-        ]
-    },
-    {
-        "id": "a8e2d4ed.3f69c8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n\t<parameter name='aai.vnfID' value=\"`$input.action-identifiers.vnf-id`\" />\n\t<parameter name='aai.prefix' value='aai.input.data' />\t",
-        "comments": "",
-        "x": 487.6667175292969,
-        "y": 301.0000228881836,
-        "z": "b4822c6c.4b863",
-        "wires": []
-    },
-    {
-        "id": "ac24dc8.2d2022",
-        "type": "method",
-        "name": "vSBG ModifyConfig",
-        "xml": "<method rpc='VSBG_ModifyConfig' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 182.5555877685547,
-        "y": 185.77777099609375,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "8e0514c2.f1c608"
-            ]
-        ]
-    },
-    {
-        "id": "5efd9802.fe2b28",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\n",
-        "comments": "",
-        "x": 824.6667175292969,
-        "y": 397.3332748413086,
-        "z": "b4822c6c.4b863",
-        "wires": []
-    },
-    {
-        "id": "37ba4fbf.e4911",
-        "type": "service-logic",
-        "name": "Appc-API 2.0.0.1",
-        "module": "Appc-API",
-        "version": "2.0.0.1",
-        "comments": "test service logic",
-        "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-API' version='2.0.0.1'>",
-        "outputs": 1,
-        "x": 123.55558776855469,
-        "y": 141.55555725097656,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "ac24dc8.2d2022"
-            ]
-        ]
-    },
-    {
-        "id": "3afe95c0.5e0aaa",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 112.66671752929688,
-        "y": 68,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "37ba4fbf.e4911"
-            ]
-        ]
-    },
-    {
-        "id": "e0a9dcc8.bb81a",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n\t<parameter name='org.onap.appc.vftype' value='`$aai.input.data.vnf-type`' />\t\n\t<parameter name='vnf-type' value='`$aai.input.data.vnf-type`' />",
-        "comments": "",
-        "x": 628.6667175292969,
-        "y": 536.9999923706055,
-        "z": "b4822c6c.4b863",
-        "wires": []
-    },
-    {
-        "id": "bb5aec54.cbbe6",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 403.6667175292969,
-        "y": 537.9999923706055,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e0a9dcc8.bb81a",
-                "7803fc.b785cc04"
-            ]
-        ]
-    },
-    {
-        "id": "8e0514c2.f1c608",
-        "type": "execute",
-        "name": "execute: flatAndAddToContext",
-        "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 268.3333435058594,
-        "y": 259.6666488647461,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "89097e7c.7a1c2",
-                "e199c03e.60f2"
-            ]
-        ]
-    },
-    {
-        "id": "89097e7c.7a1c2",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 281,
-        "y": 303.6666488647461,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "538c4326.ceed4c"
-            ]
-        ]
-    },
-    {
-        "id": "e199c03e.60f2",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 508,
-        "y": 160.66666412353516,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2c1a225a.7bc46e",
-        "type": "execute",
-        "name": "Report_Success_in_ModifyConfig",
-        "xml": "<execute plugin='org.onap.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"ModifyConfig event executed successfully\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 803.9999389648438,
-        "y": 873.6667098999023,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "2ac625be.770a7a",
-                "88f7850e.5ad108"
-            ]
-        ]
-    },
-    {
-        "id": "2ac625be.770a7a",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 742,
-        "y": 922.6667098999023,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "8c61f324.ae24"
-            ]
-        ]
-    },
-    {
-        "id": "88f7850e.5ad108",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1065,
-        "y": 889.6667098999023,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "e305119d.ed993"
-            ]
-        ]
-    },
-    {
-        "id": "354c4873.8508a8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1544,
-        "y": 631,
-        "z": "b4822c6c.4b863",
-        "wires": [
-            [
-                "1a23a9aa.d63826"
-            ]
-        ]
-    }
-]
diff --git a/platform-logic/appc/src/main/xml/APPC_chef.xml b/platform-logic/appc/src/main/xml/APPC_chef.xml
deleted file mode 100644
index 69fb012..0000000
--- a/platform-logic/appc/src/main/xml/APPC_chef.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  APPC
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<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='3.0.0'><method rpc='chef' mode='sync'>
-<block>
-<set>
-<parameter name='chef-server-address' value='`$chef-server-address`' />
-<parameter name='chef-username' value='`$chef-username`' />
-<parameter name='chef-organization' value='`$chef-organization`'/>
-</set><block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcEnvironment' >
-<parameter name='organizations' value='`$chef-organization`'/>
-<parameter name='serverAddress' value='`$chef-server-address`'/>
-<parameter name='username' value='`$chef-username`'/>
-<parameter name='Environment' value='`$Environment`'/></execute><switch test='`$chefServerResult.code`'><outcome value='200'>
-<block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcNodeobjects' >
-<parameter name='organizations' value='`$chef-organization`'/>
-<parameter name='serverAddress' value='`$chef-server-address`'/>
-<parameter name='username' value='`$chef-username`'/>
-<parameter name='NodeList' value='`$NodeList`'/>
-<parameter name='Node' value='`$Node`'/></execute><switch test='`$chefServerResult.code`'><outcome value='200'>
-<switch test='`$PushJobFlag`'>
-<outcome value='true'>
-<block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcPushJob'>
-	<parameter name='organizations' value='`$chef-organization`'/> 
-	<parameter name='serverAddress' value='`$chef-server-address`'/> 
-	<parameter name='username' value='`$chef-username`'/> 
-	<parameter name='NodeList' value='`$NodeList`'/>
-	<parameter name='CallbackCapable' value='`$CallbackCapable`'/>
-	<parameter name='RequestId' value='`$RequestId`'/>
-	<parameter name='CallbackUrl' value='`$CallbackUrl`'/></execute><switch test='`$chefServerResult.code`'>
-<outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' />
-</return></outcome><outcome value='201'>
-<switch test='`$CallbackCapable`'>
-<outcome value='true'>
-<return status='success'>
-<parameter name='output.status.code' value='400' />
-<parameter name='output.status.message' value='chef success, waiting for callback' /></return></outcome><outcome value='Other'>
-<block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='checkPushJob' >
-	<parameter name='organizations' value='`$chef-organization`'/> 
-	<parameter name='serverAddress' value='`$chef-server-address`'/> 
-	<parameter name='username' value='`$chef-username`'/> 
-	<parameter name='jobid' value='`$jobID`'/>
-	<parameter name='retryTimes' value='`$retryTimes`'/>
-	<parameter name='retryInterval' value='`$retryInterval`'/></execute><switch test='`$chefServerResult.code`'>
-<outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' /></return></outcome><outcome value='200'>
-<switch test='`$GetOutputFlag`'>
-<outcome value='Other'>
-<return status='success'>
-<parameter name='output.status.code' value='400' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' /></return></outcome><outcome value='true'>
-<block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='fetchResults' >
-	<parameter name='organizations' value='`$chef-organization`'/> 
-	<parameter name='serverAddress' value='`$chef-server-address`'/> 
-	<parameter name='username' value='`$chef-username`'/> 
-	<parameter name='NodeList' value='`$NodeList`'/></execute><switch test='`$chefServerResult.code`'>
-<outcome value='200'>
-<return status='success'>
-<parameter name='output.status.code' value='400' />
-<parameter name='output.status.message' value='finish' />
-<parameter name='output.status.results' value='`$chefServerResult.message`' /></return></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' />
-</return></outcome></switch></block></outcome></switch></outcome></switch></block></outcome></switch></outcome></switch></block></outcome><outcome value='Other'>
-<return status='success'>
-<parameter name='output.status.code' value='400' />
-<parameter name='output.status.message' value='chef success, do not need push job ' /></return></outcome></switch></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' />
-</return></outcome></switch></block></outcome><outcome value='201'>
-<block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcNodeobjects' >
-<parameter name='organizations' value='`$chef-organization`'/> 
-<parameter name='serverAddress' value='`$chef-server-address`'/> 
-<parameter name='username' value='`$chef-username`'/> 
-<parameter name='NodeList' value='`$NodeList`'/>
-<parameter name='Node' value='`$Node`'/></execute><switch test='`$chefServerResult.code`'><outcome value='200'>
-<switch test='`$PushJobFlag`'>
-<outcome value='true'>
-<block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='VnfcPushJob'>
-	<parameter name='organizations' value='`$chef-organization`'/> 
-	<parameter name='serverAddress' value='`$chef-server-address`'/> 
-	<parameter name='username' value='`$chef-username`'/> 
-	<parameter name='NodeList' value='`$NodeList`'/>
-	<parameter name='CallbackCapable' value='`$CallbackCapable`'/>
-	<parameter name='RequestId' value='`$RequestId`'/>
-	<parameter name='CallbackUrl' value='`$CallbackUrl`'/></execute><switch test='`$chefServerResult.code`'>
-<outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' />
-</return></outcome><outcome value='201'>
-<switch test='`$CallbackCapable`'>
-<outcome value='true'>
-<return status='success'>
-<parameter name='output.status.code' value='400' />
-<parameter name='output.status.message' value='chef success, waiting for callback' /></return></outcome><outcome value='Other'>
-<block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='checkPushJob' >
-	<parameter name='organizations' value='`$chef-organization`'/> 
-	<parameter name='serverAddress' value='`$chef-server-address`'/> 
-	<parameter name='username' value='`$chef-username`'/> 
-	<parameter name='jobid' value='`$jobID`'/>
-	<parameter name='retryTimes' value='`$retryTimes`'/>
-	<parameter name='retryInterval' value='`$retryInterval`'/></execute><switch test='`$chefServerResult.code`'>
-<outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' /></return></outcome><outcome value='200'>
-<switch test='`$GetOutputFlag`'>
-<outcome value='Other'>
-<return status='success'>
-<parameter name='output.status.code' value='400' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' /></return></outcome><outcome value='true'>
-<block>
-<execute plugin='org.onap.appc.adapter.chef.ChefAdapter' method='fetchResults' >
-	<parameter name='organizations' value='`$chef-organization`'/> 
-	<parameter name='serverAddress' value='`$chef-server-address`'/> 
-	<parameter name='username' value='`$chef-username`'/> 
-	<parameter name='NodeList' value='`$NodeList`'/></execute><switch test='`$chefServerResult.code`'>
-<outcome value='200'>
-<return status='success'>
-<parameter name='output.status.code' value='400' />
-<parameter name='output.status.message' value='finish' />
-<parameter name='output.status.results' value='`$chefServerResult.message`' /></return></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' />
-</return></outcome></switch></block></outcome></switch></outcome></switch></block></outcome></switch></outcome></switch></block></outcome><outcome value='Other'>
-<return status='success'>
-<parameter name='output.status.code' value='400' />
-<parameter name='output.status.message' value='chef success, do not need push job ' /></return></outcome></switch></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' />
-</return></outcome></switch></block></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='output.status.code' value='200' />
-<parameter name='output.status.message' value='`$chefServerResult.message`' />
-</return></outcome></switch></block></block></method></service-logic>
diff --git a/platform-logic/appc/src/main/xml/APPC_method_ansible_adapter_1.0_2.0.1.xml b/platform-logic/appc/src/main/xml/APPC_method_ansible_adapter_1.0_2.0.1.xml
deleted file mode 100644
index b80ebe0..0000000
--- a/platform-logic/appc/src/main/xml/APPC_method_ansible_adapter_1.0_2.0.1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  APPC
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Modifications Copyright (C) 2019 Orange
-  =============================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<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.1'>
-    <method rpc='ansible-adapter-1.0' mode='sync'>
-        <execute plugin='org.onap.appc.adapter.ansible.AnsibleAdapter' method='reqExec'>
-            <parameter name='AgentUrl' value='`$AgentUrl`'/>
-            <parameter name='User' value='`$User`'/>
-            <parameter name='Password' value='`$Password`'/>
-            <parameter name='LocalParameters' value='`$LocalParameters`'/>
-            <parameter name='EnvParameters' value='`$EnvParameters`'/>
-            <parameter name='FileParameters' value='`$FileParameters`'/>
-            <parameter name='AutoNodeList' value='`$AutoNodeList`'/>
-            <parameter name='NodeList' value='`$NodeList`'/>
-            <parameter name='Timeout' value='`$Timeout`'/>
-            <parameter name='Version' value='`$Version`'/>
-            <parameter name='InventoryNames' value='`$InventoryNames`'/>
-            <parameter name='PlaybookName' value='`$PlaybookName`'/>
-            <parameter name='Action' value='`$Action`'/>
-            <parameter name='vnfc-name' value='`$request-parameters.vnfc-name`'/>
-            <parameter name='vnfc-type' value='`$request-parameters.vnfc-type`'/>
-            <parameter name='vserver-id' value='`$request-parameters.vserver-id`'/>
-            <parameter name='vf-module-id' value='`$request-parameters.vf-module-id`'/>
-            <outcome value='failure'>
-                <return status='failure'>
-                    <parameter name='output.status.code' value='200'/>
-                    <parameter name='output.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                </return>
-            </outcome>
-            <outcome value='Other'>
-                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
-                    <outcome value='500'>
-                        <return status='failure'>
-                            <parameter name='output.status.code' value='200'/>
-                            <parameter name='output.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                            <parameter name='output.status.results' value='`$org.onap.appc.adapter.ansible.results`'/>
-                        </return>
-                    </outcome>
-                    <outcome value='100'>
-                        <execute plugin='org.onap.appc.adapter.ansible.AnsibleAdapter' method='reqExecResult'>
-                            <parameter name='message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                            <parameter name='code' value='`$org.onap.appc.adapter.ansible.result.code`'/>
-                            <parameter name='AgentUrl' value='`$AgentUrl`'/>
-                            <parameter name='User' value='`$User`'/>
-                            <parameter name='Password' value='`$Password`'/>
-                            <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                            <outcome value='failure'>
-                                <return status='failure'>
-                                    <parameter name='output.status.code' value='200'/>
-                                    <parameter name='output.status.message'
-                                               value='`$org.onap.appc.adapter.ansible.message`'/>
-                                    <parameter name='output.status.results'
-                                               value='`$org.onap.appc.adapter.ansible.results`'/>
-                                </return>
-                            </outcome>
-                            <outcome value='success'>
-                                <set>
-                                    <parameter name='output.status.code'
-                                               value='`$org.onap.appc.adapter.ansible.result.code`'/>
-                                    <parameter name='output.status.message'
-                                               value='`$org.onap.appc.adapter.ansible.message`'/>
-                                    <parameter name='output.status.results'
-                                               value='`$org.onap.appc.adapter.ansible.results`'/>
-                                </set>
-                            </outcome>
-                        </execute>
-                    </outcome>
-                </switch>
-            </outcome>
-        </execute>
-    </method>
-</service-logic>