opennebula-cli 5.12.0.4 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2648488d15b5d036a3e5a41e6df716ac9358df47
-  data.tar.gz: 0854d2925cfe7fd0b84cf28212137fd76c75317f
+  metadata.gz: bf6e5e798b363cb760c687cb5fd21a53f172e79f
+  data.tar.gz: 6c49c0c55816e6f9cdc9560b0339d87fdf5f03c9
 SHA512:
-  metadata.gz: 19d857a5b4e66972ce8b573744ce98a6da7750504e9a9754b6a22b58281092660314dbad20a425db4422a088670ec0d0af794f870534ace98f7333f82361ff5c
-  data.tar.gz: 283bce4816b2f1fb1181fd8b697dd8094806567ba96cced3c5e91e91e8faf606df85a070086141951094e594cf2dce659d2ae029f2c8adfe31a4b946071c9f53
+  metadata.gz: 1555cc93d12c2358037c19491fd81f12a94554038a9fe8b720222a0a687ce4cd97149bef414f00784d70df774182cde5c10f0431a796af418b700d5cca7b04e2
+  data.tar.gz: 09174b70d83b62c5cedab69f75c6d1b29adee105153ae80970e2fda19a0a77d5152ba1d56d17b2bd1bfa49a0d3216c7e8a9fc528e012af9d9c327202c93fa0e2

data/bin/onevcenter

@@ -155,7 +155,6 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             args = helper.parse_opts(options)
             args[:filter] = true
-            args[:short] = true
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
             importer = VCenterDriver::VcImporter
                        .new_child(helper.client, vi_client, options[:object])
@@ -186,7 +185,6 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             args = helper.parse_opts(options)
             args[:filter] = false
-            args[:short] = true
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
             importer = VCenterDriver::VcImporter
                        .new_child(helper.client, vi_client, options[:object])

data/bin/onevm

@@ -1250,12 +1250,7 @@ CommandParser::CmdParser.new(ARGV) do
         helper.perform_action(args[0], options,
                               'Updating VM configuration') do |vm|
             if template.empty?
-                rc = vm.info
-
-                if OpenNebula.is_error?(rc)
-                    STDERR.puts "ERROR: #{rc.message}"
-                    exit(-1)
-                end
+                vm.info
 
                 template = vm.template_like_str('TEMPLATE', true,
                                                 'OS | FEATURES | INPUT | '\

data/lib/cli_helper.rb

@@ -325,10 +325,9 @@ module CLIHelper
             column[:size] = 5
 
             conf.each do |c|
-                case c
-                when Symbol
+                if c.is_a? Symbol
                     column[c] = true
-                when Hash
+                elsif c.is_a? Hash
                     c.each do |key, value|
                         column[key] = value
                     end
@@ -532,7 +531,7 @@ module CLIHelper
         # @param data [Array] Array with data to show
         # @param del  [Char]  CSV delimiter
         def print_csv_data(data, del)
-            del ||= ','
+            del ? del = del : del = ','
 
             data.each do |l|
                 result = []
@@ -668,9 +667,7 @@ module CLIHelper
         def expand_columns(expand_columns, all = false)
             return if expand_columns.empty?
 
-            if $stdout.isatty
-                terminal_size = $stdout.winsize[1]
-            elsif IO.console && IO.console.tty?
+            if $stdout.tty? || (IO.console && IO.console.tty?)
                 terminal_size = IO.console.winsize[1]
             else
                 terminal_size = nil

data/lib/one_helper/oneacl_helper.rb

@@ -115,7 +115,7 @@ class OneAclHelper < OpenNebulaHelper::OneHelper
     def format_pool(_options)
         config_file = self.class.table_conf
 
-        CLIHelper::ShowTable.new(config_file, self) do
+        table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID,
                    'Rule Identifier',
                    :size => 5 do |d|
@@ -157,6 +157,8 @@ class OneAclHelper < OpenNebulaHelper::OneHelper
 
             default :ID, :USER, :RES_VHNIUTGDCOZSvRMAPt, :RID, :OPE_UMAC, :ZONE
         end
+
+        table
     end
     # rubocop:enable Lint/IneffectiveAccessModifier
 

data/lib/one_helper/onehook_helper.rb

@@ -94,7 +94,7 @@ class OneHookHelper < OpenNebulaHelper::OneHelper
     def format_pool(_options)
         config_file = self.class.table_conf
 
-        CLIHelper::ShowTable.new(config_file, self) do
+        table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ONE identifier for the Hook', :size => 5 do |d|
                 d['ID']
             end
@@ -109,6 +109,8 @@ class OneHookHelper < OpenNebulaHelper::OneHelper
 
             default :ID, :NAME, :TYPE
         end
+
+        table
     end
 
     # Function to print Execution Log records as sent by oned using:
@@ -161,11 +163,7 @@ class OneHookHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            if !header
-                default :HOOK, :ID, :TIMESTAMP, :RC, :EXECUTION
-            else
-                default :ID, :TIMESTAMP, :RC, :EXECUTION
-            end
+            default :HOOK, :ID, :TIMESTAMP, :RC, :EXECUTION
         end
 
         table.show(execs, :stat_column => :EXECUTION)

data/lib/one_helper/onehost_helper.rb

@@ -103,7 +103,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
-        CLIHelper::ShowTable.new(config_file, self) do
+        table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ONE identifier for Host', :size => 4 do |d|
                 d['ID']
             end
@@ -233,6 +233,8 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             default :ID, :NAME, :CLUSTER, :TVM,
                     :ALLOCATED_CPU, :ALLOCATED_MEM, :STAT
         end
+
+        table
     end
 
     def set_hybrid(type, path)

data/lib/one_helper/oneimage_helper.rb

@@ -20,10 +20,6 @@ require 'one_helper/onevm_helper'
 # CLI helper for oneimage command
 class OneImageHelper < OpenNebulaHelper::OneHelper
 
-    # This list contains prefixes that should skip adding user home to the path
-    # This must have the same content as the case $FROM in downloader.sh
-    PREFIXES = %w[http https ssh s3 rbd vcenter lxd docker]
-
     TEMPLATE_OPTIONS=[
         {
             :name => 'name',
@@ -86,7 +82,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             :description => 'Path of the image file',
             :format => String,
             :proc => lambda do |o, _options|
-                next [0, o] if o.match(%r{^(#{PREFIXES.join('|')})://})
+                next [0, o] if o.match(%r{^(https?|docker)://})
 
                 if o[0, 1]=='/'
                     path=o
@@ -196,7 +192,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
-        CLIHelper::ShowTable.new(config_file, self) do
+        table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ONE identifier for the Image', :size=>4 do |d|
                 d['ID']
             end
@@ -250,6 +246,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             default :ID, :USER, :GROUP, :NAME, :DATASTORE, :SIZE, :TYPE,
                     :PERSISTENT, :STAT, :RVMS
         end
+
+        table
     end
 
     def check_orphans

data/lib/one_helper/oneprovision_helper.rb

@@ -49,7 +49,7 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
     def format_pool
         config_file = self.class.table_conf
 
-        CLIHelper::ShowTable.new(config_file, self) do
+        table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'Identifier for the Provision', :size => 36 do |p|
                 p['ID']
             end
@@ -80,6 +80,8 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
 
             default :ID, :NAME, :CLUSTERS, :HOSTS, :NETWORKS, :DATASTORES, :STAT
         end
+
+        table
     end
 
     #######################################################################
@@ -226,9 +228,11 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
     end
 
     def names_to_ids(objects, type)
-        [objects].flatten.map do |obj|
+        objects = [objects].flatten.map do |obj|
             OpenNebulaHelper.rname_to_id(obj.to_s, type)[1]
         end
+
+        objects
     end
 
     def get_list(provision_list)

data/lib/one_helper/oneuser_helper.rb

@@ -201,10 +201,6 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
             login_client = self.get_login_client(username, options)
         end
 
-        if (login_client.is_a? Array) && login_client[0] == -1
-            return login_client
-        end
-
         user = OpenNebula::User.new(User.build_xml, login_client)
 
         egid = options[:group] || -1

data/lib/one_helper/onevm_helper.rb

@@ -100,8 +100,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             if File.file?(o)
                 options[:file] = o
             else
-                STDERR.puts "File `#{options[:file]}` doesn't exist"
-                exit(-1)
+                exit - 1
             end
         }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.12.0.4
+  version: 5.12.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.0.4
+        version: 5.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.0.4
+        version: 5.12.1
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables: