From 394a8e1eab6f61d332f61b0ca555f6e7b5424a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Czern=C3=BD?= Date: Mon, 18 May 2020 16:39:47 +0200 Subject: [PATCH] F #3859: Fix deploy_id for VM monitoring (#4751) --- src/im_mad/remotes/lib/domain.rb | 2 +- src/monitor/src/monitor/MonitorDriverProtocol.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/im_mad/remotes/lib/domain.rb b/src/im_mad/remotes/lib/domain.rb index ccca1bacb4..4c1d241f99 100644 --- a/src/im_mad/remotes/lib/domain.rb +++ b/src/im_mad/remotes/lib/domain.rb @@ -113,7 +113,7 @@ class BaseDomains mon_s = '' @vms.each do |_uuid, vm| - mon_s << "VM = [ ID=\"#{vm[:id]}\", UUID=\"#{vm[:uuid]}\"," + mon_s << "VM = [ ID=\"#{vm[:id]}\", DEPLOY_ID=\"#{vm[:deploy_id]}\"," mon_s << " MONITOR=\"#{vm.to_monitor}\"]\n" end diff --git a/src/monitor/src/monitor/MonitorDriverProtocol.cc b/src/monitor/src/monitor/MonitorDriverProtocol.cc index 4736557c79..1fb8ec220b 100644 --- a/src/monitor/src/monitor/MonitorDriverProtocol.cc +++ b/src/monitor/src/monitor/MonitorDriverProtocol.cc @@ -64,7 +64,7 @@ void MonitorDriverProtocol::_monitor_vm(message_t msg) { int id = -1; string monitor_b64; - string uuid; + string deploy_id; if (vm->vector_value("ID", id) != 0) { @@ -72,7 +72,7 @@ void MonitorDriverProtocol::_monitor_vm(message_t msg) } vm->vector_value("MONITOR", monitor_b64); - vm->vector_value("UUID", uuid); + vm->vector_value("DEPLOY_ID", deploy_id); auto monitor_plain = one_util::base64_decode(monitor_b64); @@ -95,11 +95,11 @@ void MonitorDriverProtocol::_monitor_vm(message_t msg) delete monitor_plain; - auto it = vms_templ.find(uuid); + auto it = vms_templ.find(deploy_id); if (it == vms_templ.end()) { - vms_templ.insert(make_pair(std::move(uuid), + vms_templ.insert(make_pair(std::move(deploy_id), make_pair(id, std::move(mon_tmpl)))); } else