opennebula-cli 5.13.80.pre → 6.0.0.2

data/bin/onevmgroup

@@ -26,14 +26,25 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -231,9 +242,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :vmgroupid,
+    command :lock, lock_desc, [:range, :vmgroupid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VMGroup locked') do |vmg|
+        helper.perform_actions(args[0], options, 'VMGroup locked') do |vmg|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -254,8 +265,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :vmgroupid do
-        helper.perform_action(args[0], options, 'VMGroup unlocked') do |vmg|
+    command :unlock, unlock_desc, [:range, :vmgroupid_list] do
+        helper.perform_actions(args[0], options, 'VMGroup unlocked') do |vmg|
             vmg.unlock
         end
     end

data/bin/onevnet

@@ -26,14 +26,25 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -379,9 +390,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :vnetid,
+    command :lock, lock_desc, [:range, :vnetid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VNet locked') do |vnet|
+        helper.perform_actions(args[0], options, 'VNet locked') do |vnet|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -402,8 +413,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :vnetid do
-        helper.perform_action(args[0], options, 'VNet unlocked') do |vnet|
+    command :unlock, unlock_desc, [:range, :vnetid_list] do
+        helper.perform_actions(args[0], options, 'VNet unlocked') do |vnet|
             vnet.unlock
         end
     end

data/bin/onevntemplate

@@ -26,14 +26,25 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -339,9 +350,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :templateid,
+    command :lock, lock_desc, [:range, :templateid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VN Template locked') do |t|
+        helper.perform_actions(args[0], options, 'VN Template locked') do |t|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -362,8 +373,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :templateid do
-        helper.perform_action(args[0], options, 'VN Template unlocked') do |t|
+    command :unlock, unlock_desc, [:range, :templateid_list] do
+        helper.perform_actions(args[0], options, 'VN Template unlocked') do |t|
             t.unlock
         end
     end

data/bin/onevrouter

@@ -26,14 +26,25 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -364,9 +375,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :vrouterid,
+    command :lock, lock_desc, [:range, :vrouterid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VRouter locked') do |vr|
+        helper.perform_actions(args[0], options, 'VRouter locked') do |vr|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -387,8 +398,8 @@ CommandParser::CmdParser.new(ARGV) do
         valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :vrouterid do
-        helper.perform_action(args[0], options, 'VRouter unlocked') do |vr|
+    command :unlock, unlock_desc, [:range, :vrouterid_list] do
+        helper.perform_actions(args[0], options, 'VRouter unlocked') do |vr|
             vr.unlock
         end
     end

data/bin/onezone

@@ -26,14 +26,25 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -57,7 +68,7 @@ CommandParser::CmdParser.new(ARGV) do
     }
 
     DATABASE = {
-        :name  => 'database',
+        :name  => 'db',
         :large => '--db',
         :description => 'Also sync database'
     }
@@ -254,7 +265,7 @@ CommandParser::CmdParser.new(ARGV) do
         end
 
         server = Replicator.new('/var/lib/one/.ssh/id_rsa', args[0])
-        server.process_files(options.key?(:database))
+        server.process_files(options[:db])
 
         0
     end

data/lib/cli_helper.rb

@@ -211,6 +211,17 @@ module CLIHelper
         end
     end
 
+    # Get text in green colour
+    #
+    # @param text [String] String to print
+    def self.green(text)
+        if $stdout.tty?
+            ANSI_GREEN + text + ANSI_RESET
+        else
+            text
+        end
+    end
+
     # Print header
     #
     # @param str       [String]  String with header content
@@ -357,14 +368,14 @@ module CLIHelper
         # @param options [Hash] Object with CLI user options
         # @param top     [Boolean]     True to not update columns again
         def show(data, options = {}, top = false)
+            update_columns(options) unless top
+
             if options[:list]
                 @cli_columns = options[:list].collect {|o| o.upcase.to_sym }
             else
                 @cli_columns = @default_columns
             end
 
-            update_columns(options) unless top
-
             if data.is_a? Hash
                 @data = data
 

data/lib/command_parser.rb

@@ -481,9 +481,12 @@ module CommandParser
                 begin
                     rc = comm[:proc].call
 
-                    if rc.instance_of?(Array)
+                    if rc.instance_of?(Array) && rc[0] != 0
+                        STDERR.puts rc[1]
+                        exit(rc[0])
+                    elsif rc.instance_of?(Array)
                         puts rc[1]
-                        exit rc.first
+                        exit(rc[0])
                     else
                         exit(@exit_code || rc)
                     end
@@ -537,7 +540,7 @@ module CommandParser
             begin
                 @cmdparse.parse!(@args)
             rescue => e
-                puts e.message
+                STDERR.puts e.message
                 exit -1
             end
 
@@ -547,8 +550,8 @@ module CommandParser
                     if rc[0] == 0
                         @options[e[:name].to_sym] = rc[1]
                     else
-                        puts rc[1]
-                        puts "option #{e[:name]}: Parsing error"
+                        STDERR.puts rc[1]
+                        STDERR.puts "option #{e[:name]}: Parsing error"
                         exit -1
                     end
                 end
@@ -557,11 +560,11 @@ module CommandParser
 
         def check_args!(name, arity, args_format)
             if @args.length < arity
-                print "Command #{name} requires "
+                STDERR.print "Command #{name} requires "
                 if arity>1
-                    puts "#{args_format.length} parameters to run."
+                    STDERR.puts "#{args_format.length} parameters to run."
                 else
-                    puts "one parameter to run"
+                    STDERR.puts "one parameter to run"
                 end
 
                 print_command_help(name)
@@ -579,11 +582,11 @@ module CommandParser
                             end
                         }.join(' ')
 
-                        puts "Wrong number of arguments"
+                        STDERR.puts "Wrong number of arguments"
                         if args_str.empty?
-                            puts "No argument is required"
+                            STDERR.puts "No argument is required"
                         else
-                            puts "The arguments should be: #{args_str}"
+                            STDERR.puts "The arguments should be: #{args_str}"
                         end
                         exit -1
                     end
@@ -613,9 +616,9 @@ module CommandParser
 
                     unless argument
                         if error_msg
-                            puts error_msg
+                            STDERR.puts error_msg
                         else
-                            puts "command #{name}: argument #{id} must be one of #{format.join(', ')}"
+                            STDERR.puts "command #{name}: argument #{id} must be one of #{format.join(', ')}"
                         end
                         exit -1
                     end

data/lib/one_helper.rb

@@ -707,9 +707,10 @@ EOT
 
                 return -1, rc.message if OpenNebula.is_error?(rc)
 
-                _, hash = print_page(pool, options)
+                elements, hash = print_page(pool, options)
 
-               if options[:ids] && elements
+                if options[:ids] && elements
+                    hash = [hash[pool.pool_name][pool.element_name]].flatten
                     hash.reject! do |element|
                         !options[:ids].include?(element['ID'].to_i)
                     end
@@ -1010,7 +1011,7 @@ EOT
                 rc = perform_action(id,options,verbose,&block)
 
                 unless rc[0]==0
-                    puts rc[1]
+                    STDERR.puts rc[1]
                     exit_code=rc[0]
                 end
             end

data/lib/one_helper/oneacct_helper.rb

@@ -98,13 +98,11 @@ class AcctHelper < OpenNebulaHelper::OneHelper
     }
 
     ACCT_OPTIONS     = [START_TIME_ACCT, END_TIME_ACCT, USERFILTER, GROUP, HOST, XPATH, SPLIT]
-    SHOWBACK_OPTIONS = [START_TIME_SHOWBACK, END_TIME_SHOWBACK, USERFILTER, GROUP]
+    SHOWBACK_OPTIONS = [START_TIME_SHOWBACK, END_TIME_SHOWBACK, USERFILTER, GROUP, OpenNebulaHelper::FORMAT]
 
     ACCT_OPTIONS << OpenNebulaHelper::XML
     ACCT_OPTIONS << OpenNebulaHelper::JSON
 
-    SHOWBACK_OPTIONS += OpenNebulaHelper::FORMAT
-
     ACCT_TABLE = CLIHelper::ShowTable.new(self.table_conf("oneacct.yaml"), nil) do
         column :UID, "User ID", :size=>4 do |d|
             d["UID"]

data/lib/one_helper/onecluster_helper.rb

@@ -16,73 +16,71 @@
 
 require 'one_helper'
 
+# OneCluster CLI command helper
 class OneClusterHelper < OpenNebulaHelper::OneHelper
 
     CLUSTER = {
-        :name   => "cluster",
-        :short  => "-c id|name",
-        :large  => "--cluster id|name" ,
-        :description => "Selects the cluster",
+        :name   => 'cluster',
+        :short  => '-c id|name',
+        :large  => '--cluster id|name',
+        :description => 'Selects the cluster',
         :format => String,
-        :proc   => lambda { |o, options|
-            OpenNebulaHelper.rname_to_id(o, "CLUSTER")
+        :proc   => lambda {|o, _options|
+            OpenNebulaHelper.rname_to_id(o, 'CLUSTER')
         }
     }
 
     def self.rname
-        "CLUSTER"
+        'CLUSTER'
     end
 
     def self.conf_file
-        "onecluster.yaml"
+        'onecluster.yaml'
     end
 
     def element_size(ehash, ename)
-        ids = ehash[ename]["ID"]
+        ids = ehash[ename]['ID']
 
         if ids.nil?
-            return 0
+            0
         elsif ids.class == String
-            return 1
+            1
         else
-            return ids.size
+            ids.size
         end
     end
 
-
-    def format_pool(options)
+    def format_pool(_options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
-            column :ID, "ONE identifier for the Cluster", :size=>5 do |d|
-                d["ID"]
+        CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, 'ONE identifier for the Cluster', :size=>5 do |d|
+                d['ID']
             end
 
-            column :NAME, "Name of the Cluster", :left, :size=>25 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the Cluster', :left, :size=>25 do |d|
+                d['NAME']
             end
 
-            column :HOSTS, "Number of Hosts", :size=>5 do |d|
-                @ext.element_size(d,"HOSTS") rescue 0
+            column :HOSTS, 'Number of Hosts', :size=>5 do |d|
+                @ext.element_size(d, 'HOSTS') rescue 0
             end
 
-            column :VNETS, "Number of Networks", :size=>5 do |d|
-                @ext.element_size(d,"VNETS") rescue 0
+            column :VNETS, 'Number of Networks', :size=>5 do |d|
+                @ext.element_size(d, 'VNETS') rescue 0
             end
 
-            column :DATASTORES, "Number of Datastores", :size=>10 do |d|
-                @ext.element_size(d,"DATASTORES") rescue 0
+            column :DATASTORES, 'Number of Datastores', :size=>10 do |d|
+                @ext.element_size(d, 'DATASTORES') rescue 0
             end
 
             default :ID, :NAME, :HOSTS, :VNETS, :DATASTORES
         end
-
-        table
     end
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::Cluster.new_with_id(id, @client)
         else
@@ -91,39 +89,74 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(user_flag=-2)
+    def factory_pool(_user_flag = -2)
         OpenNebula::ClusterPool.new(@client)
     end
 
-    def format_resource(cluster, options = {})
-        str="%-18s: %-20s"
-        str_h1="%-80s"
+    def format_resource(cluster, _options = {})
+        str='%-18s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(str_h1 % "CLUSTER #{cluster['ID']} INFORMATION")
-        puts str % ["ID",   cluster.id.to_s]
-        puts str % ["NAME", cluster.name]
+        puts format(str, 'ID', cluster.id.to_s)
+        puts format(str, 'NAME', cluster.name)
+
         puts
+        CLIHelper.print_header(str_h1 % 'CLUSTER RESOURCES', false)
+        cluster.info!
 
-        CLIHelper.print_header(str_h1 % "CLUSTER TEMPLATE", false)
-        puts cluster.template_str
+        hosts = cluster.to_hash['CLUSTER']['HOSTS']['ID']
+
+        if hosts
+            total_cpu = 0
+            used_cpu  = 0
+            total_ram = 0
+            used_ram  = 0
+
+            [hosts].flatten.each do |h|
+                h = OpenNebula::Host.new_with_id(h, @client)
+
+                h.info!
+
+                h = h.to_hash
+                h = h['HOST']['HOST_SHARE']
+
+                total_cpu += h['TOTAL_CPU'].to_i / 100
+                used_cpu  += h['CPU_USAGE'].to_i / 100
+                total_ram += h['TOTAL_MEM'].to_i / 1024 / 1024
+                used_ram  += h['MEM_USAGE'].to_i / 1024 / 1024
+            end
+
+            puts "TOTAL CPUs: #{total_cpu}"
+            puts "OCCUPIED CPUs: #{used_cpu}"
+            puts "AVAILABLE CPUs: #{total_cpu - used_cpu}"
+            puts
+            puts "TOTAL RAM: #{total_ram}"
+            puts "OCCUPIED RAM: #{used_ram}"
+            puts "AVAILABLE RAM: #{total_ram - used_ram}"
+        end
 
         puts
+        CLIHelper.print_header(str_h1 % 'CLUSTER TEMPLATE', false)
+        puts cluster.template_str
 
-        CLIHelper.print_header("%-15s" % ["HOSTS"])
+        puts
+        CLIHelper.print_header(format('%-15s', 'HOSTS'))
         cluster.host_ids.each do |id|
-            puts "%-15s" % [id]
+            puts format('%-15s', id)
         end
 
         puts
-        CLIHelper.print_header("%-15s" % ["VNETS"])
+        CLIHelper.print_header(format('%-15s', 'VNETS'))
         cluster.vnet_ids.each do |id|
-            puts "%-15s" % [id]
+            puts format('%-15s', id)
         end
 
         puts
-        CLIHelper.print_header("%-15s" % ["DATASTORES"])
+        CLIHelper.print_header(format('%-15s', 'DATASTORES'))
         cluster.datastore_ids.each do |id|
-            puts "%-15s" % [id]
+            puts format('%-15s', id)
         end
     end
+
 end