From 56bc6fe633fef1bc18f7694457398589a08a1855 Mon Sep 17 00:00:00 2001 From: Dan McMillan Date: Thu, 21 Jun 2018 14:39:55 +0000 Subject: [PATCH] [APPC-922] Add new OpenStack Reboot Directed Graph Introduce APPC_RebootVM.json directed graph Add APPC_RebootVM to the dg_activate.txt config file Add protocol query to APPC_healthcheck.json directed graph Add outputdata to APPC_ansible-adapter-1.0.json success return Change-Id: I80cc5695bf04575955b79656d731eab38b0b49c4 Issue-ID: APPC-922 Signed-off-by: Dan McMillan --- .../main/resources/json/APPC/APPC_RebootVM.json | 262 ++++++++++++++++ .../json/APPC/APPC_ansible-adapter-1.0.json | 2 +- .../main/resources/json/APPC/APPC_healthcheck.json | 331 ++++++++++++++++----- .../src/main/resources/json/dg_activate.txt | 1 + 4 files changed, 520 insertions(+), 76 deletions(-) create mode 100644 appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebootVM.json diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebootVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebootVM.json new file mode 100644 index 000000000..4dfb74122 --- /dev/null +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebootVM.json @@ -0,0 +1,262 @@ +[ + { + "id": "2908a6da.b2a8ca", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 79.11666870117188, + "y": 100.11666870117188, + "z": "be85a121.0dcb68", + "wires": [ + [ + "995f28f7.17ac08" + ] + ] + }, + { + "id": "995f28f7.17ac08", + "type": "service-logic", + "name": "APPC 4.0.0", + "module": "APPC", + "version": "4.0.0", + "comments": "", + "xml": "", + "outputs": 1, + "x": 236.11666870117188, + "y": 100.11666870117188, + "z": "be85a121.0dcb68", + "wires": [ + [ + "13428bfe.c24b7c" + ] + ] + }, + { + "id": "13428bfe.c24b7c", + "type": "method", + "name": "RebootVM", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 434.1166687011719, + "y": 102.11666870117188, + "z": "be85a121.0dcb68", + "wires": [ + [ + "bf97077a.524938" + ] + ] + }, + { + "id": "37f23061.4a84c", + "type": "success", + "name": "SUCCESS", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 802.1166381835938, + "y": 312.11663818359375, + "z": "be85a121.0dcb68", + "wires": [ + [ + "2916b3cf.482764" + ] + ] + }, + { + "id": "25a4b4ec.294ce4", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 811.1166381835938, + "y": 191.11663818359375, + "z": "be85a121.0dcb68", + "wires": [ + [ + "5491c1ea.b5ae1" + ] + ] + }, + { + "id": "bd19dd70.f3047", + "type": "returnSuccess", + "name": "return success", + "xml": "\n", + "comments": "", + "x": 1358.1166381835938, + "y": 284.11663818359375, + "z": "be85a121.0dcb68", + "wires": [] + }, + { + "id": "2bac0636.1502ca", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\n", + "comments": "", + "x": 1119.1166381835938, + "y": 191.11663818359375, + "z": "be85a121.0dcb68", + "wires": [] + }, + { + "id": "2916b3cf.482764", + "type": "switchNode", + "name": "switch status", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 995.1166381835938, + "y": 313.11663818359375, + "z": "be85a121.0dcb68", + "wires": [ + [ + "21120d2e.1cbe7a", + "cdc5d6c9.13f118" + ] + ] + }, + { + "id": "21120d2e.1cbe7a", + "type": "success", + "name": "SUCCESS", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1177.1166381835938, + "y": 283.11663818359375, + "z": "be85a121.0dcb68", + "wires": [ + [ + "bd19dd70.f3047" + ] + ] + }, + { + "id": "cdc5d6c9.13f118", + "type": "outcome", + "name": "ERROR", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1169.1166381835938, + "y": 442.11663818359375, + "z": "be85a121.0dcb68", + "wires": [ + [ + "3bf641fb.7fe476" + ] + ] + }, + { + "id": "3bf641fb.7fe476", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1302.1166381835938, + "y": 443.11663818359375, + "z": "be85a121.0dcb68", + "wires": [ + [ + "9329c487.eecde", + "cd3bd4e.e949528" + ] + ] + }, + { + "id": "9329c487.eecde", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\n\n", + "comments": "", + "x": 1437.1166381835938, + "y": 484.1166687011719, + "z": "be85a121.0dcb68", + "wires": [] + }, + { + "id": "5491c1ea.b5ae1", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 967.1166381835938, + "y": 191.11663818359375, + "z": "be85a121.0dcb68", + "wires": [ + [ + "2bac0636.1502ca" + ] + ] + }, + { + "id": "16882635.3581a2", + "type": "record", + "name": "record", + "xml": "\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 639.1166381835938, + "y": 246.11666870117188, + "z": "be85a121.0dcb68", + "wires": [ + [ + "25a4b4ec.294ce4", + "37f23061.4a84c" + ] + ] + } +] diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json index 4e26c448a..9586002f3 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json @@ -212,7 +212,7 @@ "id": "2c831d15.81b10a", "type": "returnSuccess", "name": "return success", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", "x": 814.6999816894531, "y": 621.8833348751068, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_healthcheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_healthcheck.json index 154145582..769dab273 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_healthcheck.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_healthcheck.json @@ -1,20 +1,20 @@ [ { - "id": "eb339652.aa1bb", + "id": "dda01d01.8efea", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 361.8833312988281, - "y": 294.5666790008545, - "z": "8fbf021e.b75288", + "x": 107, + "y": 100.99999809265137, + "z": "ca6ae49d.5804d", "wires": [ [ - "6a6b9cbd.5c5064" + "4285b095.ad6f98" ] ] }, { - "id": "6a6b9cbd.5c5064", + "id": "4285b095.ad6f98", "type": "service-logic", "name": "APPC 4.0.0", "module": "APPC", @@ -22,208 +22,389 @@ "comments": "", "xml": "", "outputs": 1, - "x": 520.8833312988281, - "y": 290.5666790008545, - "z": "8fbf021e.b75288", + "x": 266, + "y": 96.99999809265137, + "z": "ca6ae49d.5804d", "wires": [ [ - "ad9ed23f.8f9c68" + "e5582833.17866" ] ] }, { - "id": "ad9ed23f.8f9c68", + "id": "e5582833.17866", "type": "method", "name": "method healthcheck", "xml": "\n", "comments": "", "outputs": 1, - "x": 725.8833389282227, - "y": 289.5666809082031, - "z": "8fbf021e.b75288", + "x": 471.00000762939453, + "y": 96, + "z": "ca6ae49d.5804d", "wires": [ [ - "23912012.6a432" + "29f83645.69f632" ] ] }, { - "id": "23912012.6a432", + "id": "29f83645.69f632", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "comments": "", "outputs": 1, - "x": 385.8833312988281, - "y": 398.5666790008545, - "z": "8fbf021e.b75288", + "x": 131, + "y": 204.99999809265137, + "z": "ca6ae49d.5804d", "wires": [ [ - "96f48524.be9e1", - "d37d976d.cb8ed" + "998e3410.3369e8", + "cb2757ad.de9de8", + "2d14f196.a6ca16", + "498108f.d34d378", + "c5398023.70d25", + "240eb04.368db5" ] ] }, { - "id": "96f48524.be9e1", + "id": "998e3410.3369e8", "type": "execute", "name": "execute get and executeFlowSequence", "xml": "\n\n\n", "comments": "", "outputs": 1, - "x": 438.8832702636719, - "y": 497.01111030578613, - "z": "8fbf021e.b75288", + "x": 240.99993896484375, + "y": 615.4444580078125, + "z": "ca6ae49d.5804d", "wires": [ [ - "6be528f6.12212", - "d4a71709.a43268", - "c328bc28.cc53f" + "132553a3.a51034", + "d54c208b.83a2d", + "642a9ad3.f303cc" ] ] }, { - "id": "6be528f6.12212", + "id": "132553a3.a51034", "type": "failure", "name": "not-found", "xml": "\n", "comments": "", "outputs": 1, - "x": 737.994457244873, - "y": 469.34446811676025, - "z": "8fbf021e.b75288", + "x": 569.1111259460449, + "y": 580.7777996063232, + "z": "ca6ae49d.5804d", "wires": [ [ - "248dee55.40e1d2" + "70d13f13.0b98f8" ] ] }, { - "id": "248dee55.40e1d2", + "id": "70d13f13.0b98f8", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 891.4388961791992, - "y": 456.5666694641113, - "z": "8fbf021e.b75288", + "x": 722.5555648803711, + "y": 568.0000009536743, + "z": "ca6ae49d.5804d", "wires": [ [ - "31d502fd.89de4e" + "ad46f0c9.98d34" ] ] }, { - "id": "31d502fd.89de4e", + "id": "ad46f0c9.98d34", "type": "returnFailure", "name": "return failure", "xml": "\n\n\n\n\n\t", "comments": "", - "x": 1059.9667205810547, - "y": 443.9000587463379, - "z": "8fbf021e.b75288", + "x": 891.0833892822266, + "y": 555.3333902359009, + "z": "ca6ae49d.5804d", "wires": [] }, { - "id": "d4a71709.a43268", + "id": "d54c208b.83a2d", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 739.6610946655273, - "y": 514.1222286224365, - "z": "8fbf021e.b75288", + "x": 570.7777633666992, + "y": 625.5555601119995, + "z": "ca6ae49d.5804d", "wires": [ [ - "1d2f2a87.475dc5" + "4a3daa6d.e2b974" ] ] }, { - "id": "1d2f2a87.475dc5", + "id": "4a3daa6d.e2b974", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 891.2166862487793, - "y": 507.34448051452637, - "z": "8fbf021e.b75288", + "x": 722.3333549499512, + "y": 618.7778120040894, + "z": "ca6ae49d.5804d", "wires": [ [ - "bc79231c.35d1f" + "ccdbfd0d.c05ed" ] ] }, { - "id": "bc79231c.35d1f", + "id": "ccdbfd0d.c05ed", "type": "returnFailure", "name": "return failure", "xml": "\n\n\n\n\n\t", "comments": "", - "x": 1053.2723236083984, - "y": 500.5111427307129, - "z": "8fbf021e.b75288", + "x": 884.3889923095703, + "y": 611.9444742202759, + "z": "ca6ae49d.5804d", "wires": [] }, { - "id": "d37d976d.cb8ed", + "id": "cb2757ad.de9de8", "type": "set", "name": "set Context params", "xml": "\n \n \n\n\n\n \n\n\n\n \n\n\n\n", "comments": "", - "x": 1149.0261611938477, - "y": 373.67383003234863, - "z": "8fbf021e.b75288", + "x": 882.142822265625, + "y": 98.10714721679688, + "z": "ca6ae49d.5804d", "wires": [] }, { - "id": "c328bc28.cc53f", + "id": "642a9ad3.f303cc", "type": "success", "name": "outcome: Other", "xml": "", "comments": "", "outputs": 1, - "x": 749.9944763183594, - "y": 571.9000425338745, - "z": "8fbf021e.b75288", + "x": 581.1111450195312, + "y": 683.3333740234375, + "z": "ca6ae49d.5804d", "wires": [ [ - "a4c92174.a2ada8" + "e8bbf5.52a31c08" ] ] }, { - "id": "a4c92174.a2ada8", + "id": "e8bbf5.52a31c08", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "comments": "", "outputs": 1, - "x": 931.3277626037598, - "y": 570.2333450317383, - "z": "8fbf021e.b75288", + "x": 762.4444313049316, + "y": 681.6666765213013, + "z": "ca6ae49d.5804d", "wires": [ [ - "f6918f40.5299c" + "34ba67fe.c0a528" ] ] }, { - "id": "f6918f40.5299c", + "id": "34ba67fe.c0a528", "type": "set", "name": "set payloadResponse", "xml": "\n \n\n\n\n\n", "comments": "", - "x": 1175.8833465576172, - "y": 561.3166847229004, - "z": "8fbf021e.b75288", + "x": 1007.0000152587891, + "y": 672.7500162124634, + "z": "ca6ae49d.5804d", "wires": [] + }, + { + "id": "2d14f196.a6ca16", + "type": "get-resource", + "name": "get-resource", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 389, + "y": 217, + "z": "ca6ae49d.5804d", + "wires": [ + [ + "f8ff44d8.ec0b8", + "fc824ec.4d19ab" + ] + ] + }, + { + "id": "f8ff44d8.ec0b8", + "type": "failure", + "name": "failure", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 603, + "y": 166, + "z": "ca6ae49d.5804d", + "wires": [ + [ + "adee68d3.e0ca2" + ] + ] + }, + { + "id": "fc824ec.4d19ab", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 570, + "y": 250, + "z": "ca6ae49d.5804d", + "wires": [ + [ + "6bbab4a.29b954c" + ] + ] + }, + { + "id": "adee68d3.e0ca2", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 765, + "y": 164, + "z": "ca6ae49d.5804d", + "wires": [ + [] + ] + }, + { + "id": "6bbab4a.29b954c", + "type": "set", + "name": "set protocol", + "xml": "\n", + "comments": "", + "x": 763, + "y": 241, + "z": "ca6ae49d.5804d", + "wires": [] + }, + { + "id": "498108f.d34d378", + "type": "execute", + "name": "execute get property", + "xml": " \n \n", + "comments": "", + "outputs": 1, + "x": 424, + "y": 316, + "z": "ca6ae49d.5804d", + "wires": [ + [ + "63cda702.a4978", + "a687c5e4.57d97" + ] + ] + }, + { + "id": "63cda702.a4978", + "type": "failure", + "name": "failure", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 626, + "y": 315, + "z": "ca6ae49d.5804d", + "wires": [ + [ + "bd7dc6c1.2c92b" + ] + ] + }, + { + "id": "a687c5e4.57d97", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 636, + "y": 385, + "z": "ca6ae49d.5804d", + "wires": [ + [ + "bd7dc6c1.2c92b" + ] + ] + }, + { + "id": "bd7dc6c1.2c92b", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 780, + "y": 326, + "z": "ca6ae49d.5804d", + "wires": [ + [ + "235da745.236048" + ] + ] + }, + { + "id": "235da745.236048", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\n", + "comments": "", + "x": 927, + "y": 325, + "z": "ca6ae49d.5804d", + "wires": [] + }, + { + "id": "c5398023.70d25", + "type": "set", + "name": "set properties", + "xml": "\n\n\n\n", + "comments": "", + "x": 338, + "y": 440, + "z": "ca6ae49d.5804d", + "wires": [] + }, + { + "id": "240eb04.368db5", + "type": "record", + "name": "record", + "xml": "\n\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 311, + "y": 511, + "z": "ca6ae49d.5804d", + "wires": [ + [] + ] } -] +] 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 fdc0d9c58..c917d9468 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 @@ -107,3 +107,4 @@ 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 +APPC:RebootVM:4.0.0:sync -- 2.16.6