[PATCH container v4 23/27] api: migrate: allow forwarding certain migration properties to HA

[Fiona Ebner <f.ebner@proxmox.com>]

Empty for now, but there is a 'skip-config-check' option planned that
will be forwarded. And this is also done for consistency with VMs,
where the existing 'with-conntrack-state' option will be forwarded
too.

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

Changes in v4:
* Use parentheses when logging migration options.


 src/PVE/API2/LXC.pm | 96 ++++++++++++++++++++++++++++-----------------
 1 file changed, 59 insertions(+), 37 deletions(-)

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 5f94d5a..1b2c0e2 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -48,6 +48,53 @@ BEGIN {
     }
 }
 
+my $migrate_json_properties = {
+    node => get_standard_option('pve-node'),
+    vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }),
+    target => get_standard_option(
+        'pve-node',
+        {
+            description => "Target node.",
+            completion => \&PVE::Cluster::complete_migration_target,
+        },
+    ),
+    'target-storage' => get_standard_option('pve-targetstorage'),
+    online => {
+        type => 'boolean',
+        description => "Use online/live migration.",
+        optional => 1,
+    },
+    restart => {
+        type => 'boolean',
+        description => "Use restart migration",
+        optional => 1,
+    },
+    timeout => {
+        type => 'integer',
+        description => "Timeout in seconds for shutdown for restart migration",
+        optional => 1,
+        default => 180,
+    },
+    bwlimit => {
+        description => "Override I/O bandwidth limit (in KiB/s).",
+        optional => 1,
+        type => 'number',
+        minimum => '0',
+        default => 'migrate limit from datacenter or storage config',
+    },
+};
+
+# Properties that will be forwarded via the HA stack to the LRM, which will then use them for its
+# own invocation of the migration API endpoint. The other properties are not forwarded and lost for
+# HA migrations with many being hard-coded for the LRM invocation.
+my $ha_migrate_props = {};
+
+sub ha_migrate_json_properties {
+    my $forwarded_props = {};
+    $forwarded_props->{$_} = $migrate_json_properties->{$_} for keys $ha_migrate_props->%*;
+    return $forwarded_props;
+}
+
 my sub assert_not_restore_from_external {
     my ($archive, $storage_cfg) = @_;
 
@@ -1633,42 +1680,7 @@ __PACKAGE__->register_method({
     },
     parameters => {
         additionalProperties => 0,
-        properties => {
-            node => get_standard_option('pve-node'),
-            vmid =>
-                get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }),
-            target => get_standard_option(
-                'pve-node',
-                {
-                    description => "Target node.",
-                    completion => \&PVE::Cluster::complete_migration_target,
-                },
-            ),
-            'target-storage' => get_standard_option('pve-targetstorage'),
-            online => {
-                type => 'boolean',
-                description => "Use online/live migration.",
-                optional => 1,
-            },
-            restart => {
-                type => 'boolean',
-                description => "Use restart migration",
-                optional => 1,
-            },
-            timeout => {
-                type => 'integer',
-                description => "Timeout in seconds for shutdown for restart migration",
-                optional => 1,
-                default => 180,
-            },
-            bwlimit => {
-                description => "Override I/O bandwidth limit (in KiB/s).",
-                optional => 1,
-                type => 'number',
-                minimum => '0',
-                default => 'migrate limit from datacenter or storage config',
-            },
-        },
+        properties => $migrate_json_properties,
     },
     returns => {
         type => 'string',
@@ -1732,10 +1744,20 @@ __PACKAGE__->register_method({
                 my $upid = shift;
 
                 my $service = "ct:$vmid";
+                my $extra_opts = '';
 
                 my $cmd = ['ha-manager', 'migrate', $service, $target];
+                for my $prop (sort keys $ha_migrate_props->%*) {
+                    if (defined(my $value = $param->{$prop})) {
+                        push($cmd->@*, "--$prop", $value);
+                        $extra_opts .= ', ' if $extra_opts;
+                        $extra_opts .= "$prop=$value";
+                    }
+                }
 
-                print "Requesting HA migration for CT $vmid to node $target\n";
+                my $msg = "Requesting HA migration for CT $vmid to node $target";
+                $msg .= " (${extra_opts})" if $extra_opts;
+                print "$msg\n";
 
                 PVE::Tools::run_command($cmd);
 
-- 
2.47.3