Skip to content

feature branch sync#7110

Merged
liulinC merged 24 commits into
xapi-project:feature/ldapsfrom
liulinC:private/linl/dev
Jun 2, 2026
Merged

feature branch sync#7110
liulinC merged 24 commits into
xapi-project:feature/ldapsfrom
liulinC:private/linl/dev

Conversation

@liulinC

@liulinC liulinC commented Jun 2, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

kc284 and others added 24 commits May 20, 2026 13:28
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
…-project#7079)

Also: place the temporary file in the target folder in all cases and not
only when the latter is under a different root from the client
application,
- winbind_kerberos_encryption_type default to strong
- https_only default to true
- Remove scripts/xe-switch-network-backend
- Remove scripts/xe-switch-network-backend-bash-completion

Signed-off-by: Lin Liu <lin.liu01@citrix.com>
When running `xe sm-list params=all` you will now have the info of
supported image formats if the SM plugin specified it in its DRIVER_INFO.
The field is called `supported-image-formats`. If the plugin doesn't
provide the info the field will be empty.

This patch modifies the datamodel and add a new field to store this
information into the SM object.

Signed-off-by: Guillaume <guillaume.thouvenin@vates.tech>
This patch allows specifying the destination format for individual VDIs
mapped to a destination SR. It adds a new parameter to `VM.migrate_send`
and `VM.assert_can_migrate` API. It also adds a new parameter to XE CLI.
The format to specify the image format is `image-format:<source VDI
UUID>=<destination image format>`. If the given image format cannot be
validated, an error is returned.

It also adds a new parameter to `VDI.pool-migrate`. This new parameter
allows to provide a string that is the destination format. This string is
used to check whether the destination SR supports the expected format. If
the check fails or cannot be performed due to missing information on the
destination SR, an error is returned.

Signed-off-by: Guillaume <guillaume.thouvenin@vates.tech>
Update VM.MigrateSend call to include new VdiFormatMap parameter.

Signed-off-by: Guillaume <guillaume.thouvenin@vates.tech>
A new field supported_image_format and new parameters have been added for:
  - VM.migrate_send
  - VM.assert_can_migrate
  - VDI.pool_migrate

Signed-off-by: Guillaume <guillaume.thouvenin@vates.tech>
Introduce a new quicktest covering local VDI migration between two
Storage Repositories (SRs).

Add a `migration_path` filter that injects a `(src, dst)` SR pair
derived from an `SR.srs` constraint. The filter selects a single
valid migration path (if available) and generates one test case.
If fewer than two compatible SRs exist, no test is produced.

The test:
- Creates a VDI on the source SR
- Attaches it to a temporary VM
- Calls VDI.pool_migrate to the destination SR
- Verifies that the VDI's SR has changed accordingly
- Cleans up safely, tracking ownership transfer when migration
  replaces the original VDI

Signed-off-by: Guillaume <guillaume.thouvenin@vates.tech>
From Semaphore document:
try_acquire s immediately returns false if the value of
semaphore s is zero. Otherwise, the value of s is
atomically decremented and try_acquire s returns true.

Signed-off-by: Changlei Li <changlei.li@citrix.com>
- winbind_kerberos_encryption_type default to strong
- https_only default to true
- Remove scripts/xe-switch-network-backend
- Remove scripts/xe-switch-network-backend-bash-completion
This PR implements the supported image format mechanism proposed in this
design document:
https://xapi-project.github.io/new-docs/design/sm-supported-image-formats/index.html

- It adds supported image formats to the SM object if the SM plugin
specifies it in its `DRIVER_INFO`.
- When the information is available, you can select which image format
to use as the destination during a VM or VDI migration.

This feature is particularly useful because XCP-ng is adding support for
the Qcow2 format in SMAPI to allow _VDIs_ larger than 2TB. So in the
near future (we're currently releasing the beta version), some _SRs_
will support multiple formats such as VHD, RAW, and Qcow2.

With this patch, it becomes possible to migrate a VM with VHD disks on
one SR to another SR with Qcow2 disks. If an SM plugin does not provide
information about the supported image formats, the behavior remains
unchanged.

For more details see the
[specification](https://xapi-project.github.io/new-docs/design/sm-supported-image-formats/index.html).
Signed-off-by: Seb Hinderer <sebastien.hinderer@vates.tech>
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Signed-off-by: Seb Hinderer <sebastien.hinderer@vates.tech>
Actually seems more correct here than Indeed.

Signed-off-by: Seb Hinderer <sebastien.hinderer@vates.tech>
…t#7092)

From Semaphore document:
try_acquire s immediately returns false if the value of semaphore s is
zero. Otherwise, the value of s is atomically decremented and
try_acquire s returns true.
Actually seems more correct here than Indeed.
Signed-off-by: Colin James <colin.barr@vates.tech>
Signed-off-by: Colin James <colin.barr@vates.tech>
Signed-off-by: Colin James <colin.barr@vates.tech>
- Removes the enumeratee type abbreviation, as it's less terse than
  spelling out the iteratee transformer function type ('a t -> 'a t t).
- Removes unused combinators from iteratees, such as "apply". The use
  case for this is largely subsumed by writing effectful enumeratees,
  such as the extant "stream_printer" adapter.
- Removes "extract_result_from_iteratee". This is unused but, in
  general, it should have been partial, casing on the iteratee after
  sending EOF to it (as the equivalent "run" function does in the
  original iteratee resources).

Signed-off-by: Colin James <colin.barr@vates.tech>
Removes some unused combinators from wsproxy and adds some stylistic
changes (mostly preferring let-operators over infix monadic bind `>>=`).
These are just some changes I made when learning the iteratee style used
in wslib/wsproxy.

---

In future, we may rewrite wsproxy so as to remove the iteratee style (as
it's not convenient for other websocket use cases, like a websocket
server in full generality).
@liulinC liulinC force-pushed the private/linl/dev branch from c2fbf5f to 6d1f091 Compare June 2, 2026 07:57
@liulinC

liulinC commented Jun 2, 2026

Copy link
Copy Markdown
Collaborator Author

Fix the scheme hash:

diff --git a/ocaml/idl/schematest.ml b/ocaml/idl/schematest.ml
remerge CONFLICT (content): Merge conflict in ocaml/idl/schematest.ml
index f2984730b..335a5d36e 100644
--- a/ocaml/idl/schematest.ml
+++ b/ocaml/idl/schematest.ml
@@ -3,11 +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 *)
 
-<<<<<<< 2ba80ee11 (CA-427727: Failed to join host to pool due to ldaps sync failed (#7089))
-let last_known_schema_hash = "14292c15e8552aeacfeba78891a50568"
-=======
-let last_known_schema_hash = "13dfcc8ba21d122ba59de9c6c03c5236"
->>>>>>> 0db9a8728 (wsproxy: code removal and stylistic changes (#7099))
+let last_known_schema_hash = "9b7a30e5387240958377a8997412f399"```

@liulinC liulinC merged commit 0e59597 into xapi-project:feature/ldaps Jun 2, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants