opennebula-cli 6.6.2 → 6.7.80.pre

data/lib/one_helper/onevm_helper.rb

@@ -112,72 +112,6 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :description => 'Creates the new VM on hold state instead of pending'
     }
 
-    SCHEDULE = {
-        :name => 'schedule',
-        :large => '--schedule TIME',
-        :description => 'Schedules this action to be executed after' \
-        'the given time. For example: onevm resume 0 --schedule "09/23 14:15"',
-        :format => String,
-        :proc => lambda {|o, options|
-            if o[0] == '+'
-                options[:schedule] = o
-            elsif o == 'now'
-                options[:schedule] = Time.now.to_i
-            else
-                begin
-                    options[:schedule] = Time.parse(o).to_i
-                rescue StandardError
-                    STDERR.puts "Error parsing time spec: #{o}"
-                    exit(-1)
-                end
-            end
-        }
-    }
-
-    WEEKLY = {
-        :name => 'weekly',
-        :large => '--weekly days',
-        :description => 'Repeats the schedule action the days of the week ' \
-        '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
-    }
-
-    MONTHLY = {
-        :name => 'monthly',
-        :large => '--monthly days',
-        :description => 'Repeats the schedule action the days of the month ' \
-        '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
-    }
-
-    YEARLY = {
-        :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. ' \
-        'For example: onevm resume 0 --schedule "09/23 14:15" --yearly 30,60',
-        :format => String
-    }
-
-    HOURLY = {
-        :name => 'hourly',
-        :large => '--hourly hour',
-        :description => 'Repeats the schedule action each hours specified,' \
-        '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
-    }
-
-    END_TIME = {
-        :name => 'end',
-        :large => '--end number|TIME',
-        :description => '----',
-        :format => String
-    }
-
     ALL_TEMPLATE = {
         :name => 'all',
         :large => '--all',
@@ -267,8 +201,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
 
         vm_nics.each do |nic|
-            %w[IP EXTERNAL_IP IP6_GLOBAL IP6_ULA IP6
-               VROUTER_IP VROUTER_IP6_GLOBAL VROUTER_IP6_ULA].each do |attr|
+            ['IP', 'EXTERNAL_IP', 'IP6_GLOBAL', 'IP6_ULA', 'IP6', 'VROUTER_IP',
+             'VROUTER_IP6_GLOBAL', 'VROUTER_IP6_ULA'].each do |attr|
                 if nic.key?(attr)
                     ips.push(nic[attr])
                 end
@@ -333,7 +267,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
         end
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
+        CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ONE identifier for Virtual Machine', :size => 6 do |d|
                 d['ID']
             end
@@ -377,7 +311,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                    :left, :size => 10 do |d|
                 if d['HISTORY_RECORDS'] && d['HISTORY_RECORDS']['HISTORY']
                     state_str = VirtualMachine::VM_STATE[d['STATE'].to_i]
-                    if %w[ACTIVE SUSPENDED POWEROFF].include? state_str
+                    if ['ACTIVE', 'SUSPENDED', 'POWEROFF'].include? state_str
                         d['HISTORY_RECORDS']['HISTORY']['HOSTNAME']
                     end
                 end
@@ -414,8 +348,6 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             default :ID, :USER, :GROUP, :NAME, :STAT, :CPU, :MEM, :HOST,
                     :TIME
         end
-
-        table
     end
 
     def schedule_actions(ids, options, action, warning = nil)
@@ -428,46 +360,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                       "#{action} scheduled after #{options[:schedule]}s from start"
                   end
 
-        perform_actions( ids, options, message) do |vm|
-
-            str_periodic = ''
-
-            if options.key?(:weekly)
-                str_periodic << ", REPEAT = 0, DAYS = \"#{options[:weekly]}\""
-            elsif options.key?(:monthly)
-                str_periodic << ", REPEAT = 1, DAYS = \"#{options[:monthly]}\""
-            elsif options.key?(:yearly)
-                str_periodic << ", REPEAT = 2, DAYS = \"#{options[:yearly]}\""
-            elsif options.key?(:hourly)
-                str_periodic << ", REPEAT = 3, DAYS = \"#{options[:hourly]}\""
-            end
-
-            if options.key?(:end)
-                begin
-                    end_date = Date.parse(options[:end])
-                    str_periodic << ', END_TYPE = 2, ' \
-                            "END_VALUE = #{end_date.to_time.to_i}"
-                rescue ArgumentError
-                    if options[:end].to_i > 0
-                        str_periodic << ', END_TYPE = 1, ' \
-                            "END_VALUE = #{options[:end].to_i}"
-                    end
-                end
-            elsif str_periodic != ''
-                str_periodic << ', END_TYPE = 0'
-            end
-
-            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 = #{options[:schedule]}"
-            tmp_str << str_periodic << ']'
+        tmp_str = OpenNebulaHelper.schedule_action_tmpl(options, action, warning)
 
+        perform_actions(ids, options, message) do |vm|
             rc = vm.sched_action_add(tmp_str)
 
             if OpenNebula.is_error?(rc)
-                return rc
+                STDERR.puts rc.message
+                return -1
             end
         end
     end
@@ -477,8 +377,9 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
     # @param vm_id     [Integer] Virtual Machine ID
     # @param action_id [Integer] Sched action ID
     # @param file      [String]  File path with update content
-    def update_schedule_action(vm_id, action_id, file)
-        perform_action(vm_id, {}, 'Sched action updated') do |vm|
+    # @param options
+    def update_schedule_action(vm_id, action_id, file, options)
+        perform_action(vm_id, options, 'Sched action updated') do |vm|
             rc = vm.info
 
             if OpenNebula.is_error?(rc)
@@ -600,7 +501,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 EOF
 
                 ans = ''
-                until %w[n a r q].include?(ans)
+                until ['n', 'a', 'r', 'q'].include?(ans)
                     printf '> '
                     ans = STDIN.gets.strip.downcase
 
@@ -618,7 +519,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
                         if result == 'SUCCESS'
                             success = true
-                            puts result.to_s
+                            puts result
                         else
                             puts
                             puts "#{result}. Repeat command.".red
@@ -660,7 +561,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
     #       - action
     #           - time
     #           - warning
-    def get_charters
+    def charters
         YAML.load_file(self.class.table_conf)[:charters]
     end
 
@@ -725,9 +626,9 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             options[:ssh_opts].nil? ? opts = '' : opts = options[:ssh_opts]
 
             if opts.empty?
-                exec(*%W[ssh #{login}@#{ip} -p #{port} #{cmd}])
+                exec('ssh', "#{login}@#{ip}", '-p', port.to_s, cmd.to_s)
             else
-                exec('ssh', *opts.split, *%W[#{login}@#{ip} -p #{port} #{cmd}])
+                exec('ssh', *opts.split, "#{login}@#{ip}", '-p', port.to_s, cmd.to_s)
             end
         end
 
@@ -759,7 +660,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
         vm_hash = vm.to_hash
 
-        if %w[ACTIVE SUSPENDED POWEROFF].include? vm.state_str
+        if ['ACTIVE', 'SUSPENDED', 'POWEROFF'].include? vm.state_str
             cluster_id = vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID']
         else
             cluster_id = nil
@@ -794,7 +695,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     OpenNebulaHelper.level_lock_to_str(vm['LOCK/LOCKED']))
         puts format(str, 'RESCHED',
                     OpenNebulaHelper.boolean_to_str(vm['RESCHED']))
-        if %w[ACTIVE SUSPENDED POWEROFF].include? vm.state_str
+        if ['ACTIVE', 'SUSPENDED', 'POWEROFF'].include? vm.state_str
             puts format(str, 'HOST',
                         vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME'])
         end
@@ -823,7 +724,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
         end
 
-        order_attrs = %w[CPU MEMORY NETTX NETRX]
+        order_attrs = ['CPU', 'MEMORY', 'NETTX', 'NETRX']
 
         vm_monitoring_sort = []
         order_attrs.each do |key|
@@ -834,7 +735,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
         vm_monitoring_sort.sort_by {|a| a[0] }
 
-        filter_attrs = %w[STATE DISK_SIZE SNAPSHOT_SIZE]
+        filter_attrs = ['STATE', 'DISK_SIZE', 'SNAPSHOT_SIZE']
         vm_monitoring.each do |key, val|
             if !filter_attrs.include?(key)
                 vm_monitoring_sort << [key, val]
@@ -856,7 +757,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
         CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
 
-        %w[OWNER GROUP OTHER].each do |e|
+        ['OWNER', 'GROUP', 'OTHER'].each do |e|
             mask = '---'
             mask[0] = 'u' if vm["PERMISSIONS/#{e}_U"] == '1'
             mask[1] = 'm' if vm["PERMISSIONS/#{e}_M"] == '1'
@@ -969,9 +870,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end.show(vm_disks, {})
 
             if !options[:all]
-                while vm.has_elements?('/VM/TEMPLATE/DISK')
-                    vm.delete_element('/VM/TEMPLATE/DISK')
-                end
+                vm.delete_element('/VM/TEMPLATE/DISK') while vm.has_elements?('/VM/TEMPLATE/DISK')
             end
         end
 
@@ -1006,17 +905,17 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         # array. Duplicate IPs are not shown.
         extra_ips = []
 
-        if (val = vm['/VM/MONITORING/GUEST_IP'])
-            extra_ips << val if val && !val.empty?
+        if (val = vm['/VM/MONITORING/GUEST_IP']) && (val && !val.empty?)
+            extra_ips << val
         end
 
-        if (val = vm['/VM/MONITORING/GUEST_IP_ADDRESSES'])
-            extra_ips += val.split(',') if val && !val.empty?
+        if (val = vm['/VM/MONITORING/GUEST_IP_ADDRESSES']) && (val && !val.empty?)
+            extra_ips += val.split(',')
         end
 
         extra_ips.uniq!
 
-        %w[NIC NIC_ALIAS].each do |type|
+        ['NIC', 'NIC_ALIAS'].each do |type|
             next unless vm.has_elements?("/VM/TEMPLATE/#{type}") ||
                         vm.has_elements?('/VM/TEMPLATE/PCI[NIC_ID>-1]') ||
                         !extra_ips.empty?
@@ -1052,7 +951,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             vm_nics.each do |nic|
                 next if nic.key?('CLI_DONE')
 
-                %w[EXTERNAL_IP IP6_LINK IP6_ULA IP6_GLOBAL IP6].each do |attr|
+                ['EXTERNAL_IP', 'IP6_LINK', 'IP6_ULA', 'IP6_GLOBAL', 'IP6'].each do |attr|
                     next unless nic.key?(attr)
 
                     shown_ips << nic[attr]
@@ -1065,8 +964,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     array_id += 1
                 end
 
-                %w[VROUTER_IP VROUTER_IP6_LINK
-                   VROUTER_IP6_ULA VROUTER_IP6_GLOBAL].each do |attr|
+                ['VROUTER_IP', 'VROUTER_IP6_LINK', 'VROUTER_IP6_ULA',
+                 'VROUTER_IP6_GLOBAL'].each do |attr|
                     next unless nic.key?(attr)
 
                     shown_ips << nic[attr]
@@ -1148,15 +1047,13 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
             next if options[:all]
 
-            while vm.has_elements?("/VM/TEMPLATE/#{type}")
-                vm.delete_element("/VM/TEMPLATE/#{type}")
-            end
+            vm.delete_element("/VM/TEMPLATE/#{type}") while vm.has_elements?("/VM/TEMPLATE/#{type}")
         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]
+            nic = nic.reject {|v| v['EXTERNAL_PORT_RANGE'].nil? }[0]
 
             if nic
                 ip   = vm_hash['VM']['HISTORY_RECORDS']['HISTORY']
@@ -1174,9 +1071,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
 
         if !options[:all]
-            while vm.has_elements?('/VM/TEMPLATE/NIC')
-                vm.delete_element('/VM/TEMPLATE/NIC')
-            end
+            vm.delete_element('/VM/TEMPLATE/NIC') while vm.has_elements?('/VM/TEMPLATE/NIC')
         end
 
         if vm.has_elements?('/VM/TEMPLATE/SECURITY_GROUP_RULE') && !is_hybrid
@@ -1298,91 +1193,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             puts
             CLIHelper.print_header(str_h1 % 'SCHEDULED ACTIONS', false)
 
-            CLIHelper::ShowTable.new(nil, self) do
-                column :ID, '', :adjust => true do |d|
-                    d['ID'] unless d.nil?
-                end
-
-                column :ACTION, '', :adjust => true do |d|
-                    d['ACTION'] unless d.nil?
-                end
-
-                column :ARGS, '', :adjust => true do |d|
-                    d['ARGS'] ? d['ARGS'] : '-'
-                end
-
-                column :SCHEDULED, '', :adjust => true do |d|
-                    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
-
-                column :REPEAT, '', :adjust => true do |d|
-                    str_rep = ''
-                    if !d.nil? && d.key?('REPEAT')
-                        if d['REPEAT'] == '0'
-                            str_rep << 'Weekly '
-                        elsif d['REPEAT'] == '1'
-                            str_rep << 'Monthly '
-                        elsif d['REPEAT'] == '2'
-                            str_rep << 'Yearly '
-                        elsif d['REPEAT'] == '3'
-                            str_rep << 'Each ' << d['DAYS'] << ' hours'
-                        end
-                        if d['REPEAT'] != '3'
-                            str_rep << d['DAYS']
-                        end
-                    end
-                    str_rep unless d.nil?
-                end
-
-                column :END, '', :adjust => true do |d|
-                    str_end = ''
-                    if !d.nil? && d.key?('END_TYPE')
-                        if d['END_TYPE'] == '0'
-                            str_end << 'None'
-                        elsif d['END_TYPE'] == '1'
-                            str_end << 'After ' << d['END_VALUE'] << ' times'
-                        elsif d['END_TYPE'] == '2'
-                            str_end << 'On ' << \
-                                OpenNebulaHelper.time_to_str(d['END_VALUE'],
-                                                             false, false,
-                                                             true)
-                        end
-                    end
-                    str_end unless d.nil?
-                end
-                column :STATUS, '', :left, :size => 50  do |d|
-                    if d['DONE'] && !d['REPEAT']
-                        "Done on #{OpenNebulaHelper.time_to_str(d['DONE'], false)}"
-                    elsif d['MESSAGE']
-                        "Error! #{d['MESSAGE']}"
-                    else
-                        t1 = Time.now
-                        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)
-                        minutes = ((t2 - t1) / 60).round(2)
-
-                        if days > 1
-                            "Next in #{days} days"
-                        elsif days <= 1 && hours > 1
-                            "Next in #{hours} hours"
-                        elsif minutes > 0
-                            "Next in #{minutes} minutes"
-                        else
-                            "Overdue!"
-                        end
-                    end
-                end
-            end.show([vm_hash['VM']['TEMPLATE']['SCHED_ACTION']].flatten,
-                     {})
+            table = OpenNebulaHelper.scheduled_action_table(self)
+            table.show([vm_hash['VM']['TEMPLATE']['SCHED_ACTION']].flatten, {})
         end
 
         if !options[:all]
@@ -1427,18 +1239,18 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
     def print_backups(vm, vm_hash)
         if vm.has_elements?('/VM/BACKUPS/BACKUP_CONFIG')
             puts
-            CLIHelper.print_header('%-80s' % 'BACKUP CONFIGURATION', false)
+            CLIHelper.print_header(format('%-80s', 'BACKUP CONFIGURATION'), false)
             puts vm.template_like_str('BACKUPS/BACKUP_CONFIG')
         end
 
-        if vm.has_elements?('/VM/BACKUPS/BACKUP_IDS')
-            puts
-            CLIHelper.print_header('%-80s' % 'VM BACKUPS', false)
+        return unless vm.has_elements?('/VM/BACKUPS/BACKUP_IDS')
 
-            ids = [vm_hash['VM']['BACKUPS']['BACKUP_IDS']['ID']].flatten
+        puts
+        CLIHelper.print_header(format('%-80s', 'VM BACKUPS'), false)
 
-            puts format('IMAGE IDS: %s', ids.join(','))
-        end
+        ids = [vm_hash['VM']['BACKUPS']['BACKUP_IDS']['ID']].flatten
+
+        puts format('IMAGE IDS: %s', ids.join(','))
     end
 
     def print_numa_nodes(numa_nodes)

data/lib/one_helper/onevmgroup_helper.rb

@@ -81,6 +81,21 @@ class OneVMGroupHelper < OpenNebulaHelper::OneHelper
         table
     end
 
+    def retrieve_role_id(vmg_id, id)
+        return [0, id.to_i] if id =~ /\A\d+\z/
+
+        puts vmg_id
+        vmg = retrieve_resource(vmg_id)
+        vmg.info
+
+        ids = vmg.retrieve_elements("ROLES/ROLE[NAME='#{id}']/ID")
+
+        return [-1, "#{id} not found or duplicated"] \
+                if ids.nil? || ids.size > 1
+
+        [0, ids[0].to_i]
+    end
+
     private
 
     def factory(id=nil)