mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
Feature #3748: Fix small state bugs, handle VM failure states
This commit is contained in:
1 parent
34c50a8914
commit
f8ae9ee984
5 files changed
+29
-9
No files matched your search
@@ -1,5 +1,6 @@
|
||||
define(function(require) {
|
||||
var OpenNebulaAction = require('./action');
|
||||
var Locale = require('utils/locale');
|
||||
|
||||
var RESOURCE = "IMAGE";
|
||||
var STATES_STR = [
|
||||
|
||||
@@ -2,6 +2,7 @@ define(function(require) {
|
||||
var OpenNebulaAction = require('./action'),
|
||||
OpenNebulaHelper = require('./helper'),
|
||||
OpenNebulaError = require('./error');
|
||||
Locale = require('utils/locale');
|
||||
|
||||
var RESOURCE = "VM";
|
||||
|
||||
@@ -463,6 +464,27 @@ define(function(require) {
|
||||
"shortLcmStateStr": function(stateId) {
|
||||
return SHORT_LCM_STATES_STR[stateId];
|
||||
},
|
||||
"isFailureState": function(lcmStateId) {
|
||||
switch(parseInt(lcmStateId)){
|
||||
case LCM_STATES.BOOT_FAILURE:
|
||||
case LCM_STATES.BOOT_MIGRATE_FAILURE:
|
||||
case LCM_STATES.PROLOG_MIGRATE_FAILURE:
|
||||
case LCM_STATES.PROLOG_FAILURE:
|
||||
case LCM_STATES.EPILOG_FAILURE:
|
||||
case LCM_STATES.EPILOG_STOP_FAILURE:
|
||||
case LCM_STATES.EPILOG_UNDEPLOY_FAILURE:
|
||||
case LCM_STATES.PROLOG_MIGRATE_POWEROFF_FAILURE:
|
||||
case LCM_STATES.PROLOG_MIGRATE_SUSPEND_FAILURE:
|
||||
case LCM_STATES.BOOT_UNDEPLOY_FAILURE:
|
||||
case LCM_STATES.BOOT_STOPPED_FAILURE:
|
||||
case LCM_STATES.PROLOG_RESUME_FAILURE:
|
||||
case LCM_STATES.PROLOG_UNDEPLOY_FAILURE:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
},
|
||||
"hostnameStr": function(element) {
|
||||
var state = element.STATE;
|
||||
var hostname = "--";
|
||||
|
||||
@@ -822,10 +822,6 @@ define(function(require) {
|
||||
state_color = 'deploying';
|
||||
state_str = Locale.tr("DEPLOYING") + " (1/3)";
|
||||
break;
|
||||
case OpenNebulaVM.STATES.FAILED: // TODO: failed does not exist anymore
|
||||
state_color = 'error';
|
||||
state_str = Locale.tr("ERROR");
|
||||
break;
|
||||
case OpenNebulaVM.STATES.ACTIVE:
|
||||
var lcm_state = parseInt(data.LCM_STATE);
|
||||
|
||||
|
||||
@@ -90,11 +90,12 @@ define(function(require) {
|
||||
case OpenNebulaVM.STATES.HOLD:
|
||||
this.pendingVms++;
|
||||
break;
|
||||
case OpenNebulaVM.STATES.FAILED: // TODO: failed does not exist anymore....
|
||||
this.failedVms++;
|
||||
break;
|
||||
case OpenNebulaVM.STATES.ACTIVE:
|
||||
this.activeVms++;
|
||||
if (OpenNebulaVM.isFailureState(element.LCM_STATE)) {
|
||||
this.failedVms++;
|
||||
} else {
|
||||
this.activeVms++;
|
||||
}
|
||||
break;
|
||||
case OpenNebulaVM.STATES.STOPPED:
|
||||
case OpenNebulaVM.STATES.SUSPENDED:
|
||||
|
||||
@@ -34,7 +34,7 @@ define(function(require) {
|
||||
|
||||
var state;
|
||||
|
||||
if (state == OpenNebulaVM.STATES.ACTIVE) {
|
||||
if (element.STATE == OpenNebulaVM.STATES.ACTIVE) {
|
||||
state = OpenNebulaVM.shortLcmStateStr(element.LCM_STATE);
|
||||
} else {
|
||||
state = OpenNebulaVM.stateStr(element.STATE);
|
||||
|
||||
Reference in new issue
Block a user