opennebula-cli 6.10.4 → 6.99.85.pre

data/lib/one_helper/onegroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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    #
@@ -110,24 +110,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
-                        q['VM_QUOTA']['VM'] = {
-                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"              => "0",
-                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"              => "0",
-                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED"           => "0",
-                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_VMS_USED"      => "0",
-                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_CPU_USED"      => "0",
-                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_MEMORY_USED"   => "0",
-                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "SYSTEM_DISK_SIZE_USED" => "0"
-                        }
-
-                        quotas[d['ID']] = q
+                        q['VM_QUOTA']['VM'] = OneQuotaHelper::DEFAULT_VM_QUOTA
                     end
 
                     limit = q['VM_QUOTA']['VM']["VMS"]
@@ -153,24 +136,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
-                        q['VM_QUOTA']['VM'] = {
-                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"              => "0",
-                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"              => "0",
-                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED"           => "0",
-                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_VMS_USED"      => "0",
-                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_CPU_USED"      => "0",
-                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_MEMORY_USED"   => "0",
-                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "SYSTEM_DISK_SIZE_USED" => "0"
-                        }
-
-                        quotas[d['ID']] = q
+                        q['VM_QUOTA']['VM'] = OneQuotaHelper::DEFAULT_VM_QUOTA
                     end
 
                     limit = q['VM_QUOTA']['VM']["MEMORY"]
@@ -199,24 +165,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
-                        q['VM_QUOTA']['VM'] = {
-                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"              => "0",
-                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"              => "0",
-                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED"           => "0",
-                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_VMS_USED"      => "0",
-                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_CPU_USED"      => "0",
-                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
-                            "RUNNING_MEMORY_USED"   => "0",
-                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "SYSTEM_DISK_SIZE_USED" => "0"
-                        }
-
-                        quotas[d['ID']] = q
+                        q['VM_QUOTA']['VM'] = OneQuotaHelper::DEFAULT_VM_QUOTA
                     end
 
                     limit = q['VM_QUOTA']['VM']["CPU"]

data/lib/one_helper/onehook_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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/onehost_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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    #
@@ -24,66 +24,27 @@ require 'time'
 class OneHostHelper < OpenNebulaHelper::OneHelper
 
     TEMPLATE_XPATH = '//HOST/TEMPLATE'
-    HYBRID = {
-        :ec2 => {
-            :help => <<-EOT.unindent
-                #-----------------------------------------------------------------------
-                # Supported EC2 AUTH ATTRIBUTTES:
-                #
-                #  REGION_NAME = <the name of the ec2 region>
-                #
-                #  EC2_ACCESS = <Your ec2 access key id>
-                #  EC2_SECRET = <Your ec2 secret key>
-                #
-                #  CAPACITY = [
-                #    M1_SMALL  = <number of machines m1.small>,
-                #    M1_XLARGE = <number of machines m1.xlarge>,
-                #    M1_LARGE  = <number of machines m1.large>
-                #  ]
-                #
-                # You can set any machine type supported by ec2
-                # See your ec2_driver.conf for more information
-                #
-                #-----------------------------------------------------------------------
-            EOT
-        },
-        :az => {
-            :help => <<-EOT.unindent
-                #-----------------------------------------------------------------------
-                # Mandatory AZURE ATTRIBUTTES:
-                #
-                # AZ_SUB    = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-                # AZ_CLIENT = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-                # AZ_SECRET = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-                # AZ_TENANT = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-                # AZ_REGION = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-                #
-                # CAPACITY=[
-                #   STANDARD_B1LS =<number of machines Standard_B1ls>,
-                #   STANDARD_A1_V2=<number of machines Standard_A1_v2>
-                # ]
-                #
-                # Optional AZURE ATTRIBUTES:
-                #
-                # AZ_RGROUP = ""
-                #
-                # You can set any machine type supported by azure
-                # See your az_driver.conf for more information
-                #
-                #-----------------------------------------------------------------------
-            EOT
-        }
-    }
-
     VERSION_XPATH = "#{TEMPLATE_XPATH}/VERSION"
 
     MONITORING = {
-        'FREE_CPU'    => 'CAPACITY',
-        'FREE_MEMORY' => 'CAPACITY',
-        'USED_CPU'    => 'CAPACITY',
-        'USED_MEMORY' => 'CAPACITY',
-        'NETRX'       => 'SYSTEM',
-        'NETTX'       => 'SYSTEM'
+        'FREE_CPU'              => 'CAPACITY',
+        'FREE_CPU_FORECAST'     => 'CAPACITY',
+        'FREE_CPU_FORECAST_FAR' => 'CAPACITY',
+        'FREE_MEMORY'              => 'CAPACITY',
+        'FREE_MEMORY_FORECAST'     => 'CAPACITY',
+        'FREE_MEMORY_FORECAST_FAR' => 'CAPACITY',
+        'USED_CPU'                 => 'CAPACITY',
+        'USED_CPU_FORECAST'        => 'CAPACITY',
+        'USED_CPU_FORECAST_FAR'    => 'CAPACITY',
+        'USED_MEMORY'              => 'CAPACITY',
+        'USED_MEMORY_FORECAST'     => 'CAPACITY',
+        'USED_MEMORY_FORECAST_FAR' => 'CAPACITY',
+        'NETRX'               => 'SYSTEM',
+        'NETRX_FORECAST'      => 'SYSTEM',
+        'NETRX_FORECAST_FAR'  => 'SYSTEM',
+        'NETTX'               => 'SYSTEM',
+        'NETTX_FORECAST'      => 'SYSTEM',
+        'NETTX_FORECAST_FARR' => 'SYSTEM'
     }
 
     def self.rname
@@ -232,16 +193,6 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def set_hybrid(type, path)
-        k = type.to_sym
-
-        return unless HYBRID.key?(k)
-
-        return OpenNebulaHelper.editor_input(HYBRID[k][:help]) if path.nil?
-
-        File.read(path)
-    end
-
     NUM_THREADS = 15
     def sync(host_ids, options)
         if Process.uid.zero? || Process.gid.zero?
@@ -303,18 +254,11 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 next if host['CLUSTER_ID'].to_i != cluster_id
             end
 
-            vm_mad = host['VM_MAD'].downcase
             state = host['STATE']
 
-            # Skip this host from remote syncing if it's a PUBLIC_CLOUD host
-            next if host['TEMPLATE/PUBLIC_CLOUD'] == 'YES'
-
             # Skip this host from remote syncing if it's OFFLINE
             next if Host::HOST_STATES[state.to_i] == 'OFFLINE'
 
-            # Skip this host if it is a vCenter cluster
-            next if vm_mad == 'vcenter'
-
             host_version = host['TEMPLATE/VERSION']
 
             begin
@@ -432,9 +376,6 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
             state = host['STATE']
 
-            # Skip this host from remote syncing if it's a PUBLIC_CLOUD host
-            next if host['TEMPLATE/PUBLIC_CLOUD'] == 'YES'
-
             # Skip this host from remote syncing if it's OFFLINE
             next if Host::HOST_STATES[state.to_i] == 'OFFLINE'
 
@@ -462,9 +403,6 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         # Different available size units
         units = ['K', 'M', 'G', 'T']
 
-        # Attrs that need units conversion
-        attrs = ['FREE_MEMORY', 'USED_MEMORY']
-
         if unit && !units.include?(unit)
             STDERR.puts "Invalid unit `#{unit}`"
             exit(-1)
@@ -507,7 +445,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         # Parse dcollected data
         x = monitoring_data.collect {|v| Time.at(v[0].to_i).strftime('%H:%M') }
         y = monitoring_data.collect do |v|
-            if attrs.include?(attr)
+            if attr.match(/_MEMORY/)
                 # GB is the default unit
                 v = OpenNebulaHelper.bytes_to_unit(v[1].to_i, unit).round(2)
                 "#{v} #{unit}B"
@@ -518,7 +456,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
         title = ''
         title << "Host #{host.id} #{attr} "
-        title << "in #{unit}B " if unit && attrs.include?(attr)
+        title << "in #{unit}B " if unit && attr.match(/_MEMORY/)
         title << "from #{start_d} to #{end_d}"
 
         x = x.last(n_elems)
@@ -700,7 +638,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
         format = '%-30.30s %36s %4s %10s'
         CLIHelper.print_header(format(format, 'NAME',
-                                      'IMPORT_ID', 'CPU', 'MEMORY'),
+                                      'DEPLOY_ID', 'CPU', 'MEMORY'),
                                true)
 
         wilds.each do |wild|
@@ -718,8 +656,9 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                              line[/CPU/]
                          end[0].split('=')[1].tr('"', ' ').strip
             else
-                name = wild['DEPLOY_ID']
-                import = memory = cpu = '-'
+                name = wild['VM_NAME']
+                import = wild['DEPLOY_ID']
+                memory = cpu = '-'
             end
 
             puts format(format, name, import, cpu, memory)

data/lib/one_helper/oneimage_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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    #
@@ -22,7 +22,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
 
     # This list contains prefixes that should skip adding user home to the path
     # This must have the same content as the case $FROM in downloader.sh
-    PREFIXES = ['http', 'https', 'ssh', 's3', 'rbd', 'vcenter', 'lxd']
+    PREFIXES = ['http', 'https', 'ssh', 's3', 'rbd', 'lxd']
 
     TEMPLATE_OPTIONS=[
         {
@@ -111,23 +111,6 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
                 '(for others, check the documentation) ',
             :format => String
         },
-        {
-            :name => 'vcenter_disk_type',
-            :large => '--vcenter_disk_type vcenter_disk_type',
-            :description => "The vCenter Disk Type of the image \n"<<
-                ' ' * 31 <<
-                'for vCenter: THIN, THICK, ZEROEDTHICK ' \
-                '(for others, check the documentation) ',
-            :format => String
-        },
-        {
-            :name => 'vcenter_adapter_type',
-            :large => '--vcenter_adapter_type vcenter_adapter_type',
-            :description => 'Controller that will handle this image in ' \
-                'vCenter (lsiLogic, ide, busLogic). For other '\
-                'values check the documentation',
-            :format => String
-        },
         {
             :name => 'source',
             :large => '--source source',

data/lib/one_helper/onemarket_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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/onemarketapp_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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    #
@@ -96,6 +96,14 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.unit_to_str(d['SIZE'].to_i, {}, 'M')
             end
 
+            column :ARCH, 'OS Architecture', :size =>7 do |d|
+                d['TEMPLATE']['ARCHITECTURE']
+            end
+
+            column :HYPERVISOR, 'Hypervisor to use for VMs', :left, :size =>10 do |d|
+                d['TEMPLATE']['HYPERVISOR']
+            end
+
             column :STAT, 'State of the app', :size=>4 do |d|
                 OneMarketPlaceAppHelper.state_to_str(d['STATE'])
             end
@@ -121,6 +129,8 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
                     :NAME,
                     :VERSION,
                     :SIZE,
+                    :ARCH,
+                    :HYPERVISOR,
                     :STAT,
                     :TYPE,
                     :REGTIME,
@@ -547,7 +557,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
             # Iterate all the roles to ask for the marketplace
             body['roles'].each do |role|
                 # Read role VM template information from OpenNebula
-                template = Template.new_with_id(role['vm_template'], @client)
+                template = Template.new_with_id(role['template_id'], @client)
                 rc       = template.info
 
                 return rc if OpenNebula.is_error?(rc)
@@ -581,7 +591,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
             # Do not ask for marketplaces, just fill templates information
             body['roles'].each do |role|
                 # Read role VM template information from OpenNebula
-                template = Template.new_with_id(role['vm_template'], @client)
+                template = Template.new_with_id(role['template_id'], @client)
                 rc       = template.info
 
                 return rc if OpenNebula.is_error?(rc)

data/lib/one_helper/onequota_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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    #
@@ -20,6 +20,22 @@ class OneQuotaHelper
 
     LIMIT_DEFAULT   = "-1"
     LIMIT_UNLIMITED = "-2"
+    DEFAULT_VM_QUOTA = {
+                            "VMS"                   => LIMIT_DEFAULT,
+                            "VMS_USED"              => "0",
+                            "CPU"                   => LIMIT_DEFAULT,
+                            "CPU_USED"              => "0",
+                            "MEMORY"                => LIMIT_DEFAULT,
+                            "MEMORY_USED"           => "0",
+                            "RUNNING_VMS"           => LIMIT_DEFAULT,
+                            "RUNNING_VMS_USED"      => "0",
+                            "RUNNING_CPU"           => LIMIT_DEFAULT,
+                            "RUNNING_CPU_USED"      => "0",
+                            "RUNNING_MEMORY"        => LIMIT_DEFAULT,
+                            "RUNNING_MEMORY_USED"   => "0",
+                            "SYSTEM_DISK_SIZE"      => LIMIT_DEFAULT,
+                            "SYSTEM_DISK_SIZE_USED" => "0"
+                        }
 
     EDITOR_PATH='/usr/bin/vi'
 
@@ -214,7 +230,7 @@ class OneQuotaHelper
         generic_quotas = get_generic_quotas
 
         # This initializes the VM quotas for users/groups that don't have any
-        # resource usage yet. It not applied to oneamdin
+        # resource usage yet. It not applied to oneadmin
         if vm_quotas[0].nil? && resource_id.to_i != 0
             limit = LIMIT_DEFAULT
 
@@ -245,7 +261,13 @@ class OneQuotaHelper
 
         if !vm_quotas[0].nil?
             CLIHelper::ShowTable.new(nil, self) do
-                column :"VMS", "", :right, :size=>17 do |d|
+                column :"CLUSTERS", "", :right, :size=>8 do |d|
+                    if !d.nil?
+                        d['CLUSTER_IDS']
+                    end
+                end
+
+                column :"VMS", "", :right, :size=>11 do |d|
                     if !d.nil?
                         elem = 'VMS'
                         limit = d[elem]
@@ -253,14 +275,14 @@ class OneQuotaHelper
                             limit, "VM_QUOTA/VM/#{elem}")
 
                         if limit == LIMIT_UNLIMITED
-                            "%7d /       -" % [d["VMS_USED"]]
+                            "%4d /    -" % [d["VMS_USED"]]
                         else
-                            "%7d / %7d" % [d["VMS_USED"], limit]
+                            "%4d / %4d" % [d["VMS_USED"], limit]
                         end
                     end
                 end
 
-                column :"MEMORY", "", :right, :size=>20 do |d|
+                column :"MEMORY", "", :right, :size=>19 do |d|
                     if !d.nil?
                         elem = 'MEMORY'
                         limit = d[elem]
@@ -280,7 +302,7 @@ class OneQuotaHelper
                     end
                 end
 
-                column :"CPU", "", :right, :size=>20 do |d|
+                column :"CPU", "", :right, :size=>19 do |d|
                     if !d.nil?
                         elem = 'CPU'
                         limit = d[elem]
@@ -295,7 +317,7 @@ class OneQuotaHelper
                     end
                 end
 
-                column :"SYSTEM_DISK_SIZE", "", :right, :size=>20 do |d|
+                column :"SYSTEM_DISK_SIZE", "", :right, :size=>19 do |d|
                     if !d.nil?
                         elem = 'SYSTEM_DISK_SIZE'
                         limit = d[elem]
@@ -325,6 +347,11 @@ class OneQuotaHelper
 
         if !vm_quotas[0].nil?
             CLIHelper::ShowTable.new(nil, self) do
+                column :"CLUSTERS", "", :right, :size=>8 do |d|
+                    if !d.nil?
+                        d['CLUSTER_IDS']
+                    end
+                end
                 column :"RUNNING VMS", "", :right, :size=>17 do |d|
                     if !d.nil?
                         elem = 'RUNNING_VMS'

data/lib/one_helper/onesecgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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/onetemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, 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    #
@@ -37,13 +37,6 @@ EOT
         :description => "Instance multiple VMs"
     }
 
-    USERDATA={
-        :name  => "userdata",
-        :large => "--userdata userdata",
-        :format => String,
-        :description => "Integrate userdata into the EC2 section"
-    }
-
     EXTENDED={
         :name => "extended",
         :large => "--extended",