opennebula-cli 6.8.2 → 6.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c54d3ad1c7f151f8f8c85761c9e7d807ebaf3b60e11c8ba722f9efa55b5e36
-  data.tar.gz: 2162024e4c15e1fe2fcd811adb3a10d84e33943f5f6a67d930a93d2b3734b859
+  metadata.gz: b06fb77f587c29ae6ccfdb865f506d009c722e26a51237357785839b3334c6a6
+  data.tar.gz: 5b7b61495a23c275884b89dd7416d1e7308cc95711b1091a20febc008ebb45c2
 SHA512:
-  metadata.gz: ca211f3593bc2262afaacf6ee1872c00335f7edb86ca52d532fe2abbdfd16d89ba8d4f1b26607c3e44e3bb31e0ed14f33aeefb0cd9cf62b986c0fc8429eb870c
-  data.tar.gz: 708bf45d47a6755eb71bba7df087025ee4c2ff016a4d0cb4acff390ff7d3373b3695045e9c63ed5d880011c9520bde7ddc5fc00d20b04d0f8ab3402fb4e96c87
+  metadata.gz: ecd05a6bbb986b52da8d323d1083d90d7142f9ac336bef379c183348a9f039ab94cc258b6735f3fd558a6c5eb41e55b5e36079292139b0844f30e4b183f2d88c
+  data.tar.gz: af89f17c3100ea494ea87e5fb9228779195d410c9b9ec3b2d9752a7db4c1b0359636a5aad9769d011ce67e751cdf1cd73d85dd89b7677f0176eb8525cd1ec411

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,11 +217,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?) &&
@@ -257,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)
@@ -457,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: '
@@ -471,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/onevm

@@ -1240,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
@@ -1357,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],

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 = [

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/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.8.3
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-20 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.2
+        version: 6.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.2
+        version: 6.8.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement