RubyGems - opennebula-cli - Versions diffs - 6.10.4 → 6.99.85.pre - Mend

opennebula-cli 6.10.4 → 6.99.85.pre

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (78) hide show

checksums.yaml +4 -4
data/bin/oneacct +2 -18
data/bin/oneacl +2 -18
data/bin/onebackupjob +2 -18
data/bin/onecluster +36 -18
data/bin/onedatastore +2 -18
data/bin/oneflow +2 -18
data/bin/oneflow-template +8 -24
data/bin/onegroup +2 -18
data/bin/onehook +2 -18
data/bin/onehost +4 -48
data/bin/oneimage +2 -18
data/bin/oneirb +2 -61
data/bin/onelog +3 -22
data/bin/onemarket +2 -18
data/bin/onemarketapp +2 -30
data/bin/onesecgroup +2 -18
data/bin/oneshowback +2 -18
data/bin/onetemplate +2 -19
data/bin/oneuser +2 -18
data/bin/onevdc +2 -18
data/bin/onevm +3 -19
data/bin/onevmgroup +2 -18
data/bin/onevnet +2 -18
data/bin/onevntemplate +2 -18
data/bin/onevrouter +2 -18
data/bin/onezone +2 -18
data/lib/cli_helper.rb +1 -1
data/lib/command_parser.rb +1 -1
data/lib/one_helper/oneacct_helper.rb +1 -1
data/lib/one_helper/oneacl_helper.rb +1 -1
data/lib/one_helper/onebackupjob_helper.rb +1 -1
data/lib/one_helper/onecluster_helper.rb +49 -1
data/lib/one_helper/onedatastore_helper.rb +1 -1
data/lib/one_helper/oneflow_helper.rb +1 -1
data/lib/one_helper/oneflowtemplate_helper.rb +16 -16
data/lib/one_helper/onegroup_helper.rb +4 -55
data/lib/one_helper/onehook_helper.rb +1 -1
data/lib/one_helper/onehost_helper.rb +25 -86
data/lib/one_helper/oneimage_helper.rb +2 -19
data/lib/one_helper/onemarket_helper.rb +1 -1
data/lib/one_helper/onemarketapp_helper.rb +13 -3
data/lib/one_helper/onequota_helper.rb +35 -8
data/lib/one_helper/onesecgroup_helper.rb +1 -1
data/lib/one_helper/onetemplate_helper.rb +1 -8
data/lib/one_helper/oneuser_helper.rb +41 -75
data/lib/one_helper/onevdc_helper.rb +1 -1
data/lib/one_helper/onevm_helper.rb +96 -85
data/lib/one_helper/onevmgroup_helper.rb +1 -1
data/lib/one_helper/onevnet_helper.rb +1 -1
data/lib/one_helper/onevntemplate_helper.rb +1 -1
data/lib/one_helper/onevrouter_helper.rb +1 -1
data/lib/one_helper/onezone_helper.rb +10 -23
data/lib/one_helper.rb +6 -125
data/share/schemas/xsd/acct.xsd +2 -0
data/share/schemas/xsd/cluster.xsd +21 -0
data/share/schemas/xsd/datastore.xsd +1 -13
data/share/schemas/xsd/group.xsd +11 -122
data/share/schemas/xsd/group_pool.xsd +8 -120
data/share/schemas/xsd/host.xsd +19 -21
data/share/schemas/xsd/image.xsd +0 -1
data/share/schemas/xsd/monitoring_data.xsd +0 -8
data/share/schemas/xsd/opennebula_configuration.xsd +23 -1
data/share/schemas/xsd/plan.xsd +29 -0
data/share/schemas/xsd/requirements.xsd +45 -0
data/share/schemas/xsd/scheduler_driver_action.xsd +24 -0
data/share/schemas/xsd/shared.xsd +67 -0
data/share/schemas/xsd/user.xsd +10 -122
data/share/schemas/xsd/user_pool.xsd +8 -120
data/share/schemas/xsd/vm.xsd +37 -28
data/share/schemas/xsd/vm_pool.xsd +0 -12
data/share/schemas/xsd/vm_pool_extended.xsd +12 -0
data/share/schemas/xsd/vmtemplate.xsd +0 -3
data/share/schemas/xsd/vnet.xsd +0 -5
data/share/schemas/xsd/vnet_pool_extended.xsd +12 -0
metadata +11 -9
data/bin/onevcenter +0 -471
data/lib/one_helper/onevcenter_helper.rb +0 -523

data/bin/onemarketapp CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -29,23 +29,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -314,18 +298,6 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
-    download_desc = <<-EOT.unindent
-        Downloads a MarketApp to a file
-    EOT
-    command :download, download_desc, :appid, :path,
-            :options => [OpenNebulaHelper::FORCE] do
-        helper.perform_action(args[0], options, 'downloading') do
-            download_args = [:marketplaceapp, args[0], args[1], options[:force]]
-            OpenNebulaHelper.download_resource_sunstone(*download_args)
-        end
-    end
     delete_desc = <<-EOT.unindent
         Deletes the given marketplace app
     EOT

data/bin/onesecgroup CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneshowback CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onetemplate CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -108,7 +92,6 @@ CommandParser::CmdParser.new(ARGV) do
     instantiate_options = [
         OneTemplateHelper::VM_NAME,
         OneTemplateHelper::MULTIPLE,
-        OneTemplateHelper::USERDATA,
         OneVMHelper::HOLD,
         OneTemplateHelper::PERSISTENT,
         PREFIX

data/bin/oneuser CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevdc CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevm CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -1452,7 +1436,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, ETH* if CONTEXT_ALLOW_ETH_UPDATES set in oned.conf, **variable substitution will be made**)
+        CONTEXT (any value, except ETH*, **variable substitution will be made**)
     EOT
     command :updateconf, updateconf_desc, :vmid, [:file, nil],

data/bin/onevmgroup CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevnet CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevntemplate CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevrouter CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onezone CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -27,23 +27,7 @@ else
 end
 # %%RUBYGEMS_SETUP_BEGIN%%
-if File.directory?(GEMS_LOCATION)
-    real_gems_path = File.realpath(GEMS_LOCATION)
-    if !defined?(Gem) || Gem.path != [real_gems_path]
-        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
-    end
-end
+require 'load_opennebula_paths'
 # %%RUBYGEMS_SETUP_END%%
 $LOAD_PATH << RUBY_LIB_LOCATION

data/lib/cli_helper.rb CHANGED Viewed

@@ -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/command_parser.rb CHANGED Viewed

@@ -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/oneacct_helper.rb CHANGED Viewed

@@ -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/oneacl_helper.rb CHANGED Viewed

@@ -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/onebackupjob_helper.rb CHANGED Viewed

@@ -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/onecluster_helper.rb CHANGED Viewed

@@ -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    #
@@ -157,6 +157,54 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
         cluster.datastore_ids.each do |id|
             puts format('%-15s', id)
         end
+        plan_state = cluster.plan_state
+        return if plan_state == -1
+        puts
+        CLIHelper.print_header(format('PLAN: %s', Cluster::PLAN_STATE[plan_state]), false)
+        table = CLIHelper::ShowTable.new(nil, self) do
+            column :VM, 'VM ID', :size => 6 do |d|
+                d['VM_ID']
+            end
+            column :ACTION, 'Action', :left, :size => 10 do |d|
+                d['OPERATION']
+            end
+            column :HOST, 'Host ID', :right, :size => 6 do |d|
+                if d['HOST_ID'] != '-1'
+                    d['HOST_ID']
+                else
+                    '-'
+                end
+            end
+            column :DS, 'Datastore ID', :right, :size => 6 do |d|
+                if d['DS_ID'] != '-1'
+                    d['DS_ID']
+                else
+                    '-'
+                end
+            end
+            column :STATE, 'Action state', :size => 8 do |d|
+                Cluster::PLAN_STATE[d['STATE'].to_i]
+            end
+            column :START_TIME, 'Action start time', :right, :size => 16 do |d|
+                if d['TIMESTAMP'] != '0'
+                    OpenNebulaHelper.time_to_str(d['TIMESTAMP'])
+                else
+                    '-'
+                end
+            end
+            default :VM, :ACTION, :HOST, :DS, :STATE, :START_TIME
+        end
+        table.show(cluster.plan_actions)
     end
 end

data/lib/one_helper/onedatastore_helper.rb CHANGED Viewed

@@ -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/oneflow_helper.rb CHANGED Viewed

@@ -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/oneflowtemplate_helper.rb CHANGED Viewed

@@ -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    #
@@ -180,35 +180,35 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
         end
     end
-    # Get custom attributes values from user
+    # Get user inputs values from user
     #
-    # @param custom_attrs [Hash] Custom attributes from template
+    # @param user_inputs [Hash] User inputs from template
     #
-    # @return [Hash] Custom attributes values
-    def custom_attrs(custom_attrs)
+    # @return [Hash] User Input values
+    def user_inputs(user_inputs)
         # rubocop:disable Layout/LineLength
-        return if custom_attrs.nil? || custom_attrs.empty?
+        return if user_inputs.nil? || user_inputs.empty?
         ret = {}
-        ret['custom_attrs_values'] = OpenNebulaHelper.parse_user_inputs(custom_attrs)
+        ret['user_inputs_values'] = OpenNebulaHelper.parse_user_inputs(user_inputs)
         # rubocop:enable Layout/LineLength
         ret
     end
-    # Get custom role attributes values from user
+    # Get user input values from user
     #
-    # @param role [Hash] Service role with custom attributes
+    # @param role [Hash] Service role with user inputs
     #
-    # @return [Hash] Role with custom attributes values
-    def custom_role_attrs(roles)
+    # @return [Hash] Role with user inputs values
+    def role_user_inputs(roles)
         return if roles.nil? || roles.empty?
         ret = {}
-        role_with_custom_attrs = false
+        role_with_user_inputs = false
         roles.each do |role|
-            next unless role.key?('custom_attrs')
+            next unless role.key?('user_inputs')
             ####################################################################
             # Display Role Information
@@ -216,11 +216,11 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
             header = "> Please insert the user inputs for the role \"#{role['name']}\""
             puts header
-            role.merge!(custom_attrs(role['custom_attrs']))
-            role_with_custom_attrs = true
+            role.merge!(user_inputs(role['user_inputs']))
+            role_with_user_inputs = true
         end
-        ret['roles'] = roles if role_with_custom_attrs
+        ret['roles'] = roles if role_with_user_inputs
         ret
     end