opennebula-cli 6.10.3 → 6.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 457eac25c832b616aef506710eef840fe9bc1534749f1d2c2b3e1a1d925cb610
-  data.tar.gz: 48c7ef4904fa2fb666fde0a1d9f66a4cade853dec50d6496f755f946922ca7b8
+  metadata.gz: 9bf87d87657a21425ee5f0aa203425906d8cc72541e86c3861497340d9b531cc
+  data.tar.gz: 76239919204d89d7c9b453091181cf3c4796e44e1f98aeb9e494dd032d0dd8fe
 SHA512:
-  metadata.gz: 7d072276b229f3f4526d64b3ae52ddd6dc9608f09ab708aff2f8489e46078f225c7cbcc994cac6d59b7bdfc569fa43504bc7bf824d5b74ea3af7e421286523b2
-  data.tar.gz: 205e8f6682eecfa14d3a45857e00b9d27ee18486d3956a566f4f151f4855ed658f17e76bba5ae86444664fb6bbe3ba97815a024755e338e62d7accf08ee97c42
+  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

@@ -1452,7 +1452,7 @@ CommandParser::CmdParser.new(ARGV) do
         RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
         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/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
 

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('=')
+            :proc => lambda do |_o, options|
+                keys   = options[:user_inputs].scan(/(?:^|,)([^,=]+)=/).flatten
+                values = options[:user_inputs].scan(/=(.+?)(?=,[^,]+=|$)/).flatten
 
-                    options[:user_inputs_keys] << user_input_split[0]
-
-                    "#{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
         },
         {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.10.3
+  version: 6.10.4
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-18 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.3
+        version: 6.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.10.3
+        version: 6.10.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement