opennebula-cli 5.12.1 → 5.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6e5e798b363cb760c687cb5fd21a53f172e79f
-  data.tar.gz: 6c49c0c55816e6f9cdc9560b0339d87fdf5f03c9
+  metadata.gz: 970c8210c6b4b094cd3ca4e6eccc3257ba0b0a82
+  data.tar.gz: c0bfee71d70b958b2a8d3b6713219c10e3609b34
 SHA512:
-  metadata.gz: 1555cc93d12c2358037c19491fd81f12a94554038a9fe8b720222a0a687ce4cd97149bef414f00784d70df774182cde5c10f0431a796af418b700d5cca7b04e2
-  data.tar.gz: 09174b70d83b62c5cedab69f75c6d1b29adee105153ae80970e2fda19a0a77d5152ba1d56d17b2bd1bfa49a0d3216c7e8a9fc528e012af9d9c327202c93fa0e2
+  metadata.gz: 68238d2eb49e42709bcc7685767a4a4ccadcb474619fc86307e44813953cc1c16d684a0aec2949dc1473c6a569e7e8ec8a3984f406a5b960234f81f9e1798d6d
+  data.tar.gz: 5d4ea71d6673a794e97ab39f14f5d78dfc4c55792ae55e0452cd6284c776c3f6789066d3281e631ea3bcc1c850c316519573f18173dde926d4f39b1e80ff4fba

data/bin/onevcenter

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

data/lib/cli_helper.rb

@@ -325,9 +325,10 @@ module CLIHelper
             column[:size] = 5
 
             conf.each do |c|
-                if c.is_a? Symbol
+                case c
+                when Symbol
                     column[c] = true
-                elsif c.is_a? Hash
+                when Hash
                     c.each do |key, value|
                         column[key] = value
                     end
@@ -531,7 +532,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 = []
@@ -667,7 +668,9 @@ module CLIHelper
         def expand_columns(expand_columns, all = false)
             return if expand_columns.empty?
 
-            if $stdout.tty? || (IO.console && IO.console.tty?)
+            if $stdout.isatty
+                terminal_size = $stdout.winsize[1]
+            elsif 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
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
+        CLIHelper::ShowTable.new(config_file, self) do
             column :ID,
                    'Rule Identifier',
                    :size => 5 do |d|
@@ -157,8 +157,6 @@ 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
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
+        CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ONE identifier for the Hook', :size => 5 do |d|
                 d['ID']
             end
@@ -109,8 +109,6 @@ class OneHookHelper < OpenNebulaHelper::OneHelper
 
             default :ID, :NAME, :TYPE
         end
-
-        table
     end
 
     # Function to print Execution Log records as sent by oned using:
@@ -163,7 +161,11 @@ class OneHookHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            default :HOOK, :ID, :TIMESTAMP, :RC, :EXECUTION
+            if !header
+                default :HOOK, :ID, :TIMESTAMP, :RC, :EXECUTION
+            else
+                default :ID, :TIMESTAMP, :RC, :EXECUTION
+            end
         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
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
+        CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ONE identifier for Host', :size => 4 do |d|
                 d['ID']
             end
@@ -233,8 +233,6 @@ 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,6 +20,10 @@ 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',
@@ -82,7 +86,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{^(https?|docker)://})
+                next [0, o] if o.match(%r{^(#{PREFIXES.join('|')})://})
 
                 if o[0, 1]=='/'
                     path=o
@@ -192,7 +196,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
+        CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ONE identifier for the Image', :size=>4 do |d|
                 d['ID']
             end
@@ -246,8 +250,6 @@ 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
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
+        CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'Identifier for the Provision', :size => 36 do |p|
                 p['ID']
             end
@@ -80,8 +80,6 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
 
             default :ID, :NAME, :CLUSTERS, :HOSTS, :NETWORKS, :DATASTORES, :STAT
         end
-
-        table
     end
 
     #######################################################################
@@ -228,11 +226,9 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
     end
 
     def names_to_ids(objects, type)
-        objects = [objects].flatten.map do |obj|
+        [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,6 +201,10 @@ 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,7 +100,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             if File.file?(o)
                 options[:file] = o
             else
-                exit - 1
+                STDERR.puts "File `#{options[:file]}` doesn't exist"
+                exit(-1)
             end
         }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.12.1
+  version: 5.12.6
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,18 +16,19 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.1
+        version: 5.12.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.1
+        version: 5.12.6
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables:
 - oneacct
+- onevcenter
 - oneacl
 - onecluster
 - onedatastore
@@ -43,7 +44,6 @@ executables:
 - oneshowback
 - onetemplate
 - oneuser
-- onevcenter
 - onevdc
 - onevm
 - onevmgroup
@@ -55,6 +55,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/oneacct
+- bin/onevcenter
 - bin/oneacl
 - bin/onecluster
 - bin/onedatastore
@@ -70,7 +71,6 @@ files:
 - bin/oneshowback
 - bin/onetemplate
 - bin/oneuser
-- bin/onevcenter
 - bin/onevdc
 - bin/onevm
 - bin/onevmgroup
@@ -78,25 +78,16 @@ files:
 - bin/onevntemplate
 - bin/onevrouter
 - bin/onezone
-- lib/cli_helper.rb
 - lib/command_parser.rb
+- lib/cli_helper.rb
 - lib/one_helper.rb
-- lib/one_helper/oneacct_helper.rb
 - lib/one_helper/oneacl_helper.rb
 - lib/one_helper/onecluster_helper.rb
-- lib/one_helper/onedatastore_helper.rb
-- lib/one_helper/oneflow_helper.rb
-- lib/one_helper/oneflowtemplate_helper.rb
 - lib/one_helper/onegroup_helper.rb
 - lib/one_helper/onehook_helper.rb
-- lib/one_helper/onehost_helper.rb
-- lib/one_helper/oneimage_helper.rb
 - lib/one_helper/onemarket_helper.rb
-- lib/one_helper/onemarketapp_helper.rb
-- lib/one_helper/oneprovision_helper.rb
 - lib/one_helper/onequota_helper.rb
 - lib/one_helper/onesecgroup_helper.rb
-- lib/one_helper/onetemplate_helper.rb
 - lib/one_helper/oneuser_helper.rb
 - lib/one_helper/onevcenter_helper.rb
 - lib/one_helper/onevdc_helper.rb
@@ -104,6 +95,15 @@ files:
 - lib/one_helper/onevmgroup_helper.rb
 - lib/one_helper/onevnet_helper.rb
 - lib/one_helper/onevntemplate_helper.rb
+- lib/one_helper/oneacct_helper.rb
+- lib/one_helper/onedatastore_helper.rb
+- lib/one_helper/oneflow_helper.rb
+- lib/one_helper/oneflowtemplate_helper.rb
+- lib/one_helper/onehost_helper.rb
+- lib/one_helper/oneimage_helper.rb
+- lib/one_helper/onemarketapp_helper.rb
+- lib/one_helper/oneprovision_helper.rb
+- lib/one_helper/onetemplate_helper.rb
 - lib/one_helper/onevrouter_helper.rb
 - lib/one_helper/onezone_helper.rb
 - NOTICE