From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 46D4596CFA for ; Tue, 16 Apr 2024 15:19:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 281F41B9DA for ; Tue, 16 Apr 2024 15:19:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 16 Apr 2024 15:19:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A95EF45216 for ; Tue, 16 Apr 2024 15:19:13 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 15:18:57 +0200 Message-Id: <20240416131909.2867605-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240416131909.2867605-1-d.csapak@proxmox.com> References: <20240416131909.2867605-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage 4/9] ovf: implement parsing the ostype X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2024 13:19:48 -0000 use the standards info about the ostypes to map to our own (see comment for link to the relevant part of the dmtf schema) every type that is not listed we map to 'other', so no need to have it in a list. Signed-off-by: Dominik Csapak --- src/PVE/Storage/OVF.pm | 69 +++++++++++++++++++++++++++++++++++++++ src/test/run_ovf_tests.pl | 3 ++ 2 files changed, 72 insertions(+) diff --git a/src/PVE/Storage/OVF.pm b/src/PVE/Storage/OVF.pm index fb850a8..dd8431a 100644 --- a/src/PVE/Storage/OVF.pm +++ b/src/PVE/Storage/OVF.pm @@ -55,6 +55,71 @@ my @resources = ( { id => 35, dtmf_name => 'Vendor Reserved'} ); +# see https://schemas.dmtf.org/wbem/cim-html/2.55.0+/CIM_OperatingSystem.html +my $ostype_ids = { + 18 => 'winxp', # 'WINNT', + 29 => 'solaris', # 'Solaris', + 36 => 'l26', # 'LINUX', + 58 => 'w2k', # 'Windows 2000', + 67 => 'wxp', #'Windows XP', + 69 => 'w2k3', # 'Microsoft Windows Server 2003', + 70 => 'w2k3', # 'Microsoft Windows Server 2003 64-Bit', + 71 => 'wxp', # 'Windows XP 64-Bit', + 72 => 'wxp', # 'Windows XP Embedded', + 73 => 'wvista', # 'Windows Vista', + 74 => 'wvista', # 'Windows Vista 64-Bit', + 75 => 'wxp', # 'Windows Embedded for Point of Service', ?? + 76 => 'w2k8', # 'Microsoft Windows Server 2008', + 77 => 'w2k8', # 'Microsoft Windows Server 2008 64-Bit', + 79 => 'l26', # 'RedHat Enterprise Linux', + 80 => 'l26', # 'RedHat Enterprise Linux 64-Bit', + 81 => 'solaris', #'Solaris 64-Bit', + 82 => 'l26', # 'SUSE', + 83 => 'l26', # 'SUSE 64-Bit', + 84 => 'l26', # 'SLES', + 85 => 'l26', # 'SLES 64-Bit', + 87 => 'l26', # 'Novell Linux Desktop', + 89 => 'l26', # 'Mandriva', + 90 => 'l26', # 'Mandriva 64-Bit', + 91 => 'l26', # 'TurboLinux', + 92 => 'l26', # 'TurboLinux 64-Bit', + 93 => 'l26', # 'Ubuntu', + 94 => 'l26', # 'Ubuntu 64-Bit', + 95 => 'l26', # 'Debian', + 96 => 'l26', # 'Debian 64-Bit', + 97 => 'l24', # 'Linux 2.4.x', + 98 => 'l24', # 'Linux 2.4.x 64-Bit', + 99 => 'l26', # 'Linux 2.6.x', + 100 => 'l26', # 'Linux 2.6.x 64-Bit', + 101 => 'l26', # 'Linux 64-Bit', + 103 => 'win7', # 'Microsoft Windows Server 2008 R2', + 105 => 'win7', # 'Microsoft Windows 7', + 106 => 'l26', # 'CentOS 32-bit', + 107 => 'l26', # 'CentOS 64-bit', + 108 => 'l26', # 'Oracle Linux 32-bit', + 109 => 'l26', # 'Oracle Linux 64-bit', + 111 => 'win8', # 'Microsoft Windows Server 2011', ?? + 112 => 'win8', # 'Microsoft Windows Server 2012', + 113 => 'win8', # 'Microsoft Windows 8', + 114 => 'win8', # 'Microsoft Windows 8 64-bit', + 115 => 'win8', # 'Microsoft Windows Server 2012 R2', + 116 => 'win10', # 'Microsoft Windows Server 2016', + 117 => 'win8', # 'Microsoft Windows 8.1', + 118 => 'win8', # 'Microsoft Windows 8.1 64-bit', + 119 => 'win10', # 'Microsoft Windows 10', + 120 => 'win10', # 'Microsoft Windows 10 64-bit', + 121 => 'win10', # 'Microsoft Windows Server 2019', + 122 => 'win11', # 'Microsoft Windows 11 64-bit', + 123 => 'win11', # 'Microsoft Windows Server 2022', + # others => 'other', +}; + +sub get_ostype { + my ($id) = @_; + + return $ostype_ids->{$id} // 'other'; +} + sub find_by { my ($key, $param) = @_; foreach my $resource (@resources) { @@ -160,6 +225,10 @@ sub parse_ovf { my $xpath_find_disks="/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:ResourceType=${disk_id}]"; my @disk_items = $xpc->findnodes($xpath_find_disks); + my $xpath_find_ostype_id = "/ovf:Envelope/ovf:VirtualSystem/ovf:OperatingSystemSection/\@ovf:id"; + my $ostype_id = $xpc->findvalue($xpath_find_ostype_id); + $qm->{ostype} = get_ostype($ostype_id); + # disks metadata is split in four different xml elements: # * as an Item node of type DiskDrive in the VirtualHardwareSection # * as an Disk node in the DiskSection diff --git a/src/test/run_ovf_tests.pl b/src/test/run_ovf_tests.pl index 1ef78cc..e949c15 100755 --- a/src/test/run_ovf_tests.pl +++ b/src/test/run_ovf_tests.pl @@ -59,13 +59,16 @@ print "\ntesting vm.conf extraction\n"; is($win2008->{qm}->{name}, 'Win2008-R2x64', 'win2008 VM name is correct'); is($win2008->{qm}->{memory}, '2048', 'win2008 VM memory is correct'); is($win2008->{qm}->{cores}, '1', 'win2008 VM cores are correct'); +is($win2008->{qm}->{ostype}, 'win7', 'win2008 VM ostype is correcty'); 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($win10->{qm}->{ostype}, 'other', 'win10 VM ostype is 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'); +is($win10noNs->{qm}->{ostype}, 'other', 'win10 VM (no default rasd NS) ostype is correct'); done_testing(); -- 2.39.2