Skip to content

update Rex::Hardware::VirtInfo to work in a cross platform manner #1599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
VVelox wants to merge 6 commits into from
+72 −16
Closed

update Rex::Hardware::VirtInfo to work in a cross platform manner #1599

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e1318c9
add bhyve support and make sure kvm is only detected on Linux
VVelox Jul 11, 2023
3a350b6
rework CPU checking and get bios etc in a cross platform friendly manner
VVelox Jul 11, 2023
5602ed4
poke with perl tidy
VVelox Jul 11, 2023
de9760b
perl ciritic fixes
VVelox Jul 11, 2023
49905e2
convert to use English
VVelox Jul 11, 2023
2fa024c
fix dmi bits returning undef, formatting cleanup, and revert one kvm …
VVelox Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 72 additions & 16 deletions lib/Rex/Hardware/VirtInfo.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ use warnings;

our $VERSION = '9999.99.99_99'; # VERSION

use English qw(-no_match_vars);

use Rex;
use Rex::Helper::Run;
use Rex::Commands::Fs;
Expand All @@ -24,26 +26,46 @@ sub get {
return $cache->get($cache_key_name);
}

if ( Rex::is_ssh || $^O !~ m/^MSWin/i ) {
if ( Rex::is_ssh || $OSNAME !~ m/^MSWin/i ) {

my (
$product_name, $bios_vendor, $sys_vendor,
$self_status, $cpuinfo, $modules
) = ( '', '', '', '', '', '' );

$product_name =
i_run "cat /sys/devices/virtual/dmi/id/product_name 2>/dev/null",
fail_ok => 1;
$bios_vendor =
i_run "cat /sys/devices/virtual/dmi/id/bios_vendor 2>/dev/null",
fail_ok => 1;
$sys_vendor =
i_run "cat /sys/devices/virtual/dmi/id/sys_vendor 2>/dev/null",
fail_ok => 1;
if ( $OSNAME eq 'linux' ) {
$product_name =
i_run "cat /sys/devices/virtual/dmi/id/product_name 2>/dev/null",
fail_ok => 1;
$bios_vendor =
i_run "cat /sys/devices/virtual/dmi/id/bios_vendor 2>/dev/null",
fail_ok => 1;
$sys_vendor =
i_run "cat /sys/devices/virtual/dmi/id/sys_vendor 2>/dev/null",
fail_ok => 1;
}
else {
my $bios = Rex::Inventory::Bios::get();
$bios_vendor = $bios->get_bios()->get_vendor || '';
$product_name = $bios->get_system_information()->get_product_name || '';
$sys_vendor = $bios->get_system_information()->get_manufacturer || '';
}

$self_status = i_run "cat /proc/self/status 2>/dev/null", fail_ok => 1;
$cpuinfo = i_run "cat /proc/cpuinfo 2>/dev/null", fail_ok => 1;
$modules = i_run "cat /proc/modules 2>/dev/null", fail_ok => 1;

if ( $OSNAME eq 'linux' ) {
$cpuinfo = i_run "cat /proc/cpuinfo 2>/dev/null", fail_ok => 1;
}
else {
$cpuinfo = i_run "dmidecode -t processor 2>/dev/null", fail_ok => 1;
}

if ( $OSNAME eq 'linux' ) {
$modules = i_run "cat /proc/modules 2>/dev/null", fail_ok => 1;
}
elsif ( $OSNAME eq 'freebsd' ) {
$modules = i_run "/sbin/kldstat 2>/dev/null", fail_ok => 1;
}

my ( $virtualization_type, $virtualization_role ) = ( '', '' );

Expand Down Expand Up @@ -76,6 +98,11 @@ sub get {
$virtualization_role = "guest";
}

elsif ( $product_name =~ /BHYVE/s ) {
$virtualization_type = 'bhyve';
$virtualization_role = 'guest';
}

elsif ( $bios_vendor =~ /Xen/ ) {
$virtualization_type = "xen";
$virtualization_role = "guest";
Expand All @@ -86,6 +113,11 @@ sub get {
$virtualization_role = "guest";
}

elsif ( $bios_vendor =~ /BHYVE/s ) {
$virtualization_type = 'bhyve';
$virtualization_role = 'guest';
}

elsif ( $sys_vendor =~ /Microsoft Corporation/ ) {
$virtualization_type = "VirtualPC";
$virtualization_role = "guest";
Expand Down Expand Up @@ -120,26 +152,50 @@ sub get {
$virtualization_role = "guest";
}

elsif ( $cpuinfo =~ /vendor_id.*User Mode Linux|model name.*UML/ ) {
elsif ( $OSNAME eq 'linux'
&& $cpuinfo =~ /vendor_id.*User Mode Linux|model name.*UML/ )
{
$virtualization_type = "uml";
$virtualization_role = "guest";
}

elsif ( $cpuinfo =~ /vendor_id.*PowerVM Lx86/ ) {
elsif ( $OSNAME ne 'linux'
&& $cpuinfo =~ /Manufacturer.*User Mode Linux|model name.*UML/ )
{
$virtualization_type = "uml";
$virtualization_role = "guest";
}

elsif ( $OSNAME eq 'linux' && $cpuinfo =~ /vendor_id.*PowerVM Lx86/ ) {
$virtualization_type = "powervm_lx86";
$virtualization_role = "guest";
}

elsif ( $OSNAME ne 'linux' && $cpuinfo =~ /Manufacturer.*PowerVM Lx86/ ) {
$virtualization_type = "powervm_lx86";
$virtualization_role = "guest";
}

elsif ( $cpuinfo =~ /vendor_id.*IBM\/S390/ ) {
elsif ( $OSNAME eq 'linux' && $cpuinfo =~ /vendor_id.*IBM\/S390/ ) {
$virtualization_type = "ibm_systemz";
$virtualization_role = "guest";
}

elsif ( $modules =~ /kvm/ ) {
elsif ( $OSNAME ne 'linux' && $cpuinfo =~ /Manufacturer.*IBM\/S390/ ) {
$virtualization_type = "ibm_systemz";
$virtualization_role = "guest";
}

elsif ( $OSNAME eq 'linux' && $modules =~ /kvm/ ) {
$virtualization_type = "kvm";
$virtualization_role = "host";
}

elsif ( $OSNAME eq 'freebsd' && $modules =~ /\ vmm\.ko/s ) {
$virtualization_type = 'bhyve';
$virtualization_role = 'host';
}

elsif ( $modules =~ /vboxdrv/ ) {
$virtualization_type = "virtualbox";
$virtualization_role = "host";
Expand Down