opennebula-cli 3.9.0.beta → 3.9.80.beta

data/NOTICE

@@ -1,7 +1,6 @@
 OpenNebula Open Source Project
 --------------------------------------------------------------------------------
-Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)
-Copyright 2010-2012, C12G Labs S.L. (C12G.com)
+Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs
 --------------------------------------------------------------------------------
 
 You can find  more information about the project, release notes and

data/bin/oneacct

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -48,8 +48,8 @@ cmd = CommandParser::CmdParser.new(ARGV) do
 
     main do
         filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
-        start_time  = options[:start] ? options[:start].to_i : -1
-        end_time    = options[:end] ? options[:end].to_i : -1
+        start_time  = options[:start_time] ? options[:start_time].to_i : -1
+        end_time    = options[:end_time] ? options[:end_time].to_i : -1
 
         common_opts = {
             :start_time => start_time,
@@ -83,7 +83,8 @@ cmd = CommandParser::CmdParser.new(ARGV) do
             order_by[:order_by_1] = 'VM/UID'
             order_by[:order_by_2] = 'VM/ID' if options[:split]
 
-            acct_hash = pool.accounting(filter_flag, common_opts.merge(order_by))
+            acct_hash = pool.accounting(filter_flag,
+                                        common_opts.merge(order_by))
             if OpenNebula.is_error?(acct_hash)
                 puts acct_hash.message
                 exit -1

data/bin/oneacl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/bin/onecluster

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -69,7 +69,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         OpenNebulaHelper.rname_to_id(arg, "HOST")
     end
 
-    set :format, :datastoreid, OpenNebulaHelper.rname_to_id_desc("DATASTORE") do |arg|
+    set :format, :datastoreid,
+            OpenNebulaHelper.rname_to_id_desc("DATASTORE") do |arg|
         OpenNebulaHelper.rname_to_id(arg, "DATASTORE")
     end
 

data/bin/onedatastore

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -62,7 +62,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.list_to_id(arg)
     end
 
-    set :format, :clusterid, OpenNebulaHelper.rname_to_id_desc("CLUSTER") do |arg|
+    set :format, :clusterid,
+            OpenNebulaHelper.rname_to_id_desc("CLUSTER") do |arg|
         OpenNebulaHelper.rname_to_id(arg, "CLUSTER")
     end
 
@@ -82,7 +83,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Creates a new Datastore from the given template file
     EOT
 
-    command :create, create_desc, :file, :options=>[OneClusterHelper::CLUSTER] do
+    command :create, create_desc, :file,
+            :options=>[OneClusterHelper::CLUSTER] do
 
         cid = options[:cluster] || ClusterPool::NONE_CLUSTER_ID
 

data/bin/onegroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -103,8 +103,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     quota_desc = <<-EOT.unindent
-        Set the quota limits for the group. If a path is not provided the editor 
-        will be launched to modify the current quotas.
+        Set the quota limits for the group. If a path is not provided the
+        editor will be launched to modify the current quotas.
     EOT
 
     command :quota, quota_desc, :groupid, [:file, nil] do
@@ -131,7 +131,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         provided the editor will be launched to create new quotas.
     EOT
 
-    command :batchquota, batchquota_desc, [:range, :groupid_list], [:file, nil] do
+    command :batchquota, batchquota_desc, [:range, :groupid_list],
+            [:file, nil] do
         batch_str = OneQuotaHelper.get_batch_quota(args[1])
 
         helper.perform_actions(args[0], options, "modified") do |group|

data/bin/onehost

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -44,7 +44,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+    cmd_options=CommandParser::OPTIONS-[CommandParser::VERBOSE]
+    set :option, cmd_options+OpenNebulaHelper::CLIENT_OPTIONS
 
     IM = {
     :name   => "im",

data/bin/oneimage

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -81,7 +81,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         if Image::IMAGE_TYPES.include? type
             [0, type]
         else
-            [1, "Image type not supported. Must be #{Image::IMAGE_TYPES.join(", ")}."]
+            [1, "Image type not supported. Must be "<<
+                 Image::IMAGE_TYPES.join(", ")<<"."]
         end
     end
 

data/bin/onetemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -29,6 +29,7 @@ $: << RUBY_LIB_LOCATION+"/cli"
 
 require 'command_parser'
 require 'one_helper/onetemplate_helper'
+require 'one_helper/onevm_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
     usage "`onetemplate` <command> [<args>] [<options>]"
@@ -52,7 +53,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     instantiate_options = [
         OneTemplateHelper::VM_NAME,
-        OneTemplateHelper::MULTIPLE
+        OneTemplateHelper::MULTIPLE,
+        OneVMHelper::HOLD
     ]
 
     ########################################################################
@@ -92,12 +94,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
           - new VM Template named "arch vm" with a disk and a nic:
 
-            onetemplate create --name "arch vm" --memory 128 --cpu 1 --disk arch \\
-                         --network private_lan
+            onetemplate create --name "arch vm" --memory 128 --cpu 1 \\
+                               --disk arch --network private_lan
 
           - using two disks:
 
-            onetempate create --name "test vm" --memory 128 --cpu 1 --disk arch,data
+            onetempate create --name "test vm" --memory 128 --cpu 1 \\
+                              --disk arch,data
 
     EOT
 
@@ -170,16 +173,41 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         managed with the 'onevm' command
     EOT
 
-    command :instantiate, instantiate_desc, :templateid,
-            :options=>instantiate_options do
+    command :instantiate, instantiate_desc, :templateid, [:file, nil],
+            :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."
+            next -1
+        end
+
         number = options[:multiple] || 1
         number.times do |i|
-            exit_code=helper.perform_action(args[0],options,"instantiated") do |t|
+            exit_code=helper.perform_action(args[0], options,
+                                            "instantiated") do |t|
                 name = options[:name]
                 name = name.gsub("%i",i.to_s) if name
-                res = t.instantiate(name)
+
+                on_hold = options[:hold] != nil
+
+                extra_template = ""
+
+                if args[1]
+                    extra_template = File.read(args[1])
+                else
+                    res = OpenNebulaHelper.create_template(options)
+
+                    if res.first != 0
+                        STDERR.puts res.last
+                        next -1
+                    end
+
+                    extra_template = res.last
+                end
+
+                res = t.instantiate(name, on_hold, extra_template)
 
                 if !OpenNebula.is_error?(res)
                     puts "VM ID: #{res}"

data/bin/oneuser

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -228,7 +228,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         provided the editor will be launched to create new quotas.
     EOT
 
-    command :batchquota, batchquota_desc, [:range, :userid_list], [:file, nil] do
+    command :batchquota, batchquota_desc, [:range, :userid_list],
+            [:file, nil] do
         batch_str = OneQuotaHelper.get_batch_quota(args[1])
 
         helper.perform_actions(args[0], options, "modified") do |user|
@@ -270,6 +271,39 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         exit 0
     end
 
+    umask_desc = <<-EOT.unindent
+        Changes the umask used to create the default permissions. In a similar
+        way to the Unix umask command, the expected value is a three-digit
+        base-8 number. Each digit is a mask that disables permissions for the
+        owner, group and other, respectively.
+
+        If mask is not given, or if it is an empty string, the umask will
+        be unset
+    EOT
+
+    command :umask, umask_desc, [:range, :userid_list], [:mask, nil] do
+        helper.perform_actions(args[0],options,
+                "umask changed") do |user|
+
+            rc = user.info
+
+            if OpenNebula.is_error?(rc)
+                puts rc.message
+                exit -1
+            end
+
+            user.delete_element('/USER/TEMPLATE/UMASK')
+
+            tmp_str = user.template_str
+
+            if !args[1].nil? && args[1] != ""
+                tmp_str << "\nUMASK = #{args[1]}"
+            end
+
+            user.update(tmp_str)
+        end
+    end
+
     login_desc = <<-EOT.unindent
         Creates the Login token for authentication
         Examples:

data/bin/onevm

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -56,6 +56,22 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Device where the image will be attached"
     }
 
+    IP={
+        :name => "ip",
+        :short => "-i ip",
+        :large => "--ip ip",
+        :format => String,
+        :description => "IP address for the new NIC"
+    }
+
+    CACHE={
+        :name => "cache",
+        :large => "--cache cache_mode",
+        :format => String,
+        :description => "Hypervisor cache mode: default, none, writethrough,"<<
+            " writeback, directsync or unsafe. (Only KVM driver)"
+    }
+
     ENFORCE={
         :name  => "enforce",
         :short => "-e",
@@ -104,8 +120,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     ########################################################################
 
     create_desc = <<-EOT.unindent
-        Creates a new VM from the given description instead of using a previously
-        defined template (see 'onetemplate create' and 'onetemplate instantiate').
+        Creates a new VM from the given description instead of using a
+        previously defined template (see 'onetemplate create' and
+        'onetemplate instantiate').
 
         Examples:
 
@@ -125,7 +142,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :create, create_desc, [:file, nil], :options =>
-            [OneVMHelper::MULTIPLE]+OpenNebulaHelper::TEMPLATE_OPTIONS_VM do
+            [OneVMHelper::MULTIPLE, OneVMHelper::HOLD]+
+            OpenNebulaHelper::TEMPLATE_OPTIONS_VM do
 
         number    = options[:multiple] || 1
         exit_code = nil
@@ -160,9 +178,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             exit 0
         end
 
+        on_hold = options[:hold] != nil
+
         number.times do
             exit_code = helper.create_resource(options) do |vm|
-                error = vm.allocate(template)
+                error = vm.allocate(template, on_hold)
             end
 
             break if exit_code == -1
@@ -171,15 +191,41 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         exit_code
     end
 
-    delete_desc = <<-EOT.unindent
-        Deletes the given VM
+    update_desc = <<-EOT.unindent
+        Update the user template contents. If a path is not provided the
+        editor will be launched to modify the current content.
+    EOT
+
+    command :update, update_desc, :vmid, [:file, nil] do
+        helper.perform_action(args[0],options,"modified") do |vm|
+            str = OpenNebulaHelper.update_template(args[0], vm, args[1],
+                                                   'USER_TEMPLATE')
+            vm.update(str)
+        end
+    end
+
+    destroy_desc = <<-EOT.unindent
+        Deletes the given VM. Using --recreate resubmits the VM.
+
+        Resubmits the VM to PENDING state. This is intended for VMs stuck in a
+        transient state. To re-deploy a fresh copy of the same VM, create a
+        Template and instantiate it, see 'onetemplate instantiate'
 
         States: ANY
     EOT
 
-    command :delete, delete_desc, [:range, :vmid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |vm|
-            vm.finalize
+    command :destroy, destroy_desc, [:range, :vmid_list],
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::RECREATE] do
+
+        command_name="destroy"
+        command_name<<"-recreate" if options[:recreate]
+
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, command_name)
+        else
+            helper.perform_actions(args[0],options,"deleted") do |vm|
+                vm.destroy(options[:recreate]==true)
+            end
         end
     end
 
@@ -190,9 +236,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: PENDING
     EOT
 
-    command :hold, hold_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"put on hold") do |vm|
-            vm.hold
+    command :hold, hold_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE] do
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, @comm_name)
+        else
+            helper.perform_actions(args[0],options,"put on hold") do |vm|
+                vm.hold
+            end
         end
     end
 
@@ -202,22 +253,30 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: HOLD
     EOT
 
-    command :release, release_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"released") do |vm|
-            vm.release
+    command :release, release_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE] do
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, @comm_name)
+        else
+            helper.perform_actions(args[0],options,"released") do |vm|
+                vm.release
+            end
         end
     end
 
-    saveas_desc = <<-EOT.unindent
+    disk_snapshot_desc = <<-EOT.unindent
         Sets the specified VM disk to be saved in a new Image. The Image is
         created immediately, but the contents are saved only if the VM is
         shut down gracefully (i.e., using 'onevm shutdown' and not
-        'onevm delete')
+        'onevm destroy')
+
+        If '--live' is specified, the Image will be saved immediately.
 
         States: ANY
     EOT
 
-    command :saveas, saveas_desc, :vmid, :diskid, :img_name, :options=>[TYPE] do
+    command :"disk-snapshot", disk_snapshot_desc, :vmid, :diskid, :img_name,
+            :options=>[TYPE, OneVMHelper::LIVE] do
         disk_id    = args[1].to_i
         image_name = args[2]
         image_type = options[:type] || ""
@@ -226,7 +285,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                   "the image #{image_name}"
 
         helper.perform_action(args[0],options,verbose) do |vm|
-            res = vm.save_as(disk_id, image_name, image_type)
+            res = vm.disk_snapshot(disk_id, image_name, image_type,
+                options[:live]==true)
 
             if !OpenNebula.is_error?(res)
                 puts "Image ID: #{res}"
@@ -239,25 +299,41 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     shutdown_desc = <<-EOT.unindent
         Shuts down the given VM. The VM life cycle will end.
 
+        With --hard it unplugs the VM.
+
         States: RUNNING
     EOT
 
-    command :shutdown, shutdown_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"shutting down") do |vm|
-            vm.shutdown
+    command :shutdown, shutdown_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
+
+        command_name='shutdown'
+        command_name<<'-hard' if options[:hard]
+
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, command_name)
+        else
+            helper.perform_actions(args[0],options,"shutting down") do |vm|
+                vm.shutdown(options[:hard]==true)
+            end
         end
     end
 
     poweroff_desc = <<-EOT.unindent
         Powers off the given VM. The VM will remain in the poweroff state, and
-        can be powered on with the 'onevm restart' command.
+        can be powered on with the 'onevm boot' command.
 
         States: RUNNING
     EOT
 
-    command :poweroff, poweroff_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"shutting down") do |vm|
-            vm.poweroff
+    command :poweroff, poweroff_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE] do
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, @comm_name)
+        else
+            helper.perform_actions(args[0],options,"shutting down") do |vm|
+                vm.poweroff
+            end
         end
     end
 
@@ -265,24 +341,23 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Reboots the given VM, this is equivalent to execute the reboot command
         from the VM console.
 
+        The VM will be ungracefully rebooted if --hard is used.
+
         States: RUNNING
     EOT
 
-    command :reboot, reboot_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"rebooting") do |vm|
-            vm.reboot
-        end
-    end
+    command :reboot, reboot_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
 
-    reset_desc = <<-EOT.unindent
-        Resets the given VM
+        command_name='reboot'
+        command_name<<'-hard' if options[:hard]
 
-        States: RUNNING
-    EOT
-
-    command :reset, reset_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"resetting") do |vm|
-            vm.reset
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, command_name)
+        else
+            helper.perform_actions(args[0],options,"rebooting") do |vm|
+                vm.reboot(options[:hard])
+            end
         end
     end
 
@@ -294,7 +369,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: PENDING
     EOT
 
-    command :deploy, deploy_desc, [:range,:vmid_list], :hostid, :options=>[ENFORCE] do
+    command :deploy, deploy_desc, [:range,:vmid_list], :hostid,
+            :options=>[ENFORCE] do
         host_id = args[1]
         verbose = "deploying in host #{host_id}"
 
@@ -307,81 +383,39 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    livemigrate_desc = <<-EOT.unindent
-        Migrates the given running VM to another Host without downtime
-
-        States: RUNNING
-    EOT
-
-    command :livemigrate, livemigrate_desc, [:range,:vmid_list], :hostid, :options=>[ENFORCE] do
-        host_id = args[1]
-        verbose = "live migrating to #{host_id}"
-
-        helper.perform_actions(args[0],options,verbose) do |vm|
-            if !options[:enforce].nil?
-                vm.live_migrate(host_id, options[:enforce])
-            else
-                vm.live_migrate(host_id)
-            end
-        end
-    end
-
     migrate_desc = <<-EOT.unindent
-        Saves the given running VM and starts it again in the specified Host
+        Migrates the given running VM to another Host. If used with --live
+        parameter the miration is done without downtime.
 
         States: RUNNING
     EOT
 
-    command :migrate, migrate_desc, [:range,:vmid_list], :hostid, :options=>[ENFORCE] do
+    command :migrate, migrate_desc, [:range,:vmid_list], :hostid,
+            :options=>[ENFORCE, OneVMHelper::LIVE] do
         host_id = args[1]
         verbose = "migrating to #{host_id}"
 
         helper.perform_actions(args[0],options,verbose) do |vm|
-            if !options[:enforce].nil?
-                vm.migrate(host_id, options[:enforce])
-            else
-                vm.migrate(host_id)
-            end
+            vm.migrate( host_id,
+                        options[:live]==true,
+                        options[:enforce]==true)
         end
     end
 
-    restart_desc = <<-EOT.unindent
+    boot_desc = <<-EOT.unindent
         Boots the given VM.
 
         States: UNKNOWN, BOOT, POWEROFF
     EOT
 
-    command :restart, restart_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"restarting") do |vm|
-            vm.restart
-        end
-    end
-
-    resubmit_desc = <<-EOT.unindent
-        Resubmits the VM to PENDING state. This is intended for VMs stuck in a
-        transient state. To re-deploy a fresh copy of the same VM, create a
-        Template and instantiate it, see 'onetemplate instantiate'
-
-        States: ANY, except SUSPENDED or DONE
-    EOT
-
-    command :resubmit, resubmit_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"resubmiting") do |vm|
-            vm.resubmit
-        end
-    end
-
-    cancel_desc = <<-EOT.unindent
-        Cancels the given VM. The process is checked by OpenNebula, so
-        if the process fails the VM remains in running state. If the action
-        succeeds the VMDIR in the remote machine is not deleted
-
-        States: RUNNING
-    EOT
-
-    command :cancel, cancel_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"canceling") do |vm|
-            vm.cancel
+    command :boot, boot_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE] do
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, @comm_name)
+        else
+            helper.perform_actions(args[0],options,"booting") do |vm|
+                vm.boot
+            end
         end
     end
 
@@ -392,9 +426,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: RUNNING
     EOT
 
-    command :stop, stop_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"stopping") do |vm|
-            vm.stop
+    command :stop, stop_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE] do
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, @comm_name)
+        else
+            helper.perform_actions(args[0],options,"stopping") do |vm|
+                vm.stop
+            end
         end
     end
 
@@ -407,9 +446,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: RUNNING
     EOT
 
-    command :suspend, suspend_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"suspending") do |vm|
-            vm.suspend
+    command :suspend, suspend_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE] do
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, @comm_name)
+        else
+            helper.perform_actions(args[0],options,"suspending") do |vm|
+                vm.suspend
+            end
         end
     end
 
@@ -419,20 +463,26 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: STOPPED, SUSPENDED
     EOT
 
-    command :resume, resume_desc, [:range,:vmid_list] do
-        helper.perform_actions(args[0],options,"resuming") do |vm|
-            vm.resume
+    command :resume, resume_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE] do
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, @comm_name)
+        else
+            helper.perform_actions(args[0],options,"resuming") do |vm|
+                vm.resume
+            end
         end
     end
 
-    attachdisk_desc = <<-EOT.unindent
+    disk_attach_desc = <<-EOT.unindent
         Attaches a disk to a running VM
 
         States: RUNNING
     EOT
 
-    command :attachdisk, attachdisk_desc, :vmid,
-            :options => [OneVMHelper::FILE, OneVMHelper::IMAGE, TARGET] do
+    command :"disk-attach", disk_attach_desc, :vmid,
+            :options => [OneVMHelper::FILE, OneVMHelper::IMAGE,
+                         TARGET, CACHE] do
 
         if options[:file].nil? and options[:image].nil?
             STDERR.puts "Provide a template file or an image:"
@@ -448,29 +498,82 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             target = options[:target]
             if target
                 template =
-                    "DISK = [ IMAGE_ID = #{image_id}, TARGET = #{target} ]"
+                    "DISK = [ IMAGE_ID = #{image_id}, TARGET = #{target}"
             else
                 template =
-                    "DISK = [ IMAGE_ID = #{image_id}, DEV_PREFIX = sd ]"
+                    "DISK = [ IMAGE_ID = #{image_id}, DEV_PREFIX = sd"
             end
+
+            if options[:cache]
+                template<<", CACHE = \"#{options[:cache]}\""
+            end
+
+            template << " ]"
         end
 
         helper.perform_action(args[0],options,"Attach disk") do |vm|
-            vm.attachdisk(template)
+            vm.disk_attach(template)
         end
     end
 
-    detachdisk_desc = <<-EOT.unindent
+    disk_detach_desc = <<-EOT.unindent
         Detaches a disk from a running VM
 
         States: RUNNING
     EOT
 
-    command :detachdisk, detachdisk_desc, :vmid, :diskid do
+    command :"disk-detach", disk_detach_desc, :vmid, :diskid do
         diskid = args[1].to_i
 
         helper.perform_action(args[0],options,"Detach disk") do |vm|
-            vm.detachdisk(diskid)
+            vm.disk_detach(diskid)
+        end
+    end
+
+    nic_attach_desc = <<-EOT.unindent
+        Attaches a NIC to a running VM
+
+        States: RUNNING
+    EOT
+
+    command :"nic-attach", nic_attach_desc, :vmid,
+            :options => [OneVMHelper::FILE, OneVMHelper::NETWORK, IP] do
+
+        if options[:file].nil? and 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
+
+        if options[:file]
+            template = File.read(options[:file])
+        else
+            network_id = options[:network]
+            ip = options[:ip]
+            if ip
+                template = "NIC = [ NETWORK_ID = #{network_id}, IP = #{ip} ]"
+            else
+                template = "NIC = [ NETWORK_ID = #{network_id} ]"
+            end
+        end
+
+        helper.perform_action(args[0],options,"Attach NIC") do |vm|
+            vm.nic_attach(template)
+        end
+    end
+
+    nic_detach_desc = <<-EOT.unindent
+        Detaches a NIC from a running VM
+
+        States: RUNNING
+    EOT
+
+    command :"nic-detach", nic_detach_desc, :vmid, :nicid do
+        nicid = args[1].to_i
+
+        helper.perform_action(args[0],options,"Detach NIC") do |vm|
+            vm.nic_detach(nicid)
         end
     end
 
@@ -530,10 +633,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    list_desc = <<-EOT.unindent
-        Lists VMs in the pool
-    EOT
-
     rename_desc = <<-EOT.unindent
         Renames the VM
     EOT
@@ -544,6 +643,52 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    # TODO: Write a more complete description:
+    # what is a snapshot (system snapshot)
+    # how to revert to a snapshot
+    snapshot_create_desc = <<-EOT.unindent
+        Creates a new VM snapshot
+    EOT
+
+    command :"snapshot-create", snapshot_create_desc, [:range,:vmid_list],
+        [:name, nil], :options => [OneVMHelper::SCHEDULE] do
+
+        if (!options[:schedule].nil?)
+            helper.schedule_actions(args[0], options, @comm_name)
+        else
+            helper.perform_actions(args[0],options,"snapshot created") do |o|
+                o.snapshot_create(args[1])
+            end
+        end
+    end
+
+    # TODO: Write a more complete description:
+    snapshot_revert_desc = <<-EOT.unindent
+        Reverts a VM to a saved snapshot
+    EOT
+
+    command :"snapshot-revert", snapshot_revert_desc, :vmid, :snapshot_id do
+
+        helper.perform_action(args[0],options,"snapshot reverted") do |o|
+            o.snapshot_revert(args[1].to_i)
+        end
+    end
+
+    # TODO: Write a more complete description:
+    snapshot_delete_desc = <<-EOT.unindent
+        Delets a snapshot of a VM
+    EOT
+
+    command :"snapshot-delete", snapshot_delete_desc, :vmid, :snapshot_id do
+        helper.perform_action(args[0],options,"snapshot deleted") do |o|
+            o.snapshot_delete(args[1].to_i)
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists VMs in the pool
+    EOT
+
     command :list, list_desc, [:filterflag, nil],
             :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS+
             [OpenNebulaHelper::DESCRIBE] do
@@ -555,7 +700,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :vmid,
-            :options=>OpenNebulaHelper::XML do
+            :options=>[OpenNebulaHelper::XML, OneVMHelper::ALL_TEMPLATE] do
         helper.show_resource(args[0],options)
     end
 
@@ -567,4 +712,38 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do
         helper.list_pool(options, true, args[0])
     end
+
+    resize_desc = <<-EOT.unindent
+        Resizes the capacity of a Virtual Machine (offline, the VM cannot be
+        RUNNING)
+
+    EOT
+
+    command :resize, resize_desc, :vmid, :options =>
+            OpenNebulaHelper::CAPACITY_OPTIONS_VM + [ENFORCE, OneVMHelper::FILE] do
+
+        if options[:file]
+            template = File.read(options[:file])
+        else
+            template = ""
+
+            if !options[:cpu].nil?
+                template << "CPU = #{options[:cpu]}\n"
+            end
+
+            if !options[:vcpu].nil?
+                template << "VCPU = #{options[:vcpu]}\n"
+            end
+
+            if !options[:memory].nil?
+                template << "MEMORY = #{options[:memory]}\n"
+            end
+        end
+
+        enforce = options[:enforce] || false
+
+        helper.perform_action(args[0], options, "Resizing VM") do |vm|
+            vm.resize(template, enforce)
+        end
+    end
 end