opennebula-cli 6.8.2 → 6.9.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c54d3ad1c7f151f8f8c85761c9e7d807ebaf3b60e11c8ba722f9efa55b5e36
-  data.tar.gz: 2162024e4c15e1fe2fcd811adb3a10d84e33943f5f6a67d930a93d2b3734b859
+  metadata.gz: 38482e5c20e3b6bd22fe7b91b7d24bf7d7663fc1c43d8ea53d592c36395c652c
+  data.tar.gz: 143fa13eee00b3e666b0a8105e021c71062d668db57630b39d9c3b221e329101
 SHA512:
-  metadata.gz: ca211f3593bc2262afaacf6ee1872c00335f7edb86ca52d532fe2abbdfd16d89ba8d4f1b26607c3e44e3bb31e0ed14f33aeefb0cd9cf62b986c0fc8429eb870c
-  data.tar.gz: 708bf45d47a6755eb71bba7df087025ee4c2ff016a4d0cb4acff390ff7d3373b3695045e9c63ed5d880011c9520bde7ddc5fc00d20b04d0f8ab3402fb4e96c87
+  metadata.gz: b5b689b4788e3122e7a80407ff2846c87d56ba903e9254c4e70add4dae6f8c55e573996e75867c8f9de1aa64a592aa133861edee4e009205b46f700bdec7eb8a
+  data.tar.gz: 9704f4990ac5c7243cad58ffbe59e9f3f323acd8ea23b142059bdb21c6fe510587f8ad5eab05514e8abae6c1ce55c6bf713e7c1acc316c8b4cfe81b62c6137da

data/bin/oneflow

@@ -61,6 +61,21 @@ USER_AGENT = 'CLI'
 # Base Path representing the resource to be used in the requests
 RESOURCE_PATH = '/service'
 
+RESOURCE_DOCUMENT_TYPE = '100'
+
+def check_document_type(response)
+    if CloudClient.is_error?(response)
+        return if response.code == '500' # could be wrong document_type; skip this id
+
+        exit_with_code response.code.to_i, response.to_s
+    else
+        document_type = JSON.parse(response.body)['DOCUMENT']['TYPE']
+        if document_type == RESOURCE_DOCUMENT_TYPE
+            yield
+        end
+    end
+end
+
 CommandParser::CmdParser.new(ARGV) do
     usage '`oneflow` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
@@ -168,9 +183,11 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :delete, delete_desc, [:range, :service_id_list] do
         client = helper.client(options)
-
         Service.perform_actions(args[0]) do |service_id|
-            client.delete("#{RESOURCE_PATH}/#{service_id}")
+            response = client.get("#{RESOURCE_PATH}/#{service_id}")
+            check_document_type response do
+                client.delete("#{RESOURCE_PATH}/#{service_id}")
+            end
         end
     end
 
@@ -197,7 +214,10 @@ CommandParser::CmdParser.new(ARGV) do
 
             json = Service.build_json_action('recover', params)
 
-            client.post("#{RESOURCE_PATH}/#{service_id}/action", json)
+            response = client.get("#{RESOURCE_PATH}/#{service_id}")
+            check_document_type response do
+                client.post("#{RESOURCE_PATH}/#{service_id}/action", json)
+            end
         end
     end
 

data/bin/oneflow-template

@@ -68,6 +68,21 @@ USER_AGENT = 'CLI'
 # Base Path representing the resource to be used in the requests
 RESOURCE_PATH = '/service_template'
 
+RESOURCE_DOCUMENT_TYPE = '101'
+
+def check_document_type(response)
+    if CloudClient.is_error?(response)
+        return if response.code == '500' # could be wrong document_type; skip this id
+
+        exit_with_code response.code.to_i, response.to_s
+    else
+        document_type = JSON.parse(response.body)['DOCUMENT']['TYPE']
+        if document_type == RESOURCE_DOCUMENT_TYPE
+            yield
+        end
+    end
+end
+
 CommandParser::CmdParser.new(ARGV) do
     MULTIPLE = {
         :name  => 'multiple',
@@ -240,7 +255,10 @@ CommandParser::CmdParser.new(ARGV) do
         body['delete_type'] = delete
 
         Service.perform_actions(args[0]) do |template_id|
-            client.delete("#{RESOURCE_PATH}/#{template_id}", body.to_json)
+            response = client.get("#{RESOURCE_PATH}/#{template_id}")
+            check_document_type response do
+                client.delete("#{RESOURCE_PATH}/#{template_id}", body.to_json)
+            end
         end
     end
 

data/bin/oneimage

@@ -88,12 +88,6 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
-    NO_CONTEXT = {
-        :name => 'no_context',
-        :large => '--no-context',
-        :description => 'Do not add context when building from Dockerfile'
-    }
-
     NO_IP = {
         :name => 'no_ip',
         :large => '--no_ip',
@@ -121,6 +115,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
     ########################################################################
@@ -134,8 +135,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     CREATE_OPTIONS = [OneDatastoreHelper::DATASTORE,
                       OneImageHelper::IMAGE,
-                      NAME,
-                      NO_CONTEXT]
+                      NAME]
 
     ########################################################################
     # Formatters for arguments
@@ -210,11 +210,7 @@ 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?) &&
@@ -226,15 +222,6 @@ CommandParser::CmdParser.new(ARGV) do
             next -1
         end
 
-        # Add context information when building image (just working on Docker)
-        if (options.key? :no_context) && options[:path]
-            if options[:path].include?('?')
-                options[:path] << '&context=no'
-            else
-                options[:path] << '?context=no'
-            end
-        end
-
         helper.create_resource(options) do |image|
             begin
                 if args[0]
@@ -257,7 +244,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)
@@ -457,7 +444,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: '
@@ -471,13 +458,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
@@ -569,73 +557,4 @@ CommandParser::CmdParser.new(ARGV) do
 
         return 0
     end
-
-    dockerfile_desc = <<-EOT.unindent
-        Create an image based on a Dockerfile
-    EOT
-
-    command :dockerfile,
-            dockerfile_desc,
-            :options => CREATE_OPTIONS +
-                        OneImageHelper::TEMPLATE_OPTIONS do
-        # Check user options
-        unless options[:datastore]
-            STDERR.puts 'Datastore to save the image is mandatory: '
-            STDERR.puts "\t -d datastore_id"
-            exit(-1)
-        end
-
-        unless options[:name]
-            STDERR.puts 'No name provided'
-            exit(-1)
-        end
-
-        unless options[:size]
-            STDERR.puts 'No size given'
-            exit(-1)
-        end
-
-        # Prepare editor
-        tmp = Tempfile.new('dockerfile')
-
-        if ENV['EDITOR']
-            editor_path = ENV['EDITOR']
-        else
-            editor_path = EDITOR_PATH
-        end
-
-        system("#{editor_path} #{tmp.path}")
-
-        unless $CHILD_STATUS.exitstatus.zero?
-            STDERR.puts('Editor not defined')
-            exit(-1)
-        end
-
-        tmp.close
-
-        # Create image
-        helper.create_resource(options) do |image|
-            begin
-                b64            = Base64.strict_encode64(File.read(tmp.path))
-                options[:path] = "dockerfile:///?fileb64=#{b64}&" \
-                                 "size=#{options[:size]}"
-
-                options[:path] << '&context=no' if options.key?(:no_context)
-
-                res = OneImageHelper.create_image_template(options)
-
-                if res.first != 0
-                    STDERR.puts res.last
-                    next -1
-                end
-
-                template = res.last
-
-                image.allocate(template, options[:datastore], false)
-            rescue StandardError => e
-                STDERR.puts e.message
-                exit(-1)
-            end
-        end
-    end
 end

data/bin/onemarketapp

@@ -90,13 +90,6 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
-    TAG = {
-        :name => 'tag',
-        :large => '--tag tag',
-        :format => String,
-        :description => 'DockerHub image tag (default latest)'
-    }
-
     YES = {
         :name => 'yes',
         :large => '--yes',
@@ -143,7 +136,6 @@ CommandParser::CmdParser.new(ARGV) do
     EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE,
                       OneDatastoreHelper::FILE_DATASTORE,
                       OneMarketPlaceAppHelper::VMNAME,
-                      TAG,
                       NO,
                       TEMPLATE]
     IMPORT_OPTIONS = [YES, NO, MARKET, OneMarketPlaceAppHelper::VMNAME]
@@ -291,17 +283,14 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :export, export_desc, :appid, :name, :options => EXPORT_OPTIONS do
         helper.perform_action(args[0], options, 'exporting') do |obj|
-            tag ="tag=#{options[:tag]}" if options[:tag]
-
             obj.extend(MarketPlaceAppExt)
 
             rc = obj.export(
                 :dsid => options[:datastore],
                 :name => args[1],
                 :vmtemplate_name => options[:vmname],
-                :url_args => tag,
-                :notemplate => options[:no] == 'no',
-                :template => options[:template]
+                :notemplate      => options[:no] == 'no',
+                :template        => options[:template]
             )
 
             if OpenNebula.is_error?(rc)

data/bin/onevm

@@ -257,6 +257,21 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Creates a new backup image, from a new full backup (only for incremental)'
     }
 
+    INCREMENT = {
+        :name => 'increment',
+        :large => '--increment increment_id',
+        :format => Integer,
+        :description => 'Use the given increment ID to restore the backup.'\
+            ' If not provided the last one will be used'
+    }
+
+    DISK_ID = {
+        :name   => 'disk_id',
+        :large  => '--disk-id disk_id',
+        :format => Integer,
+        :description => 'Use only selected disk ID'
+    }
+
     OpenNebulaHelper::TEMPLATE_OPTIONS_VM.delete_if do |v|
         ['as_gid', 'as_uid'].include?(v[:name])
     end
@@ -281,6 +296,10 @@ CommandParser::CmdParser.new(ARGV) do
         OpenNebulaHelper.rname_to_id(arg, 'USER')
     end
 
+    set :format, :imageid, OpenNebulaHelper.rname_to_id_desc('IMAGE') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'IMAGE')
+    end
+
     set :format,
         :datastoreid,
         OpenNebulaHelper.rname_to_id_desc('DATASTORE') do |arg|
@@ -720,7 +739,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 recreate: Any but DONE/POWEROFF/SUSPENDED
+        States for recreate: Any but DONE
         States for delete-db: Any
     EOT
 
@@ -1240,6 +1259,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
@@ -1357,15 +1380,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],
@@ -1767,6 +1790,27 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    restore_desc = <<-EOT.unindent
+        Restore the Virtual Machine from the backup Image. The VM must be in poweroff state.
+    EOT
+
+    command :restore, restore_desc, :vmid, :imageid, :options => [DISK_ID, INCREMENT] do
+        helper.perform_action(args[0], options, 'Restoring VM from backup') do |vm|
+            disk_id = options[:disk_id]
+            disk_id ||= -1 # All disks by default
+
+            inc_id = options[:increment]
+            inc_id ||= -1 # Last increment by default
+
+            rc = vm.restore(args[1], inc_id, disk_id)
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error restoring: #{rc.message}"
+                exit(-1)
+            end
+        end
+    end
+
     # Deprecated commands, remove these commands in release 8.x
 
     deprecated_command(:'delete-chart', 'sched-delete')

data/bin/onezone

@@ -253,15 +253,11 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :serversync, sync_desc, :server, :options => [DATABASE] do
         begin
-            # Suppress augeas require warning message
-            $VERBOSE = nil
-
-            gem 'augeas', '~> 0.6'
             require 'augeas'
         rescue Gem::LoadError
             STDERR.puts(
                 'Augeas gem is not installed, run `gem install ' \
-                'augeas -v \'0.6\'` to install it'
+                'opennebula-augeas` to install it'
             )
             exit(-1)
         end

data/lib/one_helper/onegroup_helper.rb

@@ -328,7 +328,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
             default_quotas = elem
         }
 
-        helper = OneQuotaHelper.new
+        helper = OneQuotaHelper.new(@client)
         helper.format_quota(group_hash['GROUP'], default_quotas, group.id)
     end
 end

data/lib/one_helper/oneimage_helper.rb

@@ -22,7 +22,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
 
     # This list contains prefixes that should skip adding user home to the path
     # This must have the same content as the case $FROM in downloader.sh
-    PREFIXES = ['http', 'https', 'ssh', 's3', 'rbd', 'vcenter', 'lxd', 'docker', 'dockerfile']
+    PREFIXES = ['http', 'https', 'ssh', 's3', 'rbd', 'vcenter', 'lxd']
 
     TEMPLATE_OPTIONS=[
         {
@@ -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 = [

data/lib/one_helper/onequota_helper.rb

@@ -75,6 +75,10 @@ class OneQuotaHelper
         #-----------------------------------------------------------------------
     EOT
 
+    def initialize(client = nil)
+        @client=client
+    end
+
     #  Edits the quota template of a resource
     #  @param [XMLElement] resource to get the current info from
     #  @param [String] path to the new contents. If nil a editor will be
@@ -207,6 +211,8 @@ class OneQuotaHelper
 
         vm_quotas = [qh['VM_QUOTA']['VM']].flatten
 
+        generic_quotas = get_generic_quotas
+
         # This initializes the VM quotas for users/groups that don't have any
         # resource usage yet. It not applied to oneamdin
         if vm_quotas[0].nil? && resource_id.to_i != 0
@@ -228,6 +234,13 @@ class OneQuotaHelper
                 "SYSTEM_DISK_SIZE"      => limit,
                 "SYSTEM_DISK_SIZE_USED" => "0"
             }]
+
+            generic_quotas.each do |q|
+                vm_quotas[0][q] = limit
+                vm_quotas[0]["#{q}_USED"] = "0"
+                vm_quotas[0]["RUNNING_#{q}"] = limit
+                vm_quotas[0]["RUNNING_#{q}_USED"] = "0"
+            end
         end
 
         if !vm_quotas[0].nil?
@@ -378,6 +391,55 @@ class OneQuotaHelper
             puts
         end
 
+        if !generic_quotas.empty? && !vm_quotas[0].nil?
+            CLIHelper.print_header(str_h1 % "VMS GENERIC QUOTAS",false)
+            size = [80 / generic_quotas.length - 1, 18].min
+
+            CLIHelper::ShowTable.new(nil, self) do
+                generic_quotas.each do |elem|
+                    column elem.to_sym, "", :right, :size=>size do |d|
+                        if !d.nil?
+                            limit = d[elem]
+                            limit = helper.get_default_limit(
+                                limit, "VM_QUOTA/VM/#{elem}")
+
+                            if limit == LIMIT_UNLIMITED
+                                "%6s /      -" % [d["#{elem}_USED"]]
+                            else
+                                "%6s / %6s" % [d["#{elem}_USED"], limit]
+                            end
+                        end
+                    end
+                end
+            end.show(vm_quotas, {})
+
+            puts
+
+            CLIHelper.print_header(str_h1 % "VMS GENERIC RUNNING QUOTAS",false)
+            size = [80 / generic_quotas.length - 1, 18].min
+
+            CLIHelper::ShowTable.new(nil, self) do
+                generic_quotas.each do |q|
+                    elem = "RUNNING_#{q}"
+                    column elem.to_sym, "", :right, :size=>size do |d|
+                        if !d.nil?
+                            limit = d[elem]
+                            limit = helper.get_default_limit(
+                                limit, "VM_QUOTA/VM/#{elem}")
+
+                            if limit == LIMIT_UNLIMITED
+                                "%6s /      -" % [d["#{elem}_USED"]]
+                            else
+                                "%6s / %6s" % [d["#{elem}_USED"], limit]
+                            end
+                        end
+                    end
+                end
+            end.show(vm_quotas, {})
+
+            puts
+        end
+
         CLIHelper.print_header(str_h1 % "DATASTORE USAGE & QUOTAS",false)
 
         puts
@@ -503,4 +565,17 @@ class OneQuotaHelper
 
         return limit
     end
+
+    private
+
+    def get_generic_quotas
+        conf = OpenNebula::System.new(@client).get_configuration
+
+        return [] if OpenNebula.is_error?(conf)
+
+        conf.retrieve_elements('/OPENNEBULA_CONFIGURATION/QUOTA_VM_ATTRIBUTE') || []
+    rescue StandardError
+        []
+    end
+
 end

data/lib/one_helper/oneuser_helper.rb

@@ -613,7 +613,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
             default_quotas = elem
         }
 
-        helper = OneQuotaHelper.new
+        helper = OneQuotaHelper.new(@client)
         helper.format_quota(user_hash['USER'], default_quotas, user.id)
     end
 

data/lib/one_helper/onevm_helper.rb

@@ -160,7 +160,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
     SEARCH = {
         :name => 'search',
         :large => '--search search',
-        :description => 'query in KEY=VALUE format',
+        :description => 'Query in PATH=VALUE format. For example: ' \
+        'onevm list --search "VM.NAME=abc&VM.TEMPLATE.DISK[*].IMAGE=db1"',
         :format => String
     }
 

data/lib/one_helper/onezone_helper.rb

@@ -135,7 +135,7 @@ class Replicator
     def fetch_db_config(configs)
         configs.store(:backend, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/BACKEND'])
 
-        if configs[:backend] == 'mysql' || configs[:backend] == 'postgresql'
+        if configs[:backend] == 'mysql'
             configs.store(:server, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/SERVER'])
             configs.store(:user, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/USER'])
             configs.store(:password, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/PASSWD'])
@@ -143,7 +143,7 @@ class Replicator
             configs.store(:port, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/PORT'])
             configs[:port] = '3306' if configs[:port] == '0'
         else
-            STDERR.puts 'No mysql or postgresql backend configuration found'
+            STDERR.puts 'No mysql backend configuration found'
             exit(-1)
         end
     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

data/share/schemas/xsd/host.xsd

@@ -42,12 +42,25 @@
               <xs:element name="VMS_THREAD" type="xs:integer"/>
               <xs:element name="DATASTORES">
                 <xs:complexType>
-                    <xs:all>
+                    <xs:sequence>
                       <xs:element name="DISK_USAGE" type="xs:integer"/>
+                      <xs:element name="DS" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="FREE_MB" type="xs:integer"/>
+                            <xs:element name="ID" type="xs:integer"/>
+                            <xs:element name="TOTAL_MB" type="xs:integer"/>
+                            <xs:element name="USED_MB" type="xs:integer"/>
+                            <xs:element name="REPLICA_CACHE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                            <xs:element name="REPLICA_CACHE_SIZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                            <xs:element name="REPLICA_IMAGES" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+                          </xs:sequence>
+                        </xs:complexType>
+                      </xs:element>
                       <xs:element name="FREE_DISK" type="xs:integer"/>
                       <xs:element name="MAX_DISK" type="xs:integer"/>
                       <xs:element name="USED_DISK" type="xs:integer"/>
-                    </xs:all>
+                    </xs:sequence>
                 </xs:complexType>
               </xs:element>
               <xs:element name="PCI_DEVICES">

data/share/schemas/xsd/image.xsd

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
+  <xs:include schemaLocation="shared.xsd"/>
   <xs:element name="IMAGE">
     <xs:complexType>
       <xs:sequence>
@@ -65,27 +66,9 @@
         <xs:element name="TARGET_SNAPSHOT" type="xs:integer"/>
         <xs:element name="DATASTORE_ID" type="xs:integer"/>
         <xs:element name="DATASTORE" type="xs:string"/>
-        <xs:element name="VMS">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="CLONES">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="APP_CLONES">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
+        <xs:element name="VMS" type="IDS"/>
+        <xs:element name="CLONES" type="IDS"/>
+        <xs:element name="APP_CLONES" type="IDS"/>
         <xs:element name="TEMPLATE">
           <xs:complexType>
             <xs:sequence>
@@ -135,6 +118,7 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="BACKUP_DISK_IDS" type="IDS" minOccurs="0" maxOccurs="1"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>

data/share/schemas/xsd/opennebula_configuration.xsd

@@ -50,7 +50,6 @@
               <xs:element name="BACKEND" minOccurs="0" maxOccurs="1" >
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
-                    <xs:enumeration value="postgresql"/>
                     <xs:enumeration value="mysql"/>
                     <xs:enumeration value="sqlite"/>
                   </xs:restriction>
@@ -250,7 +249,6 @@
         <xs:element name="MAX_CONN_BACKLOG" type="xs:integer" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MESSAGE_SIZE" type="xs:integer" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MONITORING_INTERVAL_DATASTORE" type="xs:integer" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="MONITORING_INTERVAL_DB_UPDATE" type="xs:integer" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MONITORING_INTERVAL_HOST" type="xs:integer" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MONITORING_INTERVAL_MARKET" type="xs:integer" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MONITORING_INTERVAL_VM" type="xs:integer" minOccurs="0" maxOccurs="1"/>

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.2
+  version: 6.9.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-07-26 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.2
+        version: 6.9.80.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.2
+        version: 6.9.80.pre
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -41,33 +41,33 @@ dependencies:
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables:
-- onezone
-- onevcenter
-- oneimage
-- onevmgroup
-- onehost
+- oneacct
+- oneacl
+- onebackupjob
+- onecluster
+- onedatastore
+- oneflow
+- oneflow-template
 - onegroup
 - onehook
-- onevdc
-- oneacl
+- onehost
+- oneimage
 - oneirb
-- oneflow-template
-- onevrouter
-- oneshowback
-- oneuser
-- oneacct
-- onesecgroup
-- onecluster
 - onelog
+- onemarket
 - onemarketapp
+- onesecgroup
+- oneshowback
 - onetemplate
-- onemarket
-- onevntemplate
-- onevnet
-- oneflow
-- onedatastore
-- onebackupjob
+- oneuser
+- onevcenter
+- onevdc
 - onevm
+- onevmgroup
+- onevnet
+- onevntemplate
+- onevrouter
+- onezone
 extensions: []
 extra_rdoc_files: []
 files:
@@ -195,11 +195,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: OpenNebula Command Line Interface