From a2a8310d1ec0a0167974053d76c7cbc1905aff09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <cgonzalez@opennebula.systems>
Date: Tue, 30 Apr 2019 09:49:04 +0200
Subject: [PATCH] B #3193 Lock VM mark disappears in Sunstone (#3288)

---
 src/onedb/local/5.6.0_to_5.7.80.rb | 5 +++++
 src/vm/VirtualMachine.cc           | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/onedb/local/5.6.0_to_5.7.80.rb b/src/onedb/local/5.6.0_to_5.7.80.rb
index 07e3379e1c..57e1af0db4 100644
--- a/src/onedb/local/5.6.0_to_5.7.80.rb
+++ b/src/onedb/local/5.6.0_to_5.7.80.rb
@@ -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?
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 8e8ffa8f11..e3b8e590af 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -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>"