opennebula-cli 6.8.1 → 6.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf54d4b60a559aec10ac15e21dbbe7b6ec46f6955552809d39f520ef764933f
-  data.tar.gz: b329c6848fd04338713db8c31728254d54a885fd0c24094d1f67d199a9722b29
+  metadata.gz: b06fb77f587c29ae6ccfdb865f506d009c722e26a51237357785839b3334c6a6
+  data.tar.gz: 5b7b61495a23c275884b89dd7416d1e7308cc95711b1091a20febc008ebb45c2
 SHA512:
-  metadata.gz: 7509c3cce87f1fc8c0e185612a98b60a91fce02b605c0ba1d551174793730991d099f1f3f66f392c3f0b3a715d8296880da6b4506b578e9017cccce3cdc3ebe2
-  data.tar.gz: 3c7fde70522ba16e9bbf3e7b8b6719962a23d6c6c51ea21c2ab73151655699aeec66729c2b26213ab91cd432bae5c7932fccdd4d8cc4044eb0ab1604cd9c1000
+  metadata.gz: ecd05a6bbb986b52da8d323d1083d90d7142f9ac336bef379c183348a9f039ab94cc258b6735f3fd558a6c5eb41e55b5e36079292139b0844f30e4b183f2d88c
+  data.tar.gz: af89f17c3100ea494ea87e5fb9228779195d410c9b9ec3b2d9752a7db4c1b0359636a5aad9769d011ce67e751cdf1cd73d85dd89b7677f0176eb8525cd1ec411

data/bin/onebackupjob

@@ -147,8 +147,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable?(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 else
                     template = OneBackupJobHelper.create_backupjob_template(options)
                 end

data/bin/onedatastore

@@ -115,8 +115,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 end
                 datastore.allocate(template, cid)
             rescue StandardError => e

data/bin/oneflow-template

@@ -189,8 +189,8 @@ CommandParser::CmdParser.new(ARGV) do
 
         if args[0]
             template = File.read(args[0])
-        elsif STDIN.wait_readable(0)
-            template = STDIN.read
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
         end
 
         if !template
@@ -262,8 +262,8 @@ CommandParser::CmdParser.new(ARGV) do
 
         if args[1]
             template = File.read(args[1])
-        elsif STDIN.wait_readable(0)
-            template = STDIN.read
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
         end
         params['merge_template'] = JSON.parse(template) if template
 

data/bin/onehook

@@ -176,8 +176,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 else
                     STDERR.puts 'No hook template provided'
                     exit(-1)

data/bin/oneimage

@@ -121,6 +121,13 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Name of the new image'
     }
 
+    DISK_ID = {
+        :name   => 'disk_id',
+        :large  => '--disk-id disk_id',
+        :format => Integer,
+        :description => 'Restore only selected disk ID'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -210,16 +217,15 @@ CommandParser::CmdParser.new(ARGV) do
             exit(-1)
         end
 
-        if options[:no_check_capacity].nil?
-            check_capacity = false
-        else
-            check_capacity = true
-        end
+        no_check_capacity = !options[:no_check_capacity].nil?
+
+        conflicting_opts = []
+        if (args[0] || !(stdin = OpenNebulaHelper.read_stdin).empty?) &&
+            OneImageHelper.create_template_options_used?(options, conflicting_opts)
 
-        if (args[0] || STDIN.wait_readable(0)) &&
-            OpenNebulaHelper.create_template_options_used?(options)
+            STDERR.puts 'You cannot pass template on STDIN and use template creation options, ' <<
+                        "conflicting options: #{conflicting_opts.join(', ')}."
 
-            STDERR.puts 'You cannot use both template and template creation options.'
             next -1
         end
 
@@ -236,8 +242,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !stdin.empty?
+                    template = stdin
                 else
                     res = OneImageHelper.create_image_template(options)
 
@@ -254,7 +260,7 @@ CommandParser::CmdParser.new(ARGV) do
                     exit 0
                 end
 
-                image.allocate(template, options[:datastore], check_capacity)
+                image.allocate(template, options[:datastore], no_check_capacity)
             rescue StandardError => e
                 STDERR.puts e.message
                 exit(-1)
@@ -454,7 +460,7 @@ CommandParser::CmdParser.new(ARGV) do
     command :restore,
             restore_desc,
             :imageid,
-            :options => [OneDatastoreHelper::DATASTORE, NO_NIC, NO_IP, NAME, INCREMENT] do
+            :options => [OneDatastoreHelper::DATASTORE, NO_NIC, NO_IP, NAME, INCREMENT, DISK_ID] do
         helper.perform_action(args[0], options, 'vm backup restored') do |o|
             if options[:datastore].nil?
                 STDERR.puts 'Datastore to restore the backup is mandatory: '
@@ -468,13 +474,14 @@ CommandParser::CmdParser.new(ARGV) do
             restore_opts << "NO_IP=\"YES\"\n" if options[:no_ip]
             restore_opts << "NAME=\"#{options[:name]}\"\n" if options[:name]
             restore_opts << "INCREMENT_ID=\"#{options[:increment]}\"\n" if options[:increment]
+            restore_opts << "DISK_ID=\"#{options[:disk_id]}\"\n" if options[:disk_id]
 
             rc = o.restore(options[:datastore].to_i, restore_opts)
 
             if !OpenNebula.is_error?(rc)
                 ids = rc.split(' ')
 
-                puts "VM Template: #{ids[0]}" if ids[0]
+                puts "VM Template: #{ids[0]}" if ids[0] && ids[0] != '-1'
                 puts "Images: #{ids[1..-1].join(' ')}" if ids.length > 1
             else
                 puts rc.message

data/bin/onemarket

@@ -107,8 +107,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 end
                 marketplace.allocate(template)
             rescue StandardError => e

data/bin/onemarketapp

@@ -191,10 +191,12 @@ CommandParser::CmdParser.new(ARGV) do
             exit(-1)
         end
 
-        if (args[0] || STDIN.wait_readable(0)) &&
-           OneMarketPlaceAppHelper.create_template_options_used?(options)
-            STDERR.puts 'You can not use both template file and template'\
-                        ' creation options.'
+        conflicting_opts = []
+        if (args[0] || !(stdin = OpenNebulaHelper.read_stdin).empty?) &&
+           OneMarketPlaceAppHelper.create_template_options_used?(options, conflicting_opts)
+
+            STDERR.puts 'You cannot pass template on STDIN and use template creation options, ' <<
+            "conflicting options: #{conflicting_opts.join(', ')}."
             next -1
         end
 
@@ -202,8 +204,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !stdin.empty?
+                    template = stdin
                 else
                     res = OneMarketPlaceAppHelper
                           .create_datastore_template(options)

data/bin/onesecgroup

@@ -112,8 +112,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 else
                     STDERR.puts 'No Security Group description provided'
                     exit(-1)

data/bin/onetemplate

@@ -166,10 +166,13 @@ CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, [:file, nil], :options =>
             [OneTemplateHelper::VM_NAME] + OpenNebulaHelper::TEMPLATE_OPTIONS +
             [OpenNebulaHelper::DRY] do
-        if (args[0] || STDIN.wait_readable(0)) &&
-            OpenNebulaHelper.create_template_options_used?(options)
+        conflicting_opts = []
+        if (args[0] || !(stdin = OpenNebulaHelper.read_stdin).empty?) &&
+           OpenNebulaHelper.create_template_options_used?(options, conflicting_opts)
+
+            STDERR.puts 'You cannot pass template on STDIN and use template creation options, ' <<
+            "conflicting options: #{conflicting_opts.join(', ')}."
 
-            STDERR.puts 'You can not use both template file and template creation options.'
             next -1
         end
 
@@ -177,8 +180,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !stdin.empty?
+                    template = stdin
                 else
                     res = OpenNebulaHelper.create_template(options)
 
@@ -255,11 +258,13 @@ CommandParser::CmdParser.new(ARGV) do
     command :instantiate, instantiate_desc, :templateid, [:file, nil],
             :options => instantiate_options + OpenNebulaHelper::TEMPLATE_OPTIONS do
         exit_code = 0
+        conflicting_opts = []
+        if (args[1] || !(stdin = OpenNebulaHelper.read_stdin).empty?) &&
+            OpenNebulaHelper.create_template_options_used?(options, conflicting_opts)
 
-        if (args[1] || STDIN.wait_readable(0)) &&
-            OpenNebulaHelper.create_template_options_used?(options)
+            STDERR.puts 'You cannot pass template on STDIN and use template creation options, ' <<
+            "conflicting options: #{conflicting_opts.join(', ')}."
 
-            STDERR.puts 'You cannot use both template and template creation options.'
             next -1
         end
 
@@ -305,8 +310,8 @@ CommandParser::CmdParser.new(ARGV) do
 
                 if args[1]
                     extra_template = File.read(args[1])
-                elsif STDIN.wait_readable(0)
-                    extra_template = STDIN.read
+                elsif !stdin.empty?
+                    extra_template = stdin
                 else
                     res = OpenNebulaHelper.create_template(options, t)
 

data/bin/oneuser

@@ -621,7 +621,7 @@ CommandParser::CmdParser.new(ARGV) do
         Example, request a valid token for a generic driver (e.g. core auth, LDAP...):
           oneuser token-create my_user --time 3600
 
-        Example, request a group spefici token (new resources will be created in that
+        Example, request a group specific token (new resources will be created in that
         group and only resources that belong to that group will be listed):
           oneuser token-create my_user --group <id|group>
 

data/bin/onevcenter

@@ -261,7 +261,7 @@ CommandParser::CmdParser.new(ARGV) do
         Examples:
            - importing first datastore
 
-             onevcenter list -o templates -h <host_id>
+             onevcenter import -o templates -h <host_id>
 
            - importing 2 concrete templates:
 

data/bin/onevm

@@ -349,19 +349,21 @@ CommandParser::CmdParser.new(ARGV) do
         number    = options[:multiple] || 1
         exit_code = nil
 
-        if (args[0] || STDIN.wait_readable(0)) &&
-            OpenNebulaHelper.create_template_options_used?(options)
+        conflicting_opts = []
+        if (args[0] || !(stdin = OpenNebulaHelper.read_stdin).empty?) &&
+            OpenNebulaHelper.create_template_options_used?(options, conflicting_opts)
+
+            STDERR.puts 'You cannot pass template on STDIN and use template creation options, ' <<
+                        "conflicting options: #{conflicting_opts.join(', ')}."
 
-            STDERR.puts 'You can not use both template file and template'\
-                        ' creation options.'
             exit(-1)
         end
 
         begin
             if args[0]
                 template = File.read(args[0])
-            elsif STDIN.wait_readable(0)
-                template = STDIN.read
+            elsif !stdin.empty?
+                template = stdin
             else
                 res = OpenNebulaHelper.create_template(options)
 
@@ -615,8 +617,8 @@ CommandParser::CmdParser.new(ARGV) do
 
         if options[:file]
             extra_template = File.read(options[:file])
-        elsif STDIN.wait_readable(0)
-            extra_template = STDIN.read
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            extra_template = stdin
         end
 
         helper.perform_actions(args[0], options, verbose) do |vm|
@@ -689,7 +691,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     resume_desc = <<-EOT.unindent
-        Resumes the execution of the a saved VM
+        Resumes the execution of a saved VM
 
         States: STOPPED, SUSPENDED, UNDEPLOYED, POWEROFF, UNKNOWN
     EOT
@@ -718,7 +720,7 @@ CommandParser::CmdParser.new(ARGV) do
         States for success/failure recovers: Any ACTIVE state.
         States for a retry recover: Any *FAILURE state
         States for delete: Any
-        States for delete-recreate: Any but STOP/UNDEPLOYED
+        States for recreate: Any but DONE/POWEROFF/SUSPENDED
         States for delete-db: Any
     EOT
 
@@ -774,8 +776,8 @@ CommandParser::CmdParser.new(ARGV) do
                          TARGET, CACHE, DISCARD, PREFIX] do
         if options[:file]
             template = File.read(options[:file])
-        elsif STDIN.wait_readable(0)
-            template = STDIN.read
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
         elsif options[:image]
             image_id = options[:image]
             target   = options[:target]
@@ -851,8 +853,8 @@ CommandParser::CmdParser.new(ARGV) do
             ] do
         if options[:file]
             template = File.read(options[:file])
-        elsif STDIN.wait_readable(0)
-            template = STDIN.read
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
         elsif options[:network]
             network_id = options[:network]
             ip         = options[:ip]
@@ -1238,6 +1240,10 @@ CommandParser::CmdParser.new(ARGV) do
 
             if options[:xml]
                 puts pool.to_xml
+            elsif options[:json]
+                puts JSON.pretty_generate(pool.to_hash)
+            elsif options[:yaml]
+                puts pool.to_hash.to_yaml
             else
                 table.show(pool.to_hash, options)
             end
@@ -1276,8 +1282,8 @@ CommandParser::CmdParser.new(ARGV) do
             :options => OpenNebulaHelper::CAPACITY_OPTIONS_VM + [ENFORCE, OpenNebulaHelper::FILE] do
         if options[:file]
             template = File.read(options[:file])
-        elsif STDIN.wait_readable(0)
-            template = STDIN.read
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
         else
             template = ''
 
@@ -1355,15 +1361,15 @@ CommandParser::CmdParser.new(ARGV) do
 
         The full list of configuration attributes are:
 
-        OS        = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT", "UUID"]
+        OS        = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT", "KERNEL_CMD", "ROOT", "SD_DISK_BUS", "UUID", "FIRMWARE"]
         FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "VIRTIO_SCSI_QUEUES", "VIRTIO_BLK_QUEUES", "IOTHREADS"]
         INPUT     = ["TYPE", "BUS"]
-        GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
+        GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP", "COMMAND"]
         VIDEO     = ["TYPE", "IOMMU", "ATS", "VRAM", "RESOLUTION"]
         RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
         CPU_MODEL = ["MODEL"]
         BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE", "INCREMENT_MODE"]
-        CONTEXT (any value, **variable substitution will be made**)
+        CONTEXT (any value, except ETH*, **variable substitution will be made**)
     EOT
 
     command :updateconf, updateconf_desc, :vmid, [:file, nil],
@@ -1373,8 +1379,8 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             if args[1]
                 template = File.read(args[1])
-            elsif STDIN.wait_readable(0)
-                template = STDIN.read
+            elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                template = stdin
             end
         rescue StandardError => e
             STDERR.puts "Error reading template: #{e.message}."
@@ -1608,6 +1614,68 @@ CommandParser::CmdParser.new(ARGV) do
         '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
     EOT
 
+    pci_attach_desc = <<-EOT.unindent
+        Attaches a PCI to a VM.
+
+        You can specify the PCI device with --pci (short_address) or
+        --pci_device (device ID), --pci_class (class ID) and/or --pci_vendor (vendor ID).
+
+        States: POWEROFF
+    EOT
+
+    command :"pci-attach", pci_attach_desc, :vmid,
+            :options => [
+                OpenNebulaHelper::FILE,
+                PCI,
+                PCI_CLASS,
+                PCI_VENDOR,
+                PCI_DEVICE
+            ] do
+        pci_attrs = [:pci, :pci_device, :pci_vendor, :pci_class].any? do |o|
+            !options[o].nil?
+        end
+
+        if options[:file]
+            template = File.read(options[:file])
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
+        elsif pci_attrs
+            pcia = options[:pci]
+            pcid = options[:pci_device]
+            pcic = options[:pci_class]
+            pciv = options[:pci_vendor]
+
+            pcis = []
+            pcis << "SHORT_ADDRESS = \"#{pcia}\"" if pcia
+            pcis << "DEVICE        = \"#{pcid}\"" if pcid
+            pcis << "CLASS         = \"#{pcic}\"" if pcic
+            pcis << "VENDOR        = \"#{pciv}\"" if pciv
+
+            template = "PCI = [ #{pcis.join(',')} ]"
+        else
+            STDERR.puts 'Provide a PCI description file with --file or the relevant pci options:'
+            exit(-1)
+        end
+
+        helper.perform_action(args[0], options, 'Attaching PCI device') do |vm|
+            vm.pci_attach(template)
+        end
+    end
+
+    pci_detach_desc = <<-EOT.unindent
+        Detaches a PCI device from a VM
+
+        States: POWEROFF
+    EOT
+
+    command :"pci-detach", pci_detach_desc, :vmid, :pciid do
+        pciid = args[1].to_i
+
+        helper.perform_action(args[0], options, 'Detaching PCI') do |vm|
+            vm.pci_detach(pciid)
+        end
+    end
+
     command :ssh,
             ssh_desc,
             :vmid,

data/bin/onevmgroup

@@ -138,8 +138,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 else
                     STDERR.puts 'No VM Group description provided'
                     exit(-1)
@@ -292,8 +292,8 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             if args[1]
                 template = File.read(args[1])
-            elsif STDIN.wait_readable(0)
-                template = STDIN.read
+            elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                template = stdin
             end
         rescue StandardError => e
             STDERR.puts "Error reading template: #{e.message}."

data/bin/onevnet

@@ -173,8 +173,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 end
                 vn.allocate(template, cid)
             rescue StandardError => e
@@ -203,8 +203,8 @@ CommandParser::CmdParser.new(ARGV) do
         helper.perform_action(args[0], options, 'address range added') do |vn|
             if args[1]
                 ar = File.read(args[1])
-            elsif STDIN.wait_readable(0)
-                ar = STDIN.read
+            elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                ar = stdin
             else
                 ar = OpenNebulaHelper.create_ar(options)
             end
@@ -479,7 +479,7 @@ CommandParser::CmdParser.new(ARGV) do
         States for delete: Any but READY
     EOT
 
-    command :recover, recover_desc, [:range, :vmid_list],
+    command :recover, recover_desc, [:range, :vnetid_list],
             :options => [SUCCESS, FAILURE, DELETE, RETRY] do
         if !options[:success].nil?
             result = 1

data/bin/onevntemplate

@@ -161,8 +161,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 end
 
                 if options[:dry]
@@ -256,8 +256,8 @@ CommandParser::CmdParser.new(ARGV) do
 
                 if args[1]
                     extra_template = File.read(args[1])
-                elsif STDIN.wait_readable(0)
-                    extra_template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    extra_template = stdin
                 else
                     res = OpenNebulaHelper.create_template(options, t)
 

data/bin/onevrouter

@@ -142,8 +142,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 end
                 obj.allocate(template)
             rescue StandardError => e
@@ -174,10 +174,12 @@ CommandParser::CmdParser.new(ARGV) do
             :vrouterid, :templateid, [:file, nil],
             :options => instantiate_options +
                         OpenNebulaHelper::TEMPLATE_OPTIONS do
-        if (args[2] || STDIN.wait_readable(0)) &&
-            OpenNebulaHelper.create_template_options_used?(options)
+        conflicting_opts = []
+        if (args[2] || !(stdin = OpenNebulaHelper.read_stdin).empty?) &&
+            OpenNebulaHelper.create_template_options_used?(options, conflicting_opts)
 
-            STDERR.puts 'You cannot use both template and template creation options.'
+            STDERR.puts 'You cannot pass template on STDIN and use template creation options, ' <<
+                        "conflicting options: #{conflicting_opts.join(', ')}."
             exit(-1)
         end
 
@@ -201,8 +203,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             if args[2]
                 extra_template = File.read(args[2])
-            elsif STDIN.wait_readable(0)
-                extra_template = STDIN.read
+            elsif !stdin.empty?
+                extra_template = stdin
             else
                 res = OpenNebulaHelper.create_template(options, t)
 
@@ -307,8 +309,8 @@ CommandParser::CmdParser.new(ARGV) do
                          OneVirtualRouterHelper::FLOAT] do
         if options[:file]
             template = File.read(options[:file])
-        elsif STDIN.wait_readable(0)
-            template = STDIN.read
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
         elsif options[:network]
             network_id = options[:network]
             ip         = options[:ip]

data/bin/onezone

@@ -111,8 +111,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
-                elsif STDIN.wait_readable(0)
-                    template = STDIN.read
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 else
                     STDERR.puts 'No zone template provided'
                     exit(-1)

data/lib/one_helper/onebackupjob_helper.rb

@@ -155,8 +155,8 @@ class OneBackupJobHelper < OpenNebulaHelper::OneHelper
             # Get user information
             if file
                 str = File.read(file)
-            elsif STDIN.wait_readable(0)
-                str = STDIN.read
+            elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                str = stdin
             else
                 str = OpenNebulaHelper.update_template(id, bj, nil, xpath)
             end

data/lib/one_helper/onehost_helper.rb

@@ -794,6 +794,8 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         numa_nodes.each do |node|
             mon_node = monitoring.find {|x| x['NODE_ID'] == node['NODE_ID'] }
 
+            next if mon_node.nil?
+
             node['MEMORY']['FREE'] = mon_node['MEMORY']['FREE']
             node['MEMORY']['USED'] = mon_node['MEMORY']['USED']
 

data/lib/one_helper/oneimage_helper.rb

@@ -169,8 +169,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         :name => 'no_check_capacity',
         :large => '--no_check_capacity',
         :description =>
-            'Check Datastore capacity. By Default YES',
-        :format => String
+            'Do not check Datastore capacity, only for admins.'
     }
 
     FILTERS = [
@@ -518,6 +517,18 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             [0, template]
         end
 
+        def create_template_options_used?(options, conflicting_opts)
+            # Get the template options names as symbols, options hash uses symbols
+            template_options=TEMPLATE_OPTIONS.map do |o|
+                o[:name].to_sym
+            end
+
+            # Check if one at least one of the template options is in options hash
+            conflicting_opts.replace(options.keys & template_options)
+
+            !conflicting_opts.empty?
+        end
+
     end
 
 end

data/lib/one_helper/onemarketapp_helper.rb

@@ -129,16 +129,17 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def self.create_template_options_used?(options)
+    def self.create_template_options_used?(options, conflicting_opts)
         # Get the template options names as symbols. options hash
         # uses symbols
         template_options=self::TEMPLATE_OPTIONS.map do |o|
             o[:name].to_sym
         end
 
-        # Check if one at least one of the template options is
-        # in options hash
-        (template_options-options.keys)!=template_options
+        # Check if at least one of the template options is in options hash
+        conflicting_opts.replace(options.keys & template_options)
+
+        !conflicting_opts.empty?
     end
 
     # Import object into marketplace

data/lib/one_helper/onevm_helper.rb

@@ -397,8 +397,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             # Get user information
             if file
                 str = File.read(file)
-            elsif STDIN.wait_readable(0)
-                str = STDIN.read
+            elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                str = stdin
             else
                 str = OpenNebulaHelper.update_template(vm_id, vm, nil, xpath)
             end

data/lib/one_helper.rb

@@ -379,7 +379,7 @@ Bash symbols must be escaped on STDIN passing'
             :name   => 'context',
             :large  => '--context line1,line2,line3',
             :format => Array,
-            :description => 'Lines to add to the context section'
+            :description => 'Replaces the context section with the specified lines'
         },
         {
             :name   => 'boot',
@@ -1078,12 +1078,12 @@ Bash symbols must be escaped on STDIN passing'
             elsif options[:xml]
                 return list_pool_xml(pool, options, filter_flag)
             elsif options[:json]
-                list_pool_format(pool, options, filter_flag) do |pool|
+                return list_pool_format(pool, options, filter_flag) do |pool|
                     hash = check_resource_xsd(pool, pname)
                     puts ::JSON.pretty_generate(hash)
                 end
             elsif options[:yaml]
-                list_pool_format(pool, options, filter_flag) do |pool|
+                return list_pool_format(pool, options, filter_flag) do |pool|
                     hash = check_resource_xsd(pool, pname)
                     puts hash.to_yaml(:indent => 4)
                 end
@@ -1712,8 +1712,8 @@ Bash symbols must be escaped on STDIN passing'
     def self.update_template_helper(append, _id, resource, path, xpath, update = true)
         if path
             File.read(path)
-        elsif STDIN.wait_readable(0)
-            STDIN.read
+        elsif !(stdin = self.read_stdin).empty?
+            stdin
         elsif append
             editor_input
         else
@@ -2095,16 +2095,17 @@ Bash symbols must be escaped on STDIN passing'
         ar << ']'
     end
 
-    def self.create_template_options_used?(options)
+    def self.create_template_options_used?(options, conflicting_opts)
         # Get the template options names as symbols. options hash
         # uses symbols
         template_options=OpenNebulaHelper::TEMPLATE_OPTIONS.map do |o|
             o[:name].to_sym
         end
 
-        # Check if one at least one of the template options is
-        # in options hash
-        (template_options-options.keys)!=template_options
+        # Check if at least one of the template options is in options hash
+        conflicting_opts.replace(options.keys & template_options)
+
+        !conflicting_opts.empty?
     end
 
     def self.sunstone_url
@@ -2660,4 +2661,11 @@ Bash symbols must be escaped on STDIN passing'
         end
     end
 
+    def self.read_stdin
+        if STDIN.wait_readable(0)
+            STDIN.read()
+        else
+           ''
+        end
+    end
 end

data/share/schemas/xsd/vm_pool.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema"
+  xmlns="http://opennebula.org/XMLSchema">
   <xs:element name="VM_POOL">
     <xs:complexType>
       <xs:sequence>
@@ -60,6 +60,28 @@
               <xs:element name="USER_TEMPLATE">
                 <xs:complexType>
                   <xs:sequence>
+                    <xs:element name="LABELS" type="xs:string" minOccurs="0"/>
+                    <xs:element name="ERROR" type="xs:string" minOccurs="0"/>
+                    <xs:element name="SCHED_MESSAGE" type="xs:string" minOccurs="0"/>
+                    <xs:element name="SCHED_RANK" type="xs:string" minOccurs="0"/>
+                    <xs:element name="SCHED_DS_RANK" type="xs:string" minOccurs="0"/>
+                    <xs:element name="SCHED_REQUIREMENTS" type="xs:string" minOccurs="0"/>
+                    <xs:element name="SCHED_DS_REQUIREMENTS" type="xs:string" minOccurs="0"/>
+                    <xs:element name="USER_PRIORITY" type="xs:string" minOccurs="0"/>
+                    <xs:element name="PUBLIC_CLOUD" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:any processContents="skip"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="SCHED_ACTION" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:any processContents="skip"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
                     <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
                   </xs:sequence>
                 </xs:complexType>

metadata

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