shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

B #3193 Lock VM mark disappears in Sunstone (#3288)

Browse Source
This commit is contained in:
Christian González 2019-04-30 09:49:04 +02:00 committed by Ruben S. Montero
parent 67816c03b2
commit a2a8310d1e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/onedb/local/5.6.0_to_5.7.80.rb
View File

@ -313,6 +313,11 @@ module Migrator
xml.STIME body.root.xpath('STIME').text
xml.ETIME body.root.xpath('ETIME').text
xml.DEPLOY_ID body.root.xpath('DEPLOY_ID').text
xml.LOCK {
xml.LOCKED body.root.xpath('LOCK/LOCKED').text unless body.root.xpath('LOCK/LOCKED').text.empty?
} unless body.root.xpath('LOCK').text.empty?
xml.TEMPLATE {
xml.AUTOMATIC_REQUIREMENTS body.root.xpath('TEMPLATE/AUTOMATIC_REQUIREMENTS').text
xml.AUTOMATIC_DS_REQUIREMENTS body.root.xpath('TEMPLATE/AUTOMATIC_DS_REQUIREMENTS').text unless body.root.xpath('TEMPLATE/AUTOMATIC_DS_REQUIREMENTS').text.empty?

5
src/vm/VirtualMachine.cc
View File

@ -2357,6 +2357,11 @@ string& VirtualMachine::to_xml_short(string& xml)
<< "<ETIME>" << etime << "</ETIME>"
<< "<DEPLOY_ID>" << deploy_id << "</DEPLOY_ID>";
if (locked != PoolObjectSQL::ST_NONE)
{
oss << "<LOCK><LOCKED>" << static_cast<int>(locked) << "</LOCKED></LOCK>";
}
oss << "<TEMPLATE>"
<< "<CPU>" << cpu_tmpl << "</CPU>"
<< "<MEMORY>" << mem_tmpl << "</MEMORY>"