ovirt-engine-sdk 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 593677086e88de577c872f2e3629dabf7d2e4cefa26e73595d19c3127e77008e
-  data.tar.gz: 39a8361a675a62f8b462715a06a0de2d63f8c7c579eca10ff0cb936327580d09
+  metadata.gz: 2a18fa604006bdf2fff1c9c6ae67d53cfc8421aedca0f5a823fbae736b3b17fa
+  data.tar.gz: 6353e9cba637cd0e739ecfc525720eedd303cf19c7f1c149cd9f336927a9eae4
 SHA512:
-  metadata.gz: d99f97a8fd180f9c9b6ee0c9c8a5681001f4a83a1fc5b88909c64dae6bcb09ef157d114ea80328900f11762853b0ef0f7971d97f701c9f19e6c638ad3e26e296
-  data.tar.gz: e3bfb91602e07cfbb35b641acd589e6973280479d2cb98246cbd0a565598bdf93368cd40b0641d81534675ab64a52086822e037a83312fde2f06ed8bd4ce2b80
+  metadata.gz: 8f1b0c3d6a4b006f7536276da729334719c8507b3fddb7ca03675647c73191ef55b2c0b4411996695c13fbfdca6965a571b5bed2124c5514fc17646ff8c0bdfc
+  data.tar.gz: 519977ad66626c3ec8a3ca01184cfb966fced85b9399e6f548fd37f47bfc1bc0e5481f710f74f43ac3ea945e17fe4cc6e60f46846edec93f5d122bd029ffd88c

data/CHANGES.adoc

@@ -2,6 +2,17 @@
 
 This document describes the relevant changes between releases of the SDK.
 
+== 4.6.1 / Oct 16 2025
+Upgrade to model 4.6.1 and metamodel 1.3.11
+
+New features:
+
+* Add support for Ruby 3
+
+* Use Weld 3
+
+* Build on Java 21
+
 == 4.6.0 / Feb 1 2024
 Upgrade to model 4.6.0 and metamodel 1.3.10
 

data/ext/ovirtsdk4c/ov_http_client.c

@@ -34,6 +34,9 @@ limitations under the License.
 #include "ov_http_response.h"
 #include "ov_http_transfer.h"
 
+/* thread.c (export) */
+extern int ruby_thread_has_gvl_p(void);
+
 /* Class: */
 VALUE ov_http_client_class;
 
@@ -130,7 +133,7 @@ typedef struct {
 
 typedef struct {
     CURLM* handle;
-    CURLcode code;
+    CURLMcode code;
     bool cancel;
 } ov_http_client_wait_context;
 
@@ -176,7 +179,7 @@ static void ov_http_client_check_closed(ov_http_client_object* object) {
 static void ov_http_client_mark(void* vptr) {
     ov_http_client_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_client_object*)vptr;
     rb_gc_mark(ptr->log);
     rb_gc_mark(ptr->queue);
     rb_gc_mark(ptr->pending);
@@ -187,7 +190,7 @@ static void ov_http_client_free(void* vptr) {
     ov_http_client_object* ptr;
 
     /* Get the pointer to the object: */
-    ptr = vptr;
+    ptr = (ov_http_client_object*)vptr;
 
     /* Release the resources used by libcurl: */
     if (ptr->handle != NULL) {
@@ -213,7 +216,7 @@ rb_data_type_t ov_http_client_type = {
         .dmark = ov_http_client_mark,
         .dfree = ov_http_client_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -384,7 +387,7 @@ static void* ov_http_client_header_task(void* data) {
     }
 
     /* Parse the header and add it to the response object: */
-    pointer = memchr(buffer, ':', length);
+    pointer = (char*) memchr(buffer, ':', length);
     if (pointer != NULL) {
         name = rb_str_new(buffer, pointer - buffer);
         name = rb_funcall(name, DOWNCASE_ID, 0);
@@ -491,7 +494,7 @@ static int ov_http_client_debug_function(CURL* handle, curl_infotype type, char*
     ov_http_transfer_ptr(transfer, transfer_ptr);
 
     /* The global interpreter lock may be acquired or not, so we need to check and either call the task directly
-       or else call it after acquiring the lock. Note that the `ruby_thread_has_gvl_p` function that we ue to
+       or else call it after acquiring the lock. Note that the `ruby_thread_has_gvl_p` function that we use to
        check if the GVL is acquired is marked as experimental, and not defined in `thread.h`, so it may be
        removed at any time, but I didn't find any other way to check if the GVL is acquired. */
     context.client = transfer_ptr->client;
@@ -736,7 +739,7 @@ static VALUE ov_http_client_build_url( VALUE url, VALUE query) {
     if (!NIL_P(query)) {
         Check_Type(query, T_HASH);
         if (RHASH_SIZE(query) > 0) {
-            url = rb_sprintf("%"PRIsVALUE"?%"PRIsVALUE"", url, rb_funcall(URI_CLASS, ENCODE_WWW_FORM_ID, 1, query));
+            url = rb_sprintf("%" PRIsVALUE "?%" PRIsVALUE "", url, rb_funcall(URI_CLASS, ENCODE_WWW_FORM_ID, 1, query));
         }
     }
 
@@ -746,7 +749,7 @@ static VALUE ov_http_client_build_url( VALUE url, VALUE query) {
 static int ov_http_client_add_header(VALUE name, VALUE value, struct curl_slist** headers) {
     VALUE header = Qnil;
 
-    header = rb_sprintf("%"PRIsVALUE": %"PRIsVALUE"", name, value);
+    header = rb_sprintf("%" PRIsVALUE ": %" PRIsVALUE "", name, value);
     *headers = curl_slist_append(*headers, StringValueCStr(header));
 
     return ST_CONTINUE;
@@ -792,7 +795,7 @@ static void* ov_http_client_complete_task(void* data) {
         /* Send a summary of the response to the log: */
         ov_http_client_log_info(
             client_ptr->log,
-            "Received response code %"PRIsVALUE" for %"PRIsVALUE" request to URL '%"PRIsVALUE"'.",
+            "Received response code %" PRIsVALUE " for %" PRIsVALUE " request to URL '%" PRIsVALUE "'.",
             response_ptr->code,
             request_ptr->method,
             request_ptr->url
@@ -840,7 +843,7 @@ static void* ov_http_client_wait_task(void* data) {
 #endif
 
     /* The passed data is the wait context: */
-    context_ptr = data;
+    context_ptr = (ov_http_client_wait_context*) data;
 
     /* Get the timeout preferred by libcurl, or one 100 ms by default: */
     curl_multi_timeout(context_ptr->handle, &timeout);
@@ -851,7 +854,7 @@ static void* ov_http_client_wait_task(void* data) {
 #if LIBCURL_VERSION_NUM >= 0x071c00
     /* Wait till there is activity: */
     context_ptr->code = curl_multi_wait(context_ptr->handle, NULL, 0, timeout, NULL);
-    if (context_ptr->code != CURLE_OK) {
+    if (context_ptr->code != CURLM_OK) {
         return NULL;
     }
 #else
@@ -872,7 +875,7 @@ static void* ov_http_client_wait_task(void* data) {
     /* Let libcurl do its work, even if no file descriptor needs attention. This is necessary because some of its
        activities can't be monitored using file descriptors. */
     context_ptr->code = curl_multi_perform(context_ptr->handle, &pending);
-    if (context_ptr->code != CURLE_OK) {
+    if (context_ptr->code != CURLM_OK) {
         return NULL;
     }
 
@@ -890,7 +893,7 @@ static void* ov_http_client_wait_task(void* data) {
     }
 
     /* Everything worked correctly: */
-    context_ptr->code = CURLE_OK;
+    context_ptr->code = CURLM_OK;
     return NULL;
 }
 
@@ -898,7 +901,7 @@ static void ov_http_client_wait_cancel(void* data) {
     ov_http_client_wait_context* context_ptr;
 
     /* The passed data is the wait context: */
-    context_ptr = data;
+    context_ptr = (ov_http_client_wait_context*) data;
 
     /* Set the cancel flag so that the operation will be actually aborted in the next operation of the wait loop: */
     context_ptr->cancel = true;
@@ -980,7 +983,6 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
     else if (rb_eql(request_ptr->method, PUT_SYMBOL)) {
        *headers = curl_slist_append(*headers, "Expect:");
        curl_easy_setopt(handle, CURLOPT_UPLOAD, 1L);
-       curl_easy_setopt(handle, CURLOPT_PUT, 1L);
     }
     else if (rb_eql(request_ptr->method, DELETE_SYMBOL)) {
        curl_easy_setopt(handle, CURLOPT_HTTPGET, 1L);
@@ -992,7 +994,7 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
 
     /* Set authentication details: */
     if (!NIL_P(request_ptr->token)) {
-        header = rb_sprintf("Authorization: Bearer %"PRIsVALUE"", request_ptr->token);
+        header = rb_sprintf("Authorization: Bearer %" PRIsVALUE "", request_ptr->token);
         *headers = curl_slist_append(*headers, StringValueCStr(header));
     }
     else if (!NIL_P(request_ptr->username) && !NIL_P(request_ptr->password)) {
@@ -1006,14 +1008,14 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
 
     /* Set the headers: */
     if (!NIL_P(request_ptr->headers)) {
-        rb_hash_foreach(request_ptr->headers, ov_http_client_add_header, (VALUE) headers);
+        rb_hash_foreach(request_ptr->headers, (int (*)(VALUE, VALUE, VALUE)) ov_http_client_add_header, (VALUE) headers);
     }
     curl_easy_setopt(handle, CURLOPT_HTTPHEADER, *headers);
 
     /* Send a summary of the request to the log: */
     ov_http_client_log_info(
         client_ptr->log,
-        "Sending %"PRIsVALUE" request to URL '%"PRIsVALUE"'.",
+        "Sending %" PRIsVALUE " request to URL '%" PRIsVALUE "'.",
         request_ptr->method,
         url
     );
@@ -1119,7 +1121,7 @@ static VALUE ov_http_client_wait(VALUE self, VALUE request) {
 
     /* Work till the transfer has been completed. */
     context.handle = ptr->handle;
-    context.code = CURLE_OK;
+    context.code = CURLM_OK;
     context.cancel = false;
     for (;;) {
         /* Move requests from the queue to libcurl: */
@@ -1144,8 +1146,8 @@ static VALUE ov_http_client_wait(VALUE self, VALUE request) {
         if (context.cancel) {
             return Qnil;
         }
-        if (context.code != CURLE_OK) {
-            rb_raise(ov_error_class, "Unexpected error while waiting: %s", curl_easy_strerror(context.code));
+        if (context.code != CURLM_OK) {
+            rb_raise(ov_error_class, "Unexpected error while waiting: %s", curl_multi_strerror(context.code));
         }
     }
 
@@ -1156,7 +1158,7 @@ static VALUE ov_http_client_inspect(VALUE self) {
     ov_http_client_object* ptr;
 
     ov_http_client_ptr(self, ptr);
-    return rb_sprintf("#<%"PRIsVALUE":%p>", ov_http_client_class, ptr);
+    return rb_sprintf("#<%" PRIsVALUE ":%p>", ov_http_client_class, ptr);
 }
 
 void ov_http_client_define(void) {

data/ext/ovirtsdk4c/ov_http_request.c

@@ -45,7 +45,7 @@ static VALUE CONNECT_TIMEOUT_SYMBOL;
 static void ov_http_request_mark(void* vptr) {
     ov_http_request_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_request_object*)vptr;
     rb_gc_mark(ptr->method);
     rb_gc_mark(ptr->url);
     rb_gc_mark(ptr->query);
@@ -62,7 +62,7 @@ static void ov_http_request_mark(void* vptr) {
 static void ov_http_request_free(void* vptr) {
     ov_http_request_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_request_object*)vptr;
     xfree(ptr);
 }
 
@@ -72,7 +72,7 @@ rb_data_type_t ov_http_request_type = {
         .dmark = ov_http_request_mark,
         .dfree = ov_http_request_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -305,7 +305,7 @@ static VALUE ov_http_request_inspect(VALUE self) {
 
     ov_http_request_ptr(self, ptr);
     return rb_sprintf(
-        "#<%"PRIsVALUE":%"PRIsVALUE" %"PRIsVALUE">",
+        "#<%" PRIsVALUE ":%" PRIsVALUE " %" PRIsVALUE ">",
         ov_http_request_class,
         ptr->method,
         ptr->url

data/ext/ovirtsdk4c/ov_http_response.c

@@ -31,7 +31,7 @@ static VALUE MESSAGE_SYMBOL;
 static void ov_http_response_mark(void* vptr) {
     ov_http_response_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_response_object*)vptr;
     rb_gc_mark(ptr->body);
     rb_gc_mark(ptr->code);
     rb_gc_mark(ptr->headers);
@@ -41,7 +41,7 @@ static void ov_http_response_mark(void* vptr) {
 static void ov_http_response_free(void* vptr) {
     ov_http_response_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_response_object*)vptr;
     xfree(ptr);
 }
 
@@ -51,7 +51,7 @@ rb_data_type_t ov_http_response_type = {
         .dmark = ov_http_response_mark,
         .dfree = ov_http_response_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -151,7 +151,7 @@ static VALUE ov_http_response_inspect(VALUE self) {
 
     ov_http_response_ptr(self, ptr);
     return rb_sprintf(
-        "#<%"PRIsVALUE":%"PRIsVALUE" %"PRIsVALUE">",
+        "#<%" PRIsVALUE ":%" PRIsVALUE " %" PRIsVALUE ">",
         ov_http_response_class,
         ptr->code,
         ptr->message

data/ext/ovirtsdk4c/ov_http_transfer.c

@@ -27,7 +27,7 @@ VALUE ov_http_transfer_class;
 static void ov_http_transfer_mark(void* vptr) {
     ov_http_transfer_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_transfer_object*)vptr;
     rb_gc_mark(ptr->client);
     rb_gc_mark(ptr->request);
     rb_gc_mark(ptr->response);
@@ -38,7 +38,7 @@ static void ov_http_transfer_mark(void* vptr) {
 static void ov_http_transfer_free(void* vptr) {
     ov_http_transfer_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_transfer_object*)vptr;
     xfree(ptr);
 }
 
@@ -48,7 +48,7 @@ rb_data_type_t ov_http_transfer_type = {
         .dmark = ov_http_transfer_mark,
         .dfree = ov_http_transfer_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -75,7 +75,7 @@ static VALUE ov_http_transfer_inspect(VALUE self) {
     ov_http_transfer_object* ptr;
 
     ov_http_transfer_ptr(self, ptr);
-    return rb_sprintf("#<%"PRIsVALUE":%p>", ov_http_transfer_class, ptr);
+    return rb_sprintf("#<%" PRIsVALUE ":%p>", ov_http_transfer_class, ptr);
 }
 
 void ov_http_transfer_define(void) {

data/ext/ovirtsdk4c/ov_xml_reader.c

@@ -72,7 +72,7 @@ rb_data_type_t ov_xml_reader_type = {
         .dmark = ov_xml_reader_mark,
         .dfree = ov_xml_reader_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,

data/ext/ovirtsdk4c/ov_xml_writer.c

@@ -66,7 +66,7 @@ rb_data_type_t ov_xml_writer_type = {
         .dmark = ov_xml_writer_mark,
         .dfree = ov_xml_writer_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -181,7 +181,7 @@ static VALUE ov_xml_writer_string(VALUE self) {
     if (rc < 0) {
         rb_raise(ov_error_class, "Can't flush XML writer");
     }
-    return rb_funcall(ptr->io, STRING_ID, 0, NULL);
+    return rb_funcall(ptr->io, STRING_ID, 0, Qnil);
 }
 
 static VALUE ov_xml_writer_write_start(VALUE self, VALUE name) {

data/lib/ovirtsdk4/readers.rb

@@ -34,6 +34,8 @@ module OvirtSDK4
       object.allow_partial_import = value if not value.nil?
       value = reader.get_attribute('async')
       object.async = value if not value.nil?
+      value = reader.get_attribute('attach_wgt')
+      object.attach_wgt = value if not value.nil?
       value = reader.get_attribute('auto_pinning_policy')
       object.auto_pinning_policy = value if not value.nil?
       value = reader.get_attribute('check_connectivity')
@@ -149,6 +151,8 @@ module OvirtSDK4
           object.allow_partial_import = Reader.read_boolean(reader)
         when 'async'
           object.async = Reader.read_boolean(reader)
+        when 'attach_wgt'
+          object.attach_wgt = Reader.read_boolean(reader)
         when 'attachment'
           object.attachment = DiskAttachmentReader.read_one(reader)
         when 'authorized_key'
@@ -895,6 +899,8 @@ module OvirtSDK4
       # Process the inner elements:
       while reader.forward do
         case reader.node_name
+        when 'engine_backup'
+          object.engine_backup = EngineBackupInfoReader.read_one(reader)
         when 'product_info'
           object.product_info = ProductInfoReader.read_one(reader)
         when 'special_objects'
@@ -4273,6 +4279,8 @@ module OvirtSDK4
       object.smartcard_enabled = value if not value.nil?
       value = reader.get_attribute('type')
       object.type = value if not value.nil?
+      value = reader.get_attribute('video_type')
+      object.video_type = value if not value.nil?
       
       # Discard the start tag:
       empty = reader.empty_element?
@@ -4312,6 +4320,8 @@ module OvirtSDK4
           object.smartcard_enabled = Reader.read_boolean(reader)
         when 'type'
           object.type = Reader.read_enum(DisplayType, reader)
+        when 'video_type'
+          object.video_type = Reader.read_enum(VideoType, reader)
         else
           reader.next_element
         end
@@ -4635,6 +4645,88 @@ module OvirtSDK4
     
   end
   
+  class EngineBackupInfoReader < Reader
+    
+    def self.read_one(reader)
+      # Do nothing if there aren't more tags:
+      return nil unless reader.forward
+      
+      # Create the object:
+      object = EngineBackupInfo.new
+      
+      # Process the attributes:
+      object.href = reader.get_attribute('href')
+      value = reader.get_attribute('last_cinder_backup')
+      object.last_cinder_backup = value if not value.nil?
+      value = reader.get_attribute('last_db_backup')
+      object.last_db_backup = value if not value.nil?
+      value = reader.get_attribute('last_dwh_backup')
+      object.last_dwh_backup = value if not value.nil?
+      value = reader.get_attribute('last_engine_backup')
+      object.last_engine_backup = value if not value.nil?
+      value = reader.get_attribute('last_grafana_backup')
+      object.last_grafana_backup = value if not value.nil?
+      value = reader.get_attribute('last_keycloak_backup')
+      object.last_keycloak_backup = value if not value.nil?
+      
+      # Discard the start tag:
+      empty = reader.empty_element?
+      reader.read
+      return object if empty
+      
+      # Process the inner elements:
+      while reader.forward do
+        case reader.node_name
+        when 'last_cinder_backup'
+          object.last_cinder_backup = Reader.read_date(reader)
+        when 'last_db_backup'
+          object.last_db_backup = Reader.read_date(reader)
+        when 'last_dwh_backup'
+          object.last_dwh_backup = Reader.read_date(reader)
+        when 'last_engine_backup'
+          object.last_engine_backup = Reader.read_date(reader)
+        when 'last_grafana_backup'
+          object.last_grafana_backup = Reader.read_date(reader)
+        when 'last_keycloak_backup'
+          object.last_keycloak_backup = Reader.read_date(reader)
+        else
+          reader.next_element
+        end
+      end
+      
+      # Discard the end tag:
+      reader.read
+      
+      return object
+    end
+    
+    
+    def self.read_many(reader)
+      # Do nothing if there aren't more tags:
+      list = List.new
+      return list unless reader.forward
+      
+      # Process the attributes:
+      list.href = reader.get_attribute('href')
+      
+      # Discard the start tag:
+      empty = reader.empty_element?
+      reader.read
+      return list if empty
+      
+      # Process the inner elements:
+      while reader.forward do
+        list << read_one(reader)
+      end
+      
+      # Discard the end tag:
+      reader.read
+      
+      return list
+    end
+    
+  end
+  
   class EntityProfileDetailReader < Reader
     
     def self.read_one(reader)
@@ -10441,6 +10533,8 @@ module OvirtSDK4
       
       # Process the attributes:
       object.href = reader.get_attribute('href')
+      value = reader.get_attribute('active_paths')
+      object.active_paths = value if not value.nil?
       value = reader.get_attribute('address')
       object.address = value if not value.nil?
       value = reader.get_attribute('discard_max_size')
@@ -10488,6 +10582,8 @@ module OvirtSDK4
       # Process the inner elements:
       while reader.forward do
         case reader.node_name
+        when 'active_paths'
+          object.active_paths = Reader.read_integer(reader)
         when 'address'
           object.address = Reader.read_string(reader)
         when 'discard_max_size'
@@ -13198,6 +13294,8 @@ module OvirtSDK4
       object.cmdline = value if not value.nil?
       value = reader.get_attribute('custom_kernel_cmdline')
       object.custom_kernel_cmdline = value if not value.nil?
+      value = reader.get_attribute('description')
+      object.description = value if not value.nil?
       value = reader.get_attribute('initrd')
       object.initrd = value if not value.nil?
       value = reader.get_attribute('kernel')
@@ -13221,6 +13319,8 @@ module OvirtSDK4
           object.cmdline = Reader.read_string(reader)
         when 'custom_kernel_cmdline'
           object.custom_kernel_cmdline = Reader.read_string(reader)
+        when 'description'
+          object.description = Reader.read_string(reader)
         when 'initrd'
           object.initrd = Reader.read_string(reader)
         when 'kernel'
@@ -20957,6 +21057,8 @@ module OvirtSDK4
   Reader.register('domains', DomainReader.method(:read_many))
   Reader.register('dynamic_cpu', DynamicCpuReader.method(:read_one))
   Reader.register('dynamic_cpus', DynamicCpuReader.method(:read_many))
+  Reader.register('engine_backup_info', EngineBackupInfoReader.method(:read_one))
+  Reader.register('engine_backup_infos', EngineBackupInfoReader.method(:read_many))
   Reader.register('entity_profile_detail', EntityProfileDetailReader.method(:read_one))
   Reader.register('entity_profile_details', EntityProfileDetailReader.method(:read_many))
   Reader.register('error_handling', ErrorHandlingReader.method(:read_one))