diff --git a/lib/GLPI/Agent/Task/Inventory/Virtualization/Lxc.pm b/lib/GLPI/Agent/Task/Inventory/Virtualization/Lxc.pm index 2fae85cc7..55ac6c269 100644 --- a/lib/GLPI/Agent/Task/Inventory/Virtualization/Lxc.pm +++ b/lib/GLPI/Agent/Task/Inventory/Virtualization/Lxc.pm @@ -103,7 +103,7 @@ sub _getVirtualMachine { } if ($key eq 'lxc.cgroup.memory.limit_in_bytes' || $key eq 'lxc.cgroup2.memory.max') { - $val .= "b" if $val =~ /[KMGTP]$/i; + $val .= $val =~ /[KMGTP]$/i ? "b" : $val =~ /^\d+$/ ? "bytes" : ""; $container->{MEMORY} = getCanonicalSize($val, 1024); } diff --git a/t/tasks/inventory/virtualization/lxc.t b/t/tasks/inventory/virtualization/lxc.t index 093d70ff1..bb17498bf 100755 --- a/t/tasks/inventory/virtualization/lxc.t +++ b/t/tasks/inventory/virtualization/lxc.t @@ -23,7 +23,7 @@ my %container_tests = ( NAME => 'config', VMTYPE => 'lxc', STATUS => STATUS_OFF, - MEMORY => '2048000', + MEMORY => '1', MAC => '01:23:45:67:89:0a', VCPU => 4 } @@ -55,7 +55,7 @@ my %container_tests = ( VMTYPE => 'lxc', STATUS => STATUS_RUNNING, MAC => 'fa:ee:26:ef:6b:1c', - MEMORY => 2147483648, + MEMORY => 2048, VCPU => 2 } },