F #1548: Added options to manage relative actions from CLI

This commit is contained in:
juanmont committed 2018-03-01 10:23:54 +01:00
1 parent 6a9be099ed
commit aedee51e67
2 files changed
+65 -11

No files matched your search

+55 -1
View File
@@ -114,6 +114,37 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
:format => Time
}
WEEKLY = {
:name => "weekly",
:large => "--weekly days",
:description => "Schedules this action to be executed after" \
"the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"",
:format => String
}
MONTHLY = {
:name => "monthly",
:large => "--monthly days",
:description => "Schedules this action to be executed after" \
"the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"",
:format => String
}
YEARLY = {
:name => "yearly",
:large => "--yearly days",
:description => "Schedules this action to be executed after" \
"the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"",
:format => String
}
END_TIME = {
:name => "end",
:large => "--end number|TIME",
:description => "----",
:format => String
}
ALL_TEMPLATE = {
:name => "all",
:large => "--all",
@@ -314,6 +345,29 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
ids, options,
"#{action} scheduled at #{options[:schedule]}") do |vm|
str_periodic = ""
if options.key?(:weekly)
str_periodic << ", REP = 0, DAYS = \"#{options[:weekly]}\""
elsif options.key?(:monthly)
str_periodic << ", REP = 1, DAYS = \"#{options[:monthly]}\""
elsif options.key?(:yearly)
str_periodic << ", REP = 2, DAYS = \"#{options[:yearly]}\""
end
if options.key?(:end)
begin
end_date = Date.parse(options[:end])
str_periodic << ", END_TYPE = 2, END_VALUE = #{end_date.to_time.to_i}"
rescue ArgumentError
if options[:end].to_i > 0
str_periodic << ", END_TYPE = 1, END_VALUE = #{options[:end].to_i}"
end
end
elsif str_periodic != ""
str_periodic << ", END_TYPE = 0"
end
rc = vm.info
if OpenNebula.is_error?(rc)
@@ -331,7 +385,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
tmp_str = vm.user_template_str
tmp_str << "\nSCHED_ACTION = [ID = #{id}, ACTION = #{action}, TIME = #{options[:schedule].to_i}]"
tmp_str << "\nSCHED_ACTION = [ID = #{id}, ACTION = #{action}, TIME = #{options[:schedule].to_i}" << str_periodic << "]"
vm.update(tmp_str)
end
+10 -10
View File
@@ -316,7 +316,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
EOT
command :hold, hold_desc, [:range,:vmid_list],
:options => [OneVMHelper::SCHEDULE] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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::HARD] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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::HARD] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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::HARD] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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::HARD] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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] do
:options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, 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] do
[:name, nil], :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::END_TIME] do
if (!options[:schedule].nil?)
helper.schedule_actions(args[0], options, @comm_name)