opennebula-cli 6.4.1 → 6.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 003723be19ffff60bc9f577b306af83be5168c39be3be02913e3536c4b3abec8
-  data.tar.gz: 2c45d3c203e8efb33e3a446a8b36dc17d538ad528d79f4abe08e17cccf72374b
+  metadata.gz: 52e0a5a3b38c09a00791302328c27a3f181e20e0a1f4b0508130eb2a12359ae1
+  data.tar.gz: 283952947e0a79cdae77f1b31194a00cd84d8e503dc70da22c702d64a1d95495
 SHA512:
-  metadata.gz: db8fce550c33714a7752f157bf8fb4ee75fb8c5ab30f4d195d3ed248f75e770f6ce96b9f87f4efd086cd051a5f92b711619dc0fd4909c8ee4494a3e67da364e6
-  data.tar.gz: da31372a0c1b47c0d6d85d27bb840c9a20ae3424306ed1d4580fb7aab1f1b4acbb1d8123dd45d15d9a9f4a65429c7dc66a841d8dfe0bc76dfdaac4f99f1a8244
+  metadata.gz: 36ad8f15106d0da7d365684f85e9ccc88a36298dbd27901ba347aac6eb810abbd24c661bc96e30d40ab5427bef0fd8782e9b52b4a835c15fce8e85941496a806
+  data.tar.gz: 1d7570eb132a9d0547c6b4fda85db2975fe87969af9b8a84a11410b740f86c1db741d2c5bdb884e14ccc6d784f22480f266186391d5e804ca8b23feab8d427b0

data/bin/oneacct

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/oneacl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onecluster

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onedatastore

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/oneflow

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/oneflow-template

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -234,26 +234,26 @@ CommandParser::CmdParser.new(ARGV) do
         Instantiate a Service Template
     EOT
 
-    command :instantiate,
-            instantiate_desc,
-            :templateid,
-            [:file, nil],
+    command :instantiate, instantiate_desc, :templateid, [:file, nil],
             :options => [MULTIPLE, Service::JSON_FORMAT, Service::TOP] do
         number = options[:multiple] || 1
         params = {}
         rc     = 0
+        client = helper.client(options)
 
         number.times do
             params['merge_template'] = nil
             params['merge_template'] = JSON.parse(File.read(args[1])) if args[1]
 
             unless params['merge_template']
-                service_template = OpenNebula::ServiceTemplate
-                                   .new_with_id(args[0],
-                                                OpenNebula::Client.new)
-                service_template.info
+                response = client.get("#{RESOURCE_PATH}/#{args[0]}")
+
+                if CloudClient.is_error?(response)
+                    rc = [response.code.to_i, response.to_s]
+                    break
+                end
 
-                body = JSON.parse(service_template['/DOCUMENT/TEMPLATE/BODY'])
+                body = JSON.parse(response.body)['DOCUMENT']['TEMPLATE']['BODY']
 
                 params['merge_template'] = helper.custom_attrs(
                     body['custom_attrs']
@@ -266,7 +266,6 @@ CommandParser::CmdParser.new(ARGV) do
             end
 
             json     = Service.build_json_action('instantiate', params)
-            client   = helper.client(options)
             response = client.post("#{RESOURCE_PATH}/#{args[0]}/action", json)
 
             if CloudClient.is_error?(response)

data/bin/onegroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onehook

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onehost

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -339,7 +339,7 @@ CommandParser::CmdParser.new(ARGV) do
         rescue StandardError => e
             STDERR.puts e
         end
-        helper.perform_actions(args[0], options, 'flush') do |host|
+        helper.perform_actions(args[0], options, 'flushing') do |host|
             host.flush action
         end
     end

data/bin/oneimage

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -234,7 +234,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :clone, clone_desc, :imageid, :name,
             :options => [OneDatastoreHelper::DATASTORE] do
-        helper.perform_action(args[0], options, 'cloned') do |image|
+        helper.perform_action(args[0], options, 'cloning') do |image|
             ds_id = options[:datastore] || -1 # -1 clones to self
             res   = image.clone(args[1], ds_id)
 
@@ -252,7 +252,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :imageid_list] do
-        helper.perform_actions(args[0], options, 'deleted') do |image|
+        helper.perform_actions(args[0], options, 'deleting') do |image|
             image.delete
         end
     end
@@ -382,7 +382,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :'snapshot-delete', snapshot_delete_desc, :imageid, :snapshot_id do
-        helper.perform_action(args[0], options, 'snapshot deleted') do |o|
+        helper.perform_action(args[0], options, 'deleting snapshot') do |o|
             o.snapshot_delete(args[1].to_i)
         end
     end
@@ -392,7 +392,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :'snapshot-revert', snapshot_revert_desc, :imageid, :snapshot_id do
-        helper.perform_action(args[0], options, 'image state reverted') do |o|
+        helper.perform_action(args[0], options, 'reverting image state') do |o|
             o.snapshot_revert(args[1].to_i)
         end
     end
@@ -405,7 +405,7 @@ CommandParser::CmdParser.new(ARGV) do
             snapshot_flatten_desc,
             :imageid,
             :snapshot_id do
-        helper.perform_action(args[0], options, 'snapshot flattened') do |o|
+        helper.perform_action(args[0], options, 'flattening snapshot') do |o|
             o.snapshot_flatten(args[1].to_i)
         end
     end

data/bin/oneirb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -63,7 +63,6 @@ require 'json'
 require 'nokogiri'
 require 'openssl'
 require 'ox'
-require 'pp'
 require 'set'
 require 'socket'
 require 'sqlite3'

data/bin/onelog

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -21,9 +21,11 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
     GEMS_LOCATION     = '/usr/share/one/gems'
+    LOG_LOCATION      = '/var/log/one'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+    LOG_LOCATION      = ONE_LOCATION + '/var'
 end
 
 # %%RUBYGEMS_SETUP_BEGIN%%
@@ -114,7 +116,7 @@ CommandParser::CmdParser.new(ARGV) do
 
         options[:type].nil? ? f = logs[:log] : f = logs[options[:type].to_sym]
 
-        system("#{pager} #{options[:pager_opts]} /var/log/one/#{f}")
+        system("#{pager} #{options[:pager_opts]} #{LOG_LOCATION}/#{f}")
     end
 
     vm_desc = <<-EOT.unindent
@@ -127,7 +129,11 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             Integer(args[0])
 
-            file = "/var/log/one/#{args[0]}.log"
+            if !ONE_LOCATION
+                file = "#{LOG_LOCATION}/#{args[0]}.log"
+            else
+                file = "#{LOG_LOCATION}/vms/#{args[0]}/vm.log"
+            end
 
             unless File.exist?(file)
                 STDERR.puts "No LOG file found for '#{args[0]}' VM"
@@ -154,7 +160,7 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             Integer(args[0])
 
-            file = "/var/log/one/oneflow/#{args[0]}.log"
+            file = "#{LOG_LOCATION}/oneflow/#{args[0]}.log"
 
             unless File.exist?(file)
                 STDERR.puts "No LOG file found for '#{args[0]}' service"

data/bin/onemarket

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onemarketapp

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -284,7 +284,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :export, export_desc, :appid, :name, :options => EXPORT_OPTIONS do
-        helper.perform_action(args[0], options, 'exported') do |obj|
+        helper.perform_action(args[0], options, 'exporting') do |obj|
             tag ="tag=#{options[:tag]}" if options[:tag]
 
             obj.extend(MarketPlaceAppExt)
@@ -325,7 +325,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :download, download_desc, :appid, :path,
             :options => [OpenNebulaHelper::FORCE] do
-        helper.perform_action(args[0], options, 'downloaded') 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

data/bin/onesecgroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/oneshowback

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onetemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/oneuser

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -708,7 +708,7 @@ CommandParser::CmdParser.new(ARGV) do
 
         tokens = helper.find_token(user, token_hint, group, false)
 
-        if tokens.length.zero?
+        if tokens.empty?
             exit_with_code 1, 'No valid tokens found.'
         end
 

data/bin/onevcenter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onevdc

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onevm

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -517,7 +517,7 @@ CommandParser::CmdParser.new(ARGV) do
         if !options[:schedule].nil?
             helper.schedule_actions(args[0], options, command_name)
         else
-            helper.perform_actions(args[0], options, 'terminated') do |vm|
+            helper.perform_actions(args[0], options, 'terminating') do |vm|
                 vm.terminate(options[:hard] == true)
             end
         end
@@ -833,7 +833,7 @@ CommandParser::CmdParser.new(ARGV) do
             template << ' ]'
         end
 
-        helper.perform_action(args[0], options, 'Attach disk') do |vm|
+        helper.perform_action(args[0], options, 'Attaching disk') do |vm|
             vm.disk_attach(template)
         end
     end
@@ -847,7 +847,7 @@ CommandParser::CmdParser.new(ARGV) do
     command :"disk-detach", disk_detach_desc, :vmid, :diskid do
         diskid = args[1].to_i
 
-        helper.perform_action(args[0], options, 'Detach disk') do |vm|
+        helper.perform_action(args[0], options, 'Detaching disk') do |vm|
             vm.disk_detach(diskid)
         end
     end
@@ -910,7 +910,7 @@ CommandParser::CmdParser.new(ARGV) do
             end
         end
 
-        helper.perform_action(args[0], options, 'Attach NIC') do |vm|
+        helper.perform_action(args[0], options, 'Attaching NIC') do |vm|
             vm.nic_attach(template)
         end
     end
@@ -924,7 +924,7 @@ CommandParser::CmdParser.new(ARGV) do
     command :"nic-detach", nic_detach_desc, :vmid, :nicid do
         nicid = args[1].to_i
 
-        helper.perform_action(args[0], options, 'Detach NIC') do |vm|
+        helper.perform_action(args[0], options, 'Detaching NIC') do |vm|
             vm.nic_detach(nicid)
         end
     end
@@ -939,7 +939,7 @@ CommandParser::CmdParser.new(ARGV) do
         nic_id = args[1].to_i
         sg_id = args[2].to_i
 
-        helper.perform_action(args[0], options, 'Attach SG') do |vm|
+        helper.perform_action(args[0], options, 'Attaching SG') do |vm|
             vm.sg_attach(nic_id, sg_id)
         end
     end
@@ -954,7 +954,7 @@ CommandParser::CmdParser.new(ARGV) do
         nic_id = args[1].to_i
         sg_id = args[2].to_i
 
-        helper.perform_action(args[0], options, 'Detach SG') do |vm|
+        helper.perform_action(args[0], options, 'Detaching SG') do |vm|
             vm.sg_detach(nic_id, sg_id)
         end
     end
@@ -1047,7 +1047,7 @@ CommandParser::CmdParser.new(ARGV) do
 
             helper.schedule_actions(args[0], options, @comm_name)
         else
-            helper.perform_actions(args[0], options, 'snapshot created') do |o|
+            helper.perform_actions(args[0], options, 'creating snapshot') do |o|
                 o.snapshot_create(args[1])
             end
         end
@@ -1071,7 +1071,7 @@ CommandParser::CmdParser.new(ARGV) do
 
             helper.schedule_actions([args[0]], options, @comm_name)
         else
-            helper.perform_action(args[0], options, 'snapshot reverted') do |o|
+            helper.perform_action(args[0], options, 'reverting snapshot') do |o|
                 o.snapshot_revert(args[1].to_i)
             end
         end
@@ -1095,7 +1095,7 @@ CommandParser::CmdParser.new(ARGV) do
 
             helper.schedule_actions([args[0]], options, @comm_name)
         else
-            helper.perform_action(args[0], options, 'snapshot deleted') do |o|
+            helper.perform_action(args[0], options, 'deleting snapshot') do |o|
                 o.snapshot_delete(args[1])
             end
         end
@@ -1123,7 +1123,7 @@ CommandParser::CmdParser.new(ARGV) do
             helper.schedule_actions([args[0]], options, @comm_name)
         else
             helper.perform_action(args[0], options,
-                                  'disk snapshot created') do |o|
+                                  'creating disk snapshot') do |o|
                 o.disk_snapshot_create(args[1].to_i, args[2])
             end
         end
@@ -1150,7 +1150,7 @@ CommandParser::CmdParser.new(ARGV) do
             helper.schedule_actions([args[0]], options, @comm_name)
         else
             helper.perform_action(args[0], options,
-                                  'disk snapshot reverted') do |o|
+                                  'reverting disk snapshot') do |o|
                 o.disk_snapshot_revert(args[1].to_i, args[2].to_i)
             end
         end
@@ -1177,7 +1177,7 @@ CommandParser::CmdParser.new(ARGV) do
             helper.schedule_actions([args[0]], options, @comm_name)
         else
             helper.perform_action(args[0], options,
-                                  'disk snapshot deleted') do |o|
+                                  'deleting disk snapshot') do |o|
                 o.disk_snapshot_delete(args[1].to_i, args[2].to_i)
             end
         end
@@ -1213,7 +1213,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :"disk-resize", disk_resize_desc,
             :vmid, :diskid, :size do
-        helper.perform_action(args[0], options, 'disk resized') do |o|
+        helper.perform_action(args[0], options, 'resizing disk') do |o|
             o.info
             size = o["/VM/TEMPLATE/DISK[DISK_ID='#{args[1]}']/SIZE"].to_i
 
@@ -1350,7 +1350,7 @@ CommandParser::CmdParser.new(ARGV) do
         FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "IOTHREADS"]
         INPUT     = ["TYPE", "BUS"]
         GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
-        RAW       = ["DATA", "DATA_VMX", "TYPE"]
+        RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
         CPU_MODEL = ["MODEL"]
         CONTEXT (any value, **variable substitution will be made**)
     EOT

data/bin/onevmgroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onevnet

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -176,7 +176,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :vnetid_list] do
-        helper.perform_actions(args[0], options, 'deleted') do |vn|
+        helper.perform_actions(args[0], options, 'deleting') do |vn|
             vn.delete
         end
     end
@@ -187,7 +187,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :addar, addar_desc, :vnetid, [:file, nil],
             :options => STD_OPTIONS + OneVNetHelper::ADDAR_OPTIONS do
-        helper.perform_action(args[0], options, 'lease added') do |vn|
+        helper.perform_action(args[0], options, 'address range added') do |vn|
             if args[1]
                 ar = File.read(args[1])
             else

data/bin/onevntemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onevrouter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/bin/onezone

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/cli_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onedatastore_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onegroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onehook_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -692,7 +692,14 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         end
 
         if numa_nodes && !numa_nodes.empty?
-            print_numa_nodes(numa_nodes)
+            begin
+                monitoring_numa =
+                    host.to_hash['HOST']['MONITORING']['NUMA_NODE']
+            rescue StandardError
+                monitoring_numa = nil
+            end
+
+            print_numa_nodes(numa_nodes, monitoring_numa)
         end
 
         puts
@@ -777,14 +784,34 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         table.show(pcis)
     end
 
-    def print_numa_nodes(numa_nodes)
+    def print_numa_nodes(numa_nodes, monitoring)
         numa_nodes = get_numa_data(numa_nodes)
 
+        merge_numa_monitoring(numa_nodes, monitoring)
+
         print_numa_cores(numa_nodes)
         print_numa_memory(numa_nodes)
         print_numa_hugepages(numa_nodes)
     end
 
+    def merge_numa_monitoring(numa_nodes, monitoring)
+        return if monitoring.nil?
+
+        monitoring = [monitoring] if monitoring.class == Hash
+
+        numa_nodes.each do |node|
+            mon_node = monitoring.find {|x| x['NODE_ID'] == node['NODE_ID'] }
+
+            node['MEMORY']['FREE'] = mon_node['MEMORY']['FREE']
+            node['MEMORY']['USED'] = mon_node['MEMORY']['USED']
+
+            node['HUGEPAGE'].each do |hp|
+                mon_hp = mon_node['HUGEPAGE'].find {|x| x['SIZE'] == hp['SIZE'] }
+                hp['FREE'] = mon_hp['FREE']
+            end
+        end
+    end
+
     def get_numa_data(numa_nodes)
         numa_nodes = [numa_nodes] if numa_nodes.class == Hash
 
@@ -894,7 +921,11 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             end
 
             column :USED_REAL, 'Used memory', :size => 20, :left => true do |d|
-                OpenNebulaHelper.unit_to_str(d['MEMORY']['USED'].to_i, {})
+                if d['MEMORY']['USED'].nil?
+                    '-'
+                else
+                    OpenNebulaHelper.unit_to_str(d['MEMORY']['USED'].to_i, {})
+                end
             end
 
             column :USED_ALLOCATED, 'U memory',
@@ -903,7 +934,11 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             end
 
             column :FREE, 'Free memory', :size => 8, :left => true do |d|
-                OpenNebulaHelper.unit_to_str(d['MEMORY']['FREE'].to_i, {})
+                if d['MEMORY']['FREE'].nil?
+                    '-'
+                else
+                    OpenNebulaHelper.unit_to_str(d['MEMORY']['FREE'].to_i, {})
+                end
             end
 
             default :NODE_ID, :TOTAL, :USED_REAL, :USED_ALLOCATED, :FREE
@@ -941,7 +976,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             end
 
             column :FREE, 'Free pages', :size => 8, :left => true do |d|
-                d['HUGEPAGE']['FREE']
+                d['HUGEPAGE']['FREE'] || '-'
             end
 
             column :USED, 'allocated pages', :size => 8, :left => true do |d|

data/lib/one_helper/oneimage_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onemarket_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onequota_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onesecgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/oneuser_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onevcenter_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onevdc_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onevm_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onevmgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onevnet_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onevntemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onevrouter_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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/onezone_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2023, 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    #
@@ -30,7 +30,7 @@ include OpenNebula
 module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
-Copyright 2002-2022, OpenNebula Project, OpenNebula Systems
+Copyright 2002-2023, OpenNebula Project, OpenNebula Systems
 EOT
 
     if ONE_LOCATION

data/share/schemas/xsd/host.xsd

@@ -98,7 +98,6 @@
                           <xs:element name="HUGEPAGE" minOccurs="0" maxOccurs="unbounded">
                             <xs:complexType>
                               <xs:all>
-                                <xs:element name="FREE" type="xs:integer"/>
                                 <xs:element name="PAGES" type="xs:integer"/>
                                 <xs:element name="SIZE" type="xs:integer"/>
                                 <xs:element name="USAGE" type="xs:integer"/>
@@ -109,10 +108,8 @@
                             <xs:complexType>
                               <xs:all>
                                 <xs:element name="DISTANCE" type="xs:string"/>
-                                <xs:element name="FREE" type="xs:integer"/>
                                 <xs:element name="TOTAL" type="xs:integer"/>
                                 <xs:element name="USAGE" type="xs:integer"/>
-                                <xs:element name="USED" type="xs:integer"/>
                               </xs:all>
                             </xs:complexType>
                           </xs:element>
@@ -177,6 +174,29 @@
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="NUMA_NODE" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="HUGEPAGE" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:all>
+                          <xs:element name="FREE" type="xs:integer"/>
+                          <xs:element name="SIZE" type="xs:integer"/>
+                        </xs:all>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="MEMORY">
+                      <xs:complexType>
+                        <xs:all>
+                          <xs:element name="FREE" type="xs:string"/>
+                          <xs:element name="USED" type="xs:integer"/>
+                        </xs:all>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="NODE_ID" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.4.3
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.1
+        version: 6.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.1
+        version: 6.4.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement