opennebula-cli 6.0.1 → 6.1.90.pre

data/bin/onevrouter

@@ -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'
@@ -364,9 +375,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :vrouterid,
+    command :lock, lock_desc, [:range, :vrouterid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VRouter locked') do |vr|
+        helper.perform_actions(args[0], options, 'VRouter locked') do |vr|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -387,8 +398,8 @@ CommandParser::CmdParser.new(ARGV) do
         valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :vrouterid do
-        helper.perform_action(args[0], options, 'VRouter unlocked') do |vr|
+    command :unlock, unlock_desc, [:range, :vrouterid_list] do
+        helper.perform_actions(args[0], options, 'VRouter unlocked') do |vr|
             vr.unlock
         end
     end

data/bin/onezone

@@ -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,8 +265,28 @@ CommandParser::CmdParser.new(ARGV) do
         end
 
         server = Replicator.new('/var/lib/one/.ssh/id_rsa', args[0])
-        server.process_files(options.key?(:database))
+        server.process_files(options[:db])
 
         0
     end
+
+    enable_desc = <<-EOT.unindent
+        Enable zone
+    EOT
+
+    command :enable, enable_desc, [:range, :zoneid_list] do
+        helper.perform_actions(args[0], options, 'enable zone') do |o|
+            o.enable
+        end
+    end
+
+    disable_desc = <<-EOT.unindent
+        Disable zone, disabled zones can execute only readonly commands
+    EOT
+
+    command :disable, disable_desc, [:range, :zoneid_list] do
+        helper.perform_actions(args[0], options, 'disable zone') do |o|
+            o.disable
+        end
+    end
 end

data/lib/one_helper/oneacct_helper.rb

@@ -216,11 +216,15 @@ class AcctHelper < OpenNebulaHelper::OneHelper
             d["HOURS"]
         end
 
+        column :RUNNING_HOURS, "Running hours", :size=>7 do |d|
+            d["RHOURS"] || '-'
+        end
+
         column :COST, "Cost", :size=>15 do |d|
             d["TOTAL_COST"]
         end
 
-        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :COST
+        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :RUNNING_HOURS, :COST
     end
 
     def self.print_start_end_time_header(start_time, end_time)

data/lib/one_helper/onecluster_helper.rb

@@ -16,73 +16,71 @@
 
 require 'one_helper'
 
+# OneCluster CLI command helper
 class OneClusterHelper < OpenNebulaHelper::OneHelper
 
     CLUSTER = {
-        :name   => "cluster",
-        :short  => "-c id|name",
-        :large  => "--cluster id|name" ,
-        :description => "Selects the cluster",
+        :name   => 'cluster',
+        :short  => '-c id|name',
+        :large  => '--cluster id|name',
+        :description => 'Selects the cluster',
         :format => String,
-        :proc   => lambda { |o, options|
-            OpenNebulaHelper.rname_to_id(o, "CLUSTER")
+        :proc   => lambda {|o, _options|
+            OpenNebulaHelper.rname_to_id(o, 'CLUSTER')
         }
     }
 
     def self.rname
-        "CLUSTER"
+        'CLUSTER'
     end
 
     def self.conf_file
-        "onecluster.yaml"
+        'onecluster.yaml'
     end
 
     def element_size(ehash, ename)
-        ids = ehash[ename]["ID"]
+        ids = ehash[ename]['ID']
 
         if ids.nil?
-            return 0
+            0
         elsif ids.class == String
-            return 1
+            1
         else
-            return ids.size
+            ids.size
         end
     end
 
-
-    def format_pool(options)
+    def format_pool(_options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
-            column :ID, "ONE identifier for the Cluster", :size=>5 do |d|
-                d["ID"]
+        CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, 'ONE identifier for the Cluster', :size=>5 do |d|
+                d['ID']
             end
 
-            column :NAME, "Name of the Cluster", :left, :size=>25 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the Cluster', :left, :size=>25 do |d|
+                d['NAME']
             end
 
-            column :HOSTS, "Number of Hosts", :size=>5 do |d|
-                @ext.element_size(d,"HOSTS") rescue 0
+            column :HOSTS, 'Number of Hosts', :size=>5 do |d|
+                @ext.element_size(d, 'HOSTS') rescue 0
             end
 
-            column :VNETS, "Number of Networks", :size=>5 do |d|
-                @ext.element_size(d,"VNETS") rescue 0
+            column :VNETS, 'Number of Networks', :size=>5 do |d|
+                @ext.element_size(d, 'VNETS') rescue 0
             end
 
-            column :DATASTORES, "Number of Datastores", :size=>10 do |d|
-                @ext.element_size(d,"DATASTORES") rescue 0
+            column :DATASTORES, 'Number of Datastores', :size=>10 do |d|
+                @ext.element_size(d, 'DATASTORES') rescue 0
             end
 
             default :ID, :NAME, :HOSTS, :VNETS, :DATASTORES
         end
-
-        table
     end
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::Cluster.new_with_id(id, @client)
         else
@@ -91,39 +89,74 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(user_flag=-2)
+    def factory_pool(_user_flag = -2)
         OpenNebula::ClusterPool.new(@client)
     end
 
-    def format_resource(cluster, options = {})
-        str="%-18s: %-20s"
-        str_h1="%-80s"
+    def format_resource(cluster, _options = {})
+        str='%-18s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(str_h1 % "CLUSTER #{cluster['ID']} INFORMATION")
-        puts str % ["ID",   cluster.id.to_s]
-        puts str % ["NAME", cluster.name]
+        puts format(str, 'ID', cluster.id.to_s)
+        puts format(str, 'NAME', cluster.name)
+
         puts
+        CLIHelper.print_header(str_h1 % 'CLUSTER RESOURCES', false)
+        cluster.info!
 
-        CLIHelper.print_header(str_h1 % "CLUSTER TEMPLATE", false)
-        puts cluster.template_str
+        hosts = cluster.to_hash['CLUSTER']['HOSTS']['ID']
+
+        if hosts
+            total_cpu = 0
+            used_cpu  = 0
+            total_ram = 0
+            used_ram  = 0
+
+            [hosts].flatten.each do |h|
+                h = OpenNebula::Host.new_with_id(h, @client)
+
+                h.info!
+
+                h = h.to_hash
+                h = h['HOST']['HOST_SHARE']
+
+                total_cpu += h['TOTAL_CPU'].to_i / 100
+                used_cpu  += h['CPU_USAGE'].to_i / 100
+                total_ram += h['TOTAL_MEM'].to_i / 1024 / 1024
+                used_ram  += h['MEM_USAGE'].to_i / 1024 / 1024
+            end
+
+            puts "TOTAL CPUs: #{total_cpu}"
+            puts "OCCUPIED CPUs: #{used_cpu}"
+            puts "AVAILABLE CPUs: #{total_cpu - used_cpu}"
+            puts
+            puts "TOTAL RAM: #{total_ram}"
+            puts "OCCUPIED RAM: #{used_ram}"
+            puts "AVAILABLE RAM: #{total_ram - used_ram}"
+        end
 
         puts
+        CLIHelper.print_header(str_h1 % 'CLUSTER TEMPLATE', false)
+        puts cluster.template_str
 
-        CLIHelper.print_header("%-15s" % ["HOSTS"])
+        puts
+        CLIHelper.print_header(format('%-15s', 'HOSTS'))
         cluster.host_ids.each do |id|
-            puts "%-15s" % [id]
+            puts format('%-15s', id)
         end
 
         puts
-        CLIHelper.print_header("%-15s" % ["VNETS"])
+        CLIHelper.print_header(format('%-15s', 'VNETS'))
         cluster.vnet_ids.each do |id|
-            puts "%-15s" % [id]
+            puts format('%-15s', id)
         end
 
         puts
-        CLIHelper.print_header("%-15s" % ["DATASTORES"])
+        CLIHelper.print_header(format('%-15s', 'DATASTORES'))
         cluster.datastore_ids.each do |id|
-            puts "%-15s" % [id]
+            puts format('%-15s', id)
         end
     end
+
 end

data/lib/one_helper/onemarket_helper.rb

@@ -36,6 +36,12 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
         "onemarket.yaml"
     end
 
+    def self.state_to_str(id)
+        state_str = MarketPlace::MARKETPLACE_STATES[id.to_i]
+
+        MarketPlace::SHORT_MARKETPLACE_STATES[state_str]
+    end
+
     def format_pool(options)
         config_file = self.class.table_conf
 
@@ -86,7 +92,11 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
                 d["ZONE_ID"]
             end
 
-            default :ID, :NAME, :SIZE, :AVAIL, :APPS, :MAD, :ZONE
+            column :STAT, 'Markeplace status', :left, :size => 4 do |d|
+                OneMarketPlaceHelper.state_to_str(d['STATE'])
+            end
+
+            default :ID, :NAME, :SIZE, :AVAIL, :APPS, :MAD, :ZONE, :STAT
         end
 
         table
@@ -116,6 +126,7 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
         puts str % ["NAME",  market.name]
         puts str % ["USER",  market['UNAME']]
         puts str % ["GROUP", market['GNAME']]
+        puts str % ["STATE", market.state_str]
 
         puts str % ["MARKET_MAD", market['MARKET_MAD']]
         puts

data/lib/one_helper/onevcenter_helper.rb

@@ -188,14 +188,14 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
 
     # This method will print a list for a vcenter_resource.
     #
-    def list_object(_options, list)
+    def list_object(options, list)
         vcenter_host = list.keys[0]
         list = cli_format(list.values.first)
         table = format_list
 
         show_header(vcenter_host)
 
-        table.show(list)
+        table.show(list, options)
     end
 
     # handles :cli section of TABLE

data/lib/one_helper/onevm_helper.rb

@@ -124,7 +124,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :name => 'weekly',
         :large => '--weekly days',
         :description => 'Repeats the schedule action the days of the week ' \
-        'specified, it can be a number between 0,6 separated with commas.' \
+        'specified, it can be a number between 0 (Sunday) to 6 (Saturday) ' \
+        'separated with commas. ' \
         'For example: onevm resume 0 --schedule "09/23 14:15" --weekly 0,2,4',
         :format => String
     }
@@ -133,8 +134,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :name => 'monthly',
         :large => '--monthly days',
         :description => 'Repeats the schedule action the days of the month ' \
-        'specified, it can be a number between 0,31 separated with commas.' \
-        'For example: onevm resume 0 --schedule "09/23 14:15" --monthly 0,14',
+        'specified, it can be a number between 1,31 separated with commas. ' \
+        'For example: onevm resume 0 --schedule "09/23 14:15" --monthly 1,14',
         :format => String
     }
 
@@ -142,7 +143,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :name => 'yearly',
         :large => '--yearly days',
         :description => 'Repeats the schedule action the days of the year ' \
-        'specified, it can be a number between 0,365 separated with commas.' \
+        'specified, it can be a number between 0,365 separated with commas. ' \
         'For example: onevm resume 0 --schedule "09/23 14:15" --yearly 30,60',
         :format => String
     }
@@ -151,7 +152,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :name => 'hourly',
         :large => '--hourly hour',
         :description => 'Repeats the schedule action each hours specified,' \
-        'it can be a number between 0,168 separated with commas.' \
+        'it can be a number between 0,168 separated with commas. ' \
         'For example: onevm resume 0 --schedule "09/23 14:15" --hourly 1,5',
         :format => Numeric
     }
@@ -439,21 +440,6 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 str_periodic << ', END_TYPE = 0'
             end
 
-            rc = vm.info
-
-            if OpenNebula.is_error?(rc)
-                puts rc.message
-                exit(-1)
-            end
-
-            ids = vm.retrieve_elements('USER_TEMPLATE/SCHED_ACTION/ID')
-
-            id = 0
-            if !ids.nil? && !ids.empty?
-                ids.map! {|e| e.to_i }
-                id = ids.max + 1
-            end
-
             sched = options[:schedule]
 
             # If the action is set to be executed from VM start to an specific
@@ -463,16 +449,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 sched = sched.to_i
             end
 
-            tmp_str = vm.user_template_str
-
-            tmp_str << "\nSCHED_ACTION = "
-            tmp_str << "[ID = #{id}, ACTION = #{action}, "
+            tmp_str = "SCHED_ACTION = ["
+            tmp_str << "ACTION = #{action}, "
             tmp_str << "WARNING = #{warning}," if warning
             tmp_str << "ARGS = \"#{options[:args]}\"," if options[:args]
             tmp_str << "TIME = #{sched}"
             tmp_str << str_periodic << ']'
 
-            vm.update(tmp_str)
+            vm.sched_action_add(tmp_str)
         end
     end
 
@@ -490,7 +474,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 exit(-1)
             end
 
-            xpath = "USER_TEMPLATE/SCHED_ACTION[ID=#{action_id}]"
+            xpath = "TEMPLATE/SCHED_ACTION[ID=#{action_id}]"
 
             unless vm.retrieve_elements(xpath)
                 STDERR.puts "Sched action #{action_id} not found"
@@ -508,12 +492,11 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             vm.delete_element(xpath)
 
             # Add the modified sched action
-            tmp_str = vm.user_template_str
-            tmp_str << "\nSCHED_ACTION = ["
+            tmp_str = "\nSCHED_ACTION = ["
             tmp_str << str.split("\n").join(',')
             tmp_str << ']'
 
-            rc = vm.update(tmp_str)
+            rc = vm.sched_action_update(action_id, tmp_str)
 
             if OpenNebula.is_error?(rc)
                 STDERR.puts "Error updating: #{rc.message}"
@@ -669,6 +652,78 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         YAML.load_file(self.class.table_conf)[:charters]
     end
 
+    # SSH into a VM
+    #
+    # @param args    [Array] CLI arguments
+    # @param options [Hash]  CLI parameters
+    def ssh(args, options)
+        perform_action(args[0], options, 'SSH') do |vm|
+            rc = vm.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(-1)
+            end
+
+            if vm.lcm_state_str != 'RUNNING'
+                STDERR.puts 'VM is not RUNNING, cannot SSH to it'
+                exit(-1)
+            end
+
+            # Get user to login
+            username = vm.retrieve_xmlelements('//TEMPLATE/CONTEXT/USERNAME')[0]
+
+            if !username.nil?
+                login = username.text
+            elsif !args[1].nil?
+                login = args[1]
+            else
+                login = 'root'
+            end
+
+            # 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]
+
+            if opts.empty?
+                exec(*%W[ssh #{login}@#{ip} -p #{port} #{cmd}])
+            else
+                exec('ssh', *opts.split, *%W[#{login}@#{ip} -p #{port} #{cmd}])
+            end
+        end
+
+        # rubocop:disable Style/SpecialGlobalVars
+        $?.exitstatus
+        # rubocop:enable Style/SpecialGlobalVars
+    end
+
     private
 
     def factory(id = nil)
@@ -1086,6 +1141,26 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
         end
 
+        if vm_hash['VM']['TEMPLATE']['NIC']
+            nic = [vm_hash['VM']['TEMPLATE']['NIC']]
+            nic = nic.flatten
+            nic = nic.select {|v| !v['EXTERNAL_PORT_RANGE'].nil? }[0]
+
+            if nic
+                ip   = vm_hash['VM']['HISTORY_RECORDS']['HISTORY']
+                ip   = [ip].flatten[-1]['HOSTNAME']
+                port = Integer(nic['EXTERNAL_PORT_RANGE'].split(':')[0]) + 21
+
+                puts
+                CLIHelper.print_header(str_h1 % 'PORT FORWARD', false)
+
+                puts "[#{nic['EXTERNAL_PORT_RANGE']}]:" \
+                     "[#{nic['INTERNAL_PORT_RANGE'].split('/')[0]}]"
+
+                puts "SSH on #{ip} at port #{port}"
+            end
+        end
+
         if !options[:all]
             while vm.has_elements?('/VM/TEMPLATE/NIC')
                 vm.delete_element('/VM/TEMPLATE/NIC')
@@ -1207,7 +1282,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             format_history(vm)
         end
 
-        if vm.has_elements?('/VM/USER_TEMPLATE/SCHED_ACTION')
+        if vm.has_elements?('/VM/TEMPLATE/SCHED_ACTION')
             puts
             CLIHelper.print_header(str_h1 % 'SCHEDULED ACTIONS', false)
 
@@ -1225,7 +1300,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 end
 
                 column :SCHEDULED, '', :adjust => true do |d|
-                    OpenNebulaHelper.time_to_str(d['TIME'], false) \
+                    t2 = d['TIME'].to_i
+                    t2 += vm['STIME'].to_i unless d['TIME'] =~ /^[0-9].*/
+
+                    OpenNebulaHelper.time_to_str(t2, false) \
                         unless d.nil?
                 end
 
@@ -1276,7 +1354,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
                 column :CHARTER, '', :left, :adjust, :size => 15 do |d|
                     t1 = Time.now
-                    t2 = Time.at(vm['STIME'].to_i + d['TIME'].to_i)
+                    t2 = d['TIME'].to_i
+                    t2 += vm['STIME'].to_i unless d['TIME'] =~ /^[0-9].*/
+
+                    t2 = Time.at(t2)
 
                     days    = ((t2 - t1) / (24 * 3600)).round(2)
                     hours   = ((t2 - t1) / 3600).round(2)
@@ -1284,7 +1365,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
                     if days > 1
                         show = "In #{days} days"
-                    elsif days < 1 && hours > 1
+                    elsif days <= 1 && hours > 1
                         show = "In #{hours} hours"
                     elsif minutes > 0
                         show = "In #{minutes} minutes"
@@ -1292,18 +1373,19 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                         show = 'Already done'
                     end
 
-                    if (t1 - vm['STIME'].to_i).to_i > d['WARNING'].to_i
+                    wrn = d['WARNING']
+                    if !wrn.nil? && (t1 - vm['STIME'].to_i).to_i > wrn.to_i
                         "#{show} *"
                     else
                         show
                     end
                 end
-            end.show([vm_hash['VM']['USER_TEMPLATE']['SCHED_ACTION']].flatten,
+            end.show([vm_hash['VM']['TEMPLATE']['SCHED_ACTION']].flatten,
                      {})
         end
 
         if !options[:all]
-            vm.delete_element('/VM/USER_TEMPLATE/SCHED_ACTION')
+            vm.delete_element('/VM/TEMPLATE/SCHED_ACTION')
         end
 
         if vm.has_elements?('/VM/USER_TEMPLATE')