opennebula-cli 6.0.0.2 → 6.0.1

data/bin/oneshowback

@@ -26,25 +26,14 @@ 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/ }
-
-        # 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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'

data/bin/onetemplate

@@ -26,25 +26,14 @@ 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/ }
-
-        # 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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -225,17 +214,8 @@ CommandParser::CmdParser.new(ARGV) do
         Creates a new VM instance from the given Template. This VM can be
         managed with the 'onevm' command.
 
-        The source Template can be modified by replacing existing attributes; or
-        adding new DISK or NIC elements. The new attributes can be specified with the
-        command options or the file argument.
-
-        Example:
-
-        - Instantiate a template and add a new NIC
-            onetemplate instantiate 23 --nic private_net
-
-        - Instantiate a template and replace CONTEXT with a new one
-            onetemplate instantiate 23 --startscript /path/to/my/start_script
+        The source Template can be modified adding or replacing attributes with
+        the optional file argument, or with the options.
     EOT
 
     command :instantiate, instantiate_desc, :templateid, [:file, nil],
@@ -415,9 +395,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, [:range, :templateid_list],
+    command :lock, lock_desc, :templateid,
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_actions(args[0], options, 'Template locked') do |t|
+        helper.perform_action(args[0], options, 'Template locked') do |t|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -438,8 +418,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, [:range, :templateid_list] do
-        helper.perform_actions(args[0], options, 'Template unlocked') do |t|
+    command :unlock, unlock_desc, :templateid do
+        helper.perform_action(args[0], options, 'Template unlocked') do |t|
             t.unlock
         end
     end

data/bin/oneuser

@@ -26,25 +26,14 @@ 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/ }
-
-        # 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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'

data/bin/onevcenter

@@ -28,25 +28,14 @@ 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/ }
-
-        # 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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -272,7 +261,7 @@ CommandParser::CmdParser.new(ARGV) do
                                                            vi_client,
                                                            options[:object])
 
-            if options[:object] == 'networks' && !args.first.nil?
+            if options[:object] == "networks" && !args.first.nil?
                 indexes = args.first
             else
                 importer.retrieve_resources(helper.parse_opts(options))

data/bin/onevdc

@@ -26,25 +26,14 @@ 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/ }
-
-        # 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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'

data/bin/onevm

@@ -26,25 +26,14 @@ 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/ }
-
-        # 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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -218,27 +207,6 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Market to save oneshot'
     }
 
-    NIC_ID = {
-        :name   => 'nic_id',
-        :large  => '--nic-id nic_id',
-        :format => String,
-        :description => 'NIC to use when SSH'
-    }
-
-    CMD = {
-        :name   => 'cmd',
-        :large  => '--cmd cmd',
-        :format => String,
-        :description => 'CMD to run when SSH'
-    }
-
-    SSH_OPTS = {
-        :name   => 'ssh_opts',
-        :large  => '--ssh-options options',
-        :format => String,
-        :description => 'SSH options to use'
-    }
-
     ########################################################################
     # Global Options
     ########################################################################
@@ -1342,9 +1310,9 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :lock, lock_desc, [:range, :vmid_list],
+    command :lock, lock_desc, :vmid,
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_actions(args[0], options, 'VM locked') do |vm|
+        helper.perform_action(args[0], options, 'VM locked') do |vm|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -1365,8 +1333,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, [:range, :vmid_list] do
-        helper.perform_actions(args[0], options, 'VM unlocked') do |vm|
+    command :unlock, unlock_desc, :vmid do
+        helper.perform_action(args[0], options, 'VM unlocked') do |vm|
             vm.unlock
         end
     end
@@ -1379,7 +1347,7 @@ CommandParser::CmdParser.new(ARGV) do
         You can configure the actions in /etc/one/cli/onevm.yaml
     EOT
 
-    command :'create-chart', create_chart_desc, :vmid do
+    command :'create-chart', create_chart_desc, [:range, :vmid_list] do
         charters = helper.get_charters
 
         if charters.nil?
@@ -1393,7 +1361,7 @@ CommandParser::CmdParser.new(ARGV) do
         charters.each do |action, time|
             sched = "+#{time[:time].to_i + acc_t}"
 
-            helper.schedule_actions([args[0]].flatten,
+            helper.schedule_actions(args[0],
                                     { :schedule => sched },
                                     action.to_s,
                                     time[:warning][:time] + acc_w)
@@ -1469,33 +1437,25 @@ CommandParser::CmdParser.new(ARGV) do
         helper.perform_action(args[0], options, 'Backup') do |vm|
             vm.extend(OpenNebula::VirtualMachineExt)
 
-            # Read user options
-            if options[:verbose]
-                log_to = STDOUT
-            elsif !options[:logger].nil?
-                log_to = options[:logger]
-            end
-
-            keep = options.key?(:keep)
+            # If logger is specified use it, if not use STDOUT
+            options[:logger].nil? ? log_to = STDOUT : log_to = options[:logger]
 
-            if log_to
-                logger = Logger.new(log_to)
-                format = '%Y-%m-%d %H:%M:%S'
+            # Read user options
+            keep   = options.key?(:keep)
+            logger = Logger.new(log_to)
+            format = '%Y-%m-%d %H:%M:%S'
 
-                logger.formatter = proc do |severity, datetime, _p, msg|
-                    "#{datetime.strftime(format)} " \
-                    "#{severity.ljust(5)} : #{msg}\n"
-                end
+            logger.formatter = proc do |severity, datetime, _p, msg|
+                "#{datetime.strftime(format)} #{severity.ljust(5)} : #{msg}\n"
             end
 
-            binfo          = {}
-            binfo[:market] = options[:market]
-
             if options.key?(:oneshot)
+                binfo        = {}
                 binfo[:name] = "VM #{vm.id} BACKUP - " \
                                "#{Time.now.strftime('%Y%m%d_%k%M')}"
                 binfo[:freq]   = 1
                 binfo[:last]   = Time.now.to_i - 100
+                binfo[:market] = options[:market]
             end
 
             begin
@@ -1558,128 +1518,6 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    ssh_desc = <<-EOT.unindent
-        SSH into VM
-
-        Options example:
-
-        '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
-    EOT
-
-    command :ssh,
-            ssh_desc,
-            :vmid,
-            [:login, nil],
-            :options => [NIC_ID, CMD, SSH_OPTS] do
-        helper.perform_action(args[0], options, 'SSH') do |vm|
-            rc = vm.info
-
-            if OpenNebula.is_error?(rc)
-                STDERR.puts rc.message
-                exit(-1)
-            end
-
-            # Get user to login
-            args[1].nil? ? login = 'root' : login = args[1]
-
-            # Get CMD to run
-            options[:cmd].nil? ? cmd = '' : cmd = options[:cmd]
-
-            # Get NIC to connect
-            if options[:nic_id]
-                nic = vm.retrieve_xmlelements(
-                    "//TEMPLATE/NIC[NIC_ID=\"#{options[:nic_id]}\"]"
-                )[0]
-            else
-                nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[SSH="YES"]')[0]
-            end
-
-            nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[1]')[0] if nic.nil?
-
-            if nic.nil?
-                STDERR.puts 'No NIC found'
-                exit(-1)
-            end
-
-            # If there is node port
-            if nic['EXTERNAL_PORT_RANGE']
-                ip   = vm.to_hash['VM']['HISTORY_RECORDS']['HISTORY']
-                ip   = [ip].flatten[-1]['HOSTNAME']
-                port = Integer(nic['EXTERNAL_PORT_RANGE'].split(':')[0]) + 21
-            else
-                ip   = nic['IP']
-                port = 22
-            end
-
-            options[:ssh_opts].nil? ? opts = '' : opts = options[:ssh_opts]
-
-            system("ssh #{opts} #{login}@#{ip} -p #{port} #{cmd}")
-        end
-
-        $?.exitstatus
-    end
-
-    port_desc = <<-EOT.unindent
-        Get port forwarding from a NIC, e.g:
-
-        1.2.3.4@4000 -> 1, means that to connect to VM port 1, you need to
-        connect to IP 1.2.3.4 in port 4000
-    EOT
-
-    command :'port-forward',
-            port_desc,
-            :vmid,
-            [:port, nil],
-            :options => NIC_ID do
-        helper.perform_action(args[0], options, 'Port Forward') do |vm|
-            rc = vm.info
-
-            if OpenNebula.is_error?(rc)
-                STDERR.puts rc.message
-                exit(-1)
-            end
-
-            if options[:nic_id]
-                nic = vm.retrieve_xmlelements(
-                    "//TEMPLATE/NIC[NIC_ID=\"#{options[:nic_id]}\"]"
-                )[0]
-            else
-                nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[SSH="YES"]')[0]
-            end
-
-            nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[1]')[0] if nic.nil?
-
-            if nic.nil?
-                STDERR.puts 'No NIC found'
-                exit(-1)
-            end
-
-            if nic['EXTERNAL_PORT_RANGE'].nil?
-                STDERR.puts 'No PORT_RANGE found'
-                exit(-1)
-            end
-
-            ip = vm.to_hash['VM']['HISTORY_RECORDS']['HISTORY'][-1]['HOSTNAME']
-
-            e_range   = nic['EXTERNAL_PORT_RANGE'].split(':')
-            e_start_p = Integer(e_range[0])
-            e_end_p   = Integer(e_range[1])
-
-            i_range   = nic['INTERNAL_PORT_RANGE'].split('-')
-            i_start_p = Integer(i_range[0])
-            i_end_p   = Integer(i_range[1].split('/')[0])
-
-            if args[1].nil?
-                [*e_start_p..e_end_p].zip([*i_start_p..i_end_p]) do |p1, p2|
-                    puts "#{ip}@#{p1} -> #{p2}"
-                end
-            else
-                puts "#{ip}@#{e_start_p + Integer(args[1]) - 1} -> #{args[1]}"
-            end
-        end
-
-    end
-
     # Deprecated commands
 
     deprecated_command(:shutdown, 'terminate')