opennebula-cli 3.8.0 → 3.9.0.beta

data/lib/cli_helper.rb

@@ -31,13 +31,14 @@ module CLIHelper
     #    :description => "Order by these columns, column starting with - means decreasing order"
     #}
     #
-    #FILTER = {
-    #    :name  => "filter",
-    #    :short => "-f x,y,z",
-    #    :large => "--filter x,y,z",
-    #    :format => Array,
-    #    :description => "Filter data. An array is specified with column=value pairs."
-    #}
+    FILTER = {
+        :name  => "filter",
+        :short => "-f x,y,z",
+        :large => "--filter x,y,z",
+        :format => Array,
+        :description => "Filter data. An array is specified with\n"<<
+                        " "*31<<"column=value pairs."
+    }
     #
     #HEADER = {
     #    :name  => "header",
@@ -55,7 +56,7 @@ module CLIHelper
     }
 
     #OPTIONS = [LIST, ORDER, FILTER, HEADER, DELAY]
-    OPTIONS = [LIST, DELAY]
+    OPTIONS = [LIST, DELAY, FILTER]
 
     # Sets bold font
     def CLIHelper.scr_bold
@@ -287,7 +288,47 @@ module CLIHelper
             }.compact.join(' ')
         end
 
-        # TBD def filter_data!
+        def filter_data!(data, filter)
+            # TBD: add more operators
+            # operators=/(==|=|!=|<|<=|>|>=)/
+            operators=/(=)/
+
+            stems=filter.map do |s|
+                m=s.match(/^(.*?)#{operators}(.*?)$/)
+                if m
+                    left, operator, right=m[1..3]
+                    index=@default_columns.index(left.to_sym)
+
+                    if index
+                        {
+                            :left       => left,
+                            :operator   => operator,
+                            :right      => right,
+                            :index      => index
+                        }
+                    else
+                        STDERR.puts "Column '#{left}' not found"
+                        exit(-1)
+                    end
+                else
+                    STDERR.puts "Expresion '#{s}' incorrect"
+                    exit(-1)
+                end
+            end
+
+            data.reject! do |d|
+                pass=true
+
+                stems.each do |s|
+                    if d[s[:index]]!=s[:right]
+                        pass=false
+                        break
+                    end
+                end
+
+                !pass
+            end
+        end
 
         # TBD def sort_data!
     end

data/lib/command_parser.rb

@@ -65,6 +65,9 @@ module CommandParser
             @args = args
             @options = Hash.new
 
+            @before_proc=nil
+            @comm_name=nil
+
             define_default_formats
 
             instance_eval(&block)
@@ -97,6 +100,12 @@ module CommandParser
             @name = str
         end
 
+        # Defines a proc to be called before any command
+        # @param [Proc] block
+        def before_proc(&block)
+            @before_proc = block
+        end
+
         # Defines a block that will be used to parse the arguments
         # of the command. Formats defined using this method con be used
         # in the arguments section of the command method, when defining a new
@@ -399,7 +408,7 @@ module CommandParser
                 comm      = @main
             elsif
                 if @args[0] && !@args[0].match(/^-/)
-                    comm_name = @args.shift.to_sym
+                    @comm_name = comm_name = @args.shift.to_sym
                     comm      = @commands[comm_name]
                 end
             end
@@ -413,6 +422,8 @@ module CommandParser
             parse(extra_options)
 
             if comm
+                @before_proc.call if @before_proc
+
                 check_args!(comm_name, comm[:arity], comm[:args_format])
 
                 rc = comm[:proc].call
@@ -428,9 +439,12 @@ module CommandParser
         private
 
         def parse(extra_options)
+            with_proc=Array.new
+
             @cmdparse=OptionParser.new do |opts|
                 merge = @available_options
                 merge = @available_options + extra_options if extra_options
+
                 merge.flatten.each do |e|
                     args = []
                     args << e[:short] if e[:short]
@@ -440,16 +454,8 @@ module CommandParser
 
                     opts.on(*args) do |o|
                         if e[:proc]
-                            rc = e[:proc].call(o, @options)
-                            if rc.instance_of?(Array)
-                                if rc[0] == 0
-                                    options[e[:name].to_sym] = rc[1]
-                                else
-                                    puts rc[1]
-                                    puts "option #{e[:name]}: Parsing error"
-                                    exit -1
-                                end
-                            end
+                            @options[e[:name].to_sym]=o
+                            with_proc<<e
                         elsif e[:name]=="help"
                             print_help
                             exit
@@ -469,6 +475,19 @@ module CommandParser
                 puts e.message
                 exit -1
             end
+
+            with_proc.each do |e|
+                rc = e[:proc].call(@options[e[:name].to_sym], @options)
+                if rc.instance_of?(Array)
+                    if rc[0] == 0
+                        @options[e[:name].to_sym] = rc[1]
+                    else
+                        puts rc[1]
+                        puts "option #{e[:name]}: Parsing error"
+                        exit -1
+                    end
+                end
+            end
         end
 
         def check_args!(name, arity, args_format)
@@ -479,15 +498,9 @@ module CommandParser
                 else
                     puts "one parameter to run"
                 end
-                puts
-                puts "Usage:"
 
-                if @main
-                    print "    #{@usage}\n"
-                else
-                    print "    #{name} "
-                    print_command(@commands[name])
-                end
+                print_command_help(name)
+
                 exit -1
             else
                 id=0
@@ -550,6 +563,14 @@ module CommandParser
         ########################################################################
 
         def print_help
+            if @comm_name
+                print_command_help(@comm_name)
+            else
+                print_all_commands_help
+            end
+        end
+
+        def print_all_commands_help
             if @usage
                 puts "## SYNOPSIS"
                 puts
@@ -570,37 +591,58 @@ module CommandParser
             end
         end
 
+        def print_command_help(name)
+            command=@commands[name]
+
+            if !command
+                STDERR.puts "Command '#{name}' not found"
+                return print_all_commands_help
+            end
+
+            puts "## USAGE"
+            print "#{name} "
+            print_command(@commands[name])
+
+            puts "## OPTIONS"
+            command[:options].flatten.each do |o|
+                print_option(o)
+            end
+
+            @available_options.each do |o|
+                print_option o
+            end
+        end
 
         def print_options
             puts "## OPTIONS"
 
             shown_opts = Array.new
-            opt_format = "#{' '*5}%-25s %s"
-            @commands.each{ |key,value|
-                value[:options].flatten.each { |o|
+            @commands.each do |key,value|
+                value[:options].flatten.each do |o|
                     if shown_opts.include?(o[:name])
                         next
                     else
                         shown_opts << o[:name]
 
-                        str = ""
-                        str << o[:short].split(' ').first << ', ' if o[:short]
-                        str << o[:large]
-
-                        printf opt_format, str, o[:description]
-                        puts
+                        print_option(o)
                     end
-                }
-            }
+                end
+            end
 
-            @available_options.each{ |o|
-                str = ""
-                str << o[:short].split(' ').first << ', ' if o[:short]
-                str << o[:large]
+            @available_options.each do |o|
+                print_option o
+            end
+        end
 
-                printf opt_format, str, o[:description]
-                puts
-            }
+        def print_option(o)
+            opt_format = "#{' '*5}%-25s %s"
+
+            str = ""
+            str << o[:short].split(' ').first << ', ' if o[:short]
+            str << o[:large]
+
+            printf opt_format, str, o[:description]
+            puts
         end
 
         def print_commands

data/lib/one_helper/oneacct_helper.rb

@@ -33,10 +33,10 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :format => String # TODO Time
     }
 
-    USER = {
-        :name   => "user",
+    USERFILTER = {
+        :name   => "userfilter",
         :short  => "-u user",
-        :large  => "--user user" ,
+        :large  => "--userfilter user" ,
         :description => "User name or id to filter the results",
         :format => String,
         :proc => lambda { |o, options|
@@ -95,7 +95,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :description => "Split the output in a table for each VM"
     }
 
-    ACCT_OPTIONS = [START_TIME, END_TIME, USER, GROUP, HOST, XPATH, XML, JSON, SPLIT]
+    ACCT_OPTIONS = [START_TIME, END_TIME, USERFILTER, GROUP, HOST, XPATH, XML, JSON, SPLIT]
 
 
     ACCT_TABLE = CLIHelper::ShowTable.new("oneacct.yaml", nil) do

data/lib/one_helper/onedatastore_helper.rb

@@ -60,7 +60,12 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            column :TYPE, "Datastore driver", :left, :size=>8 do |d|
+            column :TYPE, "Datastore type", :left, :size=>4 do |d|
+                type = Datastore::DATASTORE_TYPES[d["TYPE"].to_i]
+                Datastore::SHORT_DATASTORE_TYPES[type]
+            end
+
+            column :DS, "Datastore driver", :left, :size=>8 do |d|
                 d["DS_MAD"]
             end
 
@@ -68,7 +73,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
                 d["TM_MAD"]
             end
 
-            default :ID, :NAME, :CLUSTER, :IMAGES, :TYPE, :TM
+            default :ID, :NAME, :CLUSTER, :IMAGES, :TYPE, :DS, :TM
         end
 
         table
@@ -101,6 +106,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         puts str % ["GROUP",    datastore['GNAME']]
         puts str % ["CLUSTER",  OpenNebulaHelper.cluster_str(datastore['CLUSTER'])]
 
+        puts str % ["TYPE",     datastore.type_str]
         puts str % ["DS_MAD",   datastore['DS_MAD']]
         puts str % ["TM_MAD",   datastore['TM_MAD']]
         puts str % ["BASE PATH",datastore['BASE_PATH']]

data/lib/one_helper/onegroup_helper.rb

@@ -48,6 +48,13 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
+        system = System.new(@client)
+        default_quotas = system.get_group_quotas()
+
+        if OpenNebula::is_error?(default_quotas)
+            raise "Error retrieving the default group quotas: #{default_quotas.message}"
+        end
+
         table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, "ONE identifier for the Group", :size=>4 do |d|
                 d["ID"]
@@ -67,7 +74,14 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
             column :VMS , "Number of VMS", :size=>9 do |d|             
                 if d.has_key?('VM_QUOTA') and d['VM_QUOTA'].has_key?('VM')
-                    "%3d / %3d" % [d['VM_QUOTA']['VM']["VMS_USED"], d['VM_QUOTA']['VM']["VMS"]]
+                    limit = d['VM_QUOTA']['VM']["VMS"]
+
+                    if limit == "-1"
+                        limit = default_quotas['VM_QUOTA/VM/VMS']
+                        limit = "0" if limit.nil? || limit == ""
+                    end
+
+                    "%3d / %3d" % [d['VM_QUOTA']['VM']["VMS_USED"], limit]
                 else
                     "-"
                 end
@@ -75,8 +89,16 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
             column :MEMORY, "Total memory allocated to user VMs", :size=>17 do |d|
                 if d.has_key?('VM_QUOTA') and d['VM_QUOTA'].has_key?('VM')
+                    limit = d['VM_QUOTA']['VM']["MEMORY"]
+
+                    if limit == "-1"
+                        limit = default_quotas['VM_QUOTA/VM/MEMORY']
+                        limit = "0" if limit.nil? || limit == ""
+                    end
+
+                    d['VM_QUOTA']['VM']['MEMORY_USED']
                     "%7s / %7s" % [OpenNebulaHelper.unit_to_str(d['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M"),
-                    OpenNebulaHelper.unit_to_str(d['VM_QUOTA']['VM']["MEMORY"].to_i,{},"M")]
+                    OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")]
                 else
                     "-"
                 end
@@ -84,7 +106,14 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
             column :CPU, "Total CPU allocated to user VMs", :size=>11 do |d|
                 if d.has_key?('VM_QUOTA') and d['VM_QUOTA'].has_key?('VM')
-                    "%4.0f / %4.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], d['VM_QUOTA']['VM']["CPU"]]
+                    limit = d['VM_QUOTA']['VM']["CPU"]
+
+                    if limit == "-1"
+                        limit = default_quotas['VM_QUOTA/VM/CPU']
+                        limit = "0" if limit.nil? || limit == ""
+                    end
+
+                    "%4.0f / %4.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
                 else
                     "-"
                 end
@@ -113,6 +142,13 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
     end
 
     def format_resource(group)
+        system = System.new(@client)
+        default_quotas = system.get_group_quotas()
+
+        if OpenNebula::is_error?(default_quotas)
+            raise "Error retrieving the default group quotas: #{default_quotas.message}"
+        end
+
         str="%-15s: %-20s"
         str_h1="%-80s"
 
@@ -129,6 +165,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
         group_hash = group.to_hash
 
-        OneQuotaHelper.format_quota(group_hash['GROUP'])
+        helper = OneQuotaHelper.new
+        helper.format_quota(group_hash['GROUP'], default_quotas)
     end
 end

data/lib/one_helper/onehost_helper.rb

@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'one_helper/onevm_helper'
 
 class OneHostHelper < OpenNebulaHelper::OneHelper
     def self.rname
@@ -192,5 +193,13 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         CLIHelper.print_header(str_h1 % "MONITORING INFORMATION", false)
 
         puts host.template_str
+
+        puts
+        CLIHelper.print_header("VIRTUAL MACHINES", false)
+        puts
+
+        onevm_helper=OneVMHelper.new
+        onevm_helper.client=@client
+        onevm_helper.list_pool({:filter=>["HOST=#{host.name}"]}, false)
     end
 end

data/lib/one_helper/oneimage_helper.rb

@@ -34,14 +34,14 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             :name => "type",
             :large => "--type type",
             :format => String,
-            :description => "Type of the new Image: OS, CDROM or DATABLOCK",
+            :description => "Type of the new Image: #{Image::IMAGE_TYPES.join(", ")}",
             :proc => lambda do |o, options|
                 type=o.strip.upcase
 
-                if %w{OS CDROM DATABLOCK}.include? type
+                if Image::IMAGE_TYPES.include? type
                     [0, type]
                 else
-                    [-1, "Type should be OS, CDROM or DATABLOCK"]
+                    [-1, "Type should be: #{Image::IMAGE_TYPES.join(", ")}"]
                 end
             end
         },
@@ -53,7 +53,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         {
             :name => "prefix",
             :large => "--prefix prefix",
-            :description => "Device prefix for the disk (eg. hd, sd, xvd or vd)",
+            :description => "Device prefix for the disk (eg. hd, sd, xvd\n"<<
+                            " "*31<<"or vd)",
             :format => String,
             :proc => lambda do |o, options|
                 prefix=o.strip.downcase
@@ -76,7 +77,9 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             :description => "Path of the image file",
             :format => String,
             :proc => lambda do |o, options|
-                if o[0,1]=='/'
+                if o.match(/^https?:\/\//)
+                    next [0, o]
+                elsif o[0,1]=='/'
                     path=o
                 else
                     path=Dir.pwd+"/"+o
@@ -113,7 +116,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             :name => "source",
             :large => "--source source",
             :description =>
-                "Source to be used. Useful for not file-based images",
+                "Source to be used. Useful for not file-based\n"<<
+                " "*31<<"images",
             :format => String
         },
         {
@@ -147,8 +151,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         {
             :name => "fstype",
             :large => "--fstype fstype",
-            :description => "Type of file system to be built. This can be "<<
-                "any value understood by mkfs unix command.",
+            :description => "Type of file system to be built. This can be \n"<<
+                            " "*31<<"any value understood by mkfs unix command.",
             :format => String,
             :proc => lambda do |o, options|
                 if !options[:type] || !(options[:type].upcase=='DATABLOCK')
@@ -157,7 +161,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
                     [0, o]
                 end
             end
-        }
+        },
+        OpenNebulaHelper::DRY
     ]
 
     def self.rname
@@ -318,7 +323,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         end
 
         template=create_image_variables(
-            options, template_options-[:persistent])
+            options, template_options-[:persistent, :dry])
 
         template<<"PERSISTENT=YES\n" if options[:persistent]