Merge branch master into feature/lldp

.github/workflows/generate-and-build-sdks.yml

@@ -73,7 +73,7 @@ jobs:
       # isn't using UTC
       - name: Set Timezone to Tokyo for datetime tests
         run: |
-          sudo timedatectl set-timezone Asia/Tokyo
+          sudo ln -sf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
       - name: Run CI for SDKs
         uses: ./.github/workflows/sdk-ci
@@ -139,7 +139,7 @@ jobs:
       # isn't using UTC
       - name: Set Timezone to Tokyo for datetime tests
         run: |
-          sudo timedatectl set-timezone Asia/Tokyo
+          sudo ln -sf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
       - name: Build Java SDK
         shell: bash

Makefile

@@ -138,7 +138,6 @@ install-extra:
 	install -D ./ocaml/xenopsd/scripts/xen-backend.rules $(DESTDIR)/$(ETCDIR)/udev/rules.d/xen-backend.rules
 	install -D ./ocaml/xenopsd/scripts/qemu-wrapper $(DESTDIR)/$(QEMU_WRAPPER_DIR)/qemu-wrapper
 	install -D ./ocaml/xenopsd/scripts/swtpm-wrapper $(DESTDIR)/$(QEMU_WRAPPER_DIR)/swtpm-wrapper
-	install -D ./ocaml/xenopsd/scripts/pygrub-wrapper $(DESTDIR)/$(QEMU_WRAPPER_DIR)/pygrub-wrapper
 	DESTDIR=$(DESTDIR) SBINDIR=$(SBINDIR) QEMU_WRAPPER_DIR=$(QEMU_WRAPPER_DIR) XENOPSD_LIBEXECDIR=$(XENOPSD_LIBEXECDIR) ETCDIR=$(ETCDIR) ./ocaml/xenopsd/scripts/make-custom-xenopsd.conf
 
 # common flags and packages for 'dune install' and 'dune uninstall'

doc/content/xen-api/overview/index.md

@@ -40,21 +40,42 @@ The next step is to query the list of "templates" on the host. Templates are spe
 
 Now that we have a snapshot of all the VM objects' field values in the memory of our client application we can simply iterate through them and find the ones that have their "`is_a_template`" set to true. At this stage let's assume that our example application further iterates through the template objects and remembers the reference corresponding to the one that has its "`name_label`" set to "Debian Etch 4.0" (one of the default Linux templates supplied with XenServer).
 
+### Choosing a Storage Repository for the VM's disks
+
+As mentioned above, templates generally embody software stored on
+virtual disk images. Creating a VM from a template thus involves, in
+particular, creating copies of the templates' disk images that will be
+available for the VM to use.
+
+These copies need to be stored somewhere and, in Xen-API
+terminology, a place where **Virtual Disk Images** (VDIs) are stored is
+called a **Storage Repository**.
+
+Just as we had to list templates in order to choose one to use as a basis
+for the VM, we need to list the available Storage Repositories and
+pick one. We do so by calling `SR.get_all_records(session)`.
+
+Let's assume this call returns a non-empty list of Storage
+Repositories and choose one of them, whose reference is stored in
+`my_sr_ref`. This reference will be used in the next step when
+specifying where to store the VM's VDIs by default.
+
 ### Installing the VM based on a template
 
-Continuing through our example, we must now install a new VM based on the template we selected. The installation process requires 4 API calls:
+Continuing through our example, we now wanto to install a new VM based on the template we selected. The installation process requires 4 API calls:
 
--   First we must now invoke the API call `VM.clone(session, t_ref, "my first VM")`. This tells the server to clone the VM object referenced by `t_ref` in order to make a new VM object. The return value of this call is the VM reference corresponding to the newly-created VM. Let's call this `new_vm_ref`.
+-   First we must invoke the API call `VM.clone(session, t_ref, "my first VM")`. This tells the server to clone the VM object referenced by `t_ref` in order to make a new VM object. The return value of this call is the VM reference corresponding to the newly-created VM. Let's call this `new_vm_ref`.
 
--   Next, we need to specify the UUID of the Storage Repository where the VM's
-    disks will be instantiated. We have to put this in the `sr` attribute in
+-   Next, we need to specify the UUID of the Storage
+    Repository where the VM's disks will be stored by
+    default. We do so by putting `my_sr_ref` in the `sr` attribute in
     the disk provisioning XML stored under the "`disks`" key in the
     `other_config` map of the newly-created VM. This field can be updated by
     calling its getter (`other_config <- VM.get_other_config(session,
     new_vm_ref)`) and then its setter (`VM.set_other_config(session,
     new_vm_ref, other_config)`) with the modified `other_config` map.
 
--   At this stage the object referred to by `new_vm_ref` is still a template (just like the VM object referred to by `t_ref`, from which it was cloned). To make `new_vm_ref` into a VM object we need to call `VM.provision(session, new_vm_ref)`. When this call returns the `new_vm_ref` object will have had its `is_a_template` field set to false, indicating that `new_vm_ref` now refers to a regular VM ready for starting.
+-   At this stage the object referred to by `new_vm_ref` is still a template (just like the VM object referred to by `t_ref`, from which it was cloned). To make `new_vm_ref` into a VM object we need to call `VM.provision(session, new_vm_ref)`. When this call returns, the `new_vm_ref` object will have had its `is_a_template` field set to false, indicating that `new_vm_ref` now refers to a regular VM ready for starting.
 
 > **Note**
 >
@@ -94,6 +115,8 @@ We have seen how the API can be used to install a VM from a XenServer template a
 
 -   One call to query the VM (and template) objects present on the XenServer installation: `VM.get_all_records()`. Recall that we used the information returned from this call to select a suitable template to install from.
 
+-   One call to list the Storage Repositories: `SR.get_all_records()`.
+
 -   Four calls to install a VM from our chosen template: `VM.clone()`, followed
     by the getter and setter of the `other_config` field to specify where to
     create the disk images of the template, and then `VM.provision()`.

ocaml/idl/datamodel.ml

@@ -5464,6 +5464,10 @@ module VDI = struct
           , rel_inverness
           , "Online VDI resize is not supported by any of the storage backends."
           )
+        ; ( Published
+          , "26.16.1-next"
+          , "Reintroduced to allow online resize of a VDI whose SR supports it"
+          )
         ]
       ~params:
         [

ocaml/idl/datamodel_caller.ml

@@ -112,6 +112,11 @@ let t =
           "Rate limiter attached to this caller, if any. Populated via \
            Rate_limit.add_caller rather than set directly."
           ~default_value:(Some (VRef null_ref))
+      ; field ~qualifier:DynamicRO ~ty:Bool ~lifecycle "auto_registered"
+          "True if this caller was created automatically by the rate limiter \
+           rather than by an administrator. Auto-registered callers are \
+           subject to the max-auto-registered-callers cap."
+          ~default_value:(Some (VBool false))
       ]
     ~messages:
       [

ocaml/idl/datamodel_common.ml

@@ -10,7 +10,7 @@ open Datamodel_roles
               to leave a gap for potential hotfixes needing to increment the schema version.*)
 let schema_major_vsn = 5
 
-let schema_minor_vsn = 908
+let schema_minor_vsn = 909
 
 (* Historical schema versions just in case this is useful later *)
 let rio_schema_major_vsn = 5

ocaml/idl/datamodel_lifecycle.ml

@@ -1,8 +1,8 @@
 let prototyped_of_class = function
   | "Rate_limit" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Driver_variant" ->
       Some "25.2.0"
   | "Host_driver" ->
@@ -18,33 +18,35 @@ let prototyped_of_class = function
 
 let prototyped_of_field = function
   | "Rate_limit", "fill_rate" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Rate_limit", "burst_size" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Rate_limit", "callers" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Rate_limit", "name__description" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Rate_limit", "name__label" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Rate_limit", "uuid" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
+  | "Caller", "auto_registered" ->
+      Some "26.17.0"
   | "Caller", "rate_limit" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "groups" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "last_access" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "client_ip" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "user_agent" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "name__description" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "name__label" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "uuid" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Driver_variant", "status" ->
       Some "25.2.0"
   | "Driver_variant", "priority" ->
@@ -134,7 +136,7 @@ let prototyped_of_field = function
   | "SM", "host_pending_features" ->
       Some "24.37.0"
   | "VIF", "trunks" ->
-      Some "26.16.0-next"
+      Some "26.17.0"
   | "host", "timezone" ->
       Some "26.0.0"
   | "host", "ntp_custom_servers" ->
@@ -194,7 +196,7 @@ let prototyped_of_field = function
   | "VM", "actions__after_softreboot" ->
       Some "23.1.0"
   | "pool", "auto_update_vm_secureboot_certificates" ->
-      Some "26.16.0-next"
+      Some "26.16.1"
   | "pool", "vm_console_idle_timeout" ->
       Some "26.1.0"
   | "pool", "limit_console_sessions" ->
@@ -240,15 +242,15 @@ let prototyped_of_field = function
 
 let prototyped_of_message = function
   | "Rate_limit", "set_fill_rate" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Rate_limit", "set_burst_size" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Rate_limit", "remove_caller" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Rate_limit", "add_caller" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "query_all_usage" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "query_group_call_count" ->
       Some "26.15.0"
   | "Caller", "query_group_token_usage" ->
@@ -258,9 +260,9 @@ let prototyped_of_message = function
   | "Caller", "query_token_usage" ->
       Some "26.15.0"
   | "Caller", "remove_group" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Caller", "add_group" ->
-      Some "26.16.1-next"
+      Some "26.17.0"
   | "Driver_variant", "select" ->
       Some "25.2.0"
   | "Host_driver", "rescan" ->
@@ -312,11 +314,11 @@ let prototyped_of_message = function
   | "VDI", "revert" ->
       Some "26.16.0"
   | "VIF", "set_trunks" ->
-      Some "26.16.0-next"
+      Some "26.17.0"
   | "VIF", "remove_trunks" ->
-      Some "26.16.0-next"
+      Some "26.17.0"
   | "VIF", "add_trunks" ->
-      Some "26.16.0-next"
+      Some "26.17.0"
   | "host", "set_servertime" ->
       Some "26.0.0"
   | "host", "get_ntp_synchronized" ->

ocaml/idl/datamodel_types.ml

@@ -513,6 +513,7 @@ module Lifecycle = struct
      - The rest of the changes are not idempotent, they cannot be applied twice
        in a row
      - Objects can only be removed when are prototyped or deprecated
+     - A removed object can be published again, i.e. reintroduced
   *)
   let automaton =
     {
@@ -528,7 +529,7 @@ module Lifecycle = struct
           )
         | (Published as into), _, _ -> (
             function
-            | Unreleased_s | Prototyped_s ->
+            | Unreleased_s | Prototyped_s | Removed_s ->
                 Published_s
             | from ->
                 raise_invalid_next ~from ~into

ocaml/idl/schematest.ml

@@ -3,7 +3,7 @@ let hash x = Digest.string x |> Digest.to_hex
 (* BEWARE: if this changes, check that schema has been bumped accordingly in
    ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)
 
-let last_known_schema_hash = "e5bb3f3b53e89a81d7a7fcee7ead9efe"
+let last_known_schema_hash = "4f4145585a0be563e77b01220bf3f6af"
 
 let current_schema_hash : string =
   let open Datamodel_types in