all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH ha-manager v5 12/28] resources: add migrate_json_properties() method
Date: Mon, 19 Oct 2026 16:45:54 +0200	[thread overview]
Message-ID: <20261019144629.215541-13-f.ebner@proxmox.com> (raw)
In-Reply-To: <20261019144629.215541-1-f.ebner@proxmox.com>

Will be used by the API schema for resource-type specific migration
options. When migrating dependent resources, the migration options
will be filtered according to the resource type, so the property
schema is also needed there.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Dependency bump for pve-container and qemu-server needed!

Changes in v5:
* Add required include for PVE::Cluster already in this patch.
* Only construct properties hash once.

 src/PVE/HA/Resources.pm       | 21 +++++++++++++++++++++
 src/PVE/HA/Resources/PVECT.pm | 17 +++++++++++++++++
 src/PVE/HA/Resources/PVEVM.pm | 17 +++++++++++++++++
 src/PVE/HA/Sim/Resources.pm   |  6 ++++++
 4 files changed, 61 insertions(+)

diff --git a/src/PVE/HA/Resources.pm b/src/PVE/HA/Resources.pm
index 656cb19..ad603dc 100644
--- a/src/PVE/HA/Resources.pm
+++ b/src/PVE/HA/Resources.pm
@@ -3,6 +3,7 @@ package PVE::HA::Resources;
 use strict;
 use warnings;
 
+use PVE::Cluster;
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::SectionConfig;
 use PVE::HA::Tools;
@@ -103,6 +104,20 @@ EODESC
     },
 };
 
+our $common_migrate_json_properties = {
+    sid => get_standard_option(
+        'pve-ha-resource-or-vm-id',
+        { completion => \&PVE::HA::Tools::complete_sid },
+    ),
+    node => get_standard_option(
+        'pve-node',
+        {
+            completion => \&PVE::Cluster::complete_migration_target,
+            description => "Target node.",
+        },
+    ),
+};
+
 sub verify_name {
     my ($class, $name) = @_;
 
@@ -159,6 +174,12 @@ sub migrate {
     die "implement in subclass";
 }
 
+sub migrate_json_properties {
+    my ($class) = @_;
+
+    die "implement in subclass";
+}
+
 sub config_file {
     my ($class, $id, $nodename) = @_;
 
diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm
index a8fe42e..de7c5b8 100644
--- a/src/PVE/HA/Resources/PVECT.pm
+++ b/src/PVE/HA/Resources/PVECT.pm
@@ -22,6 +22,17 @@ BEGIN {
 
 use base qw(PVE::HA::Resources);
 
+my $ct_migrate_json_properties;
+# FIXME: the extra properties are missing from the docs, since the PVE::API2::LXC module can't be
+# included in the generating docs environment, because of cyclic dependencies..
+my sub init_migrate_json_properties {
+    my $combined = { $PVE::HA::Resources::common_migrate_json_properties->%* };
+    my $extra_migrate_props = eval { PVE::API2::LXC::ha_migrate_json_properties() } // {};
+    die $@ if $@ && !$ENV{PVE_GENERATING_DOCS};
+    $combined->{$_} = $extra_migrate_props->{$_} for keys $extra_migrate_props->%*;
+    $ct_migrate_json_properties = $combined;
+}
+
 sub type {
     return 'ct';
 }
@@ -174,4 +185,10 @@ sub get_static_stats_from_config {
     };
 }
 
+sub migrate_json_properties {
+    my ($class) = @_;
+    init_migrate_json_properties() if !defined($ct_migrate_json_properties);
+    return $ct_migrate_json_properties
+}
+
 1;
diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm
index 3b61113..914f406 100644
--- a/src/PVE/HA/Resources/PVEVM.pm
+++ b/src/PVE/HA/Resources/PVEVM.pm
@@ -22,6 +22,17 @@ BEGIN {
 
 use base qw(PVE::HA::Resources);
 
+my $vm_migrate_json_properties;
+# FIXME: the extra properties are missing from the docs, since the PVE::API2::QEMU module can't be
+# included in the generating docs environment, because of cyclic dependencies..
+my sub init_migrate_json_properties {
+    my $combined = { $PVE::HA::Resources::common_migrate_json_properties->%* };
+    my $extra_migrate_props = eval { PVE::API2::Qemu::ha_migrate_json_properties() } // {};
+    die $@ if $@ && !$ENV{PVE_GENERATING_DOCS};
+    $combined->{$_} = $extra_migrate_props->{$_} for keys $extra_migrate_props->%*;
+    $vm_migrate_json_properties = $combined;
+}
+
 sub type {
     return 'vm';
 }
@@ -194,4 +205,10 @@ sub get_static_stats_from_config {
     };
 }
 
+sub migrate_json_properties {
+    my ($class) = @_;
+    init_migrate_json_properties() if !defined($vm_migrate_json_properties);
+    return $vm_migrate_json_properties;
+}
+
 1;
diff --git a/src/PVE/HA/Sim/Resources.pm b/src/PVE/HA/Sim/Resources.pm
index a464c62..730bfaa 100644
--- a/src/PVE/HA/Sim/Resources.pm
+++ b/src/PVE/HA/Sim/Resources.pm
@@ -122,6 +122,12 @@ sub migrate {
     return defined($ss->{$sid}) ? 0 : 1;
 }
 
+sub migrate_json_properties {
+    my ($class) = @_;
+
+    return $PVE::HA::Resources::common_migrate_json_properties;
+}
+
 sub remove_locks {
     my ($self, $haenv, $id, $locks, $service_node) = @_;
 
-- 
2.47.3





  parent reply	other threads:[~2026-10-19 14:49 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-19 14:45 [PATCH-SERIES many v5 00/28] migration: strict config check for intra-cluster migration Fiona Ebner
2026-10-19 14:45 ` [PATCH common v5 01/28] tools: move version_cmp() helper from qemu-server Fiona Ebner
2026-10-19 14:45 ` [PATCH common v5 02/28] rest handler: handle: respect schema's 'type-property' when resolving type Fiona Ebner
2026-10-19 14:45 ` [PATCH cluster v5 03/28] cluster: move pvecfg node version helpers from qemu-server Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 04/28] manager: add missing PVE::HA::Resources import Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 05/28] update crm commands: align logging with next state started/stopped Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 06/28] manager: factor out helper to check if requested resource motion is valid Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 07/28] next state stopped: align logging for motion command with next_state_started() Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 08/28] next state {stopped,started}: factor out helper to handle motion command Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 09/28] lrm: resource migration: support extra migration options Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 10/28] change service state: support hash as a parameter value Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 11/28] next state: handle motion command: support migration options Fiona Ebner
2026-10-19 14:45 ` Fiona Ebner [this message]
2026-10-19 14:45 ` [PATCH ha-manager v5 13/28] queue resource motion: " Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 14/28] crm command: support JSON-style migrate command Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 15/28] api: resources: migration: support additional migration options Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 16/28] test: add test for " Fiona Ebner
2026-10-19 14:45 ` [PATCH qemu-server v5 17/28] helpers: move version_cmp() helper to pve-common Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 18/28] helpers: move pvecfg node version helpers to pve-cluster Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 19/28] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 20/28] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 21/28] qm: mtunnel: reply when a command is unknown Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 22/28] qm: mtunnel: add 'conf' command to do strict configuration parsing Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 23/28] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-10-19 14:46 ` [PATCH container v5 24/28] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-10-19 14:46 ` [PATCH container v5 25/28] pct: introduce mtunnel command Fiona Ebner
2026-10-19 14:46 ` [PATCH container v5 26/28] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12 Fiona Ebner
2026-10-19 14:46 ` [PATCH container v5 27/28] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-10-19 14:46 ` [PATCH manager v5 28/28] ui: migrate: add checkbox to allow skipping newly enforced config check Fiona Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261019144629.215541-13-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal