opennebula-cli 3.9.80.beta → 3.9.90.rc

data/bin/oneuser

@@ -326,7 +326,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :key, key_desc, :options=>[KEY] do
-        require 'ssh_auth'
+        require 'opennebula/ssh_auth'
 
         options[:key] ||= ENV['HOME']+'/.ssh/id_rsa'
 

data/bin/onevm

@@ -204,7 +204,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    destroy_desc = <<-EOT.unindent
+    delete_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
@@ -214,17 +214,17 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: ANY
     EOT
 
-    command :destroy, destroy_desc, [:range, :vmid_list],
+    command :delete, delete_desc, [:range, :vmid_list],
         :options => [OneVMHelper::SCHEDULE, OneVMHelper::RECREATE] do
 
-        command_name="destroy"
+        command_name="delete"
         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)
+                vm.delete(options[:recreate]==true)
             end
         end
     end
@@ -268,7 +268,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         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 destroy')
+        'onevm delete')
 
         If '--live' is specified, the Image will be saved immediately.
 
@@ -319,20 +319,47 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    undeploy_desc = <<-EOT.unindent
+        Shuts down the given VM. The VM is saved in the system Datastore.
+
+        With --hard it unplugs the VM.
+
+        States: RUNNING
+    EOT
+
+    command :undeploy, undeploy_desc, [:range,:vmid_list],
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
+
+        command_name='undeploy'
+        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.undeploy(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 boot' command.
+        can be powered on with the 'onevm resume' command.
 
         States: RUNNING
     EOT
 
     command :poweroff, poweroff_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
+
+        command_name='poweroff'
+        command_name<<'-hard' if options[:hard]
+
         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
+                vm.poweroff(options[:hard]==true)
             end
         end
     end
@@ -405,7 +432,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     boot_desc = <<-EOT.unindent
         Boots the given VM.
 
-        States: UNKNOWN, BOOT, POWEROFF
+        States: UNKNOWN, BOOT
     EOT
 
     command :boot, boot_desc, [:range,:vmid_list],
@@ -460,7 +487,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     resume_desc = <<-EOT.unindent
         Resumes the execution of the a saved VM
 
-        States: STOPPED, SUSPENDED
+        States: STOPPED, SUSPENDED, UNDEPLOYED, POWEROFF
     EOT
 
     command :resume, resume_desc, [:range,:vmid_list],
@@ -746,4 +773,15 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             vm.resize(template, enforce)
         end
     end
+
+    # Deprecated commands
+
+    deprecated_command(:attachdisk, 'disk-attach')
+    deprecated_command(:detachdisk, 'disk-detach')
+    deprecated_command(:saveas, 'disk-snapshot')
+    deprecated_command(:livemigrate, 'migrate --live')
+    deprecated_command(:cancel, 'shutdown --hard')
+    deprecated_command(:reset, 'reboot --hard')
+    deprecated_command(:restart, 'boot')
+    deprecated_command(:resubmit, 'destroy --recreate')
 end

data/lib/cli_helper.rb

@@ -226,7 +226,7 @@ module CLIHelper
 
                         str
                     }.join(' ')
-                }.join("\n")
+                }.join("\n").gsub(/ *$/, '')
             rescue Errno::EPIPE
             end
 

data/lib/command_parser.rb

@@ -56,6 +56,7 @@ module CommandParser
         def initialize(args=[], &block)
             @available_options = Array.new
             @commands = Hash.new
+            @command_list = Array.new
             @formats = Hash.new
 
             @main = nil
@@ -288,6 +289,21 @@ module CommandParser
                 end
             }
             cmd[:proc] = block
+            @command_list << name.to_sym
+            @commands[name.to_sym] = cmd
+        end
+
+        def deprecated_command(name, new_command)
+            cmd = Hash.new
+            cmd[:desc] = "Deprecated, use #{new_command} instead"
+            cmd[:arity] = 0
+            cmd[:options] = []
+            cmd[:args_format] = [[:string, nil]] * 20
+            cmd[:deprecated] = new_command
+            cmd[:proc] = lambda do
+                print_deprecated(new_command)
+            end
+
             @commands[name.to_sym] = cmd
         end
 
@@ -418,6 +434,10 @@ module CommandParser
                 exit -1
             end
 
+            if comm[:deprecated]
+                print_deprecated(comm[:deprecated])
+            end
+
             extra_options = comm[:options] if comm
             parse(extra_options)
 
@@ -617,7 +637,9 @@ module CommandParser
             puts "## OPTIONS"
 
             shown_opts = Array.new
-            @commands.each do |key,value|
+            @command_list.each do |key|
+                value = @commands[key]
+
                 value[:options].flatten.each do |o|
                     if shown_opts.include?(o[:name])
                         next
@@ -659,11 +681,12 @@ module CommandParser
             else
                 puts "## COMMANDS"
 
-                @commands.each{ |key,value|
+                @command_list.each do |key|
+                    value = @commands[key]
                     printf cmd_format5, "* #{key} "
 
                     print_command(value)
-                }
+                end
             end
         end
 
@@ -713,6 +736,12 @@ module CommandParser
             }
         end
 
+        def print_deprecated(new_command)
+            puts "This command is deprecated, use instead:"
+            puts "  $ #{File.basename $0} #{new_command}"
+            exit(-1)
+        end
+
         def word_wrap(size, text, first_size=nil)
             output=[]
             line=""

data/lib/one_helper.rb

@@ -130,7 +130,9 @@ EOT
         {
             :name   => 'memory',
             :large  => '--memory memory',
-            :description => 'Memory ammount given to the VM',
+            :description => 'Memory amount given to the VM. By default the '<<
+                "unit is megabytes. To use gigabytes add a 'g', floats "<<
+                "can be used: 8g=8192, 0.5g=512",
             :format => String,
             :proc   => lambda do |o,options|
                 m=o.strip.match(/^(\d+(?:\.\d+)?)(m|mb|g|gb)?$/i)
@@ -608,6 +610,18 @@ EOT
         end
     end
 
+    def OpenNebulaHelper.short_period_to_str(time, print_seconds=true)
+        seconds=time.to_i
+        minutes, seconds=seconds.divmod(60)
+        hours, minutes=minutes.divmod(60)
+
+        if print_seconds
+            "%3dh%02dm%02ds" % [hours, minutes, seconds]
+        else
+            "%3dh%02dm" % [hours, minutes]
+        end
+    end
+
     BinarySufix = ["K", "M", "G", "T" ]
 
     def OpenNebulaHelper.unit_to_str(value, options, unit="K")
@@ -729,8 +743,8 @@ EOT
                 end
             end
 
-            if options[:net_context] && options[:network]
-                nets=options[:network].map {|n| parse_user_object(n).last }
+            if options[:net_context] && options[:nic]
+                nets=options[:nic].map {|n| parse_user_object(n).last }
 
                 if nets!=nets.uniq
                     STDERR.puts "Network context generation from command "<<
@@ -745,6 +759,9 @@ EOT
                     lines<<"ETH#{index}_MASK = \"$NETWORK[NETWORK_MASK, NETWORK=\\\"#{name}\\\"]\""
                     lines<<"ETH#{index}_GATEWAY = \"$NETWORK[GATEWAY, NETWORK=\\\"#{name}\\\"]\""
                     lines<<"ETH#{index}_DNS = \"$NETWORK[DNS, NETWORK=\\\"#{name}\\\"]\""
+                    lines<<"ETH#{index}_IPV6 = \"$NIC[IP6_GLOBAL, NETWORK=\\\"#{name}\\\"]\""
+                    lines<<"ETH#{index}_GATEWAY6 = \"$NETWORK[GATEWAY6, NETWORK=\\\"#{name}\\\"]\""
+                    lines<<"ETH#{index}_CONTEXT_FORCE_IPV4 = \"$NETWORK[CONTEXT_FORCE_IPV4, NETWORK=\\\"#{name}\\\"]\""
                 end
             end
 
@@ -789,8 +806,8 @@ EOT
             template<<res.last
         end
 
-        if options[:network]
-            res=create_disk_net(options[:network], 'NIC', 'NETWORK')
+        if options[:nic]
+            res=create_disk_net(options[:nic], 'NIC', 'NETWORK')
             return res if res.first!=0
 
             template<<res.last

data/lib/one_helper/oneacct_helper.rb

@@ -112,6 +112,10 @@ class AcctHelper < OpenNebulaHelper::OneHelper
             d["HOSTNAME"]
         end
 
+        column :"ACTION", "VM state change action", :left, :size=>16 do |d|
+            VirtualMachine.get_history_action d["ACTION"]
+        end
+
         column :REASON, "VM state change reason", :left, :size=>4 do |d|
             VirtualMachine.get_reason d["REASON"]
         end
@@ -142,7 +146,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
             OpenNebulaHelper.unit_to_str(d["VM"]["NET_TX"].to_i / 1024.0, {})
         end
 
-        default :VID, :HOSTNAME, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX
+        default :VID, :HOSTNAME, :ACTION, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX
     end
 
     def self.print_start_end_time_header(start_time, end_time)

data/lib/one_helper/onegroup_helper.rb

@@ -109,7 +109,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                         limit = "0" if limit.nil? || limit == ""
                     end
 
-                    "%4.0f / %4.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
+                    "%3.1f / %3.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
                 else
                     "-"
                 end

data/lib/one_helper/onehost_helper.rb

@@ -102,13 +102,19 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
             column :ALLOCATED_CPU, "Allocated CPU)", :size=>18 do |d|
                 max_cpu  = d["HOST_SHARE"]["MAX_CPU"].to_i
+                cpu_usage = d["HOST_SHARE"]["CPU_USAGE"].to_i
 
-                if max_cpu != 0
-                    cpu_usage = d["HOST_SHARE"]["CPU_USAGE"].to_i
-                    ratio    = (cpu_usage*100) / max_cpu
-                    "#{cpu_usage} / #{max_cpu} (#{ratio}%)"
-                else
+                if max_cpu == 0 && cpu_usage == 0
                     '-'
+                else
+                    cpu_usage = d["HOST_SHARE"]["CPU_USAGE"].to_i
+
+                    if max_cpu != 0
+                        ratio    = (cpu_usage*100) / max_cpu
+                        "#{cpu_usage} / #{max_cpu} (#{ratio}%)"
+                    else
+                        "#{cpu_usage} / -"
+                    end                    
                 end
             end
 
@@ -126,13 +132,17 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
             column :ALLOCATED_MEM, "Allocated MEM", :size=>18 do |d|
                 max_mem  = d["HOST_SHARE"]["MAX_MEM"].to_i
+                mem_usage = d["HOST_SHARE"]["MEM_USAGE"].to_i
 
-                if max_mem != 0
-                    mem_usage = d["HOST_SHARE"]["MEM_USAGE"].to_i
-                    ratio    = (mem_usage*100) / max_mem
-                    "#{OpenNebulaHelper.unit_to_str(mem_usage,options)} / #{OpenNebulaHelper.unit_to_str(max_mem,options)} (#{ratio}%)"
-                else
+                if max_mem == 0 && mem_usage == 0
                     '-'
+                else
+                    if max_mem != 0
+                        ratio    = (mem_usage*100) / max_mem
+                        "#{OpenNebulaHelper.unit_to_str(mem_usage,options)} / #{OpenNebulaHelper.unit_to_str(max_mem,options)} (#{ratio}%)"
+                    else
+                        "#{OpenNebulaHelper.unit_to_str(mem_usage,options)} / -"
+                    end
                 end
             end
 

data/lib/one_helper/oneuser_helper.rb

@@ -209,7 +209,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                         limit = "0" if limit.nil? || limit == ""
                     end
 
-                    "%4.0f / %4.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
+                    "%3.1f / %3.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
                 else
                     "-"
                 end

data/lib/one_helper/onevm_helper.rb

@@ -247,7 +247,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         puts str % ["RESCHED", OpenNebulaHelper.boolean_to_str(vm['RESCHED'])]
         puts str % ["HOST",
             vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']] if
-                %w{ACTIVE SUSPENDED}.include? vm.state_str
+                %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
         puts str % ["START TIME",
             OpenNebulaHelper.time_to_str(vm['/VM/STIME'])]
         puts str % ["END TIME",
@@ -531,15 +531,19 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
     def format_history(vm)
         table=CLIHelper::ShowTable.new(nil, self) do
-            column :SEQ, "Sequence number", :size=>4 do |d|
+            column :SEQ, "Sequence number", :size=>3 do |d|
                 d["SEQ"]
             end
 
-            column :HOST, "Host name of the VM container", :left, :size=>20 do |d|
+            column :HOST, "Host name of the VM container", :left, :size=>15 do |d|
                 d["HOSTNAME"]
             end
 
-            column :REASON, "VM state change reason", :left, :size=>6 do |d|
+            column :"ACTION", "VM state change action", :left, :size=>16 do |d|
+                VirtualMachine.get_history_action d["ACTION"]
+            end
+
+            column :REASON, "VM state change reason", :left, :size=>4 do |d|
                 VirtualMachine.get_reason d["REASON"]
             end
 
@@ -547,14 +551,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.time_to_str(d['STIME'])
             end
 
-            column :TIME, "Total time in this state", :size=>15 do |d|
+            column :TIME, "Total time in this state", :size=>11 do |d|
                 stime = d["STIME"].to_i
                 etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i
                 dtime = etime-stime
-                OpenNebulaHelper.period_to_str(dtime)
+                OpenNebulaHelper.period_to_str(dtime, false)
             end
 
-            column :PROLOG_TIME, "Prolog time for this state", :size=>15 do |d|
+            column :PROLOG, "Prolog time for this state", :size=>10 do |d|
                 stime = d["PSTIME"].to_i
                 if d["PSTIME"]=="0"
                     etime=0
@@ -562,10 +566,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     etime = d["PETIME"]=="0" ? Time.now.to_i: d["PETIME"].to_i
                 end
                 dtime = etime-stime
-                OpenNebulaHelper.period_to_str(dtime)
+                OpenNebulaHelper.short_period_to_str(dtime)
             end
 
-            default :SEQ, :HOST, :REASON, :START, :TIME, :PROLOG_TIME
+            default :SEQ, :HOST, :ACTION, :REASON, :START, :TIME, :PROLOG
         end
 
         vm_hash=vm.to_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 3.9.80.beta
+  version: 3.9.90.rc
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.80.beta
+        version: 3.9.90.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.80.beta
+        version: 3.9.90.rc
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -95,6 +95,6 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: OpenNebula Client API
+summary: OpenNebula Command Line Interface
 test_files: []
 has_rdoc: