[pve-devel] [PATCH v3 qemu-server 5/7] cloudinit : add extract_cloudinit_config

[Fabian Ebner]

Am 09.06.21 um 13:54 schrieb Alexandre Derumier:
> --- a/PVE/QemuServer/Cloudinit.pm
> +++ b/PVE/QemuServer/Cloudinit.pm
> @@ -607,11 +607,56 @@ sub dump_cloudinit_config {
>      }
>  }
>  
> +sub extract_cloudinit_config {
> +    my ($conf, $vmid) = @_;
> +
> +    my $current_drive = undef;
> +    PVE::QemuConfig->foreach_volume($conf, sub {
> +	my ($ds, $drive) = @_;
> +	$current_drive = $drive if PVE::QemuServer::drive_is_cloudinit($drive);
> +

Style nit: blank line shouldn't be there

> +    });
> + 

Style nit: above line starts with a space

> +    my $running = PVE::QemuServer::check_running($vmid);
> +    my $storecfg = PVE::Storage::config();
> +    my $iso_path = PVE::Storage::path($storecfg, $current_drive->{file});
> +    my ($storeid, $volname) = PVE::Storage::parse_volume_id($current_drive->{file}, 1);
> +    my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
> +    my $format = PVE::QemuServer::qemu_img_format($scfg, $volname);
> +    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
> +    $plugin->activate_volume($storeid, $scfg, $volname) if !$running;

Please use the abstraction the storage module provides, i.e.
PVE::Storage::activate_volumes().

> +
> +    my $raw_cloudinit_config = undef;
> +
> +    my $path = "/run/pve/cloudinit_current/$vmid";
> +    mkpath $path;
> +    my $parser = sub {
> +	my $line = shift;
> +	$raw_cloudinit_config .= "$line\n";
> +    };
> +    eval {
> +	#qemu-img dd is really slower (5s) than convert (0.2s)
> +        run_command([
> +            ['qemu-img', 'convert', '-f', 'raw', '-O', 'raw', "$iso_path", "$path/iso"]

Should use $format (or it won't work for qcow2).
No need for the second surrounding [].

> +        ]);
> +
> +        run_command([

Also shouldn't need the second [] I think.

> +            ['isoinfo', '-i', "$path/iso", '-x', "/PROXMOX/VMCONF.\;1"]
> +        ], outfunc => $parser);
> +    };
> +    rmtree($path);
> +    $plugin->deactivate_volume($storeid, $scfg, $volname) if !$running;

PVE::Storage::deactivate_volumes().

> +
> +    my $cloudinit_config = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $raw_cloudinit_config);
> +    return $cloudinit_config;

Style nit: no need to introduce that variable

> +}
> +