From fdf45e2986baf26331e2ca62111e2335a25a2dd5 Mon Sep 17 00:00:00 2001 From: Frederick Borges Date: Thu, 8 Oct 2020 15:38:56 +0200 Subject: [PATCH] Autorefresh (#308) * F #~: VM State badge Signed-off-by: Frederick Borges * F #2410: VM & Host State Refresh Signed-off-by: Frederick Borges --- src/sunstone/public/app/opennebula/vm.js | 90 ++++++++++++++++++ .../app/tabs/hosts-tab/panels/info/html.hbs | 2 +- .../public/app/tabs/vms-tab/panels/info.js | 4 + .../app/tabs/vms-tab/panels/info/html.hbs | 20 +++- src/sunstone/public/app/utils/websocket.js | 93 ++++++++++++------- 5 files changed, 174 insertions(+), 35 deletions(-) diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js index 0fa1e01026..20e03e8a32 100644 --- a/src/sunstone/public/app/opennebula/vm.js +++ b/src/sunstone/public/app/opennebula/vm.js @@ -41,6 +41,21 @@ define(function(require) { "CLONING_FAILURE" ]; + var STATES_CLASSES = [ + "info", // INIT + "info", // PENDING + "info", // HOLD + "", // ACTIVE + "info", // STOPPED + "info", // SUSPENDED + "info", // DONE + "info", // FAILED + "info", // POWEROFF + "info", // UNDEPLOYED + "info", // CLONING + "info" // CLONING_FAILURE + ]; + var STATES = { INIT : 0, PENDING : 1, @@ -125,6 +140,75 @@ define(function(require) { "HOTPLUG_NIC_POWEROFF" ]; + var LCM_STATES_CLASSES = [ + "info", // LCM_INIT + "info", // PROLOG + "info", // BOOT + "success", // RUNNING + "info", // MIGRATE + "info", // SAVE_STOP + "info", // SAVE_SUSPEND + "info", // SAVE_MIGRATE + "info", // PROLOG_MIGRATE + "info", // PROLOG_RESUME + "info", // EPILOG_STOP + "info", // EPILOG + "info", // SHUTDOWN + "info", // CANCEL + "alert", // FAILURE + "info", // CLEANUP_RESUBMIT + "info", // UNKNOWN + "info", // HOTPLUG + "info", // SHUTDOWN_POWEROFF + "info", // BOOT_UNKNOWN + "info", // BOOT_POWEROFF + "info", // BOOT_SUSPENDED + "info", // BOOT_STOPPED + "info", // CLEANUP_DELETE + "info", // HOTPLUG_SNAPSHOT + "info", // HOTPLUG_NIC + "info", // HOTPLUG_SAVEAS + "info", // HOTPLUG_SAVEAS_POWEROFF + "info", // HOTPLUG_SAVEAS_SUSPENDED + "info", // SHUTDOWN_UNDEPLOY + "info", // EPILOG_UNDEPLOY + "info", // PROLOG_UNDEPLOY + "info", // BOOT_UNDEPLOY + "info", // HOTPLUG_PROLOG_POWEROFF + "info", // HOTPLUG_EPILOG_POWEROFF + "info", // BOOT_MIGRATE + "alert", // BOOT_FAILURE + "alert", // BOOT_MIGRATE_FAILURE + "alert", // PROLOG_MIGRATE_FAILURE + "alert", // PROLOG_FAILURE + "alert", // EPILOG_FAILURE + "alert", // EPILOG_STOP_FAILURE + "alert", // EPILOG_UNDEPLOY_FAILURE + "info", // PROLOG_MIGRATE_POWEROFF + "alert", // PROLOG_MIGRATE_POWEROFF_FAILURE + "info", // PROLOG_MIGRATE_SUSPEND + "alert", // PROLOG_MIGRATE_SUSPEND_FAILURE + "alert", // BOOT_UNDEPLOY_FAILURE + "alert", // BOOT_STOPPED_FAILURE + "alert", // PROLOG_RESUME_FAILURE + "alert", // PROLOG_UNDEPLOY_FAILURE + "info", // DISK_SNAPSHOT_POWEROFF + "info", // DISK_SNAPSHOT_REVERT_POWEROFF + "info", // DISK_SNAPSHOT_DELETE_POWEROFF + "info", // DISK_SNAPSHOT_SUSPENDED + "info", // DISK_SNAPSHOT_REVERT_SUSPENDED + "info", // DISK_SNAPSHOT_DELETE_SUSPENDED + "info", // DISK_SNAPSHOT + "info", // DISK_SNAPSHOT_REVERT (deprecated) + "info", // DISK_SNAPSHOT_DELETE + "info", // PROLOG_MIGRATE_UNKNOWN + "alert", // PROLOG_MIGRATE_UNKNOWN_FAILURE + "info", // DISK_RESIZE + "info", // DISK_RESIZE_POWEROFF + "info", // DISK_RESIZE_UNDEPLOYED + "info" // HOTPLUG_NIC_POWEROFF + ]; + var LCM_STATES = { LCM_INIT : 0, PROLOG : 1, @@ -631,10 +715,16 @@ define(function(require) { "stateStr": function(stateId) { return STATES_STR[stateId]; }, + "stateClass": function(stateId) { + return STATES_CLASSES[stateId]; + }, "STATES": STATES, "lcmStateStr": function(stateId) { return LCM_STATES_STR[stateId]; }, + "lcmStateClass": function(stateId) { + return LCM_STATES_CLASSES[stateId]; + }, "LCM_STATES": LCM_STATES, "shortLcmStateStr": function(stateId) { return SHORT_LCM_STATES_STR[stateId]; diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs index 75674cb1b4..818f3cffe5 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs @@ -31,7 +31,7 @@ {{{clusterTrHTML}}} {{tr "State"}} - {{stateStr}} + {{stateStr}} diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info.js b/src/sunstone/public/app/tabs/vms-tab/panels/info.js index e0400c39c4..df7de1f815 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/info.js @@ -71,7 +71,9 @@ define(function(require) { var prettyStartTime = Humanize.prettyTime(this.element.STIME); var stateStr = OpenNebula.VM.stateStr(this.element.STATE); + var stateClass = OpenNebula.VM.stateClass(this.element.STATE); var lcmStateStr = OpenNebula.VM.lcmStateStr(this.element.LCM_STATE); + var lcmStateClass = OpenNebula.VM.lcmStateClass(this.element.LCM_STATE); var hostnameHTML = OpenNebula.VM.hostnameStrLink(this.element); var vrouterHTML = "--"; @@ -131,7 +133,9 @@ define(function(require) { "element": this.element, "renameTrHTML": renameTrHTML, "stateStr": stateStr, + "stateClass": stateClass, "lcmStateStr": lcmStateStr, + "lcmStateClass": lcmStateClass, "hostnameHTML": hostnameHTML, "prettyStartTime": prettyStartTime, "deployId": deployId, diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs index bfe04f510d..28cb93a974 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs @@ -33,12 +33,28 @@ {{{renameTrHTML}}} {{tr "State"}} - {{stateStr}} + + {{#if stateClass}} + +
{{stateStr}}
+
+ {{else}} + {{stateStr}} + {{/if}} + {{tr "LCM State"}} - {{lcmStateStr}} + + {{#if stateClass}} + {{lcmStateStr}} + {{else}} + + {{lcmStateStr}} + + {{/if}} + diff --git a/src/sunstone/public/app/utils/websocket.js b/src/sunstone/public/app/utils/websocket.js index d07098ecf0..1f7aed4a59 100644 --- a/src/sunstone/public/app/utils/websocket.js +++ b/src/sunstone/public/app/utils/websocket.js @@ -20,7 +20,13 @@ define(function (require) { var Sunstone = require('sunstone'); var FireedgeValidator = require('utils/fireedge-validator'); var io = require('socket-io-client'); + var OpenNebula = require("opennebula"); + var VM_header = require('tabs/vms-tab/hooks/header'); + var VM_state = require('tabs/vms-tab/hooks/state'); + + // var Host_header = require('tabs/vms-tab/hooks/header'); + var _start = function () { if (sessionStorage.getItem(FireedgeValidator.sessionVar) == 'true'){ const socket = io(Config.fireedgeEndpoint, { @@ -33,45 +39,68 @@ define(function (require) { // Listen for messages socket.on('zeroMQ', function (event) { var event_data = event.data; - // console.log(vm_info); - if (event_data && event_data.HOOK_MESSAGE && event_data.HOOK_MESSAGE.HOOK_TYPE && event_data.HOOK_MESSAGE.HOOK_TYPE != 'API'){ + if (event_data && event_data.HOOK_MESSAGE && event_data.HOOK_MESSAGE.HOOK_OBJECT){ - var tab_id; - if (event_data.HOOK_MESSAGE.HOOK_OBJECT){ - var object = event_data.HOOK_MESSAGE.HOOK_OBJECT; + var tab_id, callFunction; + var object = event_data.HOOK_MESSAGE.HOOK_OBJECT; - switch (object) { - case "VM": - tab_id = "vms-tab" - break; - case "HOST": - tab_id = "hosts-tab" - break; - default: - break; + switch (object) { + case "VM": + tab_id = "vms-tab" + callFunction = function(data_vm){ + // Update Header and Buttons + VM_header.pre(data_vm); + VM_state.pre(data_vm); + + // Update VM Info + var vm_state = OpenNebula.VM.stateStr(data_vm.VM.STATE); + var vm_state_class = OpenNebula.VM.stateClass(data_vm.VM.STATE); + var vm_lcm_state = OpenNebula.VM.lcmStateStr(data_vm.VM.LCM_STATE); + var vm_lcm_state_class = OpenNebula.VM.lcmStateClass(data_vm.VM.LCM_STATE); + + if (vm_state_class == ""){ + $('#state_value').html(vm_state); + $('#lcm_state_value').html("" + vm_lcm_state + ""); + } + else{ + $('#state_value').html("" + vm_state + ""); + $('#lcm_state_value').html(vm_lcm_state); + } } - - var response = {}; - response[object] = event_data.HOOK_MESSAGE[object]; - var request = { - "request": { - "data": [response.ID], - "method": "show", - "resource": object + break; + case "HOST": + tab_id = "hosts-tab" + callFunction = function(data_host){ + var host_state = OpenNebula.Host.stateStr(data_host.HOST.STATE); + $('#host_state_value').html(host_state); } - } + break; + default: + break; + } - // update VM and HOST - var tab = $('#' + tab_id); - Sunstone.getDataTable(tab_id).updateElement(request, response); - if (Sunstone.rightInfoVisible(tab) && event_data.HOOK_MESSAGE.RESOURCE_ID == Sunstone.rightInfoResourceId(tab)) { - Sunstone.autorefresh(tab_id, response); + var response = {}; + response[object] = event_data.HOOK_MESSAGE[object]; + var request = { + "request": { + "data": [response.ID], + "method": "show", + "resource": object } + } - if (event_data.HOOK_MESSAGE.STATE == "DONE"){ - Sunstone.getDataTable(tab_id).waitingNodes(); - Sunstone.runAction(object + ".list", {force: true}); - } + // update VM and HOST + var tab = $('#' + tab_id); + + Sunstone.getDataTable(tab_id).updateElement(request, response); + + if (Sunstone.rightInfoVisible(tab) && event_data.HOOK_MESSAGE.RESOURCE_ID == Sunstone.rightInfoResourceId(tab)) { + callFunction(response); + } + + if (event_data.HOOK_MESSAGE.STATE == "DONE"){ + Sunstone.getDataTable(tab_id).waitingNodes(); + Sunstone.runAction(object + ".list", {force: true}); } } });