summaryrefslogtreecommitdiffstats
path: root/appc-directed-graph/appc-dgraph/provider/src/main
diff options
context:
space:
mode:
authorTaka <tc012c@att.com>2017-12-22 11:32:09 -0500
committerTaka <tc012c@att.com>2017-12-22 11:33:09 -0500
commit9475355553b59df58d6f516e2c9109babae9ffd0 (patch)
tree804daa79f9688c4cb38bc076173e9d354f3e0ea9 /appc-directed-graph/appc-dgraph/provider/src/main
parent2148d65b418a3e8223fb911dafb97ac3a968bbf1 (diff)
Platform Hardening for DG Json files - Part 1
Change-Id: I0bf2ee8883889e1edeb46ef3bcd96d1002746cf6 Issue-ID: APPC-305 Signed-off-by: Taka <tc012c@att.com>
Diffstat (limited to 'appc-directed-graph/appc-dgraph/provider/src/main')
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json262
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json262
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json216
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json216
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json692
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json584
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json756
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_and_return.json291
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json726
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json217
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json719
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_acquire_license.json216
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_return_license.json122
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json468
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json564
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt163
16 files changed, 5216 insertions, 1258 deletions
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json
new file mode 100644
index 000000000..8684afa59
--- /dev/null
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json
@@ -0,0 +1,262 @@
+[
+ {
+ "id": "8c8d638b.d864e8",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 84,
+ "y": 84,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "67bc77ec.cfab9"
+ ]
+ ]
+ },
+ {
+ "id": "67bc77ec.cfab9",
+ "type": "service-logic",
+ "name": "APPC 4.0.0",
+ "module": "APPC",
+ "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' version='4.0.0'>",
+ "outputs": 1,
+ "x": 241,
+ "y": 84,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "9ab2a765.c334e"
+ ]
+ ]
+ },
+ {
+ "id": "9ab2a765.c334e",
+ "type": "method",
+ "name": "AttachVolume",
+ "xml": "<method rpc='AttachVolumeVM' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 439,
+ "y": 86,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "af60ef65.5a714"
+ ]
+ ]
+ },
+ {
+ "id": "9d95111e.b625",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 806.9999694824219,
+ "y": 295.9999694824219,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "3f10a3d4.fa8644"
+ ]
+ ]
+ },
+ {
+ "id": "98f61d5c.9857e8",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 815.9999694824219,
+ "y": 174.99996948242188,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "b2efb443.b631a"
+ ]
+ ]
+ },
+ {
+ "id": "6be48d2c.b63d8c",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>",
+ "comments": "",
+ "x": 1362.9999694824219,
+ "y": 267.9999694824219,
+ "z": "1eca43d0.41972c",
+ "wires": []
+ },
+ {
+ "id": "3ebaa10e.c55e6e",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC attachVolume not found' />",
+ "comments": "",
+ "x": 1123.9999694824219,
+ "y": 174.99996948242188,
+ "z": "1eca43d0.41972c",
+ "wires": []
+ },
+ {
+ "id": "3f10a3d4.fa8644",
+ "type": "switchNode",
+ "name": "switch error-code",
+ "xml": "<switch test='`$error_code`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 999.9999694824219,
+ "y": 296.9999694824219,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "78e00fc2.178ca8",
+ "5cb2873d.ba509"
+ ]
+ ]
+ },
+ {
+ "id": "78e00fc2.178ca8",
+ "type": "success",
+ "name": "SUCCESS 200",
+ "xml": "<outcome value='200'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1181.9999694824219,
+ "y": 266.9999694824219,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "6be48d2c.b63d8c"
+ ]
+ ]
+ },
+ {
+ "id": "5cb2873d.ba509",
+ "type": "outcome",
+ "name": "ERROR",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1173.9999694824219,
+ "y": 425.9999694824219,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "c45d6cad.1266a8"
+ ]
+ ]
+ },
+ {
+ "id": "c45d6cad.1266a8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1306.9999694824219,
+ "y": 426.9999694824219,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "4593642b.a03a34",
+ "7bdd8ae4.5a04e4"
+ ]
+ ]
+ },
+ {
+ "id": "4593642b.a03a34",
+ "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",
+ "comments": "",
+ "x": 1441.9999694824219,
+ "y": 468,
+ "z": "1eca43d0.41972c",
+ "wires": []
+ },
+ {
+ "id": "b2efb443.b631a",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 971.9999694824219,
+ "y": 174.99996948242188,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "3ebaa10e.c55e6e"
+ ]
+ ]
+ },
+ {
+ "id": "80ee82a0.8401c8",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"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=\"field2\" value=\"`'input.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />\n<parameter name=\"field4\" value=\"`'volumeId in context=' + $volumeId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 806.11669921875,
+ "y": 116,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "af60ef65.5a714",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 627.8666687011719,
+ "y": 144.86666870117188,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "80ee82a0.8401c8",
+ "1ecc7492.a889b3"
+ ]
+ ]
+ },
+ {
+ "id": "7bdd8ae4.5a04e4",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"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=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1431.8666687011719,
+ "y": 398.8666687011719,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "1ecc7492.a889b3",
+ "type": "execute",
+ "name": "attachVolume",
+ "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='attachVolume'>\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.volumeid\" value=\"`$volumeAttachment.volumeId`\" />\n<parameter name=\"org.onap.appc.device\" value=\"`$volumeAttachment.device`\" />\n<parameter name=\"org.onap.appc.tag\" value=\"`$volumeAttachment.tag`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 643.9999694824219,
+ "y": 230,
+ "z": "1eca43d0.41972c",
+ "wires": [
+ [
+ "98f61d5c.9857e8",
+ "9d95111e.b625"
+ ]
+ ]
+ }
+]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json
new file mode 100644
index 000000000..0e6504779
--- /dev/null
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json
@@ -0,0 +1,262 @@
+[
+ {
+ "id": "eeae9def.4d566",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 93,
+ "y": 92,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "f51d1b93.7d168"
+ ]
+ ]
+ },
+ {
+ "id": "f51d1b93.7d168",
+ "type": "service-logic",
+ "name": "APPC 4.0.0",
+ "module": "APPC",
+ "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' version='4.0.0'>",
+ "outputs": 1,
+ "x": 250,
+ "y": 92,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "10439b1c.b0fbc5"
+ ]
+ ]
+ },
+ {
+ "id": "10439b1c.b0fbc5",
+ "type": "method",
+ "name": "DetachVolume",
+ "xml": "<method rpc='DetachVolumeVM' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 448,
+ "y": 94,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "cf4fac38.3b932"
+ ]
+ ]
+ },
+ {
+ "id": "6f1b4f51.cab76",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 815.9999694824219,
+ "y": 303.9999694824219,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "f6364905.533518"
+ ]
+ ]
+ },
+ {
+ "id": "eda3e619.a190e",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 824.9999694824219,
+ "y": 182.99996948242188,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "b81aef23.ced6e8"
+ ]
+ ]
+ },
+ {
+ "id": "361abfaa.ca34b8",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>",
+ "comments": "",
+ "x": 1371.9999694824219,
+ "y": 275.9999694824219,
+ "z": "65f0ae97.bfd7e8",
+ "wires": []
+ },
+ {
+ "id": "5b028b69.7d6af4",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC dettachVolume not found' />",
+ "comments": "",
+ "x": 1132.9999694824219,
+ "y": 182.99996948242188,
+ "z": "65f0ae97.bfd7e8",
+ "wires": []
+ },
+ {
+ "id": "f6364905.533518",
+ "type": "switchNode",
+ "name": "switch error-code",
+ "xml": "<switch test='`$error_code`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1008.9999694824219,
+ "y": 304.9999694824219,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "567026e7.afed6",
+ "ee60ee08.fb232"
+ ]
+ ]
+ },
+ {
+ "id": "567026e7.afed6",
+ "type": "success",
+ "name": "SUCCESS 200",
+ "xml": "<outcome value='200'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1190.9999694824219,
+ "y": 274.9999694824219,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "361abfaa.ca34b8"
+ ]
+ ]
+ },
+ {
+ "id": "ee60ee08.fb232",
+ "type": "outcome",
+ "name": "ERROR",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1182.9999694824219,
+ "y": 433.9999694824219,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "285baaf0.7d06de"
+ ]
+ ]
+ },
+ {
+ "id": "285baaf0.7d06de",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1315.9999694824219,
+ "y": 434.9999694824219,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "44fe2b94.9c5d94",
+ "961f42bf.beb62"
+ ]
+ ]
+ },
+ {
+ "id": "44fe2b94.9c5d94",
+ "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",
+ "comments": "",
+ "x": 1450.9999694824219,
+ "y": 476,
+ "z": "65f0ae97.bfd7e8",
+ "wires": []
+ },
+ {
+ "id": "b81aef23.ced6e8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 980.9999694824219,
+ "y": 182.99996948242188,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "5b028b69.7d6af4"
+ ]
+ ]
+ },
+ {
+ "id": "34472fd1.b14ab",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"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=\"field2\" value=\"`'input.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />\n<parameter name=\"field4\" value=\"`'volumeId in context=' + $volumeId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 815.11669921875,
+ "y": 124,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "cf4fac38.3b932",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 636.8666687011719,
+ "y": 152.86666870117188,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "34472fd1.b14ab",
+ "e021eba0.2f5b7"
+ ]
+ ]
+ },
+ {
+ "id": "961f42bf.beb62",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"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=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1440.8666687011719,
+ "y": 406.8666687011719,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "e021eba0.2f5b7",
+ "type": "execute",
+ "name": "DetachVolume",
+ "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='attachVolume'>\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.volumeid\" value=\"`$volumeAttachment.volumeId`\" />\n<parameter name=\"org.onap.appc.device\" value=\"`$volumeAttachment.device`\" />\n<parameter name=\"org.onap.appc.tag\" value=\"`$volumeAttachment.tag`\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 652.9999694824219,
+ "y": 238,
+ "z": "65f0ae97.bfd7e8",
+ "wires": [
+ [
+ "eda3e619.a190e",
+ "6f1b4f51.cab76"
+ ]
+ ]
+ }
+]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json
index 9ca2fff9b..a46b0e64e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UpgradePreconditionCheck.json
@@ -1,95 +1,121 @@
-[{
- "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": []
- }]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json
index 732a13342..a62346dd6 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_VNF_UploadNewVersion.json
@@ -1,95 +1,121 @@
-[{
- "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": []
- }]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
index 24bc897fe..19046f502 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
@@ -1,305 +1,387 @@
-[{
- "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"]]
- }]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
index 30dad3047..35ec375f0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
@@ -1,255 +1,329 @@
-[{
- "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"]]
- }]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
index d9cfd0dee..fe978a047 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
@@ -1,329 +1,427 @@
-[{
- "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"]]
- }]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_and_return.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_and_return.json
index 70ee0599f..aed9a9321 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_and_return.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_and_return.json
@@ -1 +1,290 @@
-[{"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":[[]]}]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json
index 64c31bd61..32fdd5f90 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_acquire_license.json
@@ -1 +1,725 @@
-[{"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"]]}]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json
index 54fcedab0..5d8facfbc 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_legacy_operation.json
@@ -1 +1,216 @@
-[{"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"]]}]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json
index a9654d409..6475e237b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_return_license.json
@@ -1 +1,718 @@
-[{"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":[[]]}]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_acquire_license.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_acquire_license.json
index d60d45253..9e875d3c2 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_acquire_license.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_acquire_license.json
@@ -1,95 +1,121 @@
-[{
- "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": []
- }]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_return_license.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_return_license.json
index 61f782342..1f166eed7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_return_license.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_test_return_license.json
@@ -1 +1,121 @@
-[{"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":[]}]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json
index 6b2b00140..6dc5a571d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.0.json
@@ -1 +1,467 @@
-[{"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"]]}]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json
index 2ca19723b..55da5e6b7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_method_VSBG_ConfigModify_2.0.0.1.json
@@ -1 +1,563 @@
-[{"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"]]}]
+[
+ {
+ "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/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt
index 9d2d8052a..4ebbfa0c0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt
@@ -1,77 +1,86 @@
-# MODULE NAME:RPC NAME:VERSION:MODE
-# Example -> APPC:GetDeviceRunningConfiguration:3.0.0:sync
-APPC:CheckConfigStatus:4.0.0:sync
-APPC:CommonConfiguration:4.0.0:sync
-APPC:Configure:4.0.0:sync
-APPC:DownloadCliConfig:4.0.0:sync
-APPC:DownloadIsbcConfig:4.0.0:sync
-APPC:DownloadRestconfConfig:4.0.0:sync
-APPC:DownloadSBGConfig:4.0.0:sync
-APPC:DownloadvIRCChefConfig:4.0.0:sync
-APPC:DownloadXmlConfig:4.0.0:sync
-APPC:GenerateTemplateConfig:4.0.0:sync
-APPC:GetConfigParams:4.0.0:sync
-APPC:GetDeviceRunningConfig:4.0.0:sync
-APPC:GenerateConfig:4.0.0:sync
-APPC:SaveRunningConfig:4.0.0:sync
-APPC:SetStatus:4.0.0:sync
-APPC:UpdateAaiInfo:4.0.0:sync
-APPC:GetAaiInfo:4.0.0:sync
-APPC:GetVfModuleInfo:4.0.0:sync
-APPC:ProcessParameterDefinition:4.0.0:sync
-APPC:PublishConfiguration:4.0.0:sync
-APPC:topology-operation-all:2.0.0:sync
-ASDC-MESSAGE:configuration-document-request:3.0.0:sync
-
-Appc-API:service-configuration-operation:4.0.0:sync
-Appc-API:service-configuration-prepare:4.0.0:sync
-Appc-API:service-configuration-activate:4.0.0:sync
-Appc-API:service-configuration-backup:4.0.0:sync
-Appc-API:service-configuration-notification:4.0.0:sync
-Appc-API:audit-configuration-operation:4.0.0:sync
-Appc-API:audit-configuration-notification:4.0.0:sync
-Appc-API:update-aai:4.0.0:sync
-Appc-API:update-aai-sbg:4.0.0:sync
-Appc-API:update-vserver-info:4.0.0:sync
-Appc-API:update-vnfc-info:4.0.0:sync
-
-Appc-API:Generic_Evacuate:2.0.0:sync
-
-#
-APPC:GetRunningConfig:2.0.0:sync
-APPC:Restart-Active-Active_VNFC:2.0.0:sync
-APPC:Restart-Active-Passive_VNFC:2.0.0:sync
-APPC:Check-Active_VNFC_vSCP:2.0.0:sync
-APPC:HealthCheck_VNF_vSCP:2.0.0:sync
-APPC:Restart_VNF:2.0.0:sync
-APPC:Restart_VNFC:2.0.0:sync
-APPC:Restart_VM:2.0.0:sync
-APPC:Stop_VNFC:2.0.2:sync
-APPC:Stop_VNF:2.0.2:sync
-APPC:StopVM_VM:2.0.0:sync
-APPC:Stop_VM:2.0.0:sync
-APPC:StopApplication_VM_vSCP:2.0.0:sync
-APPC:Generic_Sync:2.0.0:sync
-APPC:Generic_Audit:2.0.0:sync
-APPC:Start_VNF:2.0.0:sync
-APPC:Start_VNFC:2.0.0:sync
-APPC:Start_VM:2.0.0:sync
-APPC:StartApplication_VM_vSCP:2.0.0:sync
-APPC:RestartVM_VM:2.0.0:sync
-APPC:Rebuild_VM:2.0.0:sync
-
-APPC:EvacuateVM:2.0.0:sync
-APPC:RebuildVM:2.0.0:sync
-APPC:CreateSnapShotVM:2.0.0:sync
-APPC:MigrateVM:2.0.0:sync
-APPC:RestartVMCommonFlow:2.0.0:sync
-APPC:RestartVMVNFCommonFlow:2.0.0:sync
-
-APPC:setInputParams:4:0:0:sync
-APPC:healthcheck:4:0:0:sync
-APPC:chef:4:0:0sync
-APPC:ansible-adapter-1.0:4:0:0:sync
-APPC:Generic_AnsibleDG:4:0:0:sync
-APPC:GetTemplateConfig_Ansible:4:0:0:sync
-APPC:GetTemplateConfig_Chef:4:0:0:sync
-APPC_Generic_ChefDG:4:0:0:sync
+# MODULE NAME:RPC NAME:VERSION:MODE
+# Example -> APPC:GetDeviceRunningConfiguration:3.0.0:sync
+APPC:CheckConfigStatus:4.0.0:sync
+APPC:CommonConfiguration:4.0.0:sync
+APPC:Configure:4.0.0:sync
+APPC:DownloadCliConfig:4.0.0:sync
+APPC:DownloadIsbcConfig:4.0.0:sync
+APPC:DownloadRestconfConfig:4.0.0:sync
+APPC:DownloadSBGConfig:4.0.0:sync
+APPC:DownloadvIRCChefConfig:4.0.0:sync
+APPC:DownloadXmlConfig:4.0.0:sync
+APPC:GenerateTemplateConfig:4.0.0:sync
+APPC:GetConfigParams:4.0.0:sync
+APPC:GetDeviceRunningConfig:4.0.0:sync
+APPC:GenerateConfig:4.0.0:sync
+APPC:SaveRunningConfig:4.0.0:sync
+APPC:SetStatus:4.0.0:sync
+APPC:UpdateAaiInfo:4.0.0:sync
+APPC:GetAaiInfo:4.0.0:sync
+APPC:GetVfModuleInfo:4.0.0:sync
+APPC:ProcessParameterDefinition:4.0.0:sync
+APPC:PublishConfiguration:4.0.0:sync
+APPC:topology-operation-all:2.0.0:sync
+SDC-MESSAGE:configuration-document-request:3.0.0:sync
+
+Appc-API:service-configuration-operation:4.0.0:sync
+Appc-API:service-configuration-prepare:4.0.0:sync
+Appc-API:service-configuration-activate:4.0.0:sync
+Appc-API:service-configuration-backup:4.0.0:sync
+Appc-API:service-configuration-notification:4.0.0:sync
+Appc-API:audit-configuration-operation:4.0.0:sync
+Appc-API:audit-configuration-notification:4.0.0:sync
+Appc-API:update-aai:4.0.0:sync
+Appc-API:update-aai-sbg:4.0.0:sync
+Appc-API:update-vserver-info:4.0.0:sync
+Appc-API:update-vnfc-info:4.0.0:sync
+
+Appc-API:Generic_Evacuate:2.0.0:sync
+
+#
+APPC:GetRunningConfig:2.0.0:sync
+APPC:Restart-Active-Active_VNFC:2.0.0:sync
+APPC:Restart-Active-Passive_VNFC:2.0.0:sync
+APPC:Check-Active_VNFC_vSCP:2.0.0:sync
+APPC:HealthCheck_VNF_vSCP:2.0.0:sync
+APPC:Restart_VNF:2.0.0:sync
+APPC:Restart_VNFC:2.0.0:sync
+APPC:Restart_VM:2.0.0:sync
+APPC:Stop_VNFC:2.0.2:sync
+APPC:Stop_VNF:2.0.2:sync
+APPC:StopVM_VM:2.0.0:sync
+APPC:Stop_VM:2.0.0:sync
+APPC:StopApplication_VM_vSCP:2.0.0:sync
+APPC:Generic_Sync:2.0.0:sync
+APPC:Generic_Audit:2.0.0:sync
+APPC:Start_VNF:2.0.0:sync
+APPC:Start_VNFC:2.0.0:sync
+APPC:Start_VM:2.0.0:sync
+APPC:StartApplication_VM_vSCP:2.0.0:sync
+APPC:RestartVM_VM:2.0.0:sync
+APPC:Rebuild_VM:2.0.0:sync
+
+APPC:EvacuateVM:2.0.0:sync
+APPC:RebuildVM:2.0.0:sync
+APPC:CreateSnapShotVM:2.0.0:sync
+APPC:MigrateVM:2.0.0:sync
+APPC:RestartVMCommonFlow:2.0.0:sync
+APPC:RestartVMVNFCommonFlow:2.0.0:sync
+
+APPC:setInputParams:4.0.0:sync
+APPC:healthcheck:4.0.0:sync
+APPC:chef:3.0.0:sync
+APPC:ansible-adapter-1.0:2.0.1:sync
+APPC:Generic_AnsibleDG:4.0.0:sync
+APPC:GetTemplateConfig_Ansible:4.0.0:sync
+APPC:GetTemplateConfig_Chef:4.0.0:sync
+APPC:Generic_ChefDG:4.0.0:sync
+APPC:loadTeamplate:4.0.0:sync
+APPC:MergeTemplateData:4.0.0:sync
+APPC:UpdateAaiforPayloadInput:4.0.0:sync
+APPC:UpdateAaiforReferenceData:4.0.0:sync
+APPC:DGOrchestrator:4.0.0:sync
+APPC:VM_Start:2.0.0:sync
+APPC:VM_Stop:2.0.0:sync
+APPC:AttachVolumeVM:4.0.0:sync
+APPC:DetachVolumeVM:4.0.0:sync \ No newline at end of file