opennebula-cli 4.12.1 → 4.13.80.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85791ed3b8e69832d513f7f06e54be33c92f8c4e
-  data.tar.gz: e8eec994719e9fc7d757a716e90dc907c1bd930a
+  metadata.gz: d11d3a159c5097cd0867e860e3830a6caf5847b9
+  data.tar.gz: 096c01365fc81804718fe90037c31d4fdbbe76cb
 SHA512:
-  metadata.gz: 94de716f262f4290a33b0629d8fb700471cc424fc941d5b02cbf73a37a63ce95789fc58b284580f77d801e8c2a64bb1349391788652c1581a15c5edbc6b57133
-  data.tar.gz: 907315b3d285a1ecb3630fb1635e76a745a1f52d0b750670c246cf6364ed370cd1f18a9d1b84236582c27c64996bcaaf6628e6bbbf7e207046ab1e8d8d09fdc1
+  metadata.gz: 93738a9b287d2bf42334703b3de47516b2c9f2dcc77212bd98548f08e624bd125a7f399c314f9d68ed01cce0e29ccf96d47ecffc7eef0b698e0a2d2f670662d0
+  data.tar.gz: e15e685a4061d48d2e81b1baa99edd11ee22665dc49f3f0db42283d229a73d05e18595a21bc047bf153c9d6916231581cc75310aaaff76a98ce9e1b3c88daf9c

data/NOTICE

@@ -1,6 +1,6 @@
 OpenNebula Open Source Project
 --------------------------------------------------------------------------------
-Copyright 2002-2014, OpenNebula Project, OpenNebula Systems (formerly C12G Labs)
+Copyright 2002-2015, OpenNebula Project, OpenNebula Systems (formerly C12G Labs)
 --------------------------------------------------------------------------------
 
 You can find  more information about the project, release notes and
@@ -21,11 +21,6 @@ The following people have contributed to the development of the technology
 - Daniel Molina Aranda (dmolina@opennebula.org)
 - Hector Sanjuan Redondo (hsanjuan@opennebula.org)
 
-The new features for service elasticity (oneFlow) introduced in OpenNebula 4.2
-were funded by BlackBerry in the context of the Fund a Feature Program.
-
-OpenNebula Project also acknowledges the contributions of C12G Labs developers.
-
 LICENSE
 
 OpenNebula is licensed under the Apache License, Version 2.0 (the

data/bin/oneacl

@@ -33,7 +33,7 @@ require 'one_helper/oneacl_helper'
 cmd = CommandParser::CmdParser.new(ARGV) do
     usage "`oneacl` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
-    
+
     helper = OneAclHelper.new
 
     before_proc do

data/bin/oneflow

@@ -282,7 +282,7 @@ def show_service(client, args, options)
 
                             column :'EVALS', "", :right, :size=>5 do |d|
                                 if d['period_number']
-                                    "#{d['true_evals'].to_i} / #{d['period_number']}"
+                                    "#{d['true_evals'].to_i}/#{d['period_number']}"
                                 else
                                     "-"
                                 end

data/bin/onehost

@@ -239,4 +239,17 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             o.rename(args[1])
         end
     end
+
+    importvm_desc = <<-EOT.unindent
+        Import VM to OpenNebula
+    EOT
+
+    command :importvm, importvm_desc, :hostid, :name do
+        helper.perform_action(args[0], options, "imported") do |o|
+            rc = o.info
+            next rc if OpenNebula.is_error?(rc)
+
+            o.import_wild(args[1])
+        end
+    end
 end

data/bin/oneimage

@@ -97,7 +97,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
             oneimage create -d default centOS.tmpl
 
-          - new image "arch" using a path of type centOS:
+          - new image "arch" using a path:
 
             oneimage create -d default --name arch --path /tmp/arch.img
 
@@ -301,6 +301,36 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    snapshot_delete_desc = <<-EOT.unindent
+        Deletes a snapshot from the image
+    EOT
+
+    command :"snapshot-delete", snapshot_delete_desc, :imageid, :snapshot_id do
+        helper.perform_action(args[0], options, "snapshot deleted") do |o|
+            o.snapshot_delete(args[1].to_i)
+        end
+    end
+
+    snapshot_revert_desc = <<-EOT.unindent
+        Reverts image state to a snapshot
+    EOT
+
+    command :"snapshot-revert", snapshot_revert_desc, :imageid, :snapshot_id do
+        helper.perform_action(args[0], options, "image state reverted") do |o|
+            o.snapshot_revert(args[1].to_i)
+        end
+    end
+
+    snapshot_flatten_desc = <<-EOT.unindent
+        Flattens the snapshot and removes all other snapshots in the image
+    EOT
+
+    command :"snapshot-flatten", snapshot_flatten_desc, :imageid, :snapshot_id do
+        helper.perform_action(args[0], options, "snapshot flattened") do |o|
+            o.snapshot_flatten(args[1].to_i)
+        end
+    end
+
     list_desc = <<-EOT.unindent
         Lists Images in the pool
     EOT

data/bin/onevcenter

@@ -216,84 +216,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     vms_desc = <<-EOT.unindent
-        Import vCenter running Virtual Machines into OpenNebula
+        Deprecated action in onevcenter, please use onehost importvm instead
     EOT
 
     command :vms, vms_desc, :options=>[ VCENTER, USER, PASS ] do
-        if  options[:vuser].nil? ||
-            options[:vpass].nil? ||
-            options[:vcenter].nil?
-            STDERR.puts "vCenter connection parameters are mandatory to import"\
-                        " VM templates:\n"\
-                        "\t --vcenter vCenter hostname\n"\
-                        "\t --vuser username to login in vcenter\n"\
-                        "\t --vpass password for the user"
-            exit -1
-        end
-
-        begin
-            STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
-
-            vc = VCenterDriver::VIClient.new_connection(
-                    :user     => options[:vuser],
-                    :password => options[:vpass],
-                    :host     => options[:vcenter])
-
-            STDOUT.print "done!\n\n"
-
-            STDOUT.print "Looking for running Virtual Machines..."
-
-            rs = vc.running_vms
-
-            STDOUT.print "done!\n"
-
-            rs.each {|dc, tmps|
-                STDOUT.print "\nDo you want to process datacenter #{dc} [y/n]? "
+        STDERR.puts "Deprecated action in onevcenter, please use onehost "\
+                    "importvm instead"
 
-                next if STDIN.gets.strip.downcase != 'y'
-
-                if tmps.empty?
-                    STDOUT.print "    No new running Virtual Machines found in"\
-                                 " #{dc}...\n\n"
-                    next
-                end
-
-                tmps.each{ |v|
-                    STDOUT.print "\n  * Running Virtual Machine found:\n"\
-                                 "      - Name   : #{v[:name]}\n"\
-                                 "      - UUID   : #{v[:uuid]}\n"\
-                                 "      - Cluster: #{v[:host]}\n"\
-                                 "    Import this Virtual Machine [y/n]? "
-
-                    next if STDIN.gets.strip.downcase != 'y'
-
-                    one_v = ::OpenNebula::VirtualMachine.new(
-                                ::OpenNebula::VirtualMachine.build_xml, vc.one)
-
-                    rc = one_v.allocate(v[:one])
-
-                    if ::OpenNebula.is_error?(rc)
-                        STDOUT.puts "    Error creating Virtual Machine: "\
-                                    "#{rc.message}\n"
-                    end
-
-                    rc = one_v.deploy v[:host_id]
-
-                    if ::OpenNebula.is_error?(rc)
-                        STDOUT.puts "    Error creating Virtual Machine: "\
-                                    "#{rc.message}\n"
-                    else
-                        STDOUT.puts "    OpenNebula VM #{one_v.id} "\
-                                    "created!\n"
-                    end
-                }
-            }
-        rescue Exception => e
-            STDOUT.puts "error: #{e.message}"
-            exit -1
-        end
-
-        exit 0
+        exit -1
     end
 
     network_desc = <<-EOT.unindent
@@ -418,14 +348,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                                 ::OpenNebula::Template.build_xml, vc.one)
 
                     vnet_template =  n[:one] + ar_str
-                    
+
                     rc = one_vn.allocate(vnet_template)
 
                     if ::OpenNebula.is_error?(rc)
                         STDOUT.puts "    Error creating virtual network: " +
                                     " #{rc.message}\n"
                     else
-                        STDOUT.puts "    OpenNebula virtual network " + 
+                        STDOUT.puts "    OpenNebula virtual network " +
                                     "#{one_vn.id} created with size #{size}!\n"
                     end
                 }

data/bin/onevm

@@ -56,6 +56,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Device where the image will be attached"
     }
 
+    PREFIX={
+        :name => "prefix",
+        :large => "--prefix prefix",
+        :format => String,
+        :description => "Overrides the DEV_PREFIX of the image"
+    }
+
     IP={
         :name => "ip",
         :short => "-i ip",
@@ -72,6 +79,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             " writeback, directsync or unsafe. (Only KVM driver)"
     }
 
+    DISCARD={
+        :name => "discard",
+        :large => "--discard discard_mode",
+        :format => String,
+        :description => "Hypervisor discard mode: ignore or unmap."<<
+            " (Only KVM driver)"
+    }
+
     ENFORCE={
         :name  => "enforce",
         :short => "-e",
@@ -91,11 +106,25 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Recover a VM by failing the pending action"
     }
 
-    CLONETEMPLATE={
-        :name => "clonetemplate",
-        :short => "-c",
-        :large => "--clonetemplate",
-        :description => "Clone original VM Template and replace disk with saved one"
+    RETRY={
+        :name  => "retry",
+        :large => "--retry",
+        :description => "Recover a VM by retrying the last failed action"
+    }
+
+    INTERACTIVE={
+        :name  => "interactive",
+        :large => "--interactive",
+        :description => "Enables interactive recovery. Only works alongside "<<
+            " the --retry option."
+    }
+
+    SNAP={
+        :name  => "snapshot",
+        :short => "-s snapshot",
+        :large => "--snapshot snapshot",
+        :format => String,
+        :description => "ID of the Snapshot to save."
     }
 
     ########################################################################
@@ -292,29 +321,36 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    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')
-
-        If '--live' is specified, the Image will be saved immediately.
+    disk_saveas_desc = <<-EOT.unindent
+        Saves the specified VM disk as a new Image. The Image is
+        created immediately, and the contents of the VM disk will be saved to
+        it.
 
         States: ANY
     EOT
 
-    command :"disk-snapshot", disk_snapshot_desc, :vmid, :diskid, :img_name,
-            :options=>[TYPE, OneVMHelper::LIVE, CLONETEMPLATE] do
-        disk_id    = args[1].to_i
-        image_name = args[2]
-        image_type = options[:type] || ""
+    command :"disk-saveas", disk_saveas_desc, :vmid, :diskid, :img_name,
+            :options=>[TYPE, SNAP] do
 
-        verbose = "disk #{disk_id} prepared to be saved in " <<
-                  "the image #{image_name}"
+        disk_id     = args[1].to_i
+        image_name  = args[2]
+        image_type  = options[:type] || ""
+        snapshot_id = options[:snapshot]
+
+        if snapshot_id.nil? || snapshot_id.empty?
+            snapshot_id = -1
+
+            verbose = "disk #{disk_id} prepared to be saved in " <<
+                      "the image #{image_name}"
+        else
+            snapshot_id = snapshot_id.to_i
+
+            verbose = "disk #{disk_id} snapshot #{snapshot_id} prepared to " <<
+                      "be saved in the image #{image_name}"
+        end
 
         helper.perform_action(args[0],options,verbose) do |vm|
-            res = vm.disk_snapshot(disk_id, image_name, image_type,
-                options[:live]==true, options[:clonetemplate]==true)
+            res = vm.disk_saveas(disk_id, image_name, image_type, snapshot_id)
 
             if !OpenNebula.is_error?(res)
                 puts "Image ID: #{res}"
@@ -421,7 +457,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         deployment, in a standard installation the Scheduler is in charge
         of this decision
 
-        States: PENDING
+        States: PENDING, HOLD, STOPPED, UNDEPLOYED
     EOT
 
     command :deploy, deploy_desc, [:range,:vmid_list], :hostid, [:datastoreid,nil],
@@ -444,32 +480,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: RUNNING
     EOT
 
-    command :migrate, migrate_desc, [:range,:vmid_list], :hostid,
+    command :migrate, migrate_desc, [:range,:vmid_list], :hostid, [:datastoreid,nil],
             :options=>[ENFORCE, OneVMHelper::LIVE] do
         host_id = args[1]
         verbose = "migrating to #{host_id}"
 
+        ds_id = args[2].nil? ? -1 : args[2]
+
         helper.perform_actions(args[0],options,verbose) do |vm|
             vm.migrate( host_id,
                         options[:live]==true,
-                        options[:enforce]==true)
-        end
-    end
-
-    boot_desc = <<-EOT.unindent
-        Boots the given VM.
-
-        States: UNKNOWN, BOOT
-    EOT
-
-    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
+                        options[:enforce]==true,
+                        ds_id)
         end
     end
 
@@ -514,7 +536,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     resume_desc = <<-EOT.unindent
         Resumes the execution of the a saved VM
 
-        States: STOPPED, SUSPENDED, UNDEPLOYED, POWEROFF
+        States: STOPPED, SUSPENDED, UNDEPLOYED, POWEROFF, UNKNOWN
     EOT
 
     command :resume, resume_desc, [:range,:vmid_list],
@@ -530,32 +552,40 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     recover_desc = <<-EOT.unindent
         Recovers a stuck VM that is waiting for a driver operation. The recovery
-        may be done by failing or succeeding the pending operation. YOU NEED
+        may be done by failing, succeeding or retrying the current operation. YOU NEED
         TO MANUALLY CHECK THE VM STATUS ON THE HOST, to decide if the operation
-        was successful or not.
+        was successful or not, or if it can be retried.
 
         Example: A VM is stuck in "migrate" because of a hardware failure. You
         need to check if the VM is running in the new host or not to recover
         the vm with --success or --failure, respectively.
 
-        States: Any ACTIVE state.
+        States for success/failure recovers: Any ACTIVE state.
+        States for a retry recover: Any *FAILURE state
     EOT
 
     command :recover, recover_desc, [:range,:vmid_list],
-        :options => [SUCCESS, FAILURE] do
+        :options => [SUCCESS, FAILURE, RETRY, INTERACTIVE] do
         if !options[:success].nil?
-            result = true
+            result = 1
         elsif !options[:failure].nil?
-            result = false
+            result = 0
+        elsif !options[:retry].nil?
+            result = 2
         else
             STDERR.puts "Need to specify the result of the pending action."
             STDERR.puts "\t--success recover the VM by succeeding the missing action."
             STDERR.puts "\t--failure recover the VM by failing the missing action."
+            STDERR.puts "\t--retry recover the VM by retrying the last failed action."
             exit -1
         end
 
         helper.perform_actions(args[0], options, "recovering") do |vm|
-            vm.recover(result)
+            if options[:retry] && options[:interactive]
+                helper.recover_retry_interactive(vm)
+            else
+                vm.recover(result)
+            end
         end
     end
 
@@ -563,12 +593,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Attaches a disk to a running VM. When using --file add only one
         DISK instance.
 
-        States: RUNNING
+        States: RUNNING, POWEROFF
     EOT
 
     command :"disk-attach", disk_attach_desc, :vmid,
             :options => [OneVMHelper::FILE, OneVMHelper::IMAGE,
-                         TARGET, CACHE] do
+                         TARGET, CACHE, DISCARD, PREFIX] do
 
         if options[:file].nil? and options[:image].nil?
             STDERR.puts "Provide a template file or an image:"
@@ -581,19 +611,25 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             template = File.read(options[:file])
         else
             image_id = options[:image]
-            target = options[:target]
+            target   = options[:target]
+            prefix   = options[:prefix] || "sd"
+
             if target
                 template =
                     "DISK = [ IMAGE_ID = #{image_id}, TARGET = #{target}"
             else
-                template =
-                    "DISK = [ IMAGE_ID = #{image_id}, DEV_PREFIX = sd"
+                template = "DISK = [ IMAGE_ID = #{image_id}"
+                template << ", DEV_PREFIX = #{prefix}"
             end
 
             if options[:cache]
                 template<<", CACHE = \"#{options[:cache]}\""
             end
 
+            if options[:discard]
+                template<<", DISCARD = \"#{options[:discard]}\""
+            end
+
             template << " ]"
         end
 
@@ -605,7 +641,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     disk_detach_desc = <<-EOT.unindent
         Detaches a disk from a running VM
 
-        States: RUNNING
+        States: RUNNING, POWEROFF
     EOT
 
     command :"disk-detach", disk_detach_desc, :vmid, :diskid do
@@ -620,7 +656,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Attaches a NIC to a running VM. When using --file add only one
         NIC instance.
 
-        States: RUNNING
+        States: RUNNING, POWEROFF
     EOT
 
     command :"nic-attach", nic_attach_desc, :vmid,
@@ -653,7 +689,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     nic_detach_desc = <<-EOT.unindent
         Detaches a NIC from a running VM
 
-        States: RUNNING
+        States: RUNNING, POWEROFF
     EOT
 
     command :"nic-detach", nic_detach_desc, :vmid, :nicid do
@@ -772,6 +808,45 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    disk_snapshot_create_desc = <<-EOT.unindent
+        Takes a new snapshot of the given disk. This operation needs support
+        from the Datastore drivers: QCOW2 or Ceph.
+
+        States: POWEROFF
+    EOT
+
+    command :"disk-snapshot-create", disk_snapshot_create_desc,
+      :vmid, :diskid, :name do
+        helper.perform_action(args[0],options,"disk snapshot created") do |o|
+          o.disk_snapshot_create(args[1].to_i, args[2])
+        end
+    end
+
+    disk_snapshot_revert_desc = <<-EOT.unindent
+        Reverts disk state to a previously taken snapshot.
+
+        States: POWEROFF
+    EOT
+
+    command :"disk-snapshot-revert", disk_snapshot_revert_desc,
+      :vmid, :diskid, :snapshot_id do
+        helper.perform_action(args[0],options,"disk snapshot reverted") do |o|
+          o.disk_snapshot_revert(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    disk_snapshot_delete_desc = <<-EOT.unindent
+        Deletes a disk snapshot.
+
+        States: POWEROFF
+    EOT
+    command :"disk-snapshot-delete", disk_snapshot_delete_desc,
+      :vmid, :diskid, :snapshot_id do
+        helper.perform_action(args[0],options,"disk snapshot deleted") do |o|
+          o.disk_snapshot_delete(args[1].to_i, args[2].to_i)
+        end
+    end
+
     list_desc = <<-EOT.unindent
         Lists VMs in the pool
     EOT
@@ -834,14 +909,34 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    save_desc = <<-EOT.unindent
+        Clones the VM's source Template, replacing the disks with live snapshots
+        of the current disks. The VM capacity and NICs are also preserved
+
+        States: POWEROFF
+    EOT
+
+    command :save, save_desc, :vmid, :name do
+        helper.perform_action(args[0],options,"Saving VM") do |vm|
+            res = vm.save_as_template(args[1])
+
+            if !OpenNebula.is_error?(res)
+                puts "Template ID: #{res}"
+            end
+
+            res
+        end
+    end
+
     # Deprecated commands
 
     deprecated_command(:attachdisk, 'disk-attach')
     deprecated_command(:detachdisk, 'disk-detach')
-    deprecated_command(:saveas, 'disk-snapshot')
+    deprecated_command(:'disk-snapshot', 'disk-saveas')
     deprecated_command(:livemigrate, 'migrate --live')
     deprecated_command(:cancel, 'shutdown --hard')
     deprecated_command(:reset, 'reboot --hard')
-    deprecated_command(:restart, 'boot')
+    deprecated_command(:restart, 'recover --retry')
+    deprecated_command(:boot, 'recover --retry')
     deprecated_command(:resubmit, 'delete --recreate')
 end