opennebula-cli 6.10.0 → 6.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5d55565c52884d481345ee71a5d40d5bd7c94167b16d2ee531ab2e41ffed4d
-  data.tar.gz: 25b6cc368e6576a8e5350875ebb970841667528c5d7264e509d38a9b1f542154
+  metadata.gz: 6e16b4ae09bc6027eed37b849e4be26e871cdff014d1858850f7aaf00d9382d6
+  data.tar.gz: 02a56e0e71ca7939bb166211d8e1fcffc694d0012d03af4e0effc3d418f69039
 SHA512:
-  metadata.gz: 0a52a24316357d4b400bbbf157785612c9deac3684fc5d1f5418d9615382b305caeaea2dd934a36eb6f5e06d8f89aa81eae9f05577ac9f71a0cfa1930a83dd2e
-  data.tar.gz: e7177952a258b2f78b7b17c0ccb88dd3cedd2ef14961087aefe21604e241561b8bf05ea917fcd5a896d8a879ce05187557c052db454ac49d45204e35c113ecdd
+  metadata.gz: a4e1ec4685a156226e45cae79603bd104badfc110bba23f912bd9b3fc068931718e439b8b4ebe1b7125946043156081a807f62e3b1b42ed2fc6f53f50ae77b0c
+  data.tar.gz: d82f045b25801d6d6b844766bbd7b8593a909e2f4dbe99ba125d062108a7e4e733b87ec9b1d8a7790634ba71c2964f93075be893bebe8e2098ff7ebb59463d82

data/bin/onebackupjob

@@ -120,6 +120,10 @@ CommandParser::CmdParser.new(ARGV) do
         helper.filterflag_to_i(arg)
     end
 
+    set :format, :schedid, 'Scheduled Action id' do |arg|
+        format_int(arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################

data/bin/onehook

@@ -103,6 +103,10 @@ CommandParser::CmdParser.new(ARGV) do
         helper.list_to_id(arg)
     end
 
+    set :format, :execid, 'Hook execution id' do |arg|
+        format_int(arg)
+    end
+
     ########################################################################
     # Hook log Options
     ########################################################################

data/bin/oneimage

@@ -149,7 +149,9 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     set :format, :imageid, OneImageHelper.to_id_desc do |arg|
-        helper.to_id(arg)
+        tmp = helper.to_id(arg)
+        @current_image = tmp[1]
+        tmp
     end
 
     set :format, :imageid_list, OneImageHelper.list_to_id_desc do |arg|
@@ -170,6 +172,10 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    set :format, :snapshot_id, 'Snapshot name or id' do |arg|
+        helper.retrieve_snapshot_id(@current_image, arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################

data/bin/onevm

@@ -320,7 +320,7 @@ CommandParser::CmdParser.new(ARGV) do
         helper.filterflag_to_i(arg)
     end
 
-    set :format, :diskid, 'Integer' do |arg|
+    set :format, :diskid, 'Disk id' do |arg|
         format_int(arg)
     end
 
@@ -328,14 +328,30 @@ CommandParser::CmdParser.new(ARGV) do
         OpenNebulaHelper.size_in_mb(arg)
     end
 
-    format :snapshot_id, 'Snapshot identifier' do |arg|
+    set :format, :snapshot_id, 'Snapshot name or id' do |arg|
         helper.retrieve_snapshot_id(@current_vm, arg)
     end
 
-    format :disk_snapshot_id, 'Disk_snapshot identifier' do |arg|
+    set :format, :disk_snapshot_id, 'Disk_snapshot name or id' do |arg|
         helper.retrieve_disk_snapshot_id(@current_vm, arg)
     end
 
+    set :format, :nicid, 'NIC name or id' do |arg|
+        helper.retrieve_nic_id(@current_vm, arg)
+    end
+
+    set :format, :pciid, 'PCI id' do |arg|
+        format_int(arg)
+    end
+
+    set :format, :sched_id, 'Scheduled Action id' do |arg|
+        format_int(arg)
+    end
+
+    set :format, :sgid, 'Security Group id' do |arg|
+        format_int(arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################
@@ -647,7 +663,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     migrate_desc = <<-EOT.unindent
         Migrates the given running VM to another Host. If used with --live
-        parameter the miration is done without downtime.
+        parameter the migration is done without downtime.
 
         States: RUNNING
     EOT
@@ -1282,6 +1298,35 @@ CommandParser::CmdParser.new(ARGV) do
         helper.show_resource(args[0], options)
     end
 
+    disk_snapshot_list_desc = <<-EOT.unindent
+        Lists the snapshots of a disk
+    EOT
+
+    command :"disk-snapshot-list", disk_snapshot_list_desc, :vmid, :diskid do
+        vm = helper.retrieve_resource(args[0])
+        vm.info
+
+        if vm.has_elements?('/VM/SNAPSHOTS')
+            filtered = []
+            vm_hash = vm.to_hash
+            vm_snapshots = [vm_hash['VM']['SNAPSHOTS']].flatten
+
+            vm_snapshots.each do |snap|
+                if snap['DISK_ID'] == args[1]
+                    filtered << snap
+                end
+            end
+
+            vm_hash['VM']['SNAPSHOTS'] = filtered
+
+            CLIHelper.print_header('VM DISK SNAPSHOTS'.ljust(80), false)
+            helper.format_snapshots(vm_hash)
+        else
+            puts 'No snapshots available in this disk'
+        end
+        0
+    end
+
     top_desc = <<-EOT.unindent
         Lists Images continuously
     EOT

data/bin/onevmgroup

@@ -121,7 +121,7 @@ CommandParser::CmdParser.new(ARGV) do
         helper.filterflag_to_i(arg)
     end
 
-    format :roleid, 'Role identifier' do |arg|
+    set :format, :roleid, 'Role identifier' do |arg|
         helper.retrieve_role_id(@current_vmg, arg)
     end
 

data/bin/onevnet

@@ -152,7 +152,7 @@ CommandParser::CmdParser.new(ARGV) do
         helper.filterflag_to_i(arg)
     end
 
-    set :format, :ar_id, 'Integer' do |arg|
+    set :format, :ar_id, 'Address Range id' do |arg|
         format_int(arg)
     end
 

data/bin/onevrouter

@@ -128,6 +128,10 @@ CommandParser::CmdParser.new(ARGV) do
         OpenNebulaHelper.rname_to_id(arg, 'VMTEMPLATE')
     end
 
+    set :format, :nicid, 'NIC id' do |arg|
+        format_int(arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################

data/bin/onezone

@@ -91,13 +91,19 @@ CommandParser::CmdParser.new(ARGV) do
     # Formatters for arguments
     ########################################################################
     set :format, :zoneid, OneZoneHelper.to_id_desc do |arg|
-        helper.to_id(arg)
+        tmp = helper.to_id(arg)
+        @current_zone = tmp[1]
+        tmp
     end
 
     set :format, :zoneid_list, OneZoneHelper.list_to_id_desc do |arg|
         helper.list_to_id(arg)
     end
 
+    set :format, :serverid, 'Server name or id' do |arg|
+        helper.retrieve_server_id(@current_zone, arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################

data/lib/command_parser.rb

@@ -828,7 +828,7 @@ module CommandParser
         end
 
         def format_int(arg)
-            arg.match(/^\d+$/) ? [0,arg] : [-1]
+            arg.match(/^\d+$/) ? [0,arg] : [-1, "Argument '#{arg}' is not a valid ID"]
         end
 
         def format_file(arg)

data/lib/one_helper/oneimage_helper.rb

@@ -201,6 +201,22 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         Image::SHORT_IMAGE_TYPES[type_str]
     end
 
+    def retrieve_snapshot_id(image_id, id)
+        return [0, id.to_i] if id =~ /\A\d+\z/
+
+        image = retrieve_resource(image_id)
+        image.info
+
+        ids = image.retrieve_elements(
+            "/IMAGE/SNAPSHOTS/SNAPSHOT[NAME='#{id}']/ID"
+        )
+
+        return [-1, "#{id} not found or duplicated"] \
+                if ids.nil? || ids.size > 1
+
+        [0, ids[0].to_i]
+    end
+
     def format_pool(options)
         config_file = self.class.table_conf
 

data/lib/one_helper/onevm_helper.rb

@@ -252,6 +252,19 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         [0, ids[0].to_i]
     end
 
+    def retrieve_nic_id(vm_id, id)
+        return [0, id.to_i] if id =~ /\A\d+\z/
+
+        vm = retrieve_resource(vm_id)
+        vm.info
+        ids = vm.retrieve_elements("/VM/TEMPLATE/NIC[NAME='#{id}']/NIC_ID")
+
+        return [-1, "NIC #{id} not found or duplicated"] \
+                if ids.nil? || ids.size > 1
+
+        [0, ids[0].to_i]
+    end
+
     def format_pool(options)
         config_file = self.class.table_conf
 
@@ -1398,6 +1411,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         table.show(history)
     end
 
+    public
+
     def format_snapshots(vm)
         table = CLIHelper::ShowTable.new(nil, self) do
             column :AC, 'Is active', :left, :size => 2 do |d|

data/lib/one_helper/onezone_helper.rb

@@ -506,6 +506,22 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         Zone::SHORT_ZONE_STATES[state_str]
     end
 
+    def retrieve_server_id(zone_id, id)
+        return [0, id.to_i] if id =~ /\A\d+\z/
+
+        zone = retrieve_resource(zone_id)
+        zone.info
+
+        ids = zone.retrieve_elements(
+            "/ZONE/SERVER_POOL/SERVER[NAME='#{id}']/ID"
+        )
+
+        return [-1, "#{id} not found or duplicated"] \
+                if ids.nil? || ids.size > 1
+
+        [0, ids[0].to_i]
+    end
+
     def format_pool(options)
         config_file = self.class.table_conf
 

data/share/schemas/xsd/api_info.xsd

@@ -13,7 +13,7 @@
                 <xs:complexType>
                   <xs:sequence>
                     <xs:element name="POSITION" type="xs:integer"/>
-                    <xs:element name="TYPE" type="xs:string">
+                    <xs:element name="TYPE">
                       <xs:simpleType>
                         <xs:restriction base="xs:string">
                         <xs:enumeration value="IN"/>
@@ -21,7 +21,7 @@
                         </xs:restriction>
                       </xs:simpleType>
                     </xs:element>
-                    <xs:element name="VALUE" type="xs:string"/>
+                    <xs:element name="VALUE" type="xs:anyType"/>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>

data/share/schemas/xsd/hook_message_api.xsd

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This schema is followd by the EVENT API message sent by the Hook Manager   -->
 <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="api_info.xsd"/>
   <xs:element name="HOOK_MESSAGE">
     <xs:complexType>
       <xs:sequence>

data/share/schemas/xsd/hook_message_retry.xsd

@@ -1,5 +1,5 @@
-<!-- This schema is followd by the EVENT API message sent by the Hook Manager   -->
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This schema is followed by the EVENT API message sent by the Hook Manager   -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
   <xs:element name="HOOK_MESSAGE">
     <xs:complexType>

data/share/schemas/xsd/hook_message_state.xsd

@@ -1,11 +1,15 @@
-<!-- This schema is followd by the EVENT API message sent by the Hook Manager   -->
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This schema is followed by the EVENT API message sent by the Hook Manager   -->
 <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="host.xsd"/>
+  <xs:include schemaLocation="vm.xsd"/>
+  <xs:include schemaLocation="image.xsd"/>
+  <xs:include schemaLocation="vnet.xsd"/>
   <xs:element name="HOOK_MESSAGE">
     <xs:complexType>
       <xs:sequence>
         <xs:element name="HOOK_TYPE" type="xs:string" fixed="STATE"/>
-        <xs:element name="HOOK_OBJECT" type="xs:string">
+        <xs:element name="HOOK_OBJECT">
           <xs:simpleType>
             <xs:restriction base="xs:string">
             <xs:enumeration value="VM"/>
@@ -17,6 +21,7 @@
         </xs:element>
         <xs:element name="STATE" type="xs:string"/>
         <xs:element name="LCM_STATE" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="RESOURCE_ID" type="xs:integer"/>
         <xs:element name="REMOTE_HOST" type="xs:string" maxOccurs="1" minOccurs="0"/>
          <!-- The template of the resource (VM, Host, Image or VNet) is included here -->
          <xs:element ref="HOST" maxOccurs="1" minOccurs="0"/>

data/share/schemas/xsd/zone_pool.xsd

@@ -2,36 +2,40 @@
 <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="ZONE_POOL">
-    <xs:element name="ZONE" minOccurs="1" maxOccurs="unbounded">
-      <xs:complexType>
-        <xs:sequence>
-          <xs:element name="ID" type="xs:integer"/>
-          <xs:element name="NAME" type="xs:string"/>
-          <xs:element name="STATE" type="xs:integer"/>
-          <xs:element name="TEMPLATE">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="ENDPOINT" type="xs:string"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="SERVER_POOL">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="SERVER" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="ENDPOINT" type="xs:string"/>
-                      <xs:element name="ID" type="xs:integer"/>
-                      <xs:element name="NAME" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
-      </xs:complexType>
-    </xs:element>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="ZONE" minOccurs="1" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer"/>
+              <xs:element name="NAME" type="xs:string"/>
+              <xs:element name="STATE" type="xs:integer"/>
+              <xs:element name="TEMPLATE">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ENDPOINT" type="xs:string"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="SERVER_POOL">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="SERVER" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="ENDPOINT" type="xs:string"/>
+                          <xs:element name="ID" type="xs:integer"/>
+                          <xs:element name="NAME" type="xs:string"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
   </xs:element>
 </xs:schema>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.10.0
+  version: 6.10.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.10.0
+        version: 6.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.10.0
+        version: 6.10.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement