mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-16 22:50:10 +03:00
Feature #3748: Use host numeric states, translate state strings
This commit is contained in:
parent
4df224e520
commit
768ad367b3
@ -1,38 +1,51 @@
|
||||
define(function(require) {
|
||||
var OpenNebulaAction = require('./action');
|
||||
var Locale = require('utils/locale');
|
||||
|
||||
var RESOURCE = "HOST";
|
||||
|
||||
var STATES = [
|
||||
"INIT",
|
||||
"MONITORING_MONITORED",
|
||||
"MONITORED",
|
||||
"ERROR",
|
||||
"DISABLED",
|
||||
"MONITORING_ERROR",
|
||||
"MONITORING_INIT",
|
||||
"MONITORING_DISABLED"
|
||||
]
|
||||
var STATES_STR = [
|
||||
Locale.tr("INIT"),
|
||||
Locale.tr("MONITORING_MONITORED"),
|
||||
Locale.tr("MONITORED"),
|
||||
Locale.tr("ERROR"),
|
||||
Locale.tr("DISABLED"),
|
||||
Locale.tr("MONITORING_ERROR"),
|
||||
Locale.tr("MONITORING_INIT"),
|
||||
Locale.tr("MONITORING_DISABLED")
|
||||
];
|
||||
|
||||
var SIMPLE_STATES = [
|
||||
"INIT",
|
||||
"UPDATE",
|
||||
"ON",
|
||||
"ERROR",
|
||||
"OFF",
|
||||
"RETRY",
|
||||
"INIT",
|
||||
"OFF"
|
||||
]
|
||||
var SIMPLE_STATES_STR = [
|
||||
Locale.tr("INIT"),
|
||||
Locale.tr("UPDATE"),
|
||||
Locale.tr("ON"),
|
||||
Locale.tr("ERROR"),
|
||||
Locale.tr("OFF"),
|
||||
Locale.tr("RETRY"),
|
||||
Locale.tr("INIT"),
|
||||
Locale.tr("OFF")
|
||||
];
|
||||
|
||||
var STATES = {
|
||||
INIT : 0,
|
||||
MONITORING_MONITORED : 1,
|
||||
MONITORED : 2,
|
||||
ERROR : 3,
|
||||
DISABLED : 4,
|
||||
MONITORING_ERROR : 5,
|
||||
MONITORING_INIT : 6,
|
||||
MONITORING_DISABLED : 7
|
||||
};
|
||||
|
||||
var Host = {
|
||||
"resource": RESOURCE,
|
||||
"stateStr": function(stateId) {
|
||||
return STATES[stateId];
|
||||
return STATES_STR[stateId];
|
||||
},
|
||||
"simpleStateStr": function(stateId) {
|
||||
return SIMPLE_STATES[stateId];
|
||||
return SIMPLE_STATES_STR[stateId];
|
||||
},
|
||||
"STATES": STATES,
|
||||
"create": function(params) {
|
||||
OpenNebulaAction.create(params, RESOURCE);
|
||||
},
|
||||
|
@ -99,18 +99,20 @@ define(function(require) {
|
||||
var memoryBars = MemoryBars.html(element);
|
||||
|
||||
this.totalHosts++;
|
||||
var stateSimpleStr = OpenNebulaHost.simpleStateStr(element.STATE);
|
||||
switch (stateSimpleStr) {
|
||||
case "INIT":
|
||||
case "UPDATE":
|
||||
case "ON":
|
||||
|
||||
switch (parseInt(element.STATE)) {
|
||||
case OpenNebulaHost.STATES.INIT:
|
||||
case OpenNebulaHost.STATES.MONITORING_INIT:
|
||||
case OpenNebulaHost.STATES.MONITORING_MONITORED:
|
||||
case OpenNebulaHost.STATES.MONITORED:
|
||||
this.onHosts++;
|
||||
break;
|
||||
case "ERROR":
|
||||
case "RETRY":
|
||||
case OpenNebulaHost.STATES.ERROR:
|
||||
case OpenNebulaHost.STATES.MONITORING_ERROR:
|
||||
this.errorHosts++;
|
||||
break;
|
||||
case "OFF":
|
||||
case OpenNebulaHost.STATES.DISABLED:
|
||||
case OpenNebulaHost.STATES.MONITORING_DISABLED:
|
||||
this.offHosts++;
|
||||
break;
|
||||
default:
|
||||
@ -136,7 +138,7 @@ define(function(require) {
|
||||
cpuBars.allocated,
|
||||
memoryBars.real,
|
||||
memoryBars.allocated,
|
||||
stateSimpleStr,
|
||||
OpenNebulaHost.simpleStateStr(element.STATE),
|
||||
element.IM_MAD,
|
||||
element.VM_MAD,
|
||||
Humanize.prettyTime(element.LAST_MON_TIME)
|
||||
|
@ -81,7 +81,6 @@ define(function(require) {
|
||||
var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
|
||||
var cpuBars = CPUBars.html(this.element);
|
||||
var memoryBars = MemoryBars.html(this.element);
|
||||
var stateStr = Locale.tr(OpenNebulaHost.stateStr(this.element.STATE));
|
||||
var datastoresCapacityTableHTML = DatastoresCapacityTable.html(this.element);
|
||||
|
||||
return TemplateInfo({
|
||||
@ -92,7 +91,7 @@ define(function(require) {
|
||||
'permissionsTableHTML': permissionsTableHTML,
|
||||
'cpuBars': cpuBars,
|
||||
'memoryBars': memoryBars,
|
||||
'stateStr': stateStr,
|
||||
'stateStr': OpenNebulaHost.stateStr(this.element.STATE),
|
||||
'datastoresCapacityTableHTML': datastoresCapacityTableHTML
|
||||
});
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user