opennebula-cli 6.8.0 → 6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67cef3295aa89ae688e917b2f9586251ad2c1ef2a965cccd75103a8a987ea980
-  data.tar.gz: 6959a48ef8b61e696c4d68b6d6fd5fcb225a62a451ec4e455354abd21aa75b7b
+  metadata.gz: 15c54d3ad1c7f151f8f8c85761c9e7d807ebaf3b60e11c8ba722f9efa55b5e36
+  data.tar.gz: 2162024e4c15e1fe2fcd811adb3a10d84e33943f5f6a67d930a93d2b3734b859
 SHA512:
-  metadata.gz: 1dc2353d7f82ad36dedad8979b1071483f01306e5ec6aedcbd81aa9142f60b2cbdb260a2ce2a9289293ad9851b169ac942c1587054067e9416a0e03b2941a410
-  data.tar.gz: c11031e925a29e9cc260117a17c6cf4ac956f381502124ea7a7e0c9aba360a704f59f71a8eabff0b527121a2ca7e179d6df2143f357a347fd26e5e3c1e2b75fc
+  metadata.gz: ca211f3593bc2262afaacf6ee1872c00335f7edb86ca52d532fe2abbdfd16d89ba8d4f1b26607c3e44e3bb31e0ed14f33aeefb0cd9cf62b986c0fc8429eb870c
+  data.tar.gz: 708bf45d47a6755eb71bba7df087025ee4c2ff016a4d0cb4acff390ff7d3373b3695045e9c63ed5d880011c9520bde7ddc5fc00d20b04d0f8ab3402fb4e96c87

data/bin/oneacct

@@ -75,7 +75,7 @@ CommandParser::CmdParser.new(ARGV) do
             exit(0)
         end
 
-        filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
+        filter_flag = options[:userfilter] || VirtualMachinePool::INFO_ALL
         if options[:start_time]
             start_time = options[:start_time].to_i
         else

data/bin/onebackupjob

@@ -130,6 +130,10 @@ CommandParser::CmdParser.new(ARGV) do
           - using a template description file:
 
             onebackupjob create weekly_backup.tmpl
+
+            - using a template description via stdin:
+
+            cat $bj_template | onebackupjob create
     EOT
 
     command :create,
@@ -143,6 +147,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 else
                     template = OneBackupJobHelper.create_backupjob_template(options)
                 end

data/bin/onedatastore

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

data/bin/oneflow

@@ -79,7 +79,7 @@ CommandParser::CmdParser.new(ARGV) do
     DELETE = {
         :name => 'delete',
         :large => '--delete',
-        :description => 'Force flow necover delete'
+        :description => 'Force flow recover delete'
     }
 
     APPEND = {
@@ -130,7 +130,8 @@ CommandParser::CmdParser.new(ARGV) do
         List the available services
     EOT
 
-    command :list, list_desc, :options => FORMAT do
+    command :list, list_desc,
+            :options => FORMAT + CLIHelper::OPTIONS + [OpenNebulaHelper::DESCRIBE] do
         helper.list_service_pool(helper.client(options), options)
     end
 
@@ -162,6 +163,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     delete_desc = <<-EOT.unindent
         Delete a given service
+        To force service removal please use 'oneflow recover --delete <service_id>' command
     EOT
 
     command :delete, delete_desc, [:range, :service_id_list] do

data/bin/oneflow-template

@@ -143,7 +143,8 @@ CommandParser::CmdParser.new(ARGV) do
         List the available Service Templates
     EOT
 
-    command :list, list_desc, :options => FORMAT do
+    command :list, list_desc,
+            :options => FORMAT + CLIHelper::OPTIONS + [OpenNebulaHelper::DESCRIBE] do
         helper.list_service_template_pool(helper.client(options), options)
     end
 
@@ -186,11 +187,13 @@ CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, [:file, nil], :options => Service::JSON_FORMAT do
         client = helper.client(options)
 
-        template = nil
-        template = File.read(args[0]) if args[0]
-        template = STDIN.read if STDIN.wait_readable(0)
+        if args[0]
+            template = File.read(args[0])
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
+        end
 
-        if template.nil?
+        if !template
             STDERR.puts 'A template must be provided'
             exit(-1)
         end
@@ -257,38 +260,40 @@ CommandParser::CmdParser.new(ARGV) do
         rc     = 0
         client = helper.client(options)
 
-        number.times do
-            template = nil
-            template = File.read(args[1]) if args[1]
-            template = STDIN.read if STDIN.wait_readable(0)
+        if args[1]
+            template = File.read(args[1])
+        elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+            template = stdin
+        end
+        params['merge_template'] = JSON.parse(template) if template
 
-            params['merge_template'] = JSON.parse(template) if template
+        unless params['merge_template']
+            response = client.get("#{RESOURCE_PATH}/#{args[0]}")
 
-            unless params['merge_template']
-                response = client.get("#{RESOURCE_PATH}/#{args[0]}")
+            if CloudClient.is_error?(response)
+                rc = [response.code.to_i, response.to_s]
+                break
+            end
 
-                if CloudClient.is_error?(response)
-                    rc = [response.code.to_i, response.to_s]
-                    break
-                end
+            params['merge_template'] = {}
+            body = JSON.parse(response.body)['DOCUMENT']['TEMPLATE']['BODY']
 
-                params['merge_template'] = {}
-                body = JSON.parse(response.body)['DOCUMENT']['TEMPLATE']['BODY']
+            # Check global custom attributes
+            custom_attrs = helper.custom_attrs(body['custom_attrs'])
+            params['merge_template'].merge!(custom_attrs) unless custom_attrs.nil?
 
-                # Check global custom attributes
-                custom_attrs = helper.custom_attrs(body['custom_attrs'])
-                params['merge_template'].merge!(custom_attrs) unless custom_attrs.nil?
+            # Check role level custom attributes
+            custom_role_attrs = helper.custom_role_attrs(body['roles'])
+            params['merge_template'].merge!(custom_role_attrs) unless custom_role_attrs.nil?
 
-                # Check role level custom attributes
-                custom_role_attrs = helper.custom_role_attrs(body['roles'])
-                params['merge_template'].merge!(custom_role_attrs) unless custom_role_attrs.nil?
+            # Check vnets attributes
+            vnets = helper.networks(body['networks'])
+            params['merge_template'].merge!(vnets) unless vnets.nil?
+        end
 
-                # Check vnets attributes
-                vnets = helper.networks(body['networks'])
-                params['merge_template'].merge!(vnets) unless vnets.nil?
-            end
+        json = Service.build_json_action('instantiate', params)
 
-            json     = Service.build_json_action('instantiate', params)
+        number.times do
             response = client.post("#{RESOURCE_PATH}/#{args[0]}/action", json)
 
             if CloudClient.is_error?(response)

data/bin/onehook

@@ -164,6 +164,10 @@ CommandParser::CmdParser.new(ARGV) do
 
             onehook create hook.tmpl
 
+            - using a Hook description file via stdin:
+
+            cat $hook_template | onehook create
+
     EOT
 
     command :create, create_desc, :file, :options =>
@@ -172,6 +176,11 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
+                else
+                    STDERR.puts 'No hook template provided'
+                    exit(-1)
                 end
 
                 if options[:dry]

data/bin/oneimage

@@ -130,6 +130,7 @@ CommandParser::CmdParser.new(ARGV) do
     list_options += OpenNebulaHelper::FORMAT
     list_options << OpenNebulaHelper::NUMERIC
     list_options << OpenNebulaHelper::DESCRIBE
+    list_options << OneImageHelper::FILTERS
 
     CREATE_OPTIONS = [OneDatastoreHelper::DATASTORE,
                       OneImageHelper::IMAGE,
@@ -215,10 +216,13 @@ CommandParser::CmdParser.new(ARGV) do
             check_capacity = true
         end
 
-        if (args[0] || STDIN.wait_readable(0)) &&
-            OpenNebulaHelper.create_template_options_used?(options)
+        conflicting_opts = []
+        if (args[0] || !(stdin = OpenNebulaHelper.read_stdin).empty?) &&
+            OneImageHelper.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 cannot use both template and template creation options.'
             next -1
         end
 
@@ -235,8 +239,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)
 
@@ -487,6 +491,16 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options => list_options do
+        if options.key?(:backup)
+            filter = 'TYPE=BK'
+
+            if options[:filter]
+                options[:filter] << filter
+            else
+                options[:filter] = [filter]
+            end
+            options.delete(:backup)
+        end
         helper.list_pool(options, false, args[0])
     end
 

data/bin/onemarket

@@ -105,8 +105,11 @@ CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, [:file, nil] do
         helper.create_resource(options) do |marketplace|
             begin
-                template = File.read(args[0]) if args[0]
-                template = STDIN.read if STDIN.wait_readable(0)
+                if args[0]
+                    template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
+                end
                 marketplace.allocate(template)
             rescue StandardError => e
                 STDERR.puts e.message

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

@@ -110,7 +110,14 @@ CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, :file do
         helper.create_resource(options) do |obj|
             begin
-                template = File.read(args[0])
+                if args[0]
+                    template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
+                else
+                    STDERR.puts 'No Security Group description provided'
+                    exit(-1)
+                end
 
                 obj.allocate(template)
             rescue StandardError => e

data/bin/oneshowback

@@ -77,7 +77,7 @@ CommandParser::CmdParser.new(ARGV) do
             exit(0)
         end
 
-        filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
+        filter_flag = options[:userfilter] || VirtualMachinePool::INFO_ALL
 
         start_month = -1
         start_year  = -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]
@@ -1267,8 +1269,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     resize_desc = <<-EOT.unindent
-        Resizes the capacity of a Virtual Machine (offline, the VM cannot be
-        RUNNING)
+        Resizes the capacity of a Virtual Machine
 
         #{OpenNebulaHelper::TEMPLATE_INPUT}
     EOT
@@ -1277,8 +1278,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 = ''
 
@@ -1325,6 +1326,26 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    backupmode_set_desc = <<-EOT.unindent
+        Updates the backup mode of a VM. Can be #{OpenNebulaHelper::BACKUP_MODES.join('|')}
+    EOT
+
+    command :backupmode, backupmode_set_desc, :vmid, :mode do
+        vm_ref = args[0]
+        backup_mode = args[1]
+
+        if !helper.backup_mode_valid?(backup_mode)
+            err_msg = "Invalid backup mode: #{backup_mode}\n"
+            err_msg << "Valid backup modes are: #{OpenNebulaHelper::BACKUP_MODES.join(',')}"
+
+            STDERR.puts err_msg
+            exit(-1)
+        end
+
+        # TODO: Ensure other BACKUP_CONFIG is not overwritten
+        helper.set_backup_mode(vm_ref, backup_mode)
+    end
+
     updateconf_desc = <<-EOT.unindent
         Updates the configuration of a VM. Valid states are: running, pending,
         failure, poweroff, undeploy, hold or cloning.
@@ -1337,13 +1358,13 @@ CommandParser::CmdParser.new(ARGV) do
         The full list of configuration attributes are:
 
         OS        = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT", "UUID"]
-        FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "IOTHREADS"]
+        FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "VIRTIO_SCSI_QUEUES", "VIRTIO_BLK_QUEUES", "IOTHREADS"]
         INPUT     = ["TYPE", "BUS"]
         GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
         VIDEO     = ["TYPE", "IOMMU", "ATS", "VRAM", "RESOLUTION"]
         RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
         CPU_MODEL = ["MODEL"]
-        BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE"]
+        BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE", "INCREMENT_MODE"]
         CONTEXT (any value, **variable substitution will be made**)
     EOT
 
@@ -1352,15 +1373,17 @@ CommandParser::CmdParser.new(ARGV) do
         template = ''
 
         begin
-            template = File.read(args[1]) if args[1]
-            template = STDIN.read if STDIN.wait_readable(0)
+            if args[1]
+                template = File.read(args[1])
+            elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                template = stdin
+            end
         rescue StandardError => e
             STDERR.puts "Error reading template: #{e.message}."
             exit(-1)
         end
 
-        helper.perform_action(args[0], options,
-                              'Updating VM configuration') do |vm|
+        helper.perform_action(args[0], options, 'Updating VM configuration') do |vm|
             if template.empty?
                 rc = vm.info
 
@@ -1587,6 +1610,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

@@ -136,7 +136,14 @@ CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, :file do
         helper.create_resource(options) do |obj|
             begin
-                template = File.read(args[0])
+                if args[0]
+                    template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
+                else
+                    STDERR.puts 'No VM Group description provided'
+                    exit(-1)
+                end
 
                 obj.allocate(template)
             rescue StandardError => e
@@ -283,8 +290,11 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :"role-add", role_add_desc, :vmgroupid, [:file, nil] do
         begin
-            template = File.read(args[1]) if args[1]
-            template = STDIN.read if STDIN.wait_readable(0)
+            if args[1]
+                template = File.read(args[1])
+            elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                template = stdin
+            end
         rescue StandardError => e
             STDERR.puts "Error reading template: #{e.message}."
             exit(-1)

data/bin/onevnet

@@ -171,8 +171,11 @@ CommandParser::CmdParser.new(ARGV) do
 
         helper.create_resource(options) do |vn|
             begin
-                template = File.read(args[0]) if args[0]
-                template = STDIN.read if STDIN.wait_readable(0)
+                if args[0]
+                    template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
+                end
                 vn.allocate(template, cid)
             rescue StandardError => e
                 STDERR.puts "Error creating network: #{e.message}"
@@ -200,6 +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 = OpenNebulaHelper.read_stdin).empty?
+                ar = stdin
             else
                 ar = OpenNebulaHelper.create_ar(options)
             end
@@ -474,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

@@ -149,6 +149,10 @@ CommandParser::CmdParser.new(ARGV) do
 
             onevntemplate create vn_description.tmpl
 
+            - using a Virtual Network Template description file via stdin:
+
+            cat $vn_template | onevntemplate create
+
     EOT
 
     command :create, create_desc, [:file, nil], :options =>
@@ -157,6 +161,8 @@ CommandParser::CmdParser.new(ARGV) do
             begin
                 if args[0]
                     template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
                 end
 
                 if options[:dry]
@@ -250,6 +256,8 @@ CommandParser::CmdParser.new(ARGV) do
 
                 if args[1]
                     extra_template = File.read(args[1])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    extra_template = stdin
                 else
                     res = OpenNebulaHelper.create_template(options, t)
 

data/bin/onevrouter

@@ -140,8 +140,11 @@ CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, [:file, nil] do
         helper.create_resource(options) do |obj|
             begin
-                template = File.read(args[0]) if args[0]
-                template = STDIN.read if STDIN.wait_readable(0)
+                if args[0]
+                    template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
+                end
                 obj.allocate(template)
             rescue StandardError => e
                 STDERR.puts e.message
@@ -171,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
 
@@ -198,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)
 
@@ -304,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

@@ -109,7 +109,14 @@ CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, :file do
         helper.create_resource(options) do |zone|
             begin
-                template = File.read(args[0])
+                if args[0]
+                    template = File.read(args[0])
+                elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                    template = stdin
+                else
+                    STDERR.puts 'No zone template provided'
+                    exit(-1)
+                end
                 zone.allocate(template)
             rescue StandardError => e
                 STDERR.puts e.message

data/lib/one_helper/onebackupjob_helper.rb

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

data/lib/one_helper/oneflow_helper.rb

@@ -105,7 +105,10 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
             elsif options[:yaml]
                 [0, array_list.to_yaml(:indent => 4)]
             else
-                format_service_pool.show(array_list)
+                table = format_service_pool
+
+                table.show(array_list, options)
+                table.describe_columns if options[:describe]
 
                 0
             end

data/lib/one_helper/oneflowtemplate_helper.rb

@@ -85,8 +85,11 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
             elsif options[:yaml]
                 [0, JSON.parse(response.body).to_yaml(:indent => 4)]
             else
+                table = format_service_template_pool
                 documents = JSON.parse(response.body)['DOCUMENT_POOL']
-                format_service_template_pool.show(documents['DOCUMENT'])
+
+                table.show(documents['DOCUMENT'], options)
+                table.describe_columns if options[:describe]
 
                 0
             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

@@ -173,6 +173,15 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         :format => String
     }
 
+    FILTERS = [
+        {
+            :name => 'backup',
+            :large => '--backup',
+            :description => 'Show only backup type images',
+            :format => String
+        }
+    ]
+
     def self.rname
         'IMAGE'
     end
@@ -263,13 +272,13 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         tmpl_pool.info
 
         pool.each do |img|
+            next if img['TYPE'].to_i == 6 # skip backup images
+
             attrs = { :id    => img['ID'],
                       :name  => img['NAME'],
                       :uname => img['UNAME'] }
 
-            orphans << img['ID'] if check_orphan(tmpl_pool,
-                                                 xpath,
-                                                 'IMAGE', attrs)
+            orphans << img['ID'] if check_orphan(tmpl_pool, xpath, 'IMAGE', attrs)
         end
 
         orphans
@@ -509,6 +518,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,6 +397,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             # Get user information
             if file
                 str = File.read(file)
+            elsif !(stdin = OpenNebulaHelper.read_stdin).empty?
+                str = stdin
             else
                 str = OpenNebulaHelper.update_template(vm_id, vm, nil, xpath)
             end
@@ -637,6 +639,21 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         # rubocop:enable Style/SpecialGlobalVars
     end
 
+    def get_backup_mode(vm_id)
+        vm = retrieve_resource(vm_id)
+
+        if vm.has_elements?('/VM/BACKUPS/BACKUP_CONFIG')
+            vm.template_like_str('BACKUPS/BACKUP_CONFIG/MODE')
+        else
+            nil
+        end
+    end
+
+    def set_backup_mode(vm_ref, backup_mode)
+        vm = retrieve_resource(vm_ref)
+        vm.updateconf("BACKUP_CONFIG = [\"MODE\"=\"#{backup_mode}\"]")
+    end
+
     private
 
     def factory(id = nil)
@@ -1449,7 +1466,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         vm_snapshots.each do |disk|
             disk_id = disk['DISK_ID']
 
-            sshots = [disk['SNAPSHOT']].flatten
+            sshots = [disk['SNAPSHOT'] || []].flatten
             sshots.each do |snapshot|
                 data = snapshot.merge('DISK_ID' => disk_id)
                 snapshots << data

data/lib/one_helper.rb

@@ -593,6 +593,8 @@ Bash symbols must be escaped on STDIN passing'
 
     OPTIONS = FORMAT, EXTENDED, NUMERIC, KILOBYTES
 
+    BACKUP_MODES = ['FULL', 'INCREMENT']
+
     class OneHelper
 
         attr_accessor :client
@@ -717,6 +719,14 @@ Bash symbols must be escaped on STDIN passing'
             end
         end
 
+        def backup_mode_valid?(sus_backup_mode)
+            BACKUP_MODES.each do |backup_mode|
+                return true if backup_mode.casecmp?(sus_backup_mode)
+            end
+
+            false
+        end
+
         #-----------------------------------------------------------------------
         #  List pool functions
         #-----------------------------------------------------------------------
@@ -1702,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
@@ -2085,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
@@ -2313,7 +2324,7 @@ Bash symbols must be escaped on STDIN passing'
                     answer = STDIN.readline.chop
 
                     answer = initial if answer == ''
-                    noanswer = ((answer == '') && optional)
+                    noanswer = (answer == '') && optional
                 end while !noanswer && (answer =~ exp).nil?
 
                 if noanswer
@@ -2379,7 +2390,7 @@ Bash symbols must be escaped on STDIN passing'
                         answer = options[answer.to_i]
                     end
 
-                    noanswer = ((answer == '') && optional)
+                    noanswer = (answer == '') && optional
                 end while !noanswer && !options.include?(answer)
 
                 if noanswer
@@ -2650,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/acct.xsd

@@ -162,6 +162,7 @@
                         <xs:element name="BACKUP_VOLATILE" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="FS_FREEZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="INCREMENTAL_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="INCREMENT_MODE" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="KEEP_LAST" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="LAST_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="LAST_BACKUP_SIZE" type="xs:string" minOccurs="0" maxOccurs="1"/>

data/share/schemas/xsd/backupjob.xsd

@@ -27,6 +27,7 @@
               <xs:element name="BACKUP_VMS" type="xs:string"/>
               <xs:element name="BACKUP_VOLATILE" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="DATASTORE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="ERROR" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="EXECUTION" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="FS_FREEZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="KEEP_LAST" type="xs:integer" minOccurs="0" maxOccurs="1"/>

data/share/schemas/xsd/vm.xsd

@@ -299,6 +299,7 @@
                     <xs:element name="BACKUP_VOLATILE" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="FS_FREEZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="INCREMENTAL_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="INCREMENT_MODE" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="KEEP_LAST" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="LAST_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="LAST_BACKUP_SIZE" type="xs:string" minOccurs="0" maxOccurs="1"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.8.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-17 00:00:00.000000000 Z
+date: 2024-02-20 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.0
+        version: 6.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.0
+        version: 6.8.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement