Skip to content

Merge 26.1-lcm into feature/26.1-lcm/trusted-certs#7012

Merged
minglumlu merged 31 commits intoxapi-project:feature/26.1-lcm/trusted-certsfrom
minglumlu:private/mingl/feature/26.1-lcm/trusted-certs
Apr 15, 2026
Merged

Merge 26.1-lcm into feature/26.1-lcm/trusted-certs#7012
minglumlu merged 31 commits intoxapi-project:feature/26.1-lcm/trusted-certsfrom
minglumlu:private/mingl/feature/26.1-lcm/trusted-certs

Conversation

@minglumlu
Copy link
Copy Markdown
Member

@minglumlu minglumlu commented Apr 14, 2026

No conflicts.
One extra commit daef7c7 to bump up schema_minor_vsn.

edwintorok and others added 30 commits March 19, 2026 09:22
This seems to be a SMAPIv1 specific implementation detail (content_id in
VDI.other-config), that is missing on SMAPIv3 SRs.

The rest of the test works on SMAPIv3, so skip just this step.

Signed-off-by: Edwin Török <edwin.torok@citrix.com>
(cherry picked from commit ceebe4b)
VHD export takes various shortcuts, and delta export only works if the source is also VHD.
Otherwise it fails with:
`Failure("Cannot compute differences on non-VHD images")`

If the source is already qcow2, like for SMAPIv3, then this is not (yet)
expected to work, so skip those tests on SMAPIv3 for now.

Note that regular export works, it is just the delta export that fails (specifying `base=`
in `xe vdi-export`).

Signed-off-by: Edwin Török <edwin.torok@citrix.com>
(cherry picked from commit 8ac4476)
…M branch (xapi-project#6959)

Backport xapi-project#6908 to the LCM
branch.
These latent bugs have existed in the tests for a long time, but
previously our test system (XenRT) picked machines randomly, so it
would've been unlikely to pick a machine which has a local 4K SR
(SMAPIv3 instead of SMAPIv1), and even if it did, the test would
seemingly pass on a rerun (because another machine would get picked).
We are now explicitly running the test multiple times on different
hardware categories, and some of those tests are now failing 100% of the
time.
Backport of 651a7b9.

Removing this device class from the USB config would let admins
configure VMs for digital signing purposes.

These devices are also not very useful in Dom0.

Signed-off-by: Tu Dinh <ngoc-tu.dinh@vates.tech>
Backport of 651a7b9.

Removing this device class from the USB config would let admins
configure VMs for digital signing purposes.

These devices are also not very useful in Dom0.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@cloud.com>
…ault value.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
- Made methods JsonRpc.Rpc() and JsonRpc.CreateSerializer() protected.
- Deprecated a number of instance Session methods in favour of the static counterparts.
- Removed property Session.Roles (which was a XenCenter-ism)
- Corrected the output of Session.get_record and the return type of Session.logout_subject_identifier
- Session.change_password(Session, string, string) is now static.
- Fields Session.Proxy, Session.Tag, Session.APIVersion were converted to properties.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
… /vm_rrd are already exposed.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
…rsion to 17 (LTS)

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@cloud.com>
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
…mporting the module.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
(cherry-pick from commit 2f8c908)

A new live patch update may drop live patch support for a component
running with an old version. This means the old version is EOL in sense
of live patching support.

Previously, the logic collected all live patches that shared the same
base build ID for the running component and treated them as cumulatively
applicable.

With this change, if the base build ID is marked EOL in the latest
relevant update (for the same live patching component), the component is
considered not live‑patchable.

Signed-off-by: Ming Lu <ming.lu@cloud.com>
(cherry-pick from commit 47e9788)

Signed-off-by: Ming Lu <ming.lu@cloud.com>
The commits in this PR are exactly the same as in PR xapi-project#6988 , they
applied cleanly on this branch.
… base versions (xapi-project#6994)

This is to back port commits merged in
xapi-project#6989

A new live patch update may drop live patch support for a component
running with an old version. This means the old version is EOL in sense
of live patching support.

Previously, the logic collected all live patches that shared the same
base build ID for the running component and treated them as cumulatively
applicable.

With this change, if the base build ID is marked EOL in the latest
relevant update (for the same live patching component), the component is
considered not live‑patchable
Sort of a follow-up to xapi-project#6908, which filtered out SRs that only offer QCOW2
backing files. This commit allows running delta tests on SRs that offer both
QCOW2 and VHD backing files (with QCOW2 as the default).

Not specifying the format on SRs with default image format=qcow2 breaks
delta tests for VHD (since they require two vhd images to calculate
differences between).

Force the format in VDI.create through sm-config instead. The sm-config
parameter is ignored if it's not supported (i.e. on XenServer VHD-only
SMAPIv1 SRs).

Force format=vhd for max_vdi_size tests as well, since they're only exporting
to vhd (and testing its max size), this speeds up the tests.

Signed-off-by: Andrii Sultanov <andriy.sultanov@vates.tech>
4194304 = 4MIB

Signed-off-by: Andrii Sultanov <andriy.sultanov@vates.tech>
Sort of a follow-up to xapi-project#6908, which filtered out SRs that only offer
QCOW2 backing files. This commit allows running delta tests on SRs that
offer both QCOW2 and VHD backing files (with QCOW2 as the default).

Not specifying the format on SRs with default image format=qcow2 breaks
delta tests for VHD (since they require two vhd images to calculate
differences between).

Force the format in VDI.create through sm-config instead. The sm-config
parameter is ignored if it's not supported (i.e. on XenServer VHD-only
SMAPIv1 SRs).

Force format=vhd for max_vdi_size tests as well, since they're only
exporting to vhd (and testing its max size), this speeds up the tests.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Backport of aef2acf

In the original code we 3-tuples where we here have 2-tuples; so the
original patch does not apply.

When we are using a known memory configuration it includes the overhead.
So we only have to add it when we create a new configuration.

Localhost migration in a loop before and after the patch, memory
reported by list_domains -memory -bytes:

  Before:

  id |         uuid |  state |  tot bytes |  max bytes | shadow bytes
  17 | 8fc1ada1-... |    B H | 4296003584 | 4336898048 |     36700160
  18 | 8fc1ada1-... |    B H | 4296003584 | 4376743936 |     36700160
  19 | 8fc1ada1-... |    B H | 4296003584 | 4416589824 |     36700160
  20 | 8fc1ada1-... |    B H | 4296003584 | 4456435712 |     36700160
  21 | 8fc1ada1-... |    B H | 4296003584 | 4496281600 |     36700160
  22 | 8fc1ada1-... |    B H | 4296003584 | 4536127488 |     36700160
  23 | 8fc1ada1-... |    B H | 4296003584 | 4575973376 |     36700160
  24 | 8fc1ada1-... |    B H | 4296003584 | 4615819264 |     36700160
  25 | 8fc1ada1-... |    B H | 4296003584 | 4655665152 |     36700160
  26 | 8fc1ada1-... |    B H | 4296003584 | 4695511040 |     36700160

  After:

  id |         uuid |  state |  tot bytes |  max bytes | shadow bytes
  27 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  28 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  29 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  30 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  31 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  32 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  33 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  34 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  35 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  36 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160

Based on work by Edwin Torok.

Signed-off-by: Christian Lindig <christian.lindig@citrix.com>
Backport of aef2acf

In the original code we 3-tuples where we here have 2-tuples; so the
original patch does not apply.

When we are using a known memory configuration it includes the overhead.
So we only have to add it when we create a new configuration.

Localhost migration in a loop before and after the patch, memory
reported by list_domains -memory -bytes:

  Before:

  id |         uuid |  state |  tot bytes |  max bytes | shadow bytes
  17 | 8fc1ada1-... |    B H | 4296003584 | 4336898048 |     36700160
  18 | 8fc1ada1-... |    B H | 4296003584 | 4376743936 |     36700160
  19 | 8fc1ada1-... |    B H | 4296003584 | 4416589824 |     36700160
  20 | 8fc1ada1-... |    B H | 4296003584 | 4456435712 |     36700160
  21 | 8fc1ada1-... |    B H | 4296003584 | 4496281600 |     36700160
  22 | 8fc1ada1-... |    B H | 4296003584 | 4536127488 |     36700160
  23 | 8fc1ada1-... |    B H | 4296003584 | 4575973376 |     36700160
  24 | 8fc1ada1-... |    B H | 4296003584 | 4615819264 |     36700160
  25 | 8fc1ada1-... |    B H | 4296003584 | 4655665152 |     36700160
  26 | 8fc1ada1-... |    B H | 4296003584 | 4695511040 |     36700160

  After:

  id |         uuid |  state |  tot bytes |  max bytes | shadow bytes
  27 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  28 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  29 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  30 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  31 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  32 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  33 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  34 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  35 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160
  36 | 8fc1ada1-... |    B H | 4256157696 | 4297052160 |     36700160

Based on work by Edwin Torok.
…out"

It changes behaviour of the audit_log endpoint

This reverts commit 2edf203.

Signed-off-by: Pau Ruiz Safont <pau.safont@vates.tech>
…ing to stdout (xapi-project#7013)

It changes behaviour of the audit_log endpoint
Signed-off-by: Ming Lu <ming.lu@cloud.com>
@minglumlu minglumlu force-pushed the private/mingl/feature/26.1-lcm/trusted-certs branch from a025e86 to daef7c7 Compare April 15, 2026 02:18
@minglumlu minglumlu merged commit e6e6dd5 into xapi-project:feature/26.1-lcm/trusted-certs Apr 15, 2026
14 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.