diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index f13486c28e..73573ffacc 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -138,6 +138,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper :format => String } + HOURLY = { + :name => "hourly", + :large => "--hourly hour", + :description => "Schedules this action to be executed after" \ + "the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"", + :format => Numeric + } + END_TIME = { :name => "end", :large => "--end number|TIME", @@ -353,6 +361,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper str_periodic << ", REP = 1, DAYS = \"#{options[:monthly]}\"" elsif options.key?(:yearly) str_periodic << ", REP = 2, DAYS = \"#{options[:yearly]}\"" + elsif options.key?(:hourly) + str_periodic << ", REP = 3, DAYS = \"#{options[:hourly].to_s}\"" end if options.key?(:end) @@ -1061,8 +1071,12 @@ in the frontend machine. str_rep << "Monthly " elsif d["REP"] == "2" str_rep << "Yearly " + elsif d["REP"] == "3" + str_rep << "Each " << d['DAYS'] << " hours" + end + if d["REP"] != "3" + str_rep << d["DAYS"] end - str_rep << d["DAYS"] end str_rep if !d.nil? end diff --git a/src/cli/onevm b/src/cli/onevm index 51764a8b0f..66bcc38bab 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -316,7 +316,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :hold, hold_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do if (!options[:schedule].nil?) helper.schedule_actions(args[0], options, @comm_name) else @@ -333,7 +333,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :release, release_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do if (!options[:schedule].nil?) helper.schedule_actions(args[0], options, @comm_name) else @@ -391,7 +391,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :terminate, terminate_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do command_name='terminate' command_name<<'-hard' if options[:hard] @@ -414,7 +414,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :undeploy, undeploy_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do command_name='undeploy' command_name<<'-hard' if options[:hard] @@ -436,7 +436,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :poweroff, poweroff_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do command_name='poweroff' command_name<<'-hard' if options[:hard] @@ -460,7 +460,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :reboot, reboot_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do command_name='reboot' command_name<<'-hard' if options[:hard] @@ -525,7 +525,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :stop, stop_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do if (!options[:schedule].nil?) helper.schedule_actions(args[0], options, @comm_name) else @@ -545,7 +545,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :suspend, suspend_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do if (!options[:schedule].nil?) helper.schedule_actions(args[0], options, @comm_name) else @@ -562,7 +562,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :resume, resume_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do if (!options[:schedule].nil?) helper.schedule_actions(args[0], options, @comm_name) else @@ -804,7 +804,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :"snapshot-create", snapshot_create_desc, [:range,:vmid_list], - [:name, nil], :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME] do + [:name, nil], :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do if (!options[:schedule].nil?) helper.schedule_actions(args[0], options, @comm_name) diff --git a/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc index 5493af0d58..9ac6283fb6 100644 --- a/src/scheduler/src/pool/VirtualMachineXML.cc +++ b/src/scheduler/src/pool/VirtualMachineXML.cc @@ -505,6 +505,22 @@ bool VirtualMachineXML::is_only_public_cloud() const /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ +static void check_months(struct tm * next){ + int days_month = m_months_days[next->tm_mon]; + if(next->tm_year+1900 % 4 == 0 && (next->tm_year+1900 % 100 != 0 || next->tm_year+1900 % 400 == 0) && next->tm_mon == 1) + { + days_month++; + } + if (next->tm_mday > days_month) + { + next->tm_mday = next->tm_mday - m_months_days[next->tm_mon]; + next->tm_mon++; + } +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + static void sum_days(struct tm * next, struct tm * now, int mayor_day, int minor_day, int max_day, int comparative){ if (mayor_day >= 0 && minor_day < max_day) { @@ -517,11 +533,7 @@ static void sum_days(struct tm * next, struct tm * now, int mayor_day, int minor next->tm_mday = next->tm_mday + (mayor_day - comparative); } } - if (next->tm_mday > m_months_days[next->tm_mon]) - { - next->tm_mday = next->tm_mday - m_months_days[next->tm_mon]; - next->tm_mon++; - } + check_months(next); } /* -------------------------------------------------------------------------- */ @@ -595,32 +607,34 @@ int VirtualMachineXML::next_action(VectorAttribute& vatt) } std::set::iterator it; std::pair::iterator,bool> ret; - - it = s_days.begin(); - minor_day = *it; - - ret = s_days.insert(start_day); - if ( ret.second == false ) + if (rep_mode != 3) { - mayor_day = *ret.first; + it = s_days.begin(); + minor_day = *it; - if ( ++ret.first != s_days.end() ) + ret = s_days.insert(start_day); + if ( ret.second == false ) { mayor_day = *ret.first; + + if ( ++ret.first != s_days.end() ) + { + mayor_day = *ret.first; + } } - } - else - { - mayor_day = minor_day; - if ( ++ret.first != s_days.end() ) + else { - mayor_day = *ret.first; - } - it = s_days.find(start_day); - s_days.erase (it); - if (*--it > mayor_day) - { - mayor_day = *it; + mayor_day = minor_day; + if ( ++ret.first != s_days.end() ) + { + mayor_day = *ret.first; + } + it = s_days.find(start_day); + s_days.erase (it); + if (*--it > mayor_day) + { + mayor_day = *it; + } } } @@ -645,7 +659,18 @@ int VirtualMachineXML::next_action(VectorAttribute& vatt) } } - generate_next_day(rep_mode, mayor_day, minor_day, &next, &start_tm); + if (rep_mode == 3) + { + it = s_days.begin(); + int hours = *it; + next.tm_min = start_tm.tm_min; + next.tm_hour = start_tm.tm_hour + hours; + check_months(&next); + } + else + { + generate_next_day(rep_mode, mayor_day, minor_day, &next, &start_tm); + } action_time = mktime (&next); if (action_time != -1) { diff --git a/src/vm_template/VMTemplate.cc b/src/vm_template/VMTemplate.cc index 1d1e62f26f..b0256ea100 100644 --- a/src/vm_template/VMTemplate.cc +++ b/src/vm_template/VMTemplate.cc @@ -225,6 +225,11 @@ int VMTemplate::parse_sched_action(string& error_str) error_str = "Error parsing days of the year. [0,365]"; return -1; } + else if (rep_mode == 3 && (first_day != last_day || s_days.size() > 1)) //YEAR [0,365] + { + error_str = "Error parsing hour."; + return -1; + } } has_end_mode = vatt->vector_value("END_TYPE", end_mode);