opennebula-cli 6.10.2 → 6.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de5f626cbb390d51c51c96f9c866e67aefb21beb83bbf7116b56097cfeb52211
-  data.tar.gz: d9101be349af4f0b9b8dff85446867ac5b8f637275a5d37fa9488e33916b8b4c
+  metadata.gz: 9bf87d87657a21425ee5f0aa203425906d8cc72541e86c3861497340d9b531cc
+  data.tar.gz: 76239919204d89d7c9b453091181cf3c4796e44e1f98aeb9e494dd032d0dd8fe
 SHA512:
-  metadata.gz: dddc332c72fa230035158cb48bdcb07244a896ae25d00b382cc08b6384c76488cbaa1ddaec70d5f154a7519470b5a30cf40001226715ce89170a9da50b447574
-  data.tar.gz: b298cbe408ad5520c36b35857d34106ac54b01b9f9a469ed8ccc4c344e08af0bb006f3296904cdb198db1bb1a3ff542572aea995a85f66e523c7a3168b6f70d9
+  metadata.gz: ea5b2612e5aa757c9130fede54c2043123b5d565bb812d5e1caf2da6e07d897027b6f8de0ca41c3202648d7c7d3979a9a9ab052ceb40f85cfdc79b5f674e4db0
+  data.tar.gz: d1238483708055143208387399653372c8c8af8ef4c9b0a15943689464e1fc35bfe534cddcbd0cb872bc909fa8611a74908ea57ef409d30aa10c94b8003e49ee

data/bin/oneacct

@@ -97,6 +97,9 @@ CommandParser::CmdParser.new(ARGV) do
             end_time = t.to_i
         end
 
+        # User defined timezone
+        ENV['TZ'] = options[:timezone] if options[:timezone]
+
         common_opts = {
             :start_time => start_time,
             :end_time => end_time,

data/bin/onevm

@@ -1140,6 +1140,24 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    snapshot_list_desc = <<-EOT.unindent
+        Lists the snapshots of a VM
+    EOT
+
+    command :"snapshot-list", snapshot_list_desc, :vmid do
+        vm = helper.retrieve_resource(args[0])
+        vm.info
+
+        if vm.has_elements?('/VM/TEMPLATE/SNAPSHOT')
+            CLIHelper.print_header('SNAPSHOTS'.ljust(80), false)
+
+            helper.format_template_snapshots(vm)
+        else
+            puts 'No snapshots available'
+        end
+        0
+    end
+
     disk_snapshot_create_desc = <<-EOT.unindent
         Takes a new snapshot of the given disk. This operation needs support
         from the Datastore drivers: QCOW2 or Ceph.
@@ -1432,9 +1450,9 @@ CommandParser::CmdParser.new(ARGV) do
         GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP", "COMMAND"]
         VIDEO     = ["TYPE", "IOMMU", "ATS", "VRAM", "RESOLUTION"]
         RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
-        CPU_MODEL = ["MODEL"]
+        CPU_MODEL = ["MODEL", "FEATURES"]
         BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE", "INCREMENT_MODE"]
-        CONTEXT (any value, except ETH*, **variable substitution will be made**)
+        CONTEXT (any value, ETH* if CONTEXT_ALLOW_ETH_UPDATES set in oned.conf, **variable substitution will be made**)
     EOT
 
     command :updateconf, updateconf_desc, :vmid, [:file, nil],

data/bin/onevrouter

@@ -188,7 +188,7 @@ CommandParser::CmdParser.new(ARGV) do
         end
 
         number = options[:multiple] || 1
-        user_inputs = nil
+        user_inputs = options[:user_inputs]
 
         helper.perform_action(args[0], options, 'instantiated') do |vr|
             name = options[:name] || ''
@@ -220,7 +220,16 @@ CommandParser::CmdParser.new(ARGV) do
                 extra_template = res.last
             end
 
-            user_inputs ||= OneTemplateHelper.get_user_inputs(t.to_hash)
+            if !user_inputs
+                user_inputs = OneTemplateHelper.get_user_inputs(t.to_hash)
+            else
+                optionals = OneTemplateHelper.get_user_inputs(
+                    t.to_hash,
+                    options[:user_inputs_keys]
+                )
+
+                user_inputs = user_inputs + "\n" + optionals
+            end
 
             extra_template << "\n" << user_inputs
 

data/lib/one_helper/oneacct_helper.rb

@@ -18,6 +18,14 @@ require 'one_helper'
 require 'optparse/time'
 
 class AcctHelper < OpenNebulaHelper::OneHelper
+    TIME_ZONE_CUR = {
+        :name  => "timezone",
+        :short => "-t TZ",
+        :large => "--timezone TZ",
+        :description => "User defined Time Zone",
+        :format => String
+    }
+
     START_TIME_ACCT = {
         :name   => "start_time",
         :short  => "-s TIME",
@@ -97,7 +105,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :description => "Split the output in a table for each VM"
     }
 
-    ACCT_OPTIONS     = [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

data/lib/one_helper/oneflowtemplate_helper.rb

@@ -260,7 +260,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 type, resource_id, extra = initial.split(':', -1)
             end
 
-            if (!type || !resource_id) && (initial && !initial.empty?)
+            if (!type || !resource_id) && initial && !initial.empty?
                 STDERR.puts 'Wrong type for user input default value:'
                 STDERR.puts "  #{key}: #{val}"
                 exit(-1)

data/lib/one_helper/onehost_helper.rb

@@ -799,9 +799,12 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             node['MEMORY']['FREE'] = mon_node['MEMORY']['FREE']
             node['MEMORY']['USED'] = mon_node['MEMORY']['USED']
 
+            node['HUGEPAGE'] = [node['HUGEPAGE']].flatten.compact
+            mon_node['HUGEPAGE'] = [mon_node['HUGEPAGE']].flatten.compact
+
             node['HUGEPAGE'].each do |hp|
                 mon_hp = mon_node['HUGEPAGE'].find {|x| x['SIZE'] == hp['SIZE'] }
-                hp['FREE'] = mon_hp['FREE']
+                hp['FREE'] = mon_hp['FREE'] unless mon_hp.nil?
             end
         end
     end

data/lib/one_helper/onevm_helper.rb

@@ -936,11 +936,11 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         # array. Duplicate IPs are not shown.
         extra_ips = []
 
-        if (val = vm['/VM/MONITORING/GUEST_IP']) && (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']) && (val && !val.empty?)
+        if (val = vm['/VM/MONITORING/GUEST_IP_ADDRESSES']) && val && !val.empty?
             extra_ips += val.split(',')
         end
 
@@ -1192,23 +1192,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             puts
             CLIHelper.print_header(str_h1 % 'SNAPSHOTS', false)
 
-            CLIHelper::ShowTable.new(nil, self) do
-                column :ID, '', :size => 4 do |d|
-                    d['SNAPSHOT_ID'] unless d.nil?
-                end
-
-                column :TIME, '', :size => 12 do |d|
-                    OpenNebulaHelper.time_to_str(d['TIME'], false) unless d.nil?
-                end
-
-                column :NAME, '', :left, :size => 46 do |d|
-                    d['NAME'] unless d.nil?
-                end
-
-                column :HYPERVISOR_ID, '', :left, :size => 15 do |d|
-                    d['HYPERVISOR_ID'] unless d.nil?
-                end
-            end.show([vm_hash['VM']['TEMPLATE']['SNAPSHOT']].flatten, {})
+            format_template_snapshots(vm)
 
             vm.delete_element('/VM/TEMPLATE/SNAPSHOT')
         end
@@ -1501,6 +1485,28 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         table.show(snapshots)
     end
 
+    def format_template_snapshots(vm)
+        table = CLIHelper::ShowTable.new(nil, self) do
+            column :ID, '', :size => 4 do |d|
+                d['SNAPSHOT_ID'] unless d.nil?
+            end
+
+            column :TIME, '', :size => 12 do |d|
+                OpenNebulaHelper.time_to_str(d['TIME'], false) unless d.nil?
+            end
+
+            column :NAME, '', :left, :size => 46 do |d|
+                d['NAME'] unless d.nil?
+            end
+
+            column :HYPERVISOR_ID, '', :left, :size => 15 do |d|
+                d['HYPERVISOR_ID'] unless d.nil?
+            end
+        end
+        vm_hash = vm.to_hash
+        table.show([vm_hash['VM']['TEMPLATE']['SNAPSHOT']].flatten, {})
+    end
+
 end
 
 # rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/one_helper.rb

@@ -421,22 +421,17 @@ Bash symbols must be escaped on STDIN passing'
         {
             :name   => 'user_inputs',
             :large  => '--user-inputs ui1,ui2,ui3',
-            :format => Array,
+            :format => String,
             :description => 'Specify the user inputs values when instantiating',
-            :proc => lambda do |o, options|
-                # Store user inputs that has been already processed
-                options[:user_inputs_keys] = []
-
-                # escape values
-                options[:user_inputs].map! do |user_input|
-                    user_input_split = user_input.split('=')
-
-                    options[:user_inputs_keys] << user_input_split[0]
+            :proc => lambda do |_o, options|
+                keys   = options[:user_inputs].scan(/(?:^|,)([^,=]+)=/).flatten
+                values = options[:user_inputs].scan(/=(.+?)(?=,[^,]+=|$)/).flatten
 
-                    "#{user_input_split[0]}=\"#{user_input_split[1]}\""
-                end
+                options[:user_inputs_keys] = keys
 
-                options[:user_inputs] = o.join("\n")
+                options[:user_inputs] = keys.zip(values).map do |k, v|
+                    %[#{k}="#{v}"]
+                end.join("\n")
             end
         },
         {
@@ -1860,15 +1855,13 @@ Bash symbols must be escaped on STDIN passing'
         [0, template]
     end
 
-    def self.create_context(options)
+    def self.create_context_str(options, context_hash)
         context_options = [:ssh, :net_context, :context, :init, :files_ds, :startscript,
                            :report_ready]
         if !(options.keys & context_options).empty?
-            lines=[]
-
             if options[:ssh]
                 if options[:ssh]==true
-                    lines<<'SSH_PUBLIC_KEY="$USER[SSH_PUBLIC_KEY]"'
+                    context_hash['SSH_PUBLIC_KEY'] = "$USER[SSH_PUBLIC_KEY]"
                 else
                     begin
                         key=File.read(options[:ssh]).strip
@@ -1876,30 +1869,24 @@ Bash symbols must be escaped on STDIN passing'
                         STDERR.puts e.message
                         exit(-1)
                     end
-                    lines<<"SSH_PUBLIC_KEY=\"#{key}\""
+                    context_hash['SSH_PUBLIC_KEY'] = key
                 end
             end
-
+            
             if options[:net_context]
-                lines << 'NETWORK = "YES"'
+                context_hash['NETWORK'] = "YES"
             end
 
-            lines+=options[:context] if options[:context]
-
             if options[:files_ds]
-                text='FILES_DS="'
-                text << options[:files_ds].map do |file|
-                    %($FILE[IMAGE=\\"#{file}\\"])
-                end.join(' ')
-                text << '"'
+                files = options[:files_ds].map { |file| %($FILE[IMAGE=\\"#{file}\\"]) }.join(" ")
 
-                lines << text
+                context_hash['FILES_DS'] = files
             end
-
+            
             if options[:init]
-                lines << %(INIT_SCRIPTS="#{options[:init].join(' ')}")
+                context_hash['INIT_SCRIPTS'] = options[:init].join(" ")
             end
-
+            
             if options[:startscript]
                 script = nil
                 begin
@@ -1909,15 +1896,23 @@ Bash symbols must be escaped on STDIN passing'
                     exit(-1)
                 end
                 script = Base64.strict_encode64(script)
-                lines<<"START_SCRIPT_BASE64=\"#{script}\""
+                context_hash['START_SCRIPT_BASE64'] = script
+
             end
 
             if options[:report_ready]
-                lines << 'REPORT_READY = "YES"'
+                context_hash['REPORT_READY'] = "YES"
             end
 
-            if !lines.empty?
-                "CONTEXT=[\n" << lines.map {|l| '  ' << l }.join(",\n") << "\n]\n"
+            if context_hash.any? || options[:context]
+                formatted_context = "CONTEXT=[\n"
+                formatted_context << options[:context].map {|l| ' ' << l }.join(",\n") if options[:context]
+                if context_hash.any?
+                    formatted_context << ",\n" if options[:context]
+                    formatted_context << context_hash.map { |k, v| "  #{k}=\"#{v}\"" }.join(",\n") 
+                end
+                formatted_context << "\n]\n"
+                formatted_context
             else
                 nil
             end
@@ -1999,10 +1994,12 @@ Bash symbols must be escaped on STDIN passing'
         end
 
         template<<"VCENTER_VM_FOLDER=#{options[:vcenter_vm_folder]}\n" if options[:vcenter_vm_folder]
-
-        context=create_context(options)
-        template<<context if context
-
+        context_hash = {}
+        if !template_obj.nil? && template_obj.has_elements?('TEMPLATE/CONTEXT')
+            context_hash = template_obj.to_hash["VMTEMPLATE"]["TEMPLATE"]["CONTEXT"]
+        end
+        context_str=create_context_str(options, context_hash)
+        template<<context_str if context_str
         if options[:userdata] && !template_obj.nil? && template_obj.has_elements?('TEMPLATE/EC2')
             template_obj.add_element(
                 'TEMPLATE/EC2',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.10.2
+  version: 6.10.4
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.10.2
+        version: 6.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.10.2
+        version: 6.10.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement