[pve-devel] [PATCH storage 7/9] ovf: implement parsing nics

[Fiona Ebner]

Am 16.04.24 um 15:19 schrieb Dominik Csapak:
> by iterating over the relevant parts and trying to parse out the
> 'ResourceSubType'. The content of that is not standardized, but I only
> ever found examples that are compatible with vmware, meaning it's
> either 'e1000', 'e1000e' or 'vmxnet3' (in various capitalizations; thus
> the `lc()`)
> 
> As a fallback i used vmxnet3, since i guess most OVAs are tuned for
> vmware.

I'm not familiar enough with the OVA/OVF ecosystem, but is this really
the best default. I'd kinda expect e1000(e) to cause less issues in case
we were not able to get the type from the OVA/OVF. And people coming
from VMWare are likely going to use the dedicated importer.

> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  src/PVE/Storage/DirPlugin.pm |  2 +-
>  src/PVE/Storage/OVF.pm       | 20 +++++++++++++++++++-
>  src/test/run_ovf_tests.pl    |  5 +++++
>  3 files changed, 25 insertions(+), 2 deletions(-)
> 
> diff --git a/src/PVE/Storage/DirPlugin.pm b/src/PVE/Storage/DirPlugin.pm
> index 8a248c7..21c8350 100644
> --- a/src/PVE/Storage/DirPlugin.pm
> +++ b/src/PVE/Storage/DirPlugin.pm
> @@ -294,7 +294,7 @@ sub get_import_metadata {
>  	'create-args' => $res->{qm},
>  	'disks' => $disks,
>  	warnings => $warnings,
> -	net => [],
> +	net => $res->{net},
>      };
>  }
>  
> diff --git a/src/PVE/Storage/OVF.pm b/src/PVE/Storage/OVF.pm
> index f438de2..c3e7ed9 100644
> --- a/src/PVE/Storage/OVF.pm
> +++ b/src/PVE/Storage/OVF.pm
> @@ -120,6 +120,12 @@ sub get_ostype {
>      return $ostype_ids->{$id} // 'other';
>  }
>  
> +my $allowed_nic_models = [
> +    'e1000',
> +    'e1000e',
> +    'vmxnet3',
> +];
> +
>  sub find_by {
>      my ($key, $param) = @_;
>      foreach my $resource (@resources) {
> @@ -355,9 +361,21 @@ ovf:Item[rasd:InstanceID='%s']/rasd:ResourceType", $controller_id);
>  
>      $qm->{boot} = "order=" . join(';', @$boot);
>  
> +    my $nic_id = dtmf_name_to_id('Ethernet Adapter');
> +    my $xpath_find_nics = "/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:ResourceType=${nic_id}]";
> +    my @nic_items = $xpc->findnodes($xpath_find_nics);
> +
> +    my $net = {};
> +
> +    my $net_count = 0;
> +    foreach my $item_node (@nic_items) {

Style nit: please use for instead of foreach

> +	my $model = $xpc->findvalue('rasd:ResourceSubType', $item_node);
> +	$model = lc($model);
> +	$model = 'vmxnet3' if ! grep $model, @$allowed_nic_models;


> +	$net->{"net${net_count}"} = { model => $model };
>      }

$net_count is never increased.

>  
> -    return {qm => $qm, disks => \@disks};
> +    return {qm => $qm, disks => \@disks, net => $net};
>  }
>  
>  1;
> diff --git a/src/test/run_ovf_tests.pl b/src/test/run_ovf_tests.pl
> index 8cf5662..d9a7b4b 100755
> --- a/src/test/run_ovf_tests.pl
> +++ b/src/test/run_ovf_tests.pl
> @@ -54,6 +54,11 @@ is($win10noNs->{disks}->[0]->{disk_address}, 'scsi0', 'single disk vm (no defaul
>  is($win10noNs->{disks}->[0]->{backing_file}, "$test_manifests/Win10-Liz-disk1.vmdk", 'single disk vm (no default rasd NS) has the correct disk backing device');
>  is($win10noNs->{disks}->[0]->{virtual_size}, 2048, 'single disk vm (no default rasd NS) has the correct size');
>  
> +print "testing nics\n";
> +is($win2008->{net}->{net0}->{model}, 'e1000', 'win2008 has correct nic model');
> +is($win10->{net}->{net0}->{model}, 'e1000e', 'win10 has correct nic model');
> +is($win10noNs->{net}->{net0}->{model}, 'e1000e', 'win10 (no default rasd NS) has correct nic model');
> +
>  print "\ntesting vm.conf extraction\n";
>  
>  is($win2008->{qm}->{boot}, 'order=scsi0;scsi1', 'win2008 VM boot is correct');