opennebula-cli 5.13.80.pre → 6.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 133ad6e159617025214647d52dbcb5d41f3093cf
-  data.tar.gz: 11cdb1ed429159108f9374034cf3fbe7a7866b8c
+  metadata.gz: ef732bebd452365e562d9f6099502278df886613
+  data.tar.gz: f23992f9012ee9a987b8b82a0fe7ea7393e5142e
 SHA512:
-  metadata.gz: b6450713483ad56c4eea014eb294043d0c83b6d29175c5c123a50e854bc5b08ffc9ecfe034dd19b7dc04655b6581152d047df29e475fdbd16bb812ee9b3701cf
-  data.tar.gz: 2633fb675faf36ec1c5d7bf20c57ecaf22f2af9404a5141a7310049108574f2e41b75f260936aa4e9109051ad600341605f350ccd2beeb9d5c61e2bb4e4a0657
+  metadata.gz: cd0659beee2f6bd73ce137a403f273601f3a05034b71ec0a348f3ef112fd37fb4f08113ead4e20cd7c0fe9336dbc55b714fba8dc70e2adbfade1d6392e5d9b7b
+  data.tar.gz: 094668b93bf8cf3757c20a9f8b65e5541f32df5bcbf282f0aadeb7a3210fa0925b4ea0d0617ff8d238cfa3d8f7553b2b428c61c6411f496b4d1310a91d42a57b

data/bin/oneacct

@@ -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'

data/bin/oneacl

@@ -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'

data/bin/onecluster

@@ -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'

data/bin/onedatastore

@@ -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'

data/bin/oneflow

@@ -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'

data/bin/oneflow-template

@@ -28,14 +28,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 << ONEFLOW_LOCATION

data/bin/onegroup

@@ -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'

data/bin/onehook

@@ -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'
@@ -254,9 +265,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :hookid,
+    command :lock, lock_desc, [:range, :hookid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'Hook locked') do |t|
+        helper.perform_actions(args[0], options, 'Hook locked') do |t|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -277,8 +288,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :hookid do
-        helper.perform_action(args[0], options, 'Hook unlocked') do |t|
+    command :unlock, unlock_desc, [:range, :hookid_list] do
+        helper.perform_actions(args[0], options, 'Hook unlocked') do |t|
             t.unlock
         end
     end

data/bin/onehost

@@ -28,14 +28,25 @@ else
     REMOTES_LOCATION  = ONE_LOCATION + '/var/remotes/'
 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'
@@ -171,8 +182,8 @@ CommandParser::CmdParser.new(ARGV) do
             [:file, nil], :options => CREAT_OPTIONS do
         if options[:im].nil? || options[:vm].nil?
             STDERR.puts 'Drivers are mandatory to create a host:'
-            STDERR.puts '\t -i information driver'
-            STDERR.puts '\t -v hypervisor driver'
+            STDERR.puts "\t -i information driver"
+            STDERR.puts "\t -v hypervisor driver"
             exit(-1)
         end
 

data/bin/oneimage

@@ -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'
@@ -164,7 +175,7 @@ CommandParser::CmdParser.new(ARGV) do
             :options => CREATE_OPTIONS + OneImageHelper::TEMPLATE_OPTIONS do
         if options[:datastore].nil? && !options[:dry]
             STDERR.puts 'Datastore to save the image is mandatory: '
-            STDERR.puts '\t -d datastore_id'
+            STDERR.puts "\t -d datastore_id"
             exit(-1)
         end
 
@@ -434,9 +445,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :imageid,
+    command :lock, lock_desc, [:range, :imageid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'Image locked') do |i|
+        helper.perform_actions(args[0], options, 'Image locked') do |i|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -457,8 +468,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :imageid do
-        helper.perform_action(args[0], options, 'Image unlocked') do |i|
+    command :unlock, unlock_desc, [:range, :imageid_list] do
+        helper.perform_actions(args[0], options, 'Image unlocked') do |i|
             i.unlock
         end
     end
@@ -484,7 +495,7 @@ CommandParser::CmdParser.new(ARGV) do
         # Check user options
         unless options[:datastore]
             STDERR.puts 'Datastore to save the image is mandatory: '
-            STDERR.puts '\t -d datastore_id'
+            STDERR.puts "\t -d datastore_id"
             exit(-1)
         end
 

data/bin/onemarket

@@ -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'

data/bin/onemarketapp

@@ -28,14 +28,25 @@ else
     VAR_LOCATION      = ONE_LOCATION + '/var'
 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'
@@ -45,9 +56,6 @@ require 'one_helper/onemarketapp_helper'
 require 'one_helper/onemarket_helper'
 require 'one_helper/onedatastore_helper'
 
-require 'vcenter_driver'
-CONFIG = VCenterConf.new
-
 CommandParser::CmdParser.new(ARGV) do
     usage '`onemarket` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
@@ -177,7 +185,7 @@ CommandParser::CmdParser.new(ARGV) do
                         OneMarketPlaceAppHelper::TEMPLATE_OPTIONS do
         if options[:marketplace].nil?
             STDERR.puts 'Marketplace to save the app is mandatory: '
-            STDERR.puts '\t -m marketplace_id'
+            STDERR.puts "\t -m marketplace_id"
             exit(-1)
         end
 
@@ -287,8 +295,7 @@ CommandParser::CmdParser.new(ARGV) do
                 :vmtemplate_name => options[:vmname],
                 :url_args => tag,
                 :notemplate => options[:no] == 'no',
-                :template => options[:template],
-                :default_template => CONFIG[:default_template]
+                :template => options[:template]
             )
 
             if OpenNebula.is_error?(rc)
@@ -442,11 +449,11 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :appid,
+    command :lock, lock_desc, [:range, :appid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0],
-                              options,
-                              'MarketPlaceApp locked') do |app|
+        helper.perform_actions(args[0],
+                               options,
+                               'MarketPlaceApp locked') do |app|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -467,10 +474,10 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :appid do
-        helper.perform_action(args[0],
-                              options,
-                              'MarketPlaceApp unlocked') do |app|
+    command :unlock, unlock_desc, [:range, :appid_list] do
+        helper.perform_actions(args[0],
+                               options,
+                               'MarketPlaceApp unlocked') do |app|
             app.unlock
         end
     end