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

F #5761: Add error and sched messages to VM pool

Browse Source 
(cherry picked from commit 2d640e88431d72a932e8abb6d01ace2bed93bb04)
This commit is contained in:
Ruben S. Montero 2022-03-08 19:18:02 +01:00
parent 62f5037915
commit e921618e2f
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vm/VirtualMachineTemplate.cc
View File

@ -90,6 +90,7 @@ string& VirtualMachineTemplate::to_xml_short(string& xml) const
{
ostringstream oss;
string labels;
string msg, schd_msg;
string schd_rank, schd_ds_rank;
string schd_req, schd_ds_req;
@ -109,12 +110,24 @@ string& VirtualMachineTemplate::to_xml_short(string& xml) const
/* ------------------------------------------------------------------ */
/* Attributes required by Sunstone */
/* - LABELS */
/* - ERROR */
/* - SCHED_MESSAGE */
/* ------------------------------------------------------------------ */
if (get("LABELS", labels))
if (get("LABELS", labels) && !labels.empty())
{
oss << "<LABELS>" << one_util::escape_xml(labels) << "</LABELS>";
}
if (get("ERROR", msg) && !msg.empty())
{
oss << "<ERROR>" << one_util::escape_xml(msg) << "</ERROR>";
}
if (get("SCHED_MESSAGE", schd_msg) && !schd_msg.empty())
{
oss << "<SCHED_MESSAGE>" << one_util::escape_xml(schd_msg) << "</SCHED_MESSAGE>";
}
/* ------------------------------------------------------------------ */
/* Attributes required by Scheduler */
/* - SCHED_RANK (RANK - deprecated) */