opennebula-cli 7.1.80.pre → 7.2.1

data/lib/one_helper/oneacct_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2026, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -19,242 +19,249 @@ require 'optparse/time'
 require 'opennebula/virtual_machine'
 require 'opennebula/virtual_machine_pool'
 
+# Helper class for accounting commands
 class AcctHelper < OpenNebulaHelper::OneHelper
+
     TIME_ZONE_CUR = {
-        :name  => "timezone",
-        :short => "-t TZ",
-        :large => "--timezone TZ",
-        :description => "User defined Time Zone",
+        :name  => 'timezone',
+        :short => '-t TZ',
+        :large => '--timezone TZ',
+        :description => 'User defined Time Zone',
         :format => String
     }
 
     START_TIME_ACCT = {
-        :name   => "start_time",
-        :short  => "-s TIME",
-        :large  => "--start TIME" ,
-        :description => "First day of the data to retrieve",
+        :name   => 'start_time',
+        :short  => '-s TIME',
+        :large  => '--start TIME',
+        :description => 'First day of the data to retrieve',
         :format => Time
     }
 
     END_TIME_ACCT = {
-        :name   => "end_time",
-        :short  => "-e TIME",
-        :large  => "--end TIME" ,
-        :description => "Last day of the data to retrieve",
+        :name   => 'end_time',
+        :short  => '-e TIME',
+        :large  => '--end TIME',
+        :description => 'Last day of the data to retrieve',
         :format => Time
     }
 
     START_TIME_SHOWBACK = {
-        :name   => "start_time",
-        :short  => "-s TIME",
-        :large  => "--start TIME" ,
-        :description => "First month of the data",
+        :name   => 'start_time',
+        :short  => '-s TIME',
+        :large  => '--start TIME',
+        :description => 'First month of the data',
         :format => Time
     }
 
     END_TIME_SHOWBACK = {
-        :name   => "end_time",
-        :short  => "-e TIME",
-        :large  => "--end TIME" ,
-        :description => "Last month of the data",
+        :name   => 'end_time',
+        :short  => '-e TIME',
+        :large  => '--end TIME',
+        :description => 'Last month of the data',
         :format => Time
     }
 
     USERFILTER = {
-        :name   => "userfilter",
-        :short  => "-u user",
-        :large  => "--userfilter user" ,
-        :description => "User name or id to filter the results",
+        :name   => 'userfilter',
+        :short  => '-u user',
+        :large  => '--userfilter user',
+        :description => 'User name or id to filter the results',
         :format => String,
-        :proc => lambda { |o, options|
-            OpenNebulaHelper.rname_to_id(o, "USER")
+        :proc => lambda {|o, _options|
+            OpenNebulaHelper.rname_to_id(o, 'USER')
         }
     }
 
     GROUP = {
-        :name   => "group",
-        :short  => "-g group",
-        :large  => "--group group" ,
-        :description => "Group name or id to filter the results",
+        :name   => 'group',
+        :short  => '-g group',
+        :large  => '--group group',
+        :description => 'Group name or id to filter the results',
         :format => String,
-        :proc => lambda { |o, options|
-            OpenNebulaHelper.rname_to_id(o, "GROUP")
+        :proc => lambda {|o, _options|
+            OpenNebulaHelper.rname_to_id(o, 'GROUP')
         }
     }
 
     HOST = {
-        :name   => "host",
-        :short  => "-H HOST",
-        :large  => "--host HOST" ,
-        :description => "Host name or id to filter the results",
+        :name   => 'host',
+        :short  => '-H HOST',
+        :large  => '--host HOST',
+        :description => 'Host name or id to filter the results',
         :format => String,
-        :proc => lambda { |o, options|
-            OpenNebulaHelper.rname_to_id(o, "HOST")
+        :proc => lambda {|o, _options|
+            OpenNebulaHelper.rname_to_id(o, 'HOST')
         }
     }
 
     XPATH = {
-        :name   => "xpath",
-        :large  => "--xpath XPATH_EXPRESSION" ,
+        :name   => 'xpath',
+        :large  => '--xpath XPATH_EXPRESSION',
         :description => "Xpath expression to filter the results. \
             For example: oneacct --xpath 'HISTORY[ETIME>0]'",
         :format => String
     }
 
     SPLIT={
-        :name  => "split",
-        :large => "--split",
-        :description => "Split the output in a table for each VM"
+        :name  => 'split',
+        :large => '--split',
+        :description => 'Split the output in a table for each VM'
     }
 
-    ACCT_OPTIONS     = [TIME_ZONE_CUR, START_TIME_ACCT, END_TIME_ACCT, USERFILTER, GROUP, HOST, XPATH, SPLIT]
+    ACCT_OPTIONS     = [TIME_ZONE_CUR, START_TIME_ACCT, END_TIME_ACCT, USERFILTER, GROUP, HOST,
+                        XPATH, SPLIT]
     SHOWBACK_OPTIONS = [START_TIME_SHOWBACK, END_TIME_SHOWBACK, USERFILTER, GROUP, OpenNebulaHelper::FORMAT]
 
     ACCT_OPTIONS << OpenNebulaHelper::XML
     ACCT_OPTIONS << OpenNebulaHelper::JSON
 
-    ACCT_TABLE = CLIHelper::ShowTable.new(self.table_conf("oneacct.yaml"), nil) do
-        column :UID, "User ID", :size=>4 do |d|
-            d["UID"]
+    ACCT_TABLE = CLIHelper::ShowTable.new(table_conf('oneacct.yaml'), nil) do
+        column :UID, 'User ID', :size=>4 do |d|
+            d['UID']
         end
 
-        column :VID, "Virtual Machine ID", :size=>4 do |d|
-            d["OID"]
+        column :VID, 'Virtual Machine ID', :size=>4 do |d|
+            d['OID']
         end
 
-        column :SEQ, "History record sequence number", :size=>3 do |d|
-            d["SEQ"]
+        column :SEQ, 'History record sequence number', :size=>3 do |d|
+            d['SEQ']
         end
 
-        column :HOSTNAME, "Host name", :left, :size=>15 do |d|
-            d["HOSTNAME"]
+        column :HOSTNAME, 'Host name', :left, :size=>15 do |d|
+            d['HOSTNAME']
         end
 
-        column :"ACTION", "VM state change action", :left, :size=>16 do |d|
-            VirtualMachine.get_history_action d["ACTION"]
+        column :ACTION, 'VM state change action', :left, :size=>16 do |d|
+            VirtualMachine.get_history_action d['ACTION']
         end
 
-        column :START_TIME, "Start time", :size=>14 do |d|
+        column :START_TIME, 'Start time', :size=>14 do |d|
             OpenNebulaHelper.time_to_str(d['STIME'])
         end
 
-        column :END_TIME, "End time", :size=>14 do |d|
+        column :END_TIME, 'End time', :size=>14 do |d|
             OpenNebulaHelper.time_to_str(d['ETIME'])
         end
 
-        column :MEMORY, "Assigned memory", :size=>6 do |d|
-            OpenNebulaHelper.unit_to_str(d["VM"]["TEMPLATE"]["MEMORY"].to_i, {}, 'M') rescue "-"
+        column :MEMORY, 'Assigned memory', :size=>6 do |d|
+            OpenNebulaHelper.unit_to_str(d['VM']['TEMPLATE']['MEMORY'].to_i, {}, 'M') rescue '-'
         end
 
-        column :CPU, "Number of CPUs", :size=>3 do |d|
-            d["VM"]["TEMPLATE"]["CPU"] rescue "-"
+        column :CPU, 'Number of CPUs', :size=>3 do |d|
+            d['VM']['TEMPLATE']['CPU'] rescue '-'
         end
 
-        column :NETRX, "Data received from the network", :size=>6 do |d|
+        column :NETRX, 'Data received from the network', :size=>6 do |d|
             # NET is measured in bytes, unit_to_str expects KBytes
-            OpenNebulaHelper.unit_to_str(d["VM"]["MONITORING"]["NETRX"].to_i / 1024.0, {}) rescue "-"
+            OpenNebulaHelper.unit_to_str(d['VM']['MONITORING']['NETRX'].to_i / 1024.0,
+                                         {}) rescue '-'
         end
 
-        column :NETTX, "Data sent to the network", :size=>6 do |d|
+        column :NETTX, 'Data sent to the network', :size=>6 do |d|
             # NET is measured in bytes, unit_to_str expects KBytes
-            OpenNebulaHelper.unit_to_str(d["VM"]["MONITORING"]["NETTX"].to_i / 1024.0, {}) rescue "-"
+            OpenNebulaHelper.unit_to_str(d['VM']['MONITORING']['NETTX'].to_i / 1024.0,
+                                         {}) rescue '-'
         end
 
-        column :DISK, "Total disk size used", :size=>6 do |d|
+        column :DISK, 'Total disk size used', :size=>6 do |d|
             # DISK size is measured in mb, unit_to_str expects KBytes
             begin
                 total_disk_size = 0
 
-                vm_id = d["VM"]["ID"].to_i
+                d['VM']['ID'].to_i
 
-                disks_all = [d["VM"]["TEMPLATE"]["DISK"]].flatten.compact rescue []
+                disks_all = [d['VM']['TEMPLATE']['DISK']].flatten.compact rescue []
                 disks_all.each do |disk|
-                    total_disk_size += disk["SIZE"].to_i
+                    total_disk_size += disk['SIZE'].to_i
                 end
 
-                snapshots_all = [d["VM"]["SNAPSHOTS"]].flatten.compact rescue []
+                snapshots_all = [d['VM']['SNAPSHOTS']].flatten.compact rescue []
                 snapshots_all.each do |snapshot|
-                    snapshot_disk = [snapshot["SNAPSHOT"]].flatten.compact rescue []
-                    snapshot_disk.each do |snapshot|
-                        total_disk_size += snapshot["SIZE"].to_i
+                    snapshot_disk = [snapshot['SNAPSHOT']].flatten.compact rescue []
+                    snapshot_disk.each do |s|
+                        total_disk_size += s['SIZE'].to_i
                     end
                 end
 
                 OpenNebulaHelper.unit_to_str(total_disk_size * 1024.0, {})
-            rescue
-                "-"
+            rescue StandardError
+                '-'
             end
         end
 
-        default :VID, :HOSTNAME, :ACTION, :START_TIME, :END_TIME, :MEMORY, :CPU, :NETRX, :NETTX, :DISK
+        default :VID, :HOSTNAME, :ACTION, :START_TIME, :END_TIME, :MEMORY, :CPU, :NETRX, :NETTX,
+                :DISK
     end
 
-    SHOWBACK_TABLE = CLIHelper::ShowTable.new(self.table_conf("oneshowback.yaml"), nil) do
-        column :UID, "User ID", :size=>4 do |d|
-            d["UID"]
+    SHOWBACK_TABLE = CLIHelper::ShowTable.new(table_conf('oneshowback.yaml'), nil) do
+        column :UID, 'User ID', :size=>4 do |d|
+            d['UID']
         end
 
-        column :USER_NAME, "User name", :left, :size=>12 do |d|
-            d["UNAME"]
+        column :USER_NAME, 'User name', :left, :size=>12 do |d|
+            d['UNAME']
         end
 
-        column :GID, "Group ID", :size=>4 do |d|
-            d["GID"]
+        column :GID, 'Group ID', :size=>4 do |d|
+            d['GID']
         end
 
-        column :GROUP_NAME, "Group name", :left, :size=>12 do |d|
-            d["GNAME"]
+        column :GROUP_NAME, 'Group name', :left, :size=>12 do |d|
+            d['GNAME']
         end
 
-        column :VM_ID, "Virtual Machine ID", :size=>6 do |d|
-            d["VMID"]
+        column :VM_ID, 'Virtual Machine ID', :size=>6 do |d|
+            d['VMID']
         end
 
-        column :VM_NAME, "Virtual Machine name", :left, :size=>12 do |d|
-            d["VMNAME"]
+        column :VM_NAME, 'Virtual Machine name', :left, :size=>12 do |d|
+            d['VMNAME']
         end
 
-        column :MONTH, "Month", :size=>5 do |d|
-            d["MONTH"]
+        column :MONTH, 'Month', :size=>5 do |d|
+            d['MONTH']
         end
 
-        column :YEAR, "Year", :size=>5 do |d|
-            d["YEAR"]
+        column :YEAR, 'Year', :size=>5 do |d|
+            d['YEAR']
         end
 
-        column :HOURS, "Hours", :size=>6 do |d|
-            d["HOURS"]
+        column :HOURS, 'Hours', :size=>6 do |d|
+            d['HOURS']
         end
 
-        column :RUNNING_HOURS, "Running hours", :size=>7 do |d|
-            d["RHOURS"] || '-'
+        column :RUNNING_HOURS, 'Running hours', :size=>7 do |d|
+            d['RHOURS'] || '-'
         end
 
-        column :COST, "Cost", :size=>15 do |d|
-            d["TOTAL_COST"]
+        column :COST, 'Cost', :size=>15 do |d|
+            d['TOTAL_COST']
         end
 
-        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :RUNNING_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)
-        print "Showing active history records from "
+        print 'Showing active history records from '
 
         CLIHelper.scr_bold
-        if ( start_time != -1 )
-            print Time.at(start_time).to_s
+        if start_time != -1
+            print Time.at(start_time)
         else
-            print "-"
+            print '-'
         end
 
         CLIHelper.scr_restore
-        print " to "
+        print ' to '
 
         CLIHelper.scr_bold
-        if ( end_time != -1 )
-            print Time.at(end_time).to_s
+        if end_time != -1
+            print Time.at(end_time)
         else
-            print "-"
+            print '-'
         end
 
         CLIHelper.scr_restore
@@ -277,4 +284,5 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         CLIHelper.scr_restore
         puts
     end
+
 end

data/lib/one_helper/oneacl_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2026, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onebackupjob_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2026, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onecluster_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2026, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #