shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-02 09:47:00 +03:00
Code Releases Wiki Activity

feature #3718: Remove STATE from monitor values

Browse Source
This commit is contained in:
Ruben S. Montero 2015-07-09 14:02:28 +02:00
parent 27e3ac289f
commit e5eb92eeec
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/VirtualMachine.h
View File

@ -430,7 +430,7 @@ public:
clear_template_monitor_error();
}
const VirtualMachineMonitorInfo& get_info() const
VirtualMachineMonitorInfo& get_info()
{
return monitoring;
}

4
include/VirtualMachineMonitorInfo.h
View File

@ -57,12 +57,14 @@ public:
return rc;
};
char get_state() const
char remove_state()
{
string state_str;
get("STATE", state_str);
erase("STATE");
if (state_str.empty())
{
return '-';

6
src/vmm/VirtualMachineManagerDriver.cc
View File

@ -656,9 +656,9 @@ void VirtualMachineManagerDriver::process_poll(
vmpool->update(vm);
const VirtualMachineMonitorInfo &minfo = vm->get_info();
VirtualMachineMonitorInfo &minfo = vm->get_info();
state = minfo.get_state();
state = minfo.remove_state();
}
else
{
@ -677,7 +677,7 @@ void VirtualMachineManagerDriver::process_poll(
return;
};
state = minfo.get_state();
state = minfo.remove_state();
}
/* ---------------------------------------------------------------------- */