diff --git a/lib/FusionInventory/Agent/Task/Inventory/Virtualization/Vmsystem.pm b/lib/FusionInventory/Agent/Task/Inventory/Virtualization/Vmsystem.pm index 2dde584a4f..851c86d72a 100644 --- a/lib/FusionInventory/Agent/Task/Inventory/Virtualization/Vmsystem.pm +++ b/lib/FusionInventory/Agent/Task/Inventory/Virtualization/Vmsystem.pm @@ -76,13 +76,8 @@ sub doInventory { }); } - my $uuid = $type eq 'Xen' ? _getXenUUID(logger => $logger) : - $type eq 'LXC' ? _getLibvirtLXC_UUID(logger => $logger) : - undef; - $inventory->setHardware({ VMSYSTEM => $type, - UUID => $uuid, }); } @@ -222,29 +217,4 @@ sub _matchPatterns { } } -sub _getXenUUID { - return getFirstLine( - file => '/sys/hypervisor/uuid', - @_ - ); -} - -sub _getLibvirtLXC_UUID { - my (%params) = ( - file => '/proc/1/environ', - @_ - ); - - my @environ = split( '\0', getAllLines( %params ) ); - - foreach my $variable (@environ) { - next unless $variable =~ /^LIBVIRT_LXC_UUID/; - my (undef, $value) = split('=', $variable); - return $value; - } - - ## no critic (ExplicitReturnUndef) - return undef; -} - 1; diff --git a/t/tasks/inventory/virtualization/vmsystem.t b/t/tasks/inventory/virtualization/vmsystem.t deleted file mode 100755 index d2acccca2f..0000000000 --- a/t/tasks/inventory/virtualization/vmsystem.t +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -use Test::Deep; -use Test::More; -use Test::NoWarnings; - -use FusionInventory::Agent::Task::Inventory::Virtualization::Vmsystem; - -plan tests => 2; - -my $hardware = FusionInventory::Agent::Task::Inventory::Virtualization::Vmsystem::_getLibvirtLXC_UUID( - file => 'resources/linux/proc/1-environ.txt' -); -ok($hardware eq '61568ec7-4ec9-4a26-89cd-94e29a91721a', '_getLibvirtLXC_UUID');