opennebula-cli 7.0.2 → 7.2.0

data/lib/one_helper/onegroup_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    #
@@ -16,14 +16,18 @@
 
 require 'one_helper'
 require 'one_helper/onequota_helper'
+require 'opennebula/group'
+require 'opennebula/group_pool'
 
+# CLI helper for onegroup command
 class OneGroupHelper < OpenNebulaHelper::OneHelper
+
     def self.rname
-        "GROUP"
+        'GROUP'
     end
 
     def self.conf_file
-        "onegroup.yaml"
+        'onegroup.yaml'
     end
 
     def create_resource(options, &block)
@@ -34,12 +38,12 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
         if OpenNebula.is_error?(rc)
             return -1, rc.message
         else
-            puts "ID: #{group.id.to_s}"
+            puts "ID: #{group.id}"
         end
 
         puts "Creating default ACL rules: #{GROUP_DEFAULT_ACLS}" if options[:verbose]
 
-        exit_code , msg = group.create_default_acls
+        exit_code, _msg = group.create_default_acls
 
         if OpenNebula.is_error?(exit_code)
             return -1, exit_code.message
@@ -60,23 +64,32 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
         return 0
     end
 
-    def format_pool(options)
+    def format_pool(_options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
-            def pool_default_quotas(path)
-                @data.dsearch('/GROUP_POOL/DEFAULT_GROUP_QUOTAS/'+path)
+        # rubocop:disable Style/FormatStringToken
+        CLIHelper::ShowTable.new(config_file, self) do
+            pool_default_quotas = lambda do |path|
+                limit = @data.dsearch('/GROUP_POOL/DEFAULT_GROUP_QUOTAS/'+path)
+                limit = OneQuotaHelper::LIMIT_UNLIMITED if limit.nil? || limit.empty?
+                limit
             end
 
-            def quotas
+            quotas_proc = lambda do
                 if !defined?(@quotas)
                     quotas = @data.dsearch('GROUP_POOL/QUOTAS')
-                    @quotas = Hash.new
+                    @quotas = {}
 
-                    if (!quotas.nil?)
+                    if !quotas.nil?
                         quotas = [quotas].flatten
 
                         quotas.each do |q|
+                            # Fix rare bug, when there are multiple VM_QUOTA values
+                            vm_quota = q['VM_QUOTA']
+                            if vm_quota.is_a?(Array)
+                                q['VM_QUOTA'] = vm_quota.max_by {|h| h.size }
+                            end
+
                             @quotas[q['ID']] = q
                         end
                     end
@@ -84,112 +97,141 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                 @quotas
             end
 
-            column :ID, "ONE identifier for the Group", :size=>4 do |d|
-                d["ID"]
+            column :ID, 'ONE identifier for the Group', :size=>4 do |d|
+                d['ID']
             end
 
-            column :NAME, "Name of the Group", :left, :size=>29 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the Group', :left, :size=>29 do |d|
+                d['NAME']
             end
 
-            column :USERS, "Number of Users in this group", :size=>5 do |d|
-                ids = d["USERS"]["ID"]
+            column :USERS, 'Number of Users in this group', :size=>5 do |d|
+                ids = d['USERS']['ID']
 
                 case ids
                 when String
-                    "1"
+                    '1'
                 when Array
                     ids.size
                 else
-                    "0"
+                    '0'
                 end
             end
 
-            column :VMS , "Number of VMS", :size=>9 do |d|
+            column :VMS, 'Number of VMS', :size=>9 do |d|
                 begin
-                    q = quotas[d['ID']]
+                    q = quotas_proc.call[d['ID']]['VM_QUOTA']['VM']
 
-                    if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
-                        q['VM_QUOTA']['VM'] = OneQuotaHelper::DEFAULT_VM_QUOTA
+                    if q.nil? && d['ID'].to_i != 0
+                        q = OneQuotaHelper::DEFAULT_VM_QUOTA
                     end
 
-                    limit = q['VM_QUOTA']['VM']["VMS"]
-
-                    if limit == OneQuotaHelper::LIMIT_DEFAULT
-                        limit = pool_default_quotas("VM_QUOTA/VM/VMS")
-                        limit = OneQuotaHelper::LIMIT_UNLIMITED if limit.nil? || limit == ""
+                    # In case of multiple quotas, use the global quota or the first
+                    if q.is_a?(Array)
+                        global_h = q.find {|h| h['CLUSTER_IDS'].nil? || h['CLUSTER_IDS'].empty? }
+                        q = global_h || q[0]
                     end
 
+                    limit = q['VMS']
+                    limit = pool_default_quotas.call('VM_QUOTA/VM/VMS') if limit == OneQuotaHelper::LIMIT_DEFAULT
+
                     if limit == OneQuotaHelper::LIMIT_UNLIMITED
-                        "%3d /   -" % [q['VM_QUOTA']['VM']["VMS_USED"]]
+                        format('%3d /   -', q['VMS_USED'])
                     else
-                        "%3d / %3d" % [q['VM_QUOTA']['VM']["VMS_USED"], limit]
+                        format('%3d / %3d', q['VMS_USED'], limit)
                     end
-
                 rescue NoMethodError
-                    "-"
+                    '-'
                 end
             end
 
-            column :MEMORY, "Total memory allocated to user VMs", :size=>17 do |d|
+            column :MEMORY, 'Total memory allocated to user VMs', :size=>15 do |d|
                 begin
-                    q = quotas[d['ID']]
+                    q = quotas_proc.call[d['ID']]['VM_QUOTA']['VM']
 
-                    if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
-                        q['VM_QUOTA']['VM'] = OneQuotaHelper::DEFAULT_VM_QUOTA
+                    if q.nil? && d['ID'].to_i != 0
+                        q = OneQuotaHelper::DEFAULT_VM_QUOTA
                     end
 
-                    limit = q['VM_QUOTA']['VM']["MEMORY"]
-
-                    if limit == OneQuotaHelper::LIMIT_DEFAULT
-                        limit = pool_default_quotas("VM_QUOTA/VM/MEMORY")
-                        limit = OneQuotaHelper::LIMIT_UNLIMITED if limit.nil? || limit == ""
+                    # In case of multiple quotas, use the global quota or the first
+                    if q.is_a?(Array)
+                        global_h = q.find {|h| h['CLUSTER_IDS'].nil? || h['CLUSTER_IDS'].empty? }
+                        q = global_h || q[0]
                     end
 
+                    limit = q['MEMORY']
+                    limit = pool_default_quotas.call('VM_QUOTA/VM/MEMORY') if limit == OneQuotaHelper::LIMIT_DEFAULT
+
                     if limit == OneQuotaHelper::LIMIT_UNLIMITED
-                        "%7s /       -" % [
-                            OpenNebulaHelper.unit_to_str(q['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M")]
+                        format('%6s /      -',
+                               OpenNebulaHelper.unit_to_str(q['MEMORY_USED'].to_i, {}, 'M'))
                     else
-                        "%7s / %7s" % [
-                            OpenNebulaHelper.unit_to_str(q['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M"),
-                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")]
+                        format('%6s / %6s',
+                               OpenNebulaHelper.unit_to_str(q['MEMORY_USED'].to_i, {}, 'M'),
+                               OpenNebulaHelper.unit_to_str(limit.to_i, {}, 'M'))
                     end
-
                 rescue NoMethodError
-                    "-"
+                    '-'
                 end
             end
 
-            column :CPU, "Total CPU allocated to user VMs", :size=>11 do |d|
+            column :CPU, 'Total CPU allocated to user VMs', :size=>11 do |d|
                 begin
-                    q = quotas[d['ID']]
+                    q = quotas_proc.call[d['ID']]['VM_QUOTA']['VM']
 
-                    if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
-                        q['VM_QUOTA']['VM'] = OneQuotaHelper::DEFAULT_VM_QUOTA
+                    if q.nil? && d['ID'].to_i != 0
+                        q = OneQuotaHelper::DEFAULT_VM_QUOTA
                     end
 
-                    limit = q['VM_QUOTA']['VM']["CPU"]
-
-                    if limit == OneQuotaHelper::LIMIT_DEFAULT
-                        limit = pool_default_quotas("VM_QUOTA/VM/CPU")
-                        limit = OneQuotaHelper::LIMIT_UNLIMITED if limit.nil? || limit == ""
+                    # In case of multiple quotas, use the global quota or the first
+                    if q.is_a?(Array)
+                        global_h = q.find {|h| h['CLUSTER_IDS'].nil? || h['CLUSTER_IDS'].empty? }
+                        q = global_h || q[0]
                     end
 
+                    limit = q['CPU']
+                    limit = pool_default_quotas.call('VM_QUOTA/VM/CPU') if limit == OneQuotaHelper::LIMIT_DEFAULT
+
                     if limit == OneQuotaHelper::LIMIT_UNLIMITED
-                        "%3.1f /    -" % [q['VM_QUOTA']['VM']["CPU_USED"]]
+                        format('%3.1f /    -', q['CPU_USED'])
                     else
-                        "%3.1f / %3.1f" % [q['VM_QUOTA']['VM']["CPU_USED"], limit]
+                        format('%3.1f / %3.1f', q['CPU_USED'], limit)
+                    end
+                rescue NoMethodError
+                    '-'
+                end
+            end
+
+            column :PCI, 'Total PCIs allocated to user VMs', :size=>9 do |d|
+                begin
+                    q = quotas_proc.call[d['ID']]['VM_QUOTA']['VM']
+
+                    if q.nil? && d['ID'].to_i != 0
+                        q = OneQuotaHelper::DEFAULT_VM_QUOTA
                     end
 
+                    # In case of multiple quotas, use the global quota or the first
+                    if q.is_a?(Array)
+                        global_q = q.find {|h| h['CLUSTER_IDS'].nil? || h['CLUSTER_IDS'].empty? }
+                        q = global_q || q[0]
+                    end
+
+                    limit = q['PCI_DEV']
+                    limit = pool_default_quotas.call('VM_QUOTA/VM/PCI_DEV') if limit == OneQuotaHelper::LIMIT_DEFAULT
+
+                    if limit == OneQuotaHelper::LIMIT_UNLIMITED
+                        format('%3s /   -', q['PCI_DEV_USED'])
+                    else
+                        format('%3s / %3s', q['PCI_DEV_USED'], limit)
+                    end
                 rescue NoMethodError
-                    "-"
+                    '-'
                 end
             end
 
-            default :ID, :NAME, :USERS, :VMS, :MEMORY, :CPU
+            default :ID, :NAME, :USERS, :VMS, :MEMORY, :CPU, :PCI
         end
-
-        table
+        # rubocop:enable Style/FormatStringToken
     end
 
     # Parses a OpenNebula template string and turns it into a Hash
@@ -200,21 +242,21 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
         variable_reg =/\s*(#{name_reg})\s*=\s*/
         single_variable_reg =/^#{variable_reg}([^\[]+?)(#.*)?$/
 
-        tmpl                      = Hash.new
-        tmpl['user']              = Hash.new
+        tmpl         = {}
+        tmpl['user'] = {}
 
-        tmpl_str.scan(single_variable_reg) do | m |
+        tmpl_str.scan(single_variable_reg) do |m|
             key   = m[0].strip.downcase
-            value = m[1].strip.gsub("\"","")
+            value = m[1].strip.gsub('"', '')
             case key
-                when "admin_user_name"
-                    tmpl['user']['name']=value
-                when "admin_user_password"
-                    tmpl['user']['password']=value
-                when "admin_user_auth_driver"
-                    tmpl['user']['auth_driver']=value
-                else
-                    tmpl[key] = value
+            when 'admin_user_name'
+                tmpl['user']['name']=value
+            when 'admin_user_password'
+                tmpl['user']['password']=value
+            when 'admin_user_auth_driver'
+                tmpl['user']['auth_driver']=value
+            else
+                tmpl[key] = value
             end
         end
 
@@ -223,7 +265,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::Group.new_with_id(id, @client)
         else
@@ -232,39 +274,33 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(user_flag=-2)
-        #TBD OpenNebula::UserPool.new(@client, user_flag)
+    def factory_pool(_user_flag = -2)
         @group_pool = OpenNebula::GroupPool.new(@client)
-        return @group_pool
     end
 
-    def format_resource(group, options = {})
-        system = System.new(@client)
-
-        str="%-15s: %-20s"
-        str_h1="%-80s"
+    def format_resource(group, _options = {})
+        str='%-15s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(str_h1 % "GROUP #{group['ID']} INFORMATION")
-        puts str % ["ID",   group.id.to_s]
-        puts str % ["NAME", group.name]
+        puts format(str, 'ID',   group.id.to_s)
+        puts format(str, 'NAME', group.name)
         puts
 
-        CLIHelper.print_header(str_h1 % "GROUP TEMPLATE",false)
+        CLIHelper.print_header(str_h1 % 'GROUP TEMPLATE', false)
         puts group.template_str
         puts
 
-        admin_ids = group.admin_ids
-
         CLIHelper::ShowTable.new(nil, self) do
-            column :"USER ID", "", :right, :size=>7 do |d|
+            column :"USER ID", '', :right, :size=>7 do |d|
                 d
             end
 
-            column :"ADMIN", "", :left, :size=>5 do |d|
-                if (group.admin_ids.include?(d))
-                    "*"
+            column :ADMIN, '', :left, :size=>5 do |d|
+                if group.admin_ids.include?(d)
+                    '*'
                 else
-                    ""
+                    ''
                 end
             end
         end.show(group.user_ids, {})
@@ -273,11 +309,10 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
         default_quotas = nil
 
-        group.each('/GROUP/DEFAULT_GROUP_QUOTAS') { |elem|
-            default_quotas = elem
-        }
+        group.each('/GROUP/DEFAULT_GROUP_QUOTAS') {|elem| default_quotas = elem }
 
         helper = OneQuotaHelper.new(@client)
         helper.format_quota(group_hash['GROUP'], default_quotas, group.id)
     end
+
 end

data/lib/one_helper/onehook_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    #
@@ -15,7 +15,10 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
-require 'rubygems'
+require 'opennebula/hook'
+require 'opennebula/hook_pool'
+require 'opennebula/hook_log'
+require 'base64'
 
 # implements onehook command
 class OneHookHelper < OpenNebulaHelper::OneHelper

data/lib/one_helper/onehost_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    #
@@ -14,11 +14,14 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+require 'time'
+require 'fileutils'
 require 'HostSyncManager'
 require 'one_helper'
 require 'one_helper/onevm_helper'
-require 'rubygems'
-require 'time'
+require 'opennebula/host'
+require 'opennebula/host_pool'
+require 'opennebula/system'
 
 # implements onehost command
 class OneHostHelper < OpenNebulaHelper::OneHelper

data/lib/one_helper/oneimage_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    #
@@ -16,6 +16,8 @@
 
 require 'one_helper'
 require 'one_helper/onevm_helper'
+require 'opennebula/image'
+require 'opennebula/image_pool'
 
 # CLI helper for oneimage command
 class OneImageHelper < OpenNebulaHelper::OneHelper

data/lib/one_helper/onemarket_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    #
@@ -15,6 +15,8 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'opennebula/marketplace'
+require 'opennebula/marketplace_pool'
 
 class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
     MARKETPLACE = {

data/lib/one_helper/onemarketapp_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    #
@@ -15,9 +15,12 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'opennebula/marketplaceapp'
+require 'opennebula/marketplaceapp_pool'
 require 'opennebula/marketplaceapp_ext'
 require 'opennebula/template_ext'
 require 'opennebula/virtual_machine_ext'
+require 'opennebula/flow/service_template'
 require 'opennebula/flow/service_template_ext'
 
 require 'securerandom'