opennebula-cli 6.6.2 → 6.7.80.pre

data/bin/onetemplate

@@ -149,6 +149,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             onetemplate create vm_description.tmpl
 
+            #{OpenNebulaHelper::TEMPLATE_INPUT}
+
           - new VM Template named "arch vm" with a disk and a nic:
 
             onetemplate create --name "arch vm" --memory 128 --cpu 1 \\
@@ -164,9 +166,10 @@ CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, [:file, nil], :options =>
             [OneTemplateHelper::VM_NAME] + OpenNebulaHelper::TEMPLATE_OPTIONS +
             [OpenNebulaHelper::DRY] do
-        if args[0] && OpenNebulaHelper.create_template_options_used?(options)
-            STDERR.puts 'You can not use both template file and template' \
-                        ' creation options.'
+        if (args[0] || STDIN.wait_readable(0)) &&
+            OpenNebulaHelper.create_template_options_used?(options)
+
+            STDERR.puts 'You can not use both template file and template creation options.'
             next -1
         end
 
@@ -174,6 +177,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
+                elsif STDIN.wait_readable(0)
+                    template = STDIN.read
                 else
                     res = OpenNebulaHelper.create_template(options)
 
@@ -248,13 +253,13 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :instantiate, instantiate_desc, :templateid, [:file, nil],
-            :options => instantiate_options +
-                        OpenNebulaHelper::TEMPLATE_OPTIONS do
+            :options => instantiate_options + OpenNebulaHelper::TEMPLATE_OPTIONS do
         exit_code = 0
 
-        if args[1] && OpenNebulaHelper.create_template_options_used?(options)
-            STDERR.puts 'You cannot use both template file and template' \
-                        ' creation options.'
+        if (args[1] || STDIN.wait_readable(0)) &&
+            OpenNebulaHelper.create_template_options_used?(options)
+
+            STDERR.puts 'You cannot use both template and template creation options.'
             next -1
         end
 
@@ -300,6 +305,8 @@ CommandParser::CmdParser.new(ARGV) do
 
                 if args[1]
                     extra_template = File.read(args[1])
+                elsif STDIN.wait_readable(0)
+                    extra_template = STDIN.read
                 else
                     res = OpenNebulaHelper.create_template(options, t)
 
@@ -404,7 +411,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Templates in the pool
+        Lists Templates in the pool. #{OneTemplateHelper.list_layout_help}
     EOT
 
     rename_desc = <<-EOT.unindent

data/bin/oneuser

@@ -562,7 +562,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Users in the pool
+        Lists Users in the pool. #{OneUserHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

data/bin/onevdc

@@ -300,7 +300,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists VDCs in the pool
+        Lists VDCs in the pool. #{OneVdcHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

data/bin/onevm

@@ -349,7 +349,9 @@ CommandParser::CmdParser.new(ARGV) do
         number    = options[:multiple] || 1
         exit_code = nil
 
-        if args[0] && OpenNebulaHelper.create_template_options_used?(options)
+        if (args[0] || STDIN.wait_readable(0)) &&
+            OpenNebulaHelper.create_template_options_used?(options)
+
             STDERR.puts 'You can not use both template file and template'\
                         ' creation options.'
             exit(-1)
@@ -358,6 +360,8 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             if args[0]
                 template = File.read(args[0])
+            elsif STDIN.wait_readable(0)
+                template = STDIN.read
             else
                 res = OpenNebulaHelper.create_template(options)
 
@@ -422,12 +426,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :hold, hold_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -444,12 +443,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :release, release_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -512,13 +506,8 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :terminate, terminate_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME,
-                         OneVMHelper::HARD] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS +
+                        [OneVMHelper::HARD] do
         command_name = 'terminate'
         command_name << '-hard' if options[:hard]
 
@@ -540,13 +529,8 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :undeploy, undeploy_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME,
-                         OneVMHelper::HARD] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS +
+                        [OneVMHelper::HARD] do
         command_name = 'undeploy'
         command_name << '-hard' if options[:hard]
 
@@ -567,13 +551,8 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :poweroff, poweroff_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME,
-                         OneVMHelper::HARD] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS +
+                        [OneVMHelper::HARD] do
         command_name = 'poweroff'
         command_name << '-hard' if options[:hard]
 
@@ -596,13 +575,8 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :reboot, reboot_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME,
-                         OneVMHelper::HARD] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS +
+                        [OneVMHelper::HARD] do
         command_name = 'reboot'
         command_name << '-hard' if options[:hard]
 
@@ -620,6 +594,8 @@ CommandParser::CmdParser.new(ARGV) do
         deployment, in a standard installation the Scheduler is in charge
         of this decision
 
+        #{OpenNebulaHelper::TEMPLATE_INPUT}
+
         States: PENDING, HOLD, STOPPED, UNDEPLOYED
     EOT
 
@@ -628,7 +604,7 @@ CommandParser::CmdParser.new(ARGV) do
             [:range, :vmid_list],
             :hostid,
             [:datastoreid, nil],
-            :options => [ENFORCE, OneVMHelper::FILE] do
+            :options => [ENFORCE, OpenNebulaHelper::FILE] do
         host_id = args[1]
         verbose = "deploying in host #{host_id}"
 
@@ -639,6 +615,8 @@ CommandParser::CmdParser.new(ARGV) do
 
         if options[:file]
             extra_template = File.read(options[:file])
+        elsif STDIN.wait_readable(0)
+            extra_template = STDIN.read
         end
 
         helper.perform_actions(args[0], options, verbose) do |vm|
@@ -680,12 +658,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :stop, stop_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -705,12 +678,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :suspend, suspend_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -727,12 +695,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :resume, resume_desc, [:range, :vmid_list],
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -799,25 +762,21 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     disk_attach_desc = <<-EOT.unindent
-        Attaches a disk to a running VM. When using --file add only one
-        DISK instance.
+        Attaches a disk to a running VM.
+
+        #{OneVMHelper.template_input_help('DISK')}
 
         States: RUNNING, POWEROFF
     EOT
 
     command :"disk-attach", disk_attach_desc, :vmid,
-            :options => [OneVMHelper::FILE, OneVMHelper::IMAGE,
+            :options => [OpenNebulaHelper::FILE, OneVMHelper::IMAGE,
                          TARGET, CACHE, DISCARD, PREFIX] do
-        if options[:file].nil? && options[:image].nil?
-            STDERR.puts 'Provide a template file or an image:'
-            STDERR.puts '\t--file  <file>'
-            STDERR.puts '\t--image <image>'
-            exit(-1)
-        end
-
         if options[:file]
             template = File.read(options[:file])
-        else
+        elsif STDIN.wait_readable(0)
+            template = STDIN.read
+        elsif options[:image]
             image_id = options[:image]
             target   = options[:target]
             prefix   = options[:prefix]
@@ -839,6 +798,11 @@ CommandParser::CmdParser.new(ARGV) do
             end
 
             template << ' ]'
+        else
+            STDERR.puts 'Provide a template or an image:'
+            STDERR.puts '\t--file  <file>'
+            STDERR.puts '\t--image <image>'
+            exit(-1)
         end
 
         helper.perform_action(args[0], options, 'Attaching disk') do |vm|
@@ -861,37 +825,35 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     nic_attach_desc = <<-EOT.unindent
-        Attaches a NIC to a VM. When using --file add only one NIC instance.
+        Attaches a NIC to a VM.
+
+        To attach a nic alias
+        #{OneVMHelper.template_input_help('NIC')}
 
         To hotplug a PCI device and use it as a NIC interface in the VM select
         it with --pci (short_address) or --pci_device (device ID),
         --pci_class (class ID) and/or --pci_vendor (vendor ID).
 
-        To attach a nic alias, use --file or --alias option.
-
         States: RUNNING, POWEROFF
     EOT
 
     command :"nic-attach", nic_attach_desc, :vmid,
-            :options => [OneVMHelper::FILE,
-                         OneVMHelper::NETWORK,
-                         OneVMHelper::IP,
-                         OneVMHelper::ALIAS,
-                         OneVMHelper::NIC_NAME,
-                         PCI,
-                         PCI_CLASS,
-                         PCI_VENDOR,
-                         PCI_DEVICE] do
-        if options[:file].nil? && options[:network].nil?
-            STDERR.puts 'Provide a template file or a network:'
-            STDERR.puts "\t--file    <file>"
-            STDERR.puts "\t--network <network>"
-            exit(-1)
-        end
-
+            :options => [
+                OpenNebulaHelper::FILE,
+                OneVMHelper::NETWORK,
+                OneVMHelper::IP,
+                OneVMHelper::ALIAS,
+                OneVMHelper::NIC_NAME,
+                PCI,
+                PCI_CLASS,
+                PCI_VENDOR,
+                PCI_DEVICE
+            ] do
         if options[:file]
             template = File.read(options[:file])
-        else
+        elsif STDIN.wait_readable(0)
+            template = STDIN.read
+        elsif options[:network]
             network_id = options[:network]
             ip         = options[:ip]
             nic_alias  = options[:alias]
@@ -923,6 +885,11 @@ CommandParser::CmdParser.new(ARGV) do
             template << ", IP   = #{ip}" if ip
             template << ", NAME = #{nic_name}" if nic_name
             template << ']'
+        else
+            STDERR.puts 'Provide a network or a template:'
+            STDERR.puts "\t--file    <file>"
+            STDERR.puts "\t--network <network>"
+            exit(-1)
         end
 
         helper.perform_action(args[0], options, 'Attaching NIC') do |vm|
@@ -1084,12 +1051,7 @@ 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::HOURLY,
-                                       OneVMHelper::END_TIME] do
+            [:name, nil], :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             # add name as an argument
             options[:args] = args[1]
@@ -1108,12 +1070,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"snapshot-revert", snapshot_revert_desc, :vmid, :snapshot_id,
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             # add snap ID as an argument
             options[:args] = args[1]
@@ -1132,12 +1089,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"snapshot-delete", snapshot_delete_desc, :vmid, :snapshot_id,
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             # add snap ID as an argument
             options[:args] = args[1]
@@ -1159,12 +1111,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :"disk-snapshot-create", disk_snapshot_create_desc,
             :vmid, :diskid, :name,
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             # add disk ID and name as arguments
             options[:args] = "#{args[1]},#{args[2]}"
@@ -1186,12 +1133,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :"disk-snapshot-revert", disk_snapshot_revert_desc,
             :vmid, :diskid, :disk_snapshot_id,
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             # add disk ID and snap ID as arguments
             options[:args] = "#{args[1]},#{args[2]}"
@@ -1213,12 +1155,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :"disk-snapshot-delete", disk_snapshot_delete_desc,
             :vmid, :diskid, :disk_snapshot_id,
-            :options => [OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+            :options => OpenNebulaHelper::SCHEDULE_OPTIONS do
         if !options[:schedule].nil?
             # add disk ID and snap ID as arguments
             options[:args] = "#{args[1]},#{args[2]}"
@@ -1278,7 +1215,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists VMs in the pool
+        Lists VMs in the pool. #{OneVMHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil],
@@ -1333,13 +1270,15 @@ CommandParser::CmdParser.new(ARGV) do
         Resizes the capacity of a Virtual Machine (offline, the VM cannot be
         RUNNING)
 
+        #{OpenNebulaHelper::TEMPLATE_INPUT}
     EOT
 
     command :resize, resize_desc, :vmid,
-            :options => OpenNebulaHelper::CAPACITY_OPTIONS_VM +
-                        [ENFORCE, OneVMHelper::FILE] do
+            :options => OpenNebulaHelper::CAPACITY_OPTIONS_VM + [ENFORCE, OpenNebulaHelper::FILE] do
         if options[:file]
             template = File.read(options[:file])
+        elsif STDIN.wait_readable(0)
+            template = STDIN.read
         else
             template = ''
 
@@ -1392,13 +1331,16 @@ CommandParser::CmdParser.new(ARGV) do
         In running state only changes in CONTEXT and BACKUP_CONFIG take effect
         immediately, other values may need a VM restart.
 
-        This command accepts a template file or opens an editor, the full list of
-        configuration attributes are:
+        This command accepts a template or opens an editor.
+        #{OpenNebulaHelper::TEMPLATE_INPUT}
+
+        The full list of configuration attributes are:
 
         OS        = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT", "UUID"]
         FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "IOTHREADS"]
         INPUT     = ["TYPE", "BUS"]
         GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
+        VIDEO     = ["TYPE", "IOMMU", "ATS", "VRAM", "RESOLUTION"]
         RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
         CPU_MODEL = ["MODEL"]
         BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE"]
@@ -1411,6 +1353,7 @@ CommandParser::CmdParser.new(ARGV) do
 
         begin
             template = File.read(args[1]) if args[1]
+            template = STDIN.read if STDIN.wait_readable(0)
         rescue StandardError => e
             STDERR.puts "Error reading template: #{e.message}."
             exit(-1)
@@ -1430,8 +1373,8 @@ CommandParser::CmdParser.new(ARGV) do
                                                 'BACKUP_CONFIG')
                 template = vm.template_like_str('TEMPLATE', true,
                                                 'OS | FEATURES | INPUT | '\
-                                                'GRAPHICS | RAW | CONTEXT | '\
-                                                'CPU_MODEL')
+                                                'GRAPHICS | VIDEO | RAW | '\
+                                                'CONTEXT | CPU_MODEL')
 
                 template << "\n" << backup
 
@@ -1485,11 +1428,11 @@ CommandParser::CmdParser.new(ARGV) do
     create_chart_desc = <<-EOT.unindent
         Adds a charter to the VM, these are some consecutive scheduled actions
 
-        You can configure the actions in /etc/one/cli/onevm.yaml
+        You can configure the actions in #{OneVMHelper.conf_file}
     EOT
 
     command :'create-chart', create_chart_desc, :vmid do
-        charters = helper.get_charters
+        charters = helper.charters
 
         if charters.nil?
             STDERR.puts 'No charters found on configuration file'
@@ -1512,10 +1455,7 @@ CommandParser::CmdParser.new(ARGV) do
                                              action.to_s,
                                              time[:warning][:time] + acc_w)
 
-                if OpenNebula.is_error?(rc)
-                    STDERR.puts rc.message
-                    exit(-1)
-                end
+                exit(-1) if rc < 0
 
                 acc_t += time[:time].to_i
                 acc_w += time[:warning][:time].to_i
@@ -1551,7 +1491,38 @@ CommandParser::CmdParser.new(ARGV) do
             :vmid,
             :sched_id,
             [:file, nil] do
-        helper.update_schedule_action(args[0], args[1], args[2])
+        helper.update_schedule_action(args[0], args[1], args[2], options)
+
+        0
+    end
+
+    sched_delete_desc = <<-EOT.unindent
+        Deletes a Scheduled Action from the VM
+    EOT
+
+    command :'sched-delete', sched_delete_desc, :vmid, :sched_id do
+        helper.perform_action(args[0], {}, 'Scheduled Action deleted') do |vm|
+            rc = vm.sched_action_delete(args[1])
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error deleting: #{rc.message}"
+                exit(-1)
+            end
+        end
+
+        0
+    end
+
+    sched_update_desc = <<-EOT.unindent
+        Updates a Scheduled Action from a VM
+    EOT
+
+    command :'sched-update',
+            sched_update_desc,
+            :vmid,
+            :sched_id,
+            [:file, nil] do
+        helper.update_schedule_action(args[0], args[1], args[2], options)
 
         0
     end
@@ -1566,19 +1537,14 @@ CommandParser::CmdParser.new(ARGV) do
             backup_vm_desc,
             :vmid,
             :options => [RESET_BACKUP,
-                         OneDatastoreHelper::DATASTORE,
-                         OneVMHelper::SCHEDULE,
-                         OneVMHelper::WEEKLY,
-                         OneVMHelper::MONTHLY,
-                         OneVMHelper::YEARLY,
-                         OneVMHelper::HOURLY,
-                         OneVMHelper::END_TIME] do
+                         OneDatastoreHelper::DATASTORE] +
+                        OpenNebulaHelper::SCHEDULE_OPTIONS do
         options[:datastore] = -1 if options[:datastore].nil?
 
         reset = options[:reset] == true
 
         if !options[:schedule].nil?
-            options[:args] = options[:datastore]
+            options[:args] = "#{options[:datastore]},#{reset ? 1 : 0}"
 
             helper.schedule_actions([args[0]], options, @comm_name)
         else
@@ -1716,8 +1682,8 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    # Deprecated commands
+    # Deprecated commands, remove these commands in release 8.x
 
-    deprecated_command(:shutdown, 'terminate')
-    deprecated_command(:delete, 'recover')
+    deprecated_command(:'delete-chart', 'sched-delete')
+    deprecated_command(:'update-chart', 'sched-update')
 end