From 95733d52480bd67c3df8da12f396f1befd7e0b79 Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Mon, 22 Jun 2020 13:09:49 +0200 Subject: [PATCH] M #-: fix minor bug in sched actions (#30) (cherry picked from commit e81dc817f6a82a9febd6fbbf1c4c1e32a0f7df3e) --- src/cli/one_helper/onevm_helper.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index e39cbd1c1a..91adc6ddcd 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -453,8 +453,13 @@ class OneVMHelper < OpenNebulaHelper::OneHelper id = ids.max + 1 end - unless options[:schedule].include?('+') - options[:schedule] = options[:schedule].to_i + sched = options[:schedule] + + # If the action is set to be executed from VM start to an specific + # amount of time later, we should preserve the + symbol + if ((sched.is_a? String) && !sched.include?('+')) || + !(sched.is_a? String) + sched = sched.to_i end tmp_str = vm.user_template_str @@ -463,7 +468,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper tmp_str << "[ID = #{id}, ACTION = #{action}, " tmp_str << "WARNING = #{warning}," if warning tmp_str << "ARGS = \"#{options[:args]}\"," if options[:args] - tmp_str << "TIME = #{options[:schedule]}" + tmp_str << "TIME = #{sched}" tmp_str << str_periodic << ']' vm.update(tmp_str)