opennebula-cli 6.0.0 → 6.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03449b210a183af54660a90a3c989f5610ad58db
-  data.tar.gz: 71df749058756def41f3bdb2f691f104451a9b5d
+  metadata.gz: 744bd1ffb1ad108ad3ebfac08a3e7a0f2e12eea0
+  data.tar.gz: d6d8d5f7a701b7252ae828bbcc00c35705e29275
 SHA512:
-  metadata.gz: 457e1c60b5e45b3eaf7907bc664b8050dd3c76ad12d09814209b67c27f8739abc836f66c7d23dae5c090608a5371cf3713657f68ada6a57394b1c9e3f629bdbe
-  data.tar.gz: 01b411b3548c445c4b184a3ff936d4789ce1b880df2cfdb436ad5e12bc8416fdb6d9dbc2577109b739e566e30533f28ee58ec00170eb311aede5c24c2125ef87
+  metadata.gz: f468a81b851acbd4b453b4c2248092544c99bcc41af5ee9b42ae67bf87251fc74ec5acf4f26ca48cc31d63075522b97053e56158bf411d15312dcef89fa840e8
+  data.tar.gz: 53662ad598df3da566a839f114e7451e9fdd1392ae14487ee733ba858cc812a050df98579ea6fcec70774c63ad17f12dcfdeef399a40e3471687b3b19d2fe937

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,10 +707,11 @@ 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
-                    hash.reject! do |element|
+                if options[:ids] && elements
+                    arr = [hash[pool.pool_name][pool.element_name]].flatten
+                    arr.reject! do |element|
                         !options[:ids].include?(element['ID'].to_i)
                     end
                 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"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.0.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement