diff --git a/test/ovf_manifests/Win10-Liz_no_default_ns.ovf b/test/ovf_manifests/Win10-Liz_no_default_ns.ovf new file mode 100755 index 00000000..b93540f4 --- /dev/null +++ b/test/ovf_manifests/Win10-Liz_no_default_ns.ovf @@ -0,0 +1,142 @@ + + + + + + + + Virtual disk information + + + + The list of logical networks + + The bridged network + + + + A virtual machine + Win10-Liz + + The kind of installed guest operating system + + + Virtual hardware requirements + + Virtual Hardware Family + 0 + Win10-Liz + vmx-11 + + + hertz * 10^6 + Number of Virtual CPUs + 4 virtual CPU(s) + 1 + 3 + 4 + + + byte * 2^20 + Memory Size + 6144MB of memory + 2 + 4 + 6144 + + + 0 + SATA Controller + sataController0 + 3 + vmware.sata.ahci + 20 + + + 0 + USB Controller (XHCI) + usb3 + 4 + vmware.usb.xhci + 23 + + + 0 + USB Controller (EHCI) + usb + 5 + vmware.usb.ehci + 23 + + + + 0 + SCSI Controller + scsiController0 + 6 + lsilogicsas + 6 + + + true + serial0 + 7 + 21 + + + + 0 + disk0 + ovf:/disk/vmdisk1 + 8 + 6 + 17 + + + 2 + true + bridged + E1000e ethernet adapter on "bridged" + ethernet0 + 9 + E1000e + 10 + + + + false + sound + 10 + vmware.soundcard.hdaudio + 1 + + + false + video + 11 + 24 + + + + false + vmci + 12 + vmware.vmci + 1 + + + 1 + false + cdrom0 + 13 + 3 + 15 + + + + + + + + + diff --git a/test/run_ovf_tests.pl b/test/run_ovf_tests.pl index 74c53bc7..ff6c7863 100755 --- a/test/run_ovf_tests.pl +++ b/test/run_ovf_tests.pl @@ -28,6 +28,13 @@ if (my $err = $@) { } else { ok('parse win10'); } +my $win10noNs = eval { PVE::QemuServer::OVF::parse_ovf("$test_manifests/Win10-Liz_no_default_ns.ovf") }; +if (my $err = $@) { + fail("parse win10 no default rasd NS"); + warn("error: $err\n"); +} else { + ok('parse win10 no default rasd NS'); +} print "testing disks\n"; @@ -43,6 +50,10 @@ is($win10->{disks}->[0]->{disk_address}, 'scsi0', 'single disk vm has the correc is($win10->{disks}->[0]->{backing_file}, "$test_manifests/Win10-Liz-disk1.vmdk", 'single disk vm has the correct disk backing device'); is($win10->{disks}->[0]->{virtual_size}, 2048, 'single disk vm has the correct size'); +is($win10noNs->{disks}->[0]->{disk_address}, 'scsi0', 'single disk vm (no default rasd NS) has the correct disk controller'); +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 "\ntesting vm.conf extraction\n"; is($win2008->{qm}->{name}, 'Win2008-R2x64', 'win2008 VM name is correct'); @@ -53,4 +64,8 @@ is($win10->{qm}->{name}, 'Win10-Liz', 'win10 VM name is correct'); is($win10->{qm}->{memory}, '6144', 'win10 VM memory is correct'); is($win10->{qm}->{cores}, '4', 'win10 VM cores are correct'); +is($win10noNs->{qm}->{name}, 'Win10-Liz', 'win10 VM (no default rasd NS) name is correct'); +is($win10noNs->{qm}->{memory}, '6144', 'win10 VM (no default rasd NS) memory is correct'); +is($win10noNs->{qm}->{cores}, '4', 'win10 VM (no default rasd NS) cores are correct'); + done_testing();