@@ -1,18 +1,419 @@
 Revision history for FusionInventory agent
 
-2.2.5  Thu, 16 Aug 2012 12:03:30 +0200
+2.3.13 Thu, 6 Nov 2014
+core:
+* log HTTP replies status
+* log agent stop event (#61)
+* better logging of task initialisation process
+* fix syslog logger usage with debug level >= 2 (#2780)
+* fix SNMPv1 multiple values queries
+
+netdiscovery:
+* skip SNMP scan immediatly if there is no answer from remote host
+* send task termination message to server when shutting down (#185)
+* thread usage cleanup
+
+netinventory:
+* propagate error messages to server
+* fix null-character presence in XML output (#2670,#2746,#2754,#2784)
+* fix WWN physical address parsing (#2759)
+* send task termination message to server when shutting down (#185)
+* thread usage cleanup
+
+inventory:
+* add support for FibreChannel controller on Linux (#2759)
+* fix HyperV machines enumeration (#2141)
+* fix typo in printer property name on Windows (#2782)
+* fix wrong function call on BSD i386 (#2797)
+* fix wrong function call on Solaris (#2799)
+* fix parsing of psrinfo -vp output on Solaris (#2798)
+
+test suite:
+* disable tests requiring POE under perl 5.8
+
+2.3.12 Mon, 06 Oct 2014
+core:
+* drop Socket::GetAddrInfo usage, and use Socket directly for name to address
+  resolution
+
+inventory:
+* fix networks interface enumeration on Windows XP (#2733)
+* fix BIOS date format error on Solaris (#2735)
+* retrieve OS minor version on Solaris (#2736)
+* identify dockers containers (#2731)
+* fix adobe license key format (RT #99164)
+
+2.3.11.1 Wed, 25 Sep 2014
+core:
+* update MANIFEST to fix missing files
+
+2.3.11 Wed, 25 Sep 2014
+core:
+* additional distribution metadata
+* more flexible message filtering in logger
+
+inventory:
+* additional exclusion categories
+* more detailed log message for inventory execution
+* utf8 encoding fixes for local users and groups on Windows
+* fix mac address retrieval for bonded addresses on Linux (#2622)
+* fix network interface type identification on Windows
+* add network interface type on BSD and Linux (#1838,#2622)
+* add WIFI info for network interfaces on BSD and Linux ()
+* identify interfaces aliases on Linux (#2622)
+* add PCIID for network interfaces and video cards 
+* better Xorg log file parsing on Linux
+* fix disk size computation on Linux (#2718)
+* prevent abusive /etc/blkid.tab update on Linux
+* ignore whitespace-only disk serial numbers on Windows (#2665)
+* fix architecture identification on Solaris (#2672)
+* add publisher for dpkg-based distribution on Linux
+
+netinventory:
+* drop consumables database in favor of standard consumable identification data
+* no more arbitrary consumables number limit
+* report unknown and approximate consumable level values as such
+* fix negative consumable level values
+* report multiple IP addresses associated with each port (#1421)
+* report aggregated network ports (#2179,#2564,#2575)
+* log sysdescr lookup in devices database
+* additional Hischmann and Fortinet devices IDs (#2631)
+
+2.3.10.1 Mon, 04 Aug 2014
+inventory:
+* fix regression introduced in 2.3.10 wrt hostname on Windows (#2647)
+* fix regression introduced in 2.3.10 wrt last logged user on Windows
+* provide error messages for name to resolution failures
+
+netdiscovery and netinventory:
+* avoid crash for missing logger with command-line tools
+
+2.3.10 Wed, 30 Jul 2014
+inventory:
+* fix serial key retrieval regression on Windows (#2632,#2641)
+* fix office 32bits serial retrieval on 64bits Windows (#2616)
+* fix duplicate network interface on AIX (#2527)
+* fix warnings for non-parsable etime on Unix (#2636)
+* fix global zone identification on Solaris (#2620)
+* fix software retrieval on recent BSDs (#2637)
+* better file system types identification on Solaris
+* add support for HyperV machines enumeration (#2141)
+* add support for LXC container identification (#2311)
+* add --scan-profiles option to fusioninventory-inventory (#2625)
+
+netdiscovery:
+* fix nmap parameters computation (#2618)
+* better device identification (#2601, #2194)
+
+netinventory:
+* fix invalid character presence in XML output
+* add support for Extreme Discovery Protocol (EDP)
+* better handling of CDP implementation differences
+* better handling of multiple discovery protocols
+
+2.3.9.1 Tue, 15 Jul 2014
+install:
+* fix sysobjectid and consumables databases files installation
+
+2.3.9 Tue, 15 Jul 2014
+core:
+* disable lower-level SSL checks when no-ssl-checks is used
+
+netinventory and netdiscovery tasks:
+* merge all files from sysobjectid database into a single one
+* update sysobjectid database
+
+netdiscovery task:
+* catch more SNMPv3 authentication errors
+* allow multiple SNMP credentials for netdiscovery executable
+
+netinventory task:
+* better printer consumable identification, using vendor references
+  (#2581,#2582,#2583,#2584,#2587,#2589,#2591,#2592,#2593,#2594)
+* externalize consumable ids in a data file
+* report 0% level instead of 100% for wastetoners with OK status (#2593) 
+* skip problematic address only for non-existing interfaces (#2599)
+* mark --model option as deprecated for netinventory executable
+
+inventory task:
+* disable user profile scanning for software by default on Windows (#2555)
+* avoid fatal dmidecode usage on Windows 2003 for CPUs (#2562)
+* fix last loggued user identification on Windows (#2553)
+* fix product key decoding on Windows 8 (#2544)
+* fix IE 10+ version retrieval on Windows (#2528)
+* more details for USB devices on Windows (#2598)
+* get OS UUID for SPARC on Solaris (#2539)
+* add Xen Citrix server VM support (#2529)
+
+2.3.8 Sun, 11 May 2014
+netinventory task:
+* add support for trunk port identification on non-cisco hardware (#2386)
+* add VENDOR element, and keep MANUFACTURER bound to original manufacturer
+* add H3C hardware database
+* better error messages for non-existing interfaces
+
+inventory task:
+* fix multiple crashes introduced by command logging
+* fix crash in Windows License module when office is not installed (#2202)
+* fix last loggued user retrieval on Windows (#2458)
+* fix 32bits software in user environment retrieval on Windows 64bits
+
+test suite:
+* transfer hardware tests in private hardware repository
+
+2.3.7.1 Wed, 30 Apr 2014
+inventory task:
+* fix crash introduced by command logging on BSD hosts
+
+2.3.7 Tue, 29 Apr 2014
+install:
+* do not rely on GNU install specific options
+
+netinventory and netdiscovery tasks:
+* drop support for SNMP dictionary
+* drop support for SNMP models
+* large code cleanup
+* enhance firmware and serial number retrieval
+* update extreme networks models database
+
+inventory task:
+* fix multiple warnings for missing commands (#2460)
+* fix 'broken pipe' error messages on Solaris (#2460)
+* fix warnings for NIS/NIS+ external references in /etc/passwd (#2460)
+* log executed commands with debug level >= 2
+* fix a crash in Windows storage inventory (#2471)
+* fix process inventory on AIX (#2481)
+* fix firmware version retrieval on AIX (#2480)
+* fix mac address extraction for infiniband interfaces (#2432)
+* fix CPU identification on newer ARM kernels (#2485)
+* fix inconsistencies in process runtime computation (#2491)
+
+test suite:
+* ship missing LXC test file (#2483)
+
+2.3.6 Mon, 10 Mar 2014
+core:
+* abort with explicit error message when there is 
+  no available task
+* when receiving a push request from a server, reschedule
+  contact for this server only
+
+inventory task:
+* fix a warning with LXC 1.0.x
+
+netinventory task:
+* fix SNMPv3 credentials handling
+* fix mac address retrieval on non-default VLANs
+* fix LLDP info retrieval for some hardware
+* fix memory exhaustion for some hardware (#2414)
+* use get-next-requests instead of get-bulk-requests, slower but safer,
+  especially with large gaps in indexes
+
+netdiscovery task:
+* fix SNMPv3 credentials handling
+* do not report errors for non-responding host with SNMPv3
+
+wake-on-lan task
+* honour all mac addresses from server request (#2353)
+
+test suite:
+* fix network interface test on Solaris (#2438)
+
+2.3.5.1 Tue, 14 Jan 2014
+inventory task:
+* fix AIX LVM regression introduced by incorrect fix (#2384)
+* fix another potential warning on AIX
+
+2.3.5  Tue, 14 Jan 2014
+netinventory task:
+* add more default OIDs for mappings undefined in SNMP model
+* fallback on default OID if SNMP model mapping doesn't bring any result
+* restore and enhance mac adressses extraction for connected devices on
+  non-default VLANs
+* fix trunk port identification
+* fix model loading with fusioninventory-netinventory
+
+inventory task:
+* get size for Adaptec RAID controller disks on Linux (#2360)
+* fix size reporting for LSI RAID controller disks on Linux
+* add support for modern MegaRAID controllers on Linux (#2361)
+* better identification for hard disk manufacturers (#2362)
+* fix timeout for user enumeration in AD environment on Windows (#2201)
+* fix a potential crash in software inventory on Windows
+* cleanup whitespace for DMI and /proc values (#2391)
+* fix multiple potential warnings on AIX (#2384)
+
+test suite:
+* fix test files list (#2394)
+* fix network interface enumeration test on Solaris (#2346)
+
+2.3.4  Fri, 29 Nov 2013
+netdiscovery task:
+* install missing sysobjectid database files
+* add additional device types (phones, storage, etc...) support
+
+netinventory task:
+* add default OIDs for mappings undefined in SNMP model
+* add IFALIAS support for interfaces
+* allow SNMPv3 usage from fusioninventory-netinventory
+* allow discovery without model from fusioninventory-netinventory
+
+netinventory and netdiscovery tasks:
+* fix infinite recursion in mac address canonicalisation, leading to memory
+  exhaustion (#2336)
+* fix SNMPv3 usage without optional parameters
+
+linux:
+* OpenVZ: disable the Virtuozzo module if libvirt is already plugged on OpenVZ
+
+2.3.3  Wed, 06 Nov 2013
+core
+* clean up in the distribution, thanks Olivier Mengué <dolmen@cpan.org>
+
+inventory task
+* fix missing 32bits software on 64bits windows (#2212)
+
+netinventory task
+* fix SNMP reconnection when issuing VLAN-specific queries on some Cisco
+  devices (#2178)
+* use longer default SNMP timeout, and make them configurable
+* handle MAC addresses with embedded VLAN identifier
+
+netdiscovery task
+* backport device model identification from sysobjectid value
+
+2.3.2  Fri, 20 Sep 2013
+core
+* avoid some warning messages
+
+netinventory task
+* fix: properly pass the SNMP credentials
+* better handling of mac addresses
+
+2.3.1  Mon, 09 Sep 2013
+inventory task
+* report when running in a BSD Jail or a LXC system, thanks Igor Morozov
+* better strategy for extracting USB printer serial on windows (#2213)
+* force lowercase identifiers for USB and PCI lookups (#2122)
+
+netdiscovery task
+* fix invalid log message and spurious warnings during discovery (#2200)
+* fix dictionary update handling, breaking fusioninventory-netdiscovery usage
+* use sysobjectid for better identification
+* more sysdescr-based identification rules
+* fix loss of information when applying sysdescr-based identification rules
+* normalize sysdescr better before dictionary lookup
+
+netinventory task
+* ensure device type is set in agent answer
+* emits warnings when retrieved values are obviously wrong
+* better handling of mac addresses
+* large code cleanup and optimisation
+
+wake-on-lan task
+* fix wrong mac address pattern check
+
+2.3.0  Thu, 01 Aug 2013
+distribution:
+* Deploy, Network and ESX tasks are now integrated in the distribution
+* new fusioninventory-inventory executable, dedicated to inventory task
+
+core:
+* no more thread usage for HTTP interface
+* no more token usage for HTTP interface, request source address is enough
+* --httpd-trust option now allows multiple values
+* --daemon and --no-fork options are now available from command-line only 
+
+inventory task:
+* add DNS_DOMAIN, BOOT_TIME and FQDN in OPERATINGSYSTEM section (#1197, #1347, #1358)
+* collect public SSH keys
+* collect local users and groups (#1570, #1870)
+* collect license key for MS Office on Windows (#152)
+* collect software from user profile on Windows(#1674)
+* collect license key for Adobe suite, Panic's Transit, VMware Fusion on MacOs
+* collect service package version on AIX (#1896)
+* collect manufacturer information for memories (#1735)
+* enforce consistent handling of USB and PCI identifiers (#1861)
+* enforce consistent TYPE values for network interfaces (#1838)
+* various UTF8 encoding fixes
+* better stripping of bogus values
+* Megaraid and 3ware RAID controller support on BSD (Egor Morozov)
+* Megaraid controller support on Linux (Egor Morozov)
+* support new OpenVZ configuration on Linux (Alessandro Iurlano)
+* LPAR support on AIX (#950, #952)
+* FreeBSD jail support on BSD (#736, #1555)
+* better caching of system_profiler output (#2076)
+* better Qemu support (#2106)
+* better OpenVM support (#1774)
+* better HyperV support (#1989, #1990, #1991)
+* fix CPU inventory for non-i386 arches on Linux (#2172)
+* better CPU inventory on Solaris (#1741, #1905, #2152)
+* better memory inventory on Solaris (#1711, #1714, #1737)
+* better slot inventory on Solaris (#1730)
+* fix VXFS filesystem identification on Solaris (#1696)
+* minimal support for busybox-specific command output (#1372)
+* no more memconf usage on Solaris
+* no more Mac::SysProfile usage on MacOS (#1646)
+
+wake-on-lan task:
+* ethernet and udp methods support on all systems
+
+netdiscovery task:
+* fix for regression introduced during code refactoring regarding printers
+  identification
+
+test suite:
+* check the link for 404 error in the doc
+* check for warnings generated during parsing
+* check entries generated from parsing match expected inventory format
+* normalize list before comparaison, for perl 5.18 hash randomisation
+
+2.2.8  unreleased
+
+AIX:
+* minor fixes in LVM support
+
+2.2.7  Tue, 13 Nov 2012
+
+General:
+* additional hack for LG screens (#1848)
+* additional model for ACER screens hack (#1840)
+* fix directory creation error handling with older File::Path versions (#1817)
+* fix initial delay randomness (#1809)
+* fix spurious null character in decoded strings (#1837)
+
+Windows:
+* fix missing bios release information on some machines (#1820, #1825)
+
+2.2.6  Fri, 14 Sep 2012
+
+Installation:
+* fix installation with older MakeMaker versions
+* do not generate html version of man pages
+* minor fixes to dependencies list
+
+General:
+* better fix for size parsing with HP RAID controllers, avoiding warnings
+  (#1807)
+* implement model-specific hack for ACER screens serials (#1607)
+
+Linux:
+* fix parsing of newer ifconfig output, such as used on Fedora 17
+
+2.2.5  Thu, 16 Aug 2012
 General:
 * Fix: deal with broken last_state file
 * Fix: fix HP RAID size parsing
-* Fix: Virtual machine inventory with VMware desktop
+* Fix: virtual machine inventory with VMware desktop
 * Fix: add /usr/local/{bin,sbin} in default $PATH
 
 Windows:
 * Fix: do not run dmidecode.exe on Win2003
+* Fix: software inventory
 
 Solaris:
 * Fix: improve ZFS support
-Fix: get memory on solaris on Sun-Fire-V490
+* Fix: get memory on solaris on Sun-Fire-V490
 
 HP-UX:
 * Fix: variou syntax issues (Drives, Uptime, etc)
@@ -25,7 +426,7 @@ Test suite:
 * use the first available TCP port for network tests
 * Enable SSL test even in IPv6 environment
 
-2.2.4  Sun, 22 Jul 2012 23:23:12 +0200
+2.2.4  Sun, 22 Jul 2012
 General:
 * Fix: non blocking flock() on log file
 
@@ -44,7 +445,7 @@ Windows:
 Solaris:
 * Fix: Collect ZFS drives properly
 
-2.2.3  Mon, 25 Jun 2012 21:36:29 +0200
+2.2.3  Mon, 25 Jun 2012
 General:
 * Fix battery voltage and capacity retrieval
 * Add --timeout option
@@ -56,7 +457,7 @@ MacOSX:
 Linux:
 * LXC support (Egor Morozov)
 
-2.2.2  Wed, 30 May 2012 16:56:43 +0200
+2.2.2  Wed, 30 May 2012
 General:
 * Improve README
 * Fix Screen.pm syntax error
@@ -70,7 +471,7 @@ Windows:
 Linux:
 * detect Virtuozzo VM (Alexander Evseev)
 
-2.2.1  Thu, 24 May 2012 14:39:50 +0200
+2.2.1  Thu, 24 May 2012
 General:
 * failure encoding with UTF8 content when using Fusion protocol (#1663)
 * wrong CSS path (#1580)
@@ -111,7 +512,7 @@ Linux:
 * sparc arch mismatch (#1573)
 * read EDID data directly from /sys when available
 
-2.2.0  Sat, 07 Apr 2012 18:57:49 +0200
+2.2.0  Sat, 07 Apr 2012
 
 Major changes:
 * large speed improvement: up to 150% for a local inventory
@@ -174,7 +575,7 @@ Minor changes:
 * HPUX: don't report unoccupied memory slots
 * AIX: add LVM support
 
-2.1.14  Wed, 22 Feb 2012 14:56:51 -0000
+2.1.14  Wed, 22 Feb 2012
 
 LINUX
  ✔ Detected OS is &quot;RedHat&quot; for CentOS servers if lsb_release not available
@@ -208,7 +609,7 @@ WINDOWS
      http://forge.fusioninventory.org/issues/1441
    thanks: Walid Nouh, Xavier Caillaud, jerome slayer
 
-2.1.13  Wed, 14 Dec 2011 13:06:44 +0100
+2.1.13  Wed, 14 Dec 2011
 
 TEST-SUITE
  ✔ 2.1.10 Test suite fails
@@ -221,10 +622,10 @@ WINDOWS
        commit:b59a09
      http://forge.fusioninventory.org/issues/1391
    thanks: Mario Gzuk
- ✔ Fix the CPU detection on Windows 
+ ✔ Fix the CPU detection on Windows
    thanks: Anthony Facchin
 
-2.1.12  Wed, 23 Nov 2011 18:14:52 +0100
+2.1.12  Wed, 23 Nov 2011
 
 GENERIC
  ✔ Memory: Add ECC / no ECC information
@@ -258,14 +659,14 @@ SOLARIS
  ✔ Fix some warnings for spurious stat() calls
  ✔ Fix hostname being forced to 'SOLARIS'
 
-2.1.11  Mon, 12 Sep 2011 17:34:38 +0200
+2.1.11  Mon, 12 Sep 2011
 
 WINDOWS
  ✔ Fix the BIOS information collect on Win2003 <= system
        commit:8c2427da5, commit: fe345815
      http://forge.fusioninventory.org/issues/1156
 
-2.1.10  Tue, 06 Sep 2011 08:48:27 -0000
+2.1.10  Tue, 06 Sep 2011
 
  ✔ Model and SSN don't correct
        commit:7bb7b1
@@ -318,7 +719,7 @@ WINDOWS
      http://forge.fusioninventory.org/issues/788
    thanks: David Durieux, Fabrice Flore-Thebault, jerome slayer
 
-2.1.9  Tue, 14 Jun 2011 19:26:55 -0000
+2.1.9  Tue, 14 Jun 2011
 
 HPUX
  ✔ HARDWARE/MEMORY missing on HPUX PA-RISC 11.11
@@ -332,11 +733,11 @@ HPUX
  ✔ HP-UX: typo in CPU name
        commit:050ead
      http://forge.fusioninventory.org/issues/760
- ✔ Serial and bios informations are missing on 11.31 
+ ✔ Serial and bios informations are missing on 11.31
        commit:2e5608
      http://forge.fusioninventory.org/issues/761
    thanks: yanick durant
- ✔ HPUX Superdome CPU not correctly identified 
+ ✔ HPUX Superdome CPU not correctly identified
        commit:0a9037
      http://forge.fusioninventory.org/issues/767
    thanks: yanick durant
@@ -444,12 +845,12 @@ WINDOWS
        commit:a63eba commit:1d18c6 commit:4afe98
      http://forge.fusioninventory.org/issues/889
    thanks: GuruNot
- ✔ GLPI plugin imports duplicate entries with software from Windows Agent 
+ ✔ GLPI plugin imports duplicate entries with software from Windows Agent
        commit:4553aa
      http://forge.fusioninventory.org/issues/927
    thanks: David Durieux, Peter Luk
 
-2.1.8  Fri, 25 Mar 2011 16:09:15 +0100
+2.1.8  Fri, 25 Mar 2011
        * Show a larger part of the string returned by the server in case of
          error
        * Win32: Decrease the severity of a winkey read error
@@ -470,7 +871,7 @@ WINDOWS
        * add support for the task called «Deploy»
        * add support for the task called «ESX»
 
-2.1.8_rc1  Sat, 05 Mar 2011 14:56:58 +0100
+2.1.8_rc1  Sat, 05 Mar 2011
        * Linux, correctly read the number of core from /proc/cpuinfo
        * MacOSX: KB unit in missing in Mac OS X Drive.pm
          http://forge.fusioninventory.org/issues/521
@@ -537,7 +938,7 @@ WINDOWS
          the feedbacks http://forge.fusioninventory.org/issues/582
        * Drop the Ping task. Was not used.
 
-2.1.7  Sun, 12 Dec 2010 20:05:16 +01000
+2.1.7  Sun, 12 Dec 2010
        * RPC: Better message if access is denied
        * add --no-p2p parameter
          http://forge.fusioninventory.org/issues/507
@@ -562,7 +963,7 @@ WINDOWS
          https://bugs.launchpad.net/bugs/682689
        * No warning if ddcprobe is not avalaible
 
-2.1.7_beta1  Fri, 19 Nov 2010 14:15:08 +0100
+2.1.7_beta1  Fri, 19 Nov 2010
        * replace Cwd::abs_path with File::Spec->rel2abs
          abs_path fails if the directory doesn't exist yet. This was breaking
          --basevardir on UNIX system.
@@ -596,10 +997,10 @@ WINDOWS
        * BSD/CPU: failback on CPU Family if Version is empty in dmidecode, closes: #439
          http://forge.fusioninventory.org/issues/439
        * Linux, distro detection: ensure /etc/issue is parsed last if lsb_release is
-         missing. This way /etc/debian_version is used on Debian 
+         missing. This way /etc/debian_version is used on Debian
        * Linux: correctly parse /etc/resolv.conf to identify the domain
        * Linux: don't save 2 time the same domain
-       * Linux/ARM: collect the Hardware information from /proc/cpuinfo 
+       * Linux/ARM: collect the Hardware information from /proc/cpuinfo
        * BSD: use sysctl -n hw.model to get the CPU name and frequency
        * MacOSX: Mem.pm, convert hex string to ASCII when needed, thanks Sylvain la Gravière
          for the bug report
@@ -617,7 +1018,7 @@ WINDOWS
        * Win32: try to identify dual core CPU even if Windows thinks it two physical CPU
        * Win32: no need to change %PATH% anymore
          http://forge.fusioninventory.org/issues/151
-       * fusioninventory-agent-config, better question for server address 
+       * fusioninventory-agent-config, better question for server address
        * BIOS: clean up
           - do not mix motherboard and system information anymore
           - do not use CPU information do create fake serial anymore
@@ -654,7 +1055,7 @@ WINDOWS
        * Linux/Storage: avoid error message with fdisk -s on invalid devices
        * RPC: Allow access to / from everywhere
 
-2.1.6    Tue, 05 Oct 2010 21:03:39 +0200
+2.1.6    Tue, 05 Oct 2010
        * Ensure the RPC serivce URL printed in the log message targets
          http://127.0.0.1::62354 with the default settings
        * Restore the Storage even if the target is not a server.
@@ -678,13 +1079,13 @@ WINDOWS
        * AIX: Erroor in harddrive module on AIX 6.1, thanks Luka KODRIC
          http://forge.fusioninventory.org/issues/398
 
-2.1.5    Wed, 15 Sep 2010 11:08:56 +0200
+2.1.5    Wed, 15 Sep 2010
        * Win32: Do not fail if the log file doesn't exist yet, thanks Igor
        * Win32: Correclty launch the sub Perl process, thanks Igor
        * Fix: Some NETWORKS/VIRTUALDEV were set to yes instead of 1
          http://forge.fusioninventory.org/issues/352
 
-2.1.4    Wed, 15 Sep 2010 00:26:03 +0200
+2.1.4    Wed, 15 Sep 2010
        * Save the realm if we found it by ourself. With this changes
          we avoid useless request with the wrong realm from sub module
        * Add Win32::OLE and Win32::TieRegistry dependency on Win32
@@ -707,7 +1108,7 @@ WINDOWS
        * fix Solaris Zone detection and add a test and some Solaris release file
          http://forge.fusioninventory.org/issues/323
 
-2.1.3    Wed, 01 Sep 2010 21:31:25 +0200
+2.1.3    Wed, 01 Sep 2010
        * Linux: Avoid error on system with no /proc/bus/input/devices
        * agent.cfg, add more server= parameter example
        * --server remove spaces at the begin and end of the server parameter
@@ -716,7 +1117,7 @@ WINDOWS
          arch
        * fix t/app.t on Windows
 
-2.1.2    Mon, 23 Aug 2010 17:24:47 +0200
+2.1.2    Mon, 23 Aug 2010 
        * set a default SNMP version to really avoid warnings
        * Add ./t/README.t to check is README{,.html} files are present
        * Really set a default SNMP version, and bails out if an invalid version
@@ -727,7 +1128,7 @@ WINDOWS
        * Linux: fix DNS domain detection
        * t/modules.t: do not fail on Syslog on Windows
 
-2.1.1    Wed, 18 Aug 2010 21:04:30 +0200
+2.1.1    Wed, 18 Aug 2010
        * Turn daemon mode off in the base configuration file
        * Fix some POD warnings
        * POD: document the common server URL for OCS and FusInv for GLPI
@@ -748,7 +1149,7 @@ WINDOWS
        * Fix error message for non-present zoneadmin command
        * Do not call getCapacity() in parseUdev(), thanks Michał Panasiewicz
 
-2.1      Sun, 15 Aug 2010 19:32:43 +0200
+2.1      Sun, 15 Aug 2010
        * cleanup Makefile.PL
        * enhance documentation with optional and mandatory dependencies
        * drop README file lost in the middle of perl modules
@@ -769,7 +1170,7 @@ WINDOWS
        * Win32: add Modem.pm
        * Fix: Virtuozzo containers memory unit (Jan JUNGMANN)
        * Win32: Ignore network it the network interface has no PNPDeviceID
-         http://comments.gmane.org/gmane.comp.monitoring.fusion-inventory.devel/34 
+         http://comments.gmane.org/gmane.comp.monitoring.fusion-inventory.devel/34
        * HP-UX: fix --no-software support
        * Win32: retrieve the Windows key on Windows 64 bit,
          http://forge.fusioninventory.org/issues/267
@@ -789,7 +1190,7 @@ WINDOWS
          and it may be normal.
        * web interface: do not open a new windows when an inventory is forced
 
-2.1_rc3  Sun, 25 Jul 2010 21:26:40 +0200
+2.1_rc3  Sun, 25 Jul 2010
        * MacOSX: fix if diskutils gives size in GB/MB instead of GiB/MiB
        * MacOSX: ignore printer if name start with:
          The printers list is empty. To add printers (fixes: #169)
@@ -857,7 +1258,7 @@ WINDOWS
        * Win32: set the NT Domain for the WORKGROUP if avalaible like OCS agent
        * MacOSX: Collect Firewire disk
 
-2.1_rc2  Thu, 01 Jul 2010 23:05:10 +0200
+2.1_rc2  Thu, 01 Jul 2010
        * MANIFEST.SKIP, we need the resources files for the test suite
        * Linux: set back DRIVES/FREE
        * Linux: CONTROLLERS/NAME drop the trailing whitespace
@@ -904,7 +1305,7 @@ WINDOWS
        * Linux + Lsilogic, avoid a warning if smartctl is installed
        * Linux Storage, parseUdev() use SERIALNUMBER _SHORT if avalaible
 
-2.1_rc1 Sat, 26 Jun 2010 00:49:44 +0200
+2.1_rc1 Sat, 26 Jun 2010
        * Add Windows support for 2000/XP/2003/Vista/2008/Seven
        * Windows: Add new values for SOFTWARES key
        * Add Windows service
@@ -1021,14 +1422,14 @@ WINDOWS
        * Add --html parameter
        * Improve --help presentation
 
-2.0.7    Mon, 14 Jun 2010 18:09:27 +0200
+2.0.7    Mon, 14 Jun 2010
        * Avoid a warning if --stdout is used.
        * print help messages on STDERR
        * --wait: no need to wait before the final exit
        * Inventory PROCESSES. Support more different date format and avoid
          warning
 
-2.0.6    Fri, 28 May 2010 15:53:16 +0200
+2.0.6    Fri, 28 May 2010
        * Fix DRIVES/CREATEDATE for ext* filesystem
        * Inventory: Always generate a CHECKSUM, OCS is not able to import
          inventory is the key is missing, thanks Eric Feron
@@ -1041,7 +1442,7 @@ WINDOWS
          https://bugs.launchpad.net/ocsinventory-unix-agent/+bug/586337
          (Guillaume Rousse)
 
-2.0.5    Wed, 12 May 2010 10:50:51 +0200
+2.0.5    Wed, 12 May 2010
        * Don't use dmidecode with -t and -s parameter since it's not
          supported on RHEL4
        * Remove wrong code to detect problem with umask. umask(077) will
@@ -1063,7 +1464,7 @@ WINDOWS
        * BIOS: correctly set SMANUFACTURER and SSN instead of
          SMANUFACTURERSSN
 
-2.0.4    Thu, 06 May 2010 18:43:30 +0200
+2.0.4    Thu, 06 May 2010
        * Add debug message on WOL and correction when no mac address comes
          in xml file from server (David DURIEUX)
        * etc/cron.d/fusioninventory-agent, call fusioninventory-agent
@@ -1075,10 +1476,10 @@ WINDOWS
        * Bump "Next server contact planned for ..." message severity from
          debug to info
 
-2.0.3     Sun, 11 Apr 2010 00:38:18 +0200
+2.0.3     Sun, 11 Apr 2010
        * Fix a syntax problem in FusionInventory::Agent::Network
 
-2.0.2     Sat Apr 10 23:31:48 2010 +0200
+2.0.2     Sat Apr 10
        * fusioninventory-agent-config: Fix a typo, thank you Act
        * --delaytime really read the parameter, thanks Walid NOUH
        * fix --no-socket
@@ -1093,7 +1494,7 @@ WINDOWS
          (David DURIEUX)
        * Set 2.0.1 release date in Changes file
 
-2.0.1 (Solarium)    Sun Mar 28 22:26:47 2010 +0200
+2.0.1 (Solarium)    Sun, 28 Mar 2010
        * tools/build-perl-tree.sh: clean up
        * Only use thread if Perl has got thread support, thank you
          Lei Andy Shi for the bug report (LP: #545477)
@@ -1102,7 +1503,7 @@ WINDOWS
        * Add a warning for the Storage.pm breakage with pre 2.0 tasks
        * SNMP.pm: fixes (David DURIEUX)
 
-2.0 (Zygotene Bouquet)   Tue, 23 Mar 2010 18:53:36 +0100
+2.0 (Zygotene Bouquet)   Tue, 23 Mar 2010
        * OcsDeploy: avoid a warning when the server don't send DOWNLOAD
          option
        * Drop the Net::Walk dependency
@@ -1130,7 +1531,7 @@ WINDOWS
        * Makefile.PL add Net::CUPS is recommended
        * Linux, retrieve the PCI Class
 
-2.0beta4 Thu, 04 Mar 2010 12:19:47 +0100
+2.0beta4 Thu, 04 Mar 2010
        * Drop the dependency on Net::SSLGlue::LWP because its own dependencies
          are not avalaible on RHEL5.x, thank you Remi Collet for pointing
          this issue.
@@ -1162,7 +1563,7 @@ WINDOWS
        * rename FusionInventory::Agent::Task::NetDiscovery::dico in FusionInventory::Agent::Task::NetDiscovery::Dico;
        * WAKEONLAN : Begin to rewrite good WOL, so send magic packet directly on OSI2 of network card (ONLY FOR LINUX UNDER ROOT) (David DURIEUX)
 
-2.0beta3 Mon, 22 Feb 2010 00:51:36 +0100
+2.0beta3 Mon, 22 Feb 2010
        * README: clean up
        * Do not use IPC::Run, thanks Mario Gzuk
        * Fix --local
@@ -1176,19 +1577,19 @@ WINDOWS
        * POD documentation for FusionInventory::Agent::Network
        * POD documentation clean in FusionInventory::Agent::XML::Query::Inventory
        * POD documentation for FusionInventory::Agent::XML::Query::SimpleMessage
-       * Linux: Handle channel bonding interfaces (Stéphane URBANOVSKI) 
-       * XML: clean up addNetwork (Stéphane URBANOVSKI) 
-       * CPU: Add CORE/THREAD 
+       * Linux: Handle channel bonding interfaces (Stéphane URBANOVSKI)
+       * XML: clean up addNetwork (Stéphane URBANOVSKI)
+       * CPU: Add CORE/THREAD
        * Inventory: use the standard Inventory object
        * Inventory: correctly save OcsDeploy package ID
        * NetDiscover/SNMP: Various changes (David DURIEUX)
 
-2.0beta2 Wed, 17 Feb 2010 23:21:59 +0100
+2.0beta2 Wed, 17 Feb 2010
        * Update dico for detected devices in NETDISCOVERY module
          (David DURIEUX)
        * Changes file clean up
 
-2.0beta1 Wed, 17 Feb 2010 22:08:00 +0100
+2.0beta1 Wed, 17 Feb 2010
        * Use Sys::Hostname instead of uname for better portability
        * add --daemon-no-fork
        * post-install.pl: Don't ask the user if Download.pm should be
@@ -1234,12 +1635,12 @@ WINDOWS
        * run dosfslabel on the correct device
        * Nmap: Check ip send by server
 
-1.1.2    Sun, 27 Dec 2009 17:24:43 +0100
+1.1.2    Sun, 27 Dec 2009
        * Avoid problem with dmidecode -V output on RHEL3.9 (Remi COLLET)
        * Fix internal --delaytime handling. That's seconds, not hours!
        * Download.pm: improve a error message
 
-1.1.1    Mon, 21 Dec 2009 22:38:12 +0100
+1.1.1    Mon, 21 Dec 2009
        * NETWORKS/VIRTUALDEV should be 1 or 0
        * FreeBSD: Fix CPU detection (David DURIEUX)
        * Virtualization::Qemu, fix kvm detection
@@ -1254,7 +1655,7 @@ WINDOWS
        * LP: #490774 Fix PowerPC CPU detection on Linux, thanks darkpep for
          the bug report
 
-1.1     Fri, 06 Nov 2009 16:07:08 +0100
+1.1     Fri, 06 Nov 2009
        * addMemorie() renamed to addMemories(), this had been broken during
          the addMemories() → addMemory() transition
        * Debug mode: msg "check function failed" changed to "ignored" since
@@ -1284,14 +1685,14 @@ WINDOWS
        * Generic/Screen: HSD code for "Hanns.G" (Remi COLLET)
        * postinst.pl, put user $PATH in /etc/cron.d/ocsinventory-agent
 
-1.1_beta1    Fri, 18 Sep 2009 11:54:12 +0200
+1.1_beta1    Fri, 18 Sep 2009
        * Can use Net::CUPS to find the default printer
        * AIX: Hide procfs in Filesystem
        * OS::Linux::Storages, correctly retrieve the serial (Vladimir ELISSEEV)
        * load $http_proxy env settings and --proxy option is available
        * Add OS::Linux::Distro::NonLSB::ArchLinux (Julien SAFAR)
-       * New Backend OS::Generic::Processes 
-       * Linux/BSD: detect DNS servers config 
+       * New Backend OS::Generic::Processes
+       * Linux/BSD: detect DNS servers config
        * Solaris: Better output for $OSVErsion (Vladimir ELISSEEV)
        * Solaris: Sun Fire T1000 patches for memory (Vladimir ELISSEEV)
        * Solaris: memory SPARC Enterprise T5220 (Vladimir ELISSEEV)
@@ -1347,7 +1748,7 @@ WINDOWS
        * Solaris: add a warning if memconf is not in $PATH
        * Switch the XML content from ISO-8859-1 to UTF-8, BTW we force
          LC_ALL=C...
-       * Fix the history flood in Download.pm (Pascal DANEK) 
+       * Fix the history flood in Download.pm (Pascal DANEK)
          https://sourceforge.net/tracker/index.php?func=detail&aid=2806585&group_id=58373&atid=487492
        * Stores PCIID in CONTROLLERS/PCIID
        * Storage the monitor EDID string in BASE64 and UUENCODE
@@ -1358,7 +1759,7 @@ WINDOWS
        * Warns the user during the install process if one of
          the recommended module is not installed
        * Update out copy of memconf, thanks WeatherDave who notified the new
-         revision and of course Tom Schmidt who do a great job 
+         revision and of course Tom Schmidt who do a great job
        * MacOSX: Avoid a scalar used has hash ref error, thanks Adadov
        * Save VIDEOS/MEMORY and VIDEOS/RESOLUTION
        * MacOSX: Correctilly detect Up/Down network interfaces
@@ -1383,13 +1784,13 @@ WINDOWS
        * Always send tag, even if server already has one
        * Add the byHand software collect method (Sébastien DAGNICOURT)
        * add logging to can_read(), can_load() and can_run()
-       * use addUser() instead of setHardware() 
+       * use addUser() instead of setHardware()
        * Add the runcmd() in the Backend modules
 
-1.0.1    Sun, 22 Mar 2009 20:48:49 +0100
-       * Fix a typo in Ocsinventory::Agent::Backend::OS::AIX::Memory 
+1.0.1    Sun, 22 Mar 2009
+       * Fix a typo in Ocsinventory::Agent::Backend::OS::AIX::Memory
 
-1.0    Sun, 22 Mar 2009 20:14:26 +0100
+1.0    Sun, 22 Mar 2009
        * Hide warning messages when tw_cli or hpacucli are not present on CentOS
        * Avoid unnecessary about missing 'http://' in local mode
        * Ipmi.pm: use can_run do detect ipmitool
@@ -1414,9 +1815,9 @@ WINDOWS
          want to drop the old linux_agent
        * Backend::OS::Solaris::Memory: use the Logger instead of "print"
        * Solaris: Drop unwanted spaces around OSVERSION and STORAGES/DESCRIPTION
-       * Solaris: Avoid warning is the user can't use fstyp 
+       * Solaris: Avoid warning is the user can't use fstyp
        * MANIFEST.SKIP: ignore .git/ and .gitignore
-       * add a workaround for http://rt.cpan.org/Ticket/Display.html?id=38067 
+       * add a workaround for http://rt.cpan.org/Ticket/Display.html?id=38067
        * build-perl-tree.sh use cpanp and perl 5.10 now
        * Backend.pm: do a eval around require File::Find
        * Add a workaround to find the backend modules for PAR::Packer
@@ -1437,7 +1838,7 @@ WINDOWS
        * Bump 0.0.10 to 1.0 because it's the first release to be officially part
          of the OCSInventory distribution
 
-0.0.10beta2    Wed, 24 Sep 2008 23:41:21 +0200
+0.0.10beta2    Wed, 24 Sep 2008
        * README: add a not about the $PATH varible on Solaris.
        * Added extra section support for backends (Pascal DANEK)
        * Fix the way submodules are disabled with $runMeIfTheseChecksFailed
@@ -1451,7 +1852,7 @@ WINDOWS
        * Apply a little change in standalone.sh that may fix the ParserDetails.ini problem,
          thanks tharoun
 
-0.0.10beta1    Thu, 04 Sep 2008 18:16:49 +0200
+0.0.10beta1    Thu, 04 Sep 2008
        * Fix a "ocs server name" => URI side effect (Pascal DANEK)
        * Download::Store: used absolute path to "cp" on STORE action (Pascal DANEK)
        * Download::Store: set -dpR flags to "cp" (Pascal DANEK)
@@ -1469,7 +1870,7 @@ WINDOWS
          with File::Find.
        * import the can_run, can_load and can_read functions in the Backend modules
        * the backend module can have no check function, in this case OCS assume it's ok
-       * apply a patch by Etienne GUILLAUMONT to fix CPU detection on AIX 4 
+       * apply a patch by Etienne GUILLAUMONT to fix CPU detection on AIX 4
        * standalone.sh checks PAR::Packer presence now
        * only inventory installed .deb
        * postinst.pl: accept another vardir if the first one was invalide
@@ -1529,7 +1930,7 @@ WINDOWS
        * add the --lazy parameter: send an inventory only if the a random delay between 0 and PROLOG_FREQ had been run over. Usefull for package maintainer (Remi COLLET)
        * return 1 to the shell is the agent failed to contact the server
        * postinst.pl asks for the basevardir
-       * postinst.pl write the modules.conf 
+       * postinst.pl write the modules.conf
        * OS::Linux::Network::Networks, correctly reset the ipaddress before every loop so
          now a network can't have the address of the previous one
        * rename the key $params->{conffile} to $params->{accountconfig}
@@ -1551,7 +1952,7 @@ WINDOWS
          yet by the server (egamin)
 
 0.0.8.1 02/20/2008
-       * postinst.pl, correctly save the realm, do not override the password 
+       * postinst.pl, correctly save the realm, do not override the password
        * Added "CAPTION" field to memory (Pascal DANEK)
        * Fix a bug with "NUMSLOTS" memory field (Pascal DANEK)
        * improve the parsing of the config file to accept quote and spaces in the value
@@ -1599,7 +2000,7 @@ WINDOWS
          - prologresp, the Ocsinventory::Agent::XML::Response::Prolog object returned by
            the prolog
          - storage: an hashref stored on the harddrive at the end of the execution of the module
-       * a backend module without a run function is accepted now 
+       * a backend module without a run function is accepted now
        * Inventory.pm: add addIpDiscoverEntry() to add host from the same network
        * @runMeIfTheseChecksFailed: new optional setting for Backend module
        * Ipdiscover is now a backend module and nmap can be used instead of ipdiscover
@@ -1613,7 +2014,7 @@ WINDOWS
        * change the way --server parameter is read. Now we can have a full URL, --remotedir
          is now useless
        * fix: correctly load the last_state
-       * improve the Makefile.PL by using inc::Module::Install and adding new check 
+       * improve the Makefile.PL by using inc::Module::Install and adding new check
        * add a --version parameter and improve the --help
        * come with bundled dependency to simply the build process
        * fix the login/passwd/realm authentification
@@ -1625,9 +2026,9 @@ WINDOWS
 
        * remove a debug "die" in the code
 
-0.0.6.1 06/12/2007 Bug fix release 
+0.0.6.1 06/12/2007 Bug fix release
        * Fix an undef value in Ocsinventory::Agent::Backend::OS::BSD::Mem
-       * AIX: retrieve correctly the MAC address of some FibberChannel card 
+       * AIX: retrieve correctly the MAC address of some FibberChannel card
        * now standalone.sh will try to find every module before the build to
          avoid unexplicated error
 
@@ -1648,7 +2049,7 @@ WINDOWS
        * remove a stupid check in Ocsinventory::Agent::AccountConfig, the
          accountconfig file was not written unless the file was already present
        * add a recMkdir function in ocsinventory-agent to create directory recursivly
-       * do not process checksum in local mode 
+       * do not process checksum in local mode
 
 0.0.5  04/17/2007
        * AIX: use lslpp -c -l to find installed packages
@@ -1679,4 +2080,4 @@ WINDOWS
        * don't write the last_state is the connexion failed
        * Deals correctly with the accountinfo if it's internaly stored in a
          array ref
-       * BSD support by Thierry Lacoste 
+       * BSD support by Thierry Lacoste

@@ -1,15 +1,26 @@
+bin/fusioninventory-agent
+bin/fusioninventory-esx
+bin/fusioninventory-injector
+bin/fusioninventory-inventory
+bin/fusioninventory-netdiscovery
+bin/fusioninventory-netinventory
+bin/fusioninventory-wakeonlan
+bin/fusioninventory-win32-service
 Changes
-contrib/debian/fusioninventory-agent.init
-contrib/FusionInventory.adml
-contrib/FusionInventory.admx
-contrib/Tarballs.pm
+contrib/unix/fusioninventory-agent.init.redhat
+contrib/unix/fusioninventory-agent.service
+contrib/windows/fusioninventory-agent-deployment.vbs
+contrib/windows/FusionInventory.adml
+contrib/windows/FusionInventory.admx
 contrib/yum-plugin/fusioninventory-agent.conf
 contrib/yum-plugin/fusioninventory-agent.py
 contrib/yum-plugin/INSTALL
+doc/deploy.mdwn
+doc/esx.mdwn
+doc/inventory.mdwn
+doc/network.mdwn
+doc/wakeonlan.mdwn
 etc/agent.cfg
-fusioninventory-agent
-fusioninventory-injector
-fusioninventory-win32-service
 inc/Module/AutoInstall.pm
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
@@ -28,184 +39,225 @@ lib/FusionInventory/Agent/HTTP/Client/Fusion.pm
 lib/FusionInventory/Agent/HTTP/Client/OCS.pm
 lib/FusionInventory/Agent/HTTP/Protocol/https.pm
 lib/FusionInventory/Agent/HTTP/Server.pm
+lib/FusionInventory/Agent/Inventory.pm
 lib/FusionInventory/Agent/Logger.pm
 lib/FusionInventory/Agent/Logger/Backend.pm
 lib/FusionInventory/Agent/Logger/File.pm
 lib/FusionInventory/Agent/Logger/Stderr.pm
 lib/FusionInventory/Agent/Logger/Syslog.pm
-lib/FusionInventory/Agent/Scheduler.pm
+lib/FusionInventory/Agent/SNMP.pm
+lib/FusionInventory/Agent/SNMP/Live.pm
+lib/FusionInventory/Agent/SNMP/Mock.pm
+lib/FusionInventory/Agent/SOAP/VMware.pm
+lib/FusionInventory/Agent/SOAP/VMware/Host.pm
 lib/FusionInventory/Agent/Storage.pm
 lib/FusionInventory/Agent/Target.pm
 lib/FusionInventory/Agent/Target/Local.pm
 lib/FusionInventory/Agent/Target/Server.pm
-lib/FusionInventory/Agent/Target/Stdout.pm
 lib/FusionInventory/Agent/Task.pm
+lib/FusionInventory/Agent/Task/Deploy.pm
+lib/FusionInventory/Agent/Task/Deploy/ActionProcessor.pm
+lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Cmd.pm
+lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Copy.pm
+lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Delete.pm
+lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Mkdir.pm
+lib/FusionInventory/Agent/Task/Deploy/ActionProcessor/Action/Move.pm
+lib/FusionInventory/Agent/Task/Deploy/CheckProcessor.pm
+lib/FusionInventory/Agent/Task/Deploy/Datastore.pm
+lib/FusionInventory/Agent/Task/Deploy/Datastore/WorkDir.pm
+lib/FusionInventory/Agent/Task/Deploy/DiskFree.pm
+lib/FusionInventory/Agent/Task/Deploy/File.pm
+lib/FusionInventory/Agent/Task/Deploy/Job.pm
+lib/FusionInventory/Agent/Task/Deploy/P2P.pm
+lib/FusionInventory/Agent/Task/ESX.pm
 lib/FusionInventory/Agent/Task/Inventory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AccessLog.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Bios.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Controllers.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/CPU.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Drives.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/LVM.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Memory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Modems.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Networks.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Slots.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Softwares.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Sounds.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Storages.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/AIX/Videos.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Archs/Alpha.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Archs/i386.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Archs/MIPS.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Archs/SPARC.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/CPU.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Drives.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Memory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Networks.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Softwares.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Storages.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Uptime.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Dmidecode.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Dmidecode/Battery.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Dmidecode/Bios.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Dmidecode/Memory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Dmidecode/Ports.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Dmidecode/Slots.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Domains.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Environment.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Hostname.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Ipmi.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Lspci.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Lspci/Controllers.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Lspci/Modems.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Lspci/Sounds.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Lspci/Videos.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Printers.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Processes.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Screen.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/Deb.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/Gentoo.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/Pacman.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/Slackware.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Storages.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Storages/HP.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/USB.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Users.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Bios.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Controllers.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/CPU.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Drives.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Memory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/MP.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Networks.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Slots.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Softwares.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Storages.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/HPUX/Uptime.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs/Alpha.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs/ARM.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs/i386.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs/m68k.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs/MIPS.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs/PowerPC.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs/SPARC.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Distro.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Distro/LSB.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Distro/NonLSB.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Drives.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/iLO.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Inputs.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/LVM.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Memory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Networks.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages/3ware.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages/Adaptec.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages/Lsilogic.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages/ServeRaid.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Uptime.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Videos.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Bios.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/CPU.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Drives.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Hostname.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Memory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Networks.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Printers.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Softwares.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Sound.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Storages.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Uptime.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/USB.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Videos.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Bios.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Controllers.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/CPU.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Drives.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Memory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Networks.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Slots.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Softwares.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Storages.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Hpvm.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Libvirt.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Lxc.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Parallels.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Qemu.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/SolarisZones.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/VirtualBox.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Virtuozzo.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Vmsystem.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/VmWareDesktop.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/VmWareESX.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Vserver.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Xen.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/AntiVirus.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Bios.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Chassis.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Controllers.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/CPU.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Drives.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Environment.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Inputs.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Memory.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Modems.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Networks.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/OS.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Ports.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Printers.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Registry.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Slots.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Softwares.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Sounds.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Storages.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/USB.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/User.pm
-lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Videos.pm
-lib/FusionInventory/Agent/Task/Inventory/Inventory.pm
+lib/FusionInventory/Agent/Task/Inventory/AccessLog.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Controllers.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Drives.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/LVM.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Memory.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Modems.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Networks.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Slots.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Softwares.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Sounds.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Storages.pm
+lib/FusionInventory/Agent/Task/Inventory/AIX/Videos.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/Alpha.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/Drives.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/i386.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/Memory.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/MIPS.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/Networks.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/Softwares.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/SPARC.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/Storages.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/Storages/Megaraid.pm
+lib/FusionInventory/Agent/Task/Inventory/BSD/Uptime.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Arch.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Battery.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Bios.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Memory.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Ports.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Slots.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Domains.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Environment.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Hostname.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Ipmi.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/PCI.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/PCI/Controllers.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/PCI/Modems.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/PCI/Sounds.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/PCI/Videos.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Printers.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Processes.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Screen.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Deb.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Gentoo.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Pacman.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/RPM.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Slackware.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/SSH.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Storages.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Storages/3ware.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Storages/HP.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/USB.pm
+lib/FusionInventory/Agent/Task/Inventory/Generic/Users.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Bios.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Controllers.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Drives.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Memory.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/MP.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Networks.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Slots.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Softwares.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Storages.pm
+lib/FusionInventory/Agent/Task/Inventory/HPUX/Uptime.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Alpha.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Alpha/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/ARM.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/ARM/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Distro.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/LSB.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/NonLSB.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Drives.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/i386.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/i386/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Inputs.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/LVM.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/m68k.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/m68k/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Memory.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/MIPS.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/MIPS/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Networks/FibreChannel.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Networks/iLO.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/PowerPC.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/PowerPC/Bios.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/PowerPC/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Rudder.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/SPARC.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/SPARC/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Storages.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Storages/Adaptec.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Storages/Lsilogic.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Storages/Megacli.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Storages/Megaraid.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Storages/ServeRaid.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Uptime.pm
+lib/FusionInventory/Agent/Task/Inventory/Linux/Videos.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Bios.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Drives.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Hostname.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/License.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Memory.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Networks.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Printers.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Softwares.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Sound.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Storages.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Uptime.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/USB.pm
+lib/FusionInventory/Agent/Task/Inventory/MacOS/Videos.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/Bios.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/Controllers.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/Drives.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/Memory.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/Networks.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/Slots.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/Softwares.pm
+lib/FusionInventory/Agent/Task/Inventory/Solaris/Storages.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Hpvm.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/HyperV.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Jails.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Libvirt.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Lxc.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Parallels.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Qemu.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/SolarisZones.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/VirtualBox.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Virtuozzo.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Vmsystem.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/VmWareDesktop.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/VmWareESX.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Vserver.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/Xen.pm
+lib/FusionInventory/Agent/Task/Inventory/Virtualization/XenCitrixServer.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/AntiVirus.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Bios.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Chassis.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Controllers.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/CPU.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Drives.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Environment.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Inputs.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/License.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Memory.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Modems.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Networks.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/OS.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Ports.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Printers.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Registry.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Slots.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Softwares.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Sounds.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Storages.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/USB.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Users.pm
+lib/FusionInventory/Agent/Task/Inventory/Win32/Videos.pm
+lib/FusionInventory/Agent/Task/NetDiscovery.pm
+lib/FusionInventory/Agent/Task/NetInventory.pm
 lib/FusionInventory/Agent/Task/WakeOnLan.pm
+lib/FusionInventory/Agent/Threads.pm
 lib/FusionInventory/Agent/Tools.pm
 lib/FusionInventory/Agent/Tools/AIX.pm
+lib/FusionInventory/Agent/Tools/BSD.pm
 lib/FusionInventory/Agent/Tools/Generic.pm
+lib/FusionInventory/Agent/Tools/Hardware.pm
 lib/FusionInventory/Agent/Tools/Hostname.pm
 lib/FusionInventory/Agent/Tools/HPUX.pm
+lib/FusionInventory/Agent/Tools/License.pm
 lib/FusionInventory/Agent/Tools/Linux.pm
 lib/FusionInventory/Agent/Tools/MacOS.pm
 lib/FusionInventory/Agent/Tools/Network.pm
-lib/FusionInventory/Agent/Tools/Screen.pm
 lib/FusionInventory/Agent/Tools/Solaris.pm
 lib/FusionInventory/Agent/Tools/Unix.pm
 lib/FusionInventory/Agent/Tools/Win32.pm
@@ -216,11 +268,15 @@ lib/FusionInventory/Agent/XML/Response.pm
 LICENSE
 Makefile.PL
 MANIFEST			This list of files
-memconf
 META.yml
-MYMETA.json
-MYMETA.yml
 README
+resources/aix/lparstat/README
+resources/aix/lparstat/sample1
+resources/aix/lparstat/sample2
+resources/aix/lparstat/sample3
+resources/aix/lparstat/sample4
+resources/aix/lparstat/sample5
+resources/aix/lparstat/sample6
 resources/aix/lsattr/aix-4.3.1-en0
 resources/aix/lsattr/aix-4.3.1-hdisk0
 resources/aix/lsattr/aix-4.3.1-hdisk1
@@ -338,27 +394,9 @@ resources/aix/lsdev/aix-6.1b-mem
 resources/aix/lsdev/aix-6.1b-memory
 resources/aix/lsdev/aix-6.1b-pdisk
 resources/aix/lsdev/aix-6.1b-processor
-resources/aix/lsfs/aix-4.3.1-root
-resources/aix/lsfs/aix-4.3.1-tmp
-resources/aix/lsfs/aix-4.3.1-usr
-resources/aix/lsfs/aix-4.3.2-root
-resources/aix/lsfs/aix-4.3.2-tmp
-resources/aix/lsfs/aix-4.3.2-usr
-resources/aix/lsfs/aix-5.3a-root
-resources/aix/lsfs/aix-5.3a-tmp
-resources/aix/lsfs/aix-5.3a-usr
-resources/aix/lsfs/aix-5.3b-root
-resources/aix/lsfs/aix-5.3b-tmp
-resources/aix/lsfs/aix-5.3b-usr
-resources/aix/lsfs/aix-5.3c-root
-resources/aix/lsfs/aix-5.3c-tmp
-resources/aix/lsfs/aix-5.3c-usr
-resources/aix/lsfs/aix-6.1a-root
-resources/aix/lsfs/aix-6.1a-tmp
-resources/aix/lsfs/aix-6.1a-usr
-resources/aix/lsfs/aix-6.1b-root
-resources/aix/lsfs/aix-6.1b-tmp
-resources/aix/lsfs/aix-6.1b-usr
+resources/aix/lsfs/aix-4.3.1
+resources/aix/lsfs/aix-5.3
+resources/aix/lsfs/aix-6.1
 resources/aix/lslpp/aix-4.3.1
 resources/aix/lslpp/aix-4.3.2
 resources/aix/lslpp/aix-5.3a
@@ -366,6 +404,23 @@ resources/aix/lslpp/aix-5.3b
 resources/aix/lslpp/aix-5.3c
 resources/aix/lslpp/aix-6.1a
 resources/aix/lslpp/aix-6.1b
+resources/aix/lslv/aix-6.1-dooncelv
+resources/aix/lslv/aix-6.1-fslv00
+resources/aix/lslv/aix-6.1-fslv01
+resources/aix/lslv/aix-6.1-hd1
+resources/aix/lslv/aix-6.1-hd10opt
+resources/aix/lslv/aix-6.1-hd11admin
+resources/aix/lslv/aix-6.1-hd2
+resources/aix/lslv/aix-6.1-hd3
+resources/aix/lslv/aix-6.1-hd4
+resources/aix/lslv/aix-6.1-hd5
+resources/aix/lslv/aix-6.1-hd6
+resources/aix/lslv/aix-6.1-hd8
+resources/aix/lslv/aix-6.1-hd9var
+resources/aix/lslv/aix-6.1-lg_dumplv
+resources/aix/lslv/aix-6.1-livedump
+resources/aix/lslv/aix-6.1-lv_auditlog
+resources/aix/lslv/aix-6.1-lv_tpc
 resources/aix/lsps/aix-4.3.1
 resources/aix/lsps/aix-4.3.2
 resources/aix/lsps/aix-5.3a
@@ -373,6 +428,15 @@ resources/aix/lsps/aix-5.3b
 resources/aix/lsps/aix-5.3c
 resources/aix/lsps/aix-6.1a
 resources/aix/lsps/aix-6.1b
+resources/aix/lspv/aix-6.1-hdisk0
+resources/aix/lspv/aix-6.1-hdisk1
+resources/aix/lspv/aix-6.1-hdisk2
+resources/aix/lspv/aix-6.1-hdisk3
+resources/aix/lsvg/aix-6.1-l_altinst_rootvg
+resources/aix/lsvg/aix-6.1-l_rootvg
+resources/aix/lsvg/aix-6.1-l_vg_apps01
+resources/aix/lsvg/aix-6.x-l_rootvg
+resources/aix/lsvg/aix-6.x-rootvg
 resources/aix/lsvpd/aix-5.3a
 resources/aix/lsvpd/aix-5.3b
 resources/aix/lsvpd/aix-5.3c
@@ -383,6 +447,19 @@ resources/bsd/fstab/freebsd-1
 resources/bsd/lsvfs/freebsd-8.1
 resources/bsd/mount/dragonfly-1
 resources/bsd/pkg_info/sample1
+resources/bsd/pkg_info/sample2
+resources/bsd/storages/mfiutil
+resources/config/sample1
+resources/config/sample2
+resources/config/sample3
+resources/esx-4.1.0-1/Login.soap
+resources/esx-4.1.0-1/RetrieveProperties-VM-16.soap
+resources/esx-4.1.0-1/RetrieveProperties-VM-32.soap
+resources/esx-4.1.0-1/RetrieveProperties-VM-48.soap
+resources/esx-4.1.0-1/RetrieveProperties-VM-64.soap
+resources/esx-4.1.0-1/RetrieveProperties.soap
+resources/esx-4.1.0-1/RetrievePropertiesVMList.soap
+resources/esx-4.1.0-1/ServiceInstance.soap
 resources/generic/df/aix
 resources/generic/df/freebsd
 resources/generic/df/linux
@@ -405,6 +482,7 @@ resources/generic/dmidecode/rhel-3.4
 resources/generic/dmidecode/rhel-3.9
 resources/generic/dmidecode/rhel-4.3
 resources/generic/dmidecode/rhel-4.6
+resources/generic/dmidecode/rhel-5.6
 resources/generic/dmidecode/S3000AHLX
 resources/generic/dmidecode/S5000VSA
 resources/generic/dmidecode/vmware
@@ -414,13 +492,11 @@ resources/generic/dmidecode/windows
 resources/generic/dmidecode/windows-7
 resources/generic/dmidecode/windows-hyperV
 resources/generic/dmidecode/windows-xp
-resources/generic/edid/acer-AL19161-1
-resources/generic/edid/acer-AL19161-2
-resources/generic/edid/acer-AL19161-3
-resources/generic/edid/acer-AL19161-4
 resources/generic/edid/crt.13
 resources/generic/edid/crt.dell-d1626ht
+resources/generic/edid/crt.dell-e190s
 resources/generic/edid/crt.dell-p1110
+resources/generic/edid/crt.dell-p190s
 resources/generic/edid/crt.dell-p790
 resources/generic/edid/crt.E55
 resources/generic/edid/crt.emc0313
@@ -438,10 +514,16 @@ resources/generic/edid/crt.sony-gdm400ps
 resources/generic/edid/crt.sony-gdm420
 resources/generic/edid/crt.test_box_lmontel
 resources/generic/edid/IMP2262
-resources/generic/edid/ivm-PL2409HD
 resources/generic/edid/lcd.20inches
+resources/generic/edid/lcd.acer-al19161.1
+resources/generic/edid/lcd.acer-al19161.2
+resources/generic/edid/lcd.acer-al19161.3
+resources/generic/edid/lcd.acer-al19161.4
 resources/generic/edid/lcd.acer-al1921
 resources/generic/edid/lcd.acer-asp1680
+resources/generic/edid/lcd.acer-v193.1
+resources/generic/edid/lcd.acer-v193.2
+resources/generic/edid/lcd.acer-x193hq
 resources/generic/edid/lcd.b-101750
 resources/generic/edid/lcd.benq-t904
 resources/generic/edid/lcd.blino
@@ -449,38 +531,58 @@ resources/generic/edid/lcd.cmc-17-AD
 resources/generic/edid/lcd.compaq-evo-n1020v
 resources/generic/edid/lcd.dell-2001fp
 resources/generic/edid/lcd.dell-inspiron-6400
+resources/generic/edid/lcd.eizo-l997
 resources/generic/edid/lcd.Elonex-PR600
+resources/generic/edid/lcd.fujitsu-a171
 resources/generic/edid/lcd.gericom-cy-96
+resources/generic/edid/lcd.hp-l1950
 resources/generic/edid/lcd.hp-nx-7000
 resources/generic/edid/lcd.hp-nx-7010
 resources/generic/edid/lcd.HP-Pavilion-ZV6000
+resources/generic/edid/lcd.iiyama-pl2409hd
 resources/generic/edid/lcd.lenovo-3000-v100
 resources/generic/edid/lcd.lenovo-w500
+resources/generic/edid/lcd.lg-l1960.1
+resources/generic/edid/lcd.lg-l1960.2
 resources/generic/edid/lcd.philips-150s
 resources/generic/edid/lcd.philips-180b2
 resources/generic/edid/lcd.presario-R4000
 resources/generic/edid/lcd.rafael
 resources/generic/edid/lcd.regis
 resources/generic/edid/lcd.samsung-191n
+resources/generic/edid/lcd.samsung-2494hm
 resources/generic/edid/lcd.tv.VQ32-1T
+resources/generic/edid/lcd.viewsonic-vx715
 resources/generic/edid/lenovo-LT2452
-resources/generic/edid/SAM04d3
-resources/generic/edid/VSC4319
+resources/generic/hdparm/linux1
+resources/generic/hpacucli/README
+resources/generic/hpacucli/sample1-drives
+resources/generic/hpacucli/sample1-slots
+resources/generic/hpacucli/sample1-storage
+resources/generic/hpacucli/sample2-drives
+resources/generic/hpacucli/sample2-slots
+resources/generic/hpacucli/sample2-storage
 resources/generic/ifconfig/aix-5.3
 resources/generic/ifconfig/aix-6.1
 resources/generic/ifconfig/dell-xt2
 resources/generic/ifconfig/dragonfly-1
+resources/generic/ifconfig/freebsd-4
 resources/generic/ifconfig/freebsd-8.1
 resources/generic/ifconfig/freebsd-bis
+resources/generic/ifconfig/freebsd-ter
 resources/generic/ifconfig/hpux1-lan0
 resources/generic/ifconfig/hpux2-lan0
 resources/generic/ifconfig/linux-archlinux
 resources/generic/ifconfig/linux-bonding
+resources/generic/ifconfig/linux-fc17
 resources/generic/ifconfig/linux-rhel5.6
 resources/generic/ifconfig/opensolaris
 resources/generic/ifconfig/solaris-10
 resources/generic/ipmitool_lan_print/sample1
+resources/generic/license/adobe/cache.db-sample1
+resources/generic/license/adobe/README
 resources/generic/lspci/dell-xt2
+resources/generic/lspci/linux-2
 resources/generic/lsusb/dell-xt2
 resources/generic/mount/darwin
 resources/generic/mount/freebsd
@@ -495,9 +597,14 @@ resources/generic/netstat/linux1
 resources/generic/netstat/macosx1
 resources/generic/netstat/netbsd
 resources/generic/netstat/openbsd
+resources/generic/ps/busybox
 resources/generic/ps/linux
 resources/generic/ps/macos
 resources/generic/README
+resources/generic/tw_cli/cards
+resources/generic/tw_cli/ports
+resources/generic/tw_cli/storage
+resources/generic/tw_cli/units
 resources/generic/xorg/linux-ati-1
 resources/generic/xorg/linux-ati-2
 resources/generic/xorg/linux-intel-1
@@ -507,6 +614,7 @@ resources/generic/xorg/linux-intel-4
 resources/generic/xorg/linux-nouveau
 resources/generic/xorg/linux-nvidia-1
 resources/generic/xorg/linux-nvidia-2
+resources/generic/xorg/linux-nvidia-3
 resources/generic/xorg/linux-vesa-1
 resources/generic/xorg/linux-vesa-3
 resources/generic/xorg/openbsd
@@ -598,10 +706,24 @@ resources/linux/hponcfg/sample2
 resources/linux/ip/ip_addr-1
 resources/linux/ip/ip_addr-2
 resources/linux/ip/ip_addr-3
+resources/linux/ip/ip_addr-4
+resources/linux/ip/ip_addr-5
+resources/linux/iwconfig/sample1
+resources/linux/iwconfig/sample2
+resources/linux/megacli/set1_adpCount
+resources/linux/megacli/set1_EncInfo
+resources/linux/megacli/set1_PDlist
+resources/linux/megacli/set1_ShowSummary
+resources/linux/megacli/set2_adpCount
+resources/linux/megacli/set2_EncInfo
+resources/linux/megacli/set2_PDlist
+resources/linux/megacli/set2_ShowSummary
+resources/linux/megasasctl/sample
 resources/linux/mpt-status/sample1
 resources/linux/mpt-status/sample2
 resources/linux/packaging/dpkg
 resources/linux/packaging/rpm
+resources/linux/proc/1-environ.txt
 resources/linux/proc/cpuinfo/cpuinfo-vmware-esx
 resources/linux/proc/cpuinfo/esx
 resources/linux/proc/cpuinfo/linux-2.6.35-1-core-2-thread
@@ -610,6 +732,7 @@ resources/linux/proc/cpuinfo/linux-686-samsung-nc10-1
 resources/linux/proc/cpuinfo/linux-alpha-1
 resources/linux/proc/cpuinfo/linux-armel-1
 resources/linux/proc/cpuinfo/linux-armel-2
+resources/linux/proc/cpuinfo/linux-armel-3
 resources/linux/proc/cpuinfo/linux-hp-dl180
 resources/linux/proc/cpuinfo/linux-ia64-1
 resources/linux/proc/cpuinfo/linux-mips-1
@@ -617,6 +740,7 @@ resources/linux/proc/cpuinfo/linux-ppc-1
 resources/linux/proc/cpuinfo/linux-ppc-2
 resources/linux/proc/cpuinfo/linux-ppc-3
 resources/linux/proc/cpuinfo/linux-sparc-1
+resources/linux/proc/cpuinfo/rhel-5.6
 resources/linux/proc/cpuinfo/toshiba-r630-2-core
 resources/linux/proc/scsi/linux1
 resources/linux/proc/scsi/linux2
@@ -628,10 +752,7 @@ resources/linux/smartctl/sample1
 resources/linux/smartctl/sample2
 resources/linux/smartctl/sample3
 resources/linux/smartctl/sample4
-resources/linux/tw_cli/cards
-resources/linux/tw_cli/ports
-resources/linux/tw_cli/storage
-resources/linux/tw_cli/units
+resources/linux/systool/sample1
 resources/linux/udev/ssd
 resources/lvm/linux/lvs/linux-1
 resources/lvm/linux/lvs/README
@@ -656,24 +777,70 @@ resources/macos/system_profiler/10.6.5-dual-monitor
 resources/macos/system_profiler/10.6.6-intel
 resources/macos/system_profiler/datatypes
 resources/macos/system_profiler/fiberchannel
+resources/macos/system_profiler/sample1.SPApplicationsDataType
+resources/macos/system_profiler/sample2.SPApplicationsDataType
+resources/messages/message2.xml
+resources/messages/message3.xml
+resources/nmap/10.0.1.1
+resources/nmap/10.0.1.127
+resources/nmap/10.0.1.128
+resources/nmap/192.168.0.1
+resources/nmap/88.191.59.1
+resources/nmap/google.com
 resources/solaris/fcinfo_hba-port/sample-1
 resources/solaris/iostat/sample1
 resources/solaris/iostat/sample2
 resources/solaris/iostat/sample3-wrong-vendor-product
-resources/solaris/memconf/sample1
-resources/solaris/memconf/sample2
-resources/solaris/memconf/sample3
-resources/solaris/memconf/sample4
+resources/solaris/iostat/sample4-slash-char-in-model
+resources/solaris/mount/mount_-v_sample1
 resources/solaris/opensolaris/release-1
 resources/solaris/opensolaris/smbios-1
-resources/solaris/prtconf/SPARC-1
-resources/solaris/psrinfo/sample1
-resources/solaris/release-1
-resources/solaris/release-2
-resources/solaris/release-3
-resources/solaris/release-4
-resources/solaris/release-5
-resources/solaris/release-6
+resources/solaris/prtconf/sparc1
+resources/solaris/prtconf/sparc2
+resources/solaris/prtconf/sparc3
+resources/solaris/prtdiag/sample1
+resources/solaris/prtdiag/sample2
+resources/solaris/prtdiag/sample3
+resources/solaris/prtdiag/sample4
+resources/solaris/prtdiag/sample5
+resources/solaris/prtdiag/sample6
+resources/solaris/prtdiag/sample7
+resources/solaris/prtdiag/sample8
+resources/solaris/psrinfo/e6900-psrinfo_v
+resources/solaris/psrinfo/e6900-psrinfo_vp
+resources/solaris/psrinfo/giration-psrinfo_v
+resources/solaris/psrinfo/giration-psrinfo_vp
+resources/solaris/psrinfo/sample1-psrinfo_v
+resources/solaris/psrinfo/solaris11-psrinfo_v
+resources/solaris/psrinfo/solaris11-psrinfo_vp
+resources/solaris/psrinfo/t1-psrinfo_v
+resources/solaris/psrinfo/t1-psrinfo_vp
+resources/solaris/psrinfo/t5120-psrinfo_v
+resources/solaris/psrinfo/t5120-psrinfo_vp
+resources/solaris/psrinfo/unstable10s-psrinfo_v
+resources/solaris/psrinfo/unstable10s-psrinfo_vp
+resources/solaris/psrinfo/unstable10x-psrinfo_v
+resources/solaris/psrinfo/unstable10x-psrinfo_vp
+resources/solaris/psrinfo/unstable11s-psrinfo_v
+resources/solaris/psrinfo/unstable11s-psrinfo_vp
+resources/solaris/psrinfo/unstable11x-psrinfo_v
+resources/solaris/psrinfo/unstable11x-psrinfo_vp
+resources/solaris/psrinfo/unstable9s-psrinfo_v
+resources/solaris/psrinfo/unstable9s-psrinfo_vp
+resources/solaris/psrinfo/unstable9x-psrinfo_v
+resources/solaris/psrinfo/unstable9x-psrinfo_vp
+resources/solaris/psrinfo/v240-psrinfo_v
+resources/solaris/psrinfo/v240-psrinfo_vp
+resources/solaris/psrinfo/v490-psrinfo_v
+resources/solaris/psrinfo/v490-psrinfo_vp
+resources/solaris/release/sample1
+resources/solaris/release/sample2
+resources/solaris/release/sample3
+resources/solaris/release/sample4
+resources/solaris/release/sample5
+resources/solaris/release/sample6
+resources/solaris/release/sample7
+resources/solaris/release/sample8
 resources/solaris/showrev/SPARC-1
 resources/solaris/showrev/SPARC-2
 resources/solaris/showrev/x86-1
@@ -684,28 +851,31 @@ resources/solaris/smbios/x86-3
 resources/ssl/cnf/alternate.cnf
 resources/ssl/cnf/bad.cnf
 resources/ssl/cnf/ca.cnf
-resources/ssl/cnf/good-sha256.cnf
 resources/ssl/cnf/good.cnf
 resources/ssl/cnf/joker.cnf
 resources/ssl/cnf/wrong.cnf
 resources/ssl/crt/alternate.pem
 resources/ssl/crt/bad.pem
 resources/ssl/crt/ca.pem
-resources/ssl/crt/good-sha256.pem
 resources/ssl/crt/good.pem
 resources/ssl/crt/joker.pem
 resources/ssl/crt/wrong.pem
 resources/ssl/key/alternate.pem
 resources/ssl/key/bad.pem
 resources/ssl/key/ca.pem
-resources/ssl/key/good-sha256.pem
 resources/ssl/key/good.pem
 resources/ssl/key/joker.pem
 resources/ssl/key/wrong.pem
 resources/ssl/README
+resources/virtualization/jails/sample1
 resources/virtualization/lxc/config
 resources/virtualization/lxc/lxc-info_-n_name1
+resources/virtualization/lxc/lxc-info_-n_name2
 resources/virtualization/lxc/lxc-ls_-1
+resources/virtualization/openvz/example-config-new.conf
+resources/virtualization/openvz/example-config-old.conf
+resources/virtualization/openvz/status-sample1
+resources/virtualization/openvz/status_sample1
 resources/virtualization/prlctl/sample1
 resources/virtualization/README
 resources/virtualization/vboxmanage/sample1
@@ -714,18 +884,32 @@ resources/virtualization/vboxmanage/sample3
 resources/virtualization/virsh/dumpxml1
 resources/virtualization/virsh/dumpxml2
 resources/virtualization/virsh/dumpxml3
+resources/virtualization/virsh/dumpxml4
+resources/virtualization/virsh/dumpxml5_lxc
 resources/virtualization/virsh/list1
 resources/virtualization/virsh/list2
 resources/virtualization/xm/xm_list
 resources/virtualization/xm/xm_list_-l_vmname
+resources/walks/sample1.walk
+resources/walks/sample2.walk
+resources/walks/sample3.walk
+resources/walks/sample4.result
+resources/walks/sample4.walk
+resources/walks/sample5.walk
 resources/win32/README
 resources/win32/registry/2003-CentralProcessor.reg
 resources/win32/registry/2003SP2-CentralProcessor.reg
 resources/win32/registry/7-CentralProcessor.reg
+resources/win32/registry/7-Network.reg
 resources/win32/registry/7-USB.reg
 resources/win32/registry/7-USBPRINT.reg
+resources/win32/registry/7bis-USB.reg
+resources/win32/registry/7bis-USBPRINT.reg
+resources/win32/registry/7ter-USB.reg
+resources/win32/registry/7ter-USBPRINT.reg
 resources/win32/registry/xp-CentralProcessor.reg
 resources/win32/registry/xp-uninstall.reg
+resources/win32/registry/xp-{4D36E972-E325-11CE-BFC1-08002BE10318}.reg
 resources/win32/registry/xppro1-USB.reg
 resources/win32/registry/xppro1-USBPRINT.reg
 resources/win32/registry/xppro2-USB.reg
@@ -736,12 +920,20 @@ resources/win32/wmi/2003-Win32_Processor.wmi
 resources/win32/wmi/2003SP2-Win32_PhysicalMemory.wmi
 resources/win32/wmi/2003SP2-Win32_PhysicalMemoryArray.wmi
 resources/win32/wmi/2003SP2-Win32_Processor.wmi
+resources/win32/wmi/2008-MSVM_ComputerSystem.wmi
+resources/win32/wmi/2008-MSVM_MemorySettingData.wmi
+resources/win32/wmi/2008-MSVM_ProcessorSettingData.wmi
 resources/win32/wmi/7-CIM_LogicalDevice.wmi
 resources/win32/wmi/7-Win32_NetworkAdapter.wmi
 resources/win32/wmi/7-Win32_NetworkAdapterConfiguration.wmi
 resources/win32/wmi/7-Win32_PhysicalMemory.wmi
 resources/win32/wmi/7-Win32_PhysicalMemoryArray.wmi
 resources/win32/wmi/7-Win32_Processor.wmi
+resources/win32/wmi/unknown-MSVM_ComputerSystem.wmi
+resources/win32/wmi/win7-sp1-x64-Win32_LogicalDisk.wmi
+resources/win32/wmi/win7-sp1-x64-Win32_OperatingSystem.wmi
+resources/win32/wmi/winxp-sp3-x86-Win32_LogicalDisk.wmi
+resources/win32/wmi/winxp-sp3-x86-Win32_OperatingSystem.wmi
 resources/win32/wmi/xp-Win32_NetworkAdapter.wmi
 resources/win32/wmi/xp-Win32_NetworkAdapterConfiguration.wmi
 resources/win32/wmi/xp-Win32_PhysicalMemory.wmi
@@ -752,6 +944,7 @@ resources/win32/wmi/xppro2-CIM_LogicalDevice.wmi
 resources/xml/response/message1.xml
 resources/xml/response/message2.xml
 resources/xml/response/message3.xml
+share/edid.ids
 share/html/favicon.ico
 share/html/index.tpl
 share/html/inventory.tpl
@@ -759,117 +952,159 @@ share/html/logo.png
 share/html/now.tpl
 share/html/site.css
 share/pci.ids
+share/sysobject.ids
+share/usb.ids
 t/01compile.t
 t/02critic.t
-t/03pod.t
-t/04pod-coverage.t
-t/05var.t
-t/06spelling.t
+t/03var.t
+t/04pod-syntax.t
+t/05pod-coverage.t
+t/06pod-no404.t
+t/06pod-spelling.t
+t/07whitespaces.t
+t/08changelog.t
+t/agent/agent.t
+t/agent/config.t
+t/agent/http/client/connection.t
+t/agent/http/client/instanciation.t
+t/agent/http/client/ocs/compression.t
+t/agent/http/client/ocs/response.t
+t/agent/http/client/ssl.t
+t/agent/http/server.t
+t/agent/inventory.t
+t/agent/logger.t
+t/agent/snmp/live.t
+t/agent/snmp/mock.t
+t/agent/soap.t
+t/agent/storage.t
+t/agent/target.t
+t/agent/task.t
+t/agent/tools.t
+t/agent/tools/aix.t
+t/agent/tools/bsd.t
+t/agent/tools/generic.t
+t/agent/tools/hardware.t
+t/agent/tools/hpux.t
+t/agent/tools/license.t
+t/agent/tools/linux.t
+t/agent/tools/macos.t
+t/agent/tools/network.t
+t/agent/tools/solaris.t
+t/agent/tools/unix.t
+t/agent/tools/win32.t
+t/agent/xml/netinventory.t
+t/agent/xml/query/inventory.t
+t/agent/xml/query/prolog.t
+t/agent/xml/query/simpleMessage.t
+t/agent/xml/response.t
 t/apps/agent.t
+t/apps/esx.t
 t/apps/injector.t
-t/components/agent.t
-t/components/client/connection.t
-t/components/client/instanciation.t
-t/components/client/ocs/compression.t
-t/components/client/ocs/response.t
-t/components/client/ssl.t
-t/components/inventory.t
-t/components/logger.t
-t/components/server.t
-t/components/storage.t
-t/components/target.t
-t/components/task.t
-t/fake/unix/Sys/Syslog.pm
-t/fake/windows/Win32.pm
-t/fake/windows/Win32/API.pm
-t/fake/windows/Win32/Job.pm
-t/fake/windows/Win32/OLE.pm
-t/fake/windows/Win32/TieRegistry.pm
-t/FusionInventory/Agent/Logger/Test.pm
-t/FusionInventory/Test/Agent.pm
-t/FusionInventory/Test/Auth.pm
-t/FusionInventory/Test/Module.pm
-t/FusionInventory/Test/Proxy.pm
-t/FusionInventory/Test/Server.pm
-t/FusionInventory/Test/Utils.pm
-t/inventory/aix/controllers.t
-t/inventory/aix/memory.t
-t/inventory/aix/modems.t
-t/inventory/aix/networks.t
-t/inventory/aix/slots.t
-t/inventory/aix/softwares.t
-t/inventory/aix/sounds.t
-t/inventory/aix/storages.t
-t/inventory/aix/videos.t
-t/inventory/bsd/networks.t
-t/inventory/bsd/softwares.t
-t/inventory/bsd/storages.t
-t/inventory/generic/dmidecode/battery.t
-t/inventory/generic/dmidecode/bios.t
-t/inventory/generic/dmidecode/memory.t
-t/inventory/generic/dmidecode/ports.t
-t/inventory/generic/dmidecode/slots.t
-t/inventory/generic/lspci/controllers.t
-t/inventory/generic/lspci/modems.t
-t/inventory/generic/lspci/sounds.t
-t/inventory/generic/lspci/videos.t
-t/inventory/generic/screen.t
-t/inventory/generic/usb.t
-t/inventory/hpux/controllers.t
-t/inventory/hpux/cpu.t
-t/inventory/hpux/drives.t
-t/inventory/hpux/memory.t
-t/inventory/hpux/mp.t
-t/inventory/hpux/networks.t
-t/inventory/hpux/slots.t
-t/inventory/hpux/softwares.t
-t/inventory/hpux/storages.t
-t/inventory/hpux/uptime.t
-t/inventory/linux/cpu.t
-t/inventory/linux/drives.t
-t/inventory/linux/ilo.t
-t/inventory/linux/lvm.t
-t/inventory/linux/rhn-systemid.t
-t/inventory/linux/softwares.t
-t/inventory/linux/storages/3ware.t
-t/inventory/linux/storages/adaptec.t
-t/inventory/linux/storages/lsilogic.t
-t/inventory/linux/video.t
-t/inventory/macos/cpu.t
-t/inventory/macos/memory.t
-t/inventory/macos/softwares.t
-t/inventory/macos/storages.t
-t/inventory/macos/uptime.t
-t/inventory/macos/usb.t
-t/inventory/macos/videos.t
-t/inventory/solaris/bios.t
-t/inventory/solaris/cpu.t
-t/inventory/solaris/networks.t
-t/inventory/solaris/storages.t
-t/inventory/virtualization/libvirt.t
-t/inventory/virtualization/lxc.t
-t/inventory/virtualization/parallels.t
-t/inventory/virtualization/virtualbox.t
-t/inventory/virtualization/xen.t
-t/inventory/windows/cpu.t
-t/inventory/windows/memory.t
-t/inventory/windows/networks.t
-t/inventory/windows/printers.t
-t/inventory/windows/registry.t
-t/inventory/windows/softwares.t
-t/inventory/windows/usb.t
+t/apps/inventory.t
+t/apps/netdiscovery.t
+t/apps/netinventory.t
+t/apps/wakeonlan.t
+t/lib/fake/unix/Sys/Syslog.pm
+t/lib/fake/windows/Win32.pm
+t/lib/fake/windows/Win32/API.pm
+t/lib/fake/windows/Win32/Job.pm
+t/lib/fake/windows/Win32/OLE.pm
+t/lib/fake/windows/Win32/TieRegistry.pm
+t/lib/FusionInventory/Agent/Logger/Fatal.pm
+t/lib/FusionInventory/Agent/Logger/Test.pm
+t/lib/FusionInventory/Test/Agent.pm
+t/lib/FusionInventory/Test/Auth.pm
+t/lib/FusionInventory/Test/Inventory.pm
+t/lib/FusionInventory/Test/Module.pm
+t/lib/FusionInventory/Test/Proxy.pm
+t/lib/FusionInventory/Test/Server.pm
+t/lib/FusionInventory/Test/Utils.pm
 t/perlcriticrc
-t/tools.t
-t/tools/aix.t
-t/tools/generic.t
-t/tools/hpux.t
-t/tools/linux.t
-t/tools/macos.t
-t/tools/network.t
-t/tools/unix.t
-t/tools/win32.t
-t/xml/query/inventory.t
-t/xml/query/prolog.t
-t/xml/query/simpleMessage.t
-t/xml/response.t
+t/tasks/deploy/diskfree.t
+t/tasks/deploy/file.t
+t/tasks/deploy/p2p.t
+t/tasks/deploy/validate.t
+t/tasks/inventory/aix/controllers.t
+t/tasks/inventory/aix/drives.t
+t/tasks/inventory/aix/lvm.t
+t/tasks/inventory/aix/memory.t
+t/tasks/inventory/aix/modems.t
+t/tasks/inventory/aix/networks.t
+t/tasks/inventory/aix/slots.t
+t/tasks/inventory/aix/softwares.t
+t/tasks/inventory/aix/sounds.t
+t/tasks/inventory/aix/storages.t
+t/tasks/inventory/aix/videos.t
+t/tasks/inventory/bsd/softwares.t
+t/tasks/inventory/bsd/storages.t
+t/tasks/inventory/generic/dmidecode/battery.t
+t/tasks/inventory/generic/dmidecode/bios.t
+t/tasks/inventory/generic/dmidecode/memory.t
+t/tasks/inventory/generic/dmidecode/ports.t
+t/tasks/inventory/generic/dmidecode/slots.t
+t/tasks/inventory/generic/pci/controllers.t
+t/tasks/inventory/generic/pci/modems.t
+t/tasks/inventory/generic/pci/sounds.t
+t/tasks/inventory/generic/pci/videos.t
+t/tasks/inventory/generic/screen.t
+t/tasks/inventory/generic/storages/3ware.t
+t/tasks/inventory/generic/storages/hp.t
+t/tasks/inventory/generic/usb.t
+t/tasks/inventory/hpux/controllers.t
+t/tasks/inventory/hpux/cpu.t
+t/tasks/inventory/hpux/drives.t
+t/tasks/inventory/hpux/memory.t
+t/tasks/inventory/hpux/mp.t
+t/tasks/inventory/hpux/networks.t
+t/tasks/inventory/hpux/slots.t
+t/tasks/inventory/hpux/softwares.t
+t/tasks/inventory/hpux/storages.t
+t/tasks/inventory/hpux/uptime.t
+t/tasks/inventory/linux/cpu.t
+t/tasks/inventory/linux/drives.t
+t/tasks/inventory/linux/lvm.t
+t/tasks/inventory/linux/networks.t
+t/tasks/inventory/linux/networks/fibrechannel.t
+t/tasks/inventory/linux/networks/ilo.t
+t/tasks/inventory/linux/rhn-systemid.t
+t/tasks/inventory/linux/softwares.t
+t/tasks/inventory/linux/storages/adaptec.t
+t/tasks/inventory/linux/storages/lsilogic.t
+t/tasks/inventory/linux/storages/megacli.t
+t/tasks/inventory/linux/storages/megaraid.t
+t/tasks/inventory/linux/video.t
+t/tasks/inventory/macos/cpu.t
+t/tasks/inventory/macos/memory.t
+t/tasks/inventory/macos/softwares.t
+t/tasks/inventory/macos/storages.t
+t/tasks/inventory/macos/uptime.t
+t/tasks/inventory/macos/usb.t
+t/tasks/inventory/macos/videos.t
+t/tasks/inventory/solaris/bios.t
+t/tasks/inventory/solaris/cpu.t
+t/tasks/inventory/solaris/memory.t
+t/tasks/inventory/solaris/networks.t
+t/tasks/inventory/solaris/slots.t
+t/tasks/inventory/solaris/storages.t
+t/tasks/inventory/virtualization/hyperv.t
+t/tasks/inventory/virtualization/jails.t
+t/tasks/inventory/virtualization/libvirt.t
+t/tasks/inventory/virtualization/lxc.t
+t/tasks/inventory/virtualization/openvz.t
+t/tasks/inventory/virtualization/parallels.t
+t/tasks/inventory/virtualization/qemu.t
+t/tasks/inventory/virtualization/virtualbox.t
+t/tasks/inventory/virtualization/vmsystem.t
+t/tasks/inventory/virtualization/xen.t
+t/tasks/inventory/windows/bios.t
+t/tasks/inventory/windows/cpu.t
+t/tasks/inventory/windows/drives.t
+t/tasks/inventory/windows/memory.t
+t/tasks/inventory/windows/networks.t
+t/tasks/inventory/windows/printers.t
+t/tasks/inventory/windows/registry.t
+t/tasks/inventory/windows/softwares.t
+t/tasks/inventory/windows/usb.t
+t/tasks/network/nmap.t
+t/tasks/wakeonlan.t
 THANKS

@@ -1,5 +1,7 @@
 ---
 abstract: 'FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX'
+author:
+  - 'FusionInventory Team'
 build_requires:
   ExtUtils::MakeMaker: 6.59
   HTTP::Proxy: 0
@@ -8,16 +10,23 @@ build_requires:
   IO::Capture::Stderr: 0
   IO::Socket::SSL: 0
   IPC::Run: 0
+  JSON: 0
   LWP::Protocol::https: 0
+  Net::SNMP: 0
+  POE::Component::Client::Ping: 0
+  Test::Compile: 0
+  Test::Deep: 0
   Test::Exception: 0
+  Test::HTTP::Server::Simple: 0
   Test::MockModule: 0
-  Test::More: 0.93
-  YAML: 0
+  Test::MockObject: 0
+  Test::More: '0.93'
+  Test::NoWarnings: 0
 configure_requires:
   ExtUtils::MakeMaker: 6.59
 distribution_type: module
 dynamic_config: 1
-generated_by: 'Module::Install version 1.06'
+generated_by: 'Module::Install version 1.12'
 license: gpl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -29,22 +38,37 @@ no_index:
     - share
     - t
 recommends:
+  Archive::Extract: 0
   Compress::Zlib: 0
+  Crypt::DES: 0
+  Digest::MD5: 0
+  Digest::SHA: 0
+  File::Copy::Recursive: 0
   HTTP::Daemon: 0
   IO::Socket::SSL: 0
+  JSON: 0
   LWP::Protocol::https: 0
   Net::CUPS: 0.6
+  Net::NBName: 0
+  Net::SNMP: 0
+  Net::Write::Layer2: 0
+  POE::Component::Client::Ping: 0
+  Parse::EDID: 0
   Proc::Daemon: 0
   Proc::PID::File: 0
+  URI::Escape: 0
 requires:
-  Digest::MD5: 0
   File::Which: 0
-  LWP: 5.8
+  LWP: '5.8'
   Net::IP: 0
   Text::Template: 0
   UNIVERSAL::require: 0
-  XML::TreePP: 0.26
+  XML::TreePP: '0.26'
   perl: 5.8.0
 resources:
+  IRC: irc://irc.freenode.net/#fusioninventory
+  bugtracker: http://forge.fusioninventory.org/projects/fusioninventory-agent/issues
+  homepage: http://www.fusioninventory.org
   license: http://opensource.org/licenses/gpl-license.php
-version: 2.2.5
+  repository: http://github.com/fusinv/fusioninventory-agent/
+version: 2.3.13

@@ -1,59 +0,0 @@
-{
-   "abstract" : "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX",
-   "author" : [
-      "unknown"
-   ],
-   "dynamic_config" : 0,
-   "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921",
-   "license" : [
-      "open_source"
-   ],
-   "meta-spec" : {
-      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
-   },
-   "name" : "FusionInventory-Agent",
-   "no_index" : {
-      "directory" : [
-         "t",
-         "inc"
-      ]
-   },
-   "prereqs" : {
-      "build" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "6.59",
-            "HTTP::Proxy" : "0",
-            "HTTP::Server::Simple" : "0",
-            "HTTP::Server::Simple::Authen" : "0",
-            "IO::Capture::Stderr" : "0",
-            "IO::Socket::SSL" : "0",
-            "IPC::Run" : "0",
-            "LWP::Protocol::https" : "0",
-            "Test::Exception" : "0",
-            "Test::MockModule" : "0",
-            "Test::More" : "0.93",
-            "YAML" : "0"
-         }
-      },
-      "configure" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "0"
-         }
-      },
-      "runtime" : {
-         "requires" : {
-            "Digest::MD5" : "0",
-            "File::Which" : "0",
-            "LWP" : "5.8",
-            "Net::IP" : "0",
-            "Text::Template" : "0",
-            "UNIVERSAL::require" : "0",
-            "XML::TreePP" : "0.26",
-            "perl" : "5.008"
-         }
-      }
-   },
-   "release_status" : "stable",
-   "version" : "v2.2.5"
-}

@@ -1,40 +0,0 @@
----
-abstract: 'FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX'
-author:
-  - unknown
-build_requires:
-  ExtUtils::MakeMaker: 6.59
-  HTTP::Proxy: 0
-  HTTP::Server::Simple: 0
-  HTTP::Server::Simple::Authen: 0
-  IO::Capture::Stderr: 0
-  IO::Socket::SSL: 0
-  IPC::Run: 0
-  LWP::Protocol::https: 0
-  Test::Exception: 0
-  Test::MockModule: 0
-  Test::More: 0.93
-  YAML: 0
-configure_requires:
-  ExtUtils::MakeMaker: 0
-dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921'
-license: open_source
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
-name: FusionInventory-Agent
-no_index:
-  directory:
-    - t
-    - inc
-requires:
-  Digest::MD5: 0
-  File::Which: 0
-  LWP: 5.8
-  Net::IP: 0
-  Text::Template: 0
-  UNIVERSAL::require: 0
-  XML::TreePP: 0.26
-  perl: 5.008
-version: v2.2.5

@@ -6,11 +6,12 @@ name 'FusionInventory-Agent';
 include 'Module::AutoInstall';
 abstract 'FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX';
 license 'gpl';
+repository 'https://github.com/fusinv/fusioninventory-agent';
 version_from 'lib/FusionInventory/Agent.pm';
 perl_version '5.008';
+authors 'FusionInventory Team';
 
 # mandatory dependencies
-requires 'Digest::MD5'        => undef;
 requires 'File::Which'        => undef;
 requires 'LWP'                => '5.8';
 requires 'Net::IP'            => undef;
@@ -18,50 +19,93 @@ requires 'UNIVERSAL::require' => undef;
 requires 'Text::Template'     => undef;
 requires 'XML::TreePP'        => '0.26';
 
-if ($OSNAME eq 'darwin') {
-    requires 'Mac::SysProfile' => undef;
+if ($OSNAME eq 'MSWin32') {
+    requires 'Win32::OLE'         => undef;
+    requires 'Win32::TieRegistry' => undef;
+    requires 'Win32::Job'         => undef;
 }
 
-# optional dependencies
-recommends 'Compress::Zlib'   => undef;
-recommends 'HTTP::Daemon'     => undef;
-recommends 'Net::CUPS'        => 0.60;
-recommends 'IO::Socket::SSL'  => undef;
-recommends 'LWP::Protocol::https'  => undef;
+recommends 'Compress::Zlib'       => undef;
+recommends 'HTTP::Daemon'         => undef;
+recommends 'IO::Socket::SSL'      => undef;
+recommends 'LWP::Protocol::https' => undef;
 
 if ($OSNAME ne 'MSWin32') {
     recommends 'Proc::Daemon'     => undef;
     recommends 'Proc::PID::File'  => undef;
 } else {
-    requires 'Win32::OLE' => undef;
-    requires 'Win32::TieRegistry' => undef;
-    requires 'Win32::Job' => undef;
     recommends 'Win32::Daemon'    => undef;
+    recommends 'Win32::Unicode::File' => undef;
 }
 
 # test dependencies
-test_requires  'HTTP::Proxy'                  => undef;
-test_requires  'HTTP::Server::Simple'         => undef;
-test_requires  'HTTP::Server::Simple::Authen' => undef;
-test_requires  'IO::Socket::SSL'              => undef;
-test_requires  'IO::Capture::Stderr'          => undef;
-test_requires  'IPC::Run'                     => undef;
-test_requires  'Test::Exception'              => undef;
-test_requires  'Test::MockModule'             => undef;
-test_requires  'Test::More'                   => '0.93'; # subtest
-test_requires  'YAML'                         => undef;
-test_requires  'LWP::Protocol::https'          => undef;
-
-install_script  'fusioninventory-agent';
-install_script  'fusioninventory-win32-service' if $OSNAME eq 'MSWin32';
-install_script  'fusioninventory-injector';
-# memconf is needed by Solaris backend module
-install_script  'memconf' if $OSNAME eq 'solaris';
+test_requires 'HTTP::Proxy'                  => undef;
+test_requires 'HTTP::Server::Simple'         => undef;
+test_requires 'HTTP::Server::Simple::Authen' => undef;
+test_requires 'IO::Socket::SSL'              => undef;
+test_requires 'IO::Capture::Stderr'          => undef;
+test_requires 'IPC::Run'                     => undef;
+test_requires 'Test::Compile'                => undef;
+test_requires 'Test::Deep'                   => undef;
+test_requires 'Test::Exception'              => undef;
+test_requires 'Test::MockModule'             => undef;
+test_requires 'Test::More'                   => '0.93'; # subtest
+test_requires 'Test::NoWarnings'             => undef;
+test_requires 'LWP::Protocol::https'         => undef;
+test_requires 'Test::MockObject'             => undef;
+test_requires 'JSON'                         => undef;
+test_requires 'Net::SNMP'                    => undef;
+
+# Inventory
+recommends 'Parse::EDID' => undef;
+recommends 'Net::CUPS'   => 0.60 if $OSNAME ne 'MSWin32';
+
+# Deploy
+recommends 'Archive::Extract'             => undef;
+recommends 'Digest::SHA'                  => undef;
+recommends 'File::Copy::Recursive'        => undef;
+recommends 'JSON'                         => undef;
+recommends 'URI::Escape'                  => undef;
+recommends 'POE::Component::Client::Ping' => undef;
+
+test_requires 'Test::HTTP::Server::Simple'   => undef;
+test_requires 'POE::Component::Client::Ping' => undef;
+
+# Network
+recommends 'Net::SNMP'   => undef;
+recommends 'Net::NBName' => undef;
+recommends 'Digest::MD5' => undef;
+recommends 'Crypt::DES'  => undef;
+
+# Wake-On-LAN
+recommends 'Net::Write::Layer2' => undef;
+
+install_script 'bin/fusioninventory-agent';
+install_script 'bin/fusioninventory-win32-service' if $OSNAME eq 'MSWin32';
+install_script 'bin/fusioninventory-injector';
+install_script 'bin/fusioninventory-inventory';
+install_script 'bin/fusioninventory-wakeonlan';
+install_script 'bin/fusioninventory-netdiscovery';
+install_script 'bin/fusioninventory-netinventory';
+install_script 'bin/fusioninventory-esx';
+
+resources
+    homepage    => "http://www.fusioninventory.org",
+    bugtracker  => "http://forge.fusioninventory.org/projects/fusioninventory-agent/issues",
+    repository  => "http://github.com/fusinv/fusioninventory-agent/",
+    IRC         => "irc://irc.freenode.net/#fusioninventory";
 
 makemaker_args(
     test => {
-        TESTS => join ' ', map { glob } qw(t/*.t t/*/*.t t/*/*/*.t t/*/*/*/*.t)
+        TESTS => join ' ', map { glob } qw(
+            t/*.t
+            t/*/*.t
+            t/*/*/*.t
+            t/*/*/*/*.t
+            t/*/*/*/*/*.t
+        )
     },
+    INSTALLMAN3DIR => 'none'
 );
 
 WriteAll;
@@ -151,7 +195,9 @@ sub install {
 
     # add dependency on data and configuration installation targets, and remove
     # dependency on perlocal installation target
+    # depending on MakeMaker version, the line to match changes
     $install =~ s/install :: pure_install doc_install/install :: pure_install config_install data_install/;
+    $install =~ s/install :: all pure_install doc_install/install :: all pure_install config_install data_install/;
 
     # suppress all lines related to packlist file installation
     $install =~ s/.*\.packlist \\\n//g;
@@ -170,6 +216,8 @@ config_install :
 data_install :
 	install -d -m 755 $(DESTDIR)$(DATADIR)
 	install -m 644 share/pci.ids $(DESTDIR)$(DATADIR)/
+	install -m 644 share/usb.ids $(DESTDIR)$(DATADIR)/
+	install -m 644 share/sysobject.ids $(DESTDIR)$(DATADIR)/
 	install -d -m 755 $(DESTDIR)$(DATADIR)/html
 	install -m 644 share/html/* $(DESTDIR)$(DATADIR)/html
 EOF
@@ -197,14 +245,3 @@ EOF
     return $installbin;
 }
 
-sub manifypods {
-    my ($self) = @_;
-    my $manifypods = $self->SUPER::manifypods(@_);
-    $manifypods =~ s/manifypods : pure_all/manifypods : pure_all fusioninventory-agent.1.html/;
-    $manifypods .= <<'EOF';
-fusioninventory-agent.1.html: fusioninventory-agent
-	pod2html --infile=$< --outfile=$@
-
-EOF
-    return $manifypods;
-}

@@ -1,191 +1,87 @@
-			FusionInventory Agent
-			---------------------
+# FusionInventory Agent
+
+## Summary
 
-Description
------------
 The FusionInventory agent is a generic management agent. It can perform a
 certain number of tasks, according to its own execution plan, or on behalf of a
 GLPI server with fusioninventory plugin, acting as a control point.
 
-Two of these tasks are included in agent source distribution, local inventory
-and wake on lan. Other tasks are distributed separatly, excepted for binary
-distributions where they are bundled together.
+## Description
+
+TODO.
 
-Dependencies
-------------
+## Dependencies
 
 Minimum perl version: 5.8
 
 Additional mandatory perl modules:
-- Digest::MD5
-- File::Which
-- LWP
-- Net::IP
-- Text::Template
-- UNIVERSAL::require
-- XML::TreePP
-- Mac::SysProfile (MacOs only)
+
+* File::Which
+* LWP
+* Net::IP
+* Text::Template
+* UNIVERSAL::require
+* XML::TreePP
 
 Additional optional perl modules:
-- Compress::Zlib, for message compression
-- HTTP::Daemon, for web interface
-- IO::Socket::SSL, for HTTPS support with certificate validation
-- Net::CUPS (v0.60 minimum), for printers detection 
-- Proc::Daemon, for daemon mode (Unix only)
-- Win32::Daemon, for Win32 service mode (Windows only)
-- Proc::PID::File, for daemon mode (Unix only)
+
+* Compress::Zlib, for message compression
+* HTTP::Daemon, for web interface
+* IO::Socket::SSL, for HTTPS support with certificate validation
+* Net::CUPS (v0.60 minimum), for printers detection 
+* Parse::EDID, for screen identification
+* Proc::Daemon, for daemon mode (Unix only)
+* Win32::Daemon, for Win32 service mode (Windows only)
+* Proc::PID::File, for daemon mode (Unix only)
 
 Additional optional programs:
-- dmidecode, for hardware inventory
-- lspci, for hardware inventory
-
-Usage
------
-They are two different ways to run the agent:
-- as a temporary process, exiting after completing its run
-- as a permanent process, staying in memory permanently (daemon under Unix,
-  service under Windows)
-
-In the first case, the agent execution scheduling is controlled from local
-system, and the memory footprint between agent executions is zero.
-
-In second case, the agent execution scheduling is controlled from GLPI server,
-as the agent runs regulary according to a parameter initially set in its
-configuration (delaytime), overrided by the server at the first connection
-(PROLOG_FREQ). Additionaly, the server may also initiate additional
-out-of-schedule executions by sending HTTP requests if the web interface is
-used. However, it also mean you have a full perl interpreter loaded in memory
-constantly, and a network port open on your system with a process running with
-full system privileges attached to it.
-
-If you don't need to control agent execution from the server, and if you're
-able to periodically launch the agent without resorting to its internal
-scheduler, through cron on Unix systems, or scheduled tasks on Windows, you'd
-better use first execution mode. The various installation procedure may offer
-limited choice about initial configuration, but you should always be able to
-change it thereafter.
-
-When executing, the agent tries to run every available task for every
-configured target. A task is a specific kind of work to perform (local
-inventory, network discovery, wake on lan, etc...), while a target is both a
-recipient for the result and a controller for this work (an OCS server, a GLPI
-server, a local directory, etc...). Only the local inventory task is compatible
-with all kind of target, tough, all others require a GLPI server target, and
-will get discarded for other kind of target.
-
-System-specific informations
-----------------------------
-On Solaris/SPARC, you must install sneep and record the Serial Number with it.
-Download it from http://www.sun.com/download/products.xml?id=4304155a.
-
-On Windows, we use an additional dmidecode binary shipped in the windows
-distribution to retrieve many informations not available otherwise, including
-fine-grained multi-cores CPUs identification. Unfortunatly, this binary is not
-reliable enough to be used on Windows 2003, leading to less precise
-inventories.
-
-On any system, the privilege level used to run the agent will change inventory
-results. Generally speaking, this means less results when run with lesser
-privileges. On Windows, tough, running agent with SYSTEM privileges, which is
-implicit if running as a service, does sometimes gives less results, especially
-for shared printers only visible from a user account.
-
-Security
---------
-They are several potential security issues in fusioninventory.
-
-First, the server automatically trust any received message, using the
-identifier found in the message (unfortunatly called DEVICEID) to identify the
-sending agent. If you want to protect your machine inventory from rogue
-reports, you have to restrict access to the plugin location on your GLPI
-server, typically using HTTP authentication. And preferentially over HTTPS,
-to prevent password sniffing.
-
-Second, some messages between the server and the agent may contain sensible
-informations. For instance, NetInventory tasks involves sending SNMP
-credentials from the server to the agent. In this case, HTTPS usage ensures
-proper communication encryption.
-
-Third, some tasks are explicitely designed to make the agent execute arbitrary
-commands on its host. For instance, the Deploy task is used to install
-software on agent side. In this case, HTTPS usage ensures proper server
-authentication.
-
-SSL support
------------
-LWP (also known as libwww-perl) is able to use either Crypt::SSLeay or
-IO::Socket::SSL transparently as underlying socket implementation for HTTPS
-support. However, only the second one is able to perform server certificate
-validation. As a consequence, the agent will refuse to use HTTPS, and exit
-immediatly if IO::Socket::SSL is not available, unless certificate checking has
-been explicitely disabled (--no-ssl-check command line parameter, or
-no-ssl-check configuration parameter).
-
-The SSL protocol version supported by the agent is dependant of openssl
-version. In particular, usage of specific certificate signature algorithms such
-as SHA requires at least openssl 0.9.8o, as it is supposed to be allowed
-starting from TLS 1.1 only. Failure to comply will result in error message such
-as:
-warning: TLS library problem: 14710:error:0D0C50A1:asn1 encoding
-routines:ASN1_item_verify:unknown message digest algorithm:a_verify.c:146:
-
-This can be controlled in the certificate itself:
-[guillaume@beria ~]$ openssl x509 -noout -text -in cert.pem | grep Signature
-Signature Algorithm: sha256WithRSAEncryption
-Signature Algorithm: sha256WithRSAEncryption
-
-The available workaround:
-- ensure server certificate complies with clients capacities, using controlled
-  certificate generation parameters
-- ensure clients capacities matches server certificate properties, upgrading
-  openssl and its perl bindings (Net::SSLeay)
-- disable server certificate checking on client
-
-Contacts
---------
+
+* dmidecode, for hardware inventory
+* lspci, for hardware inventory
+
+## Contacts
 
 Project websites:
-* main site: http://www.fusioninventory.org
-* forge: http://forge.fusioninventory.org
+
+* main site: <http://www.fusioninventory.org>
+* forge: <http://forge.fusioninventory.org>
 
 Project mailing lists:
-* http://lists.alioth.debian.org/mailman/listinfo/fusioninventory-user
-* http://lists.alioth.debian.org/mailman/listinfo/fusioninventory-devel
+
+* <http://lists.alioth.debian.org/mailman/listinfo/fusioninventory-user>
+* <http://lists.alioth.debian.org/mailman/listinfo/fusioninventory-devel>
 
 Project IRC channel:
+
 * #FusionInventory on FreeNode IRC Network
 
 Please report any issues on project forge bugtracker.
 
-Authors 
--------
-* Gonéri Le Bouder <goneri@rulezlan.org>>
+## Authors 
+
+* Gonéri Le Bouder <goneri@rulezlan.org>
 * Guillaume Rousse <guillomovitch@gmail.com>
 
 Copyright 2006-2010 OCS Inventory contributors
 Copyright 2010-2012 FusionInventory Team
+Copyright 2011 TECLIB' ( http://www.teclib.com )
+
+## License
 
-License
--------
 This software is licensed under the terms of GPLv2+, see LICENSE file for
 details.
 
-Additional pieces of software
------------------------------
+## Additional pieces of software
+
+The fusioninventory-injector script:
 
-The memconf script:
-url: http://myweb.cableone.net/4schmidts/memconf.html
-author: Tom Schmidt
-copyright: 1996-2009 Tom Schmidt
+* author: Pascal Danek
+* copyright: 2005 Pascal Danek
 
 FusionInventory::Agent::Task::Inventory::Input::Virtualization::Vmsystem
 contains code from imvirt:
-url: http://micky.ibh.net/~liske/imvirt.html
-author: Thomas Liske <liske@ibh.de>
-copyright: 2008 IBH IT-Service GmbH [http://www.ibh.de/]
-License: GPLv2+
-
-FusionInventory::Agent::Tools::Screen contains code from monitor-edid:
-url: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/monitor-edid
-copyright: 2005 Mandriva
-license: GPLv2+
+
+* url: <http://micky.ibh.net/~liske/imvirt.html>
+* author: Thomas Liske <liske@ibh.de>
+* copyright: 2008 IBH IT-Service GmbH <http://www.ibh.de/>
+* License: GPLv2+

@@ -22,7 +22,7 @@ Dmitry Ilyin: Patches
 DuyLong LE: Solaris testing/debug and much more
 Earl Flack: bug reports and testing
 Edouard Gamin: RAID devices support for Linux
-Egor Morozov: lxc-tools support and bug reports
+Egor Morozov: lxc-tools support, patches and bug reports
 Emengao: Patch
 Eric Freyens: debuging
 Eric Meygret: AIX testing samples
@@ -53,6 +53,7 @@ Nicolas Dorfsman: Solaris patches
 Nicolas Eisen: patches
 Nicolas Richard: patches and bug reports
 Olivier Andreotti: AIX, Solaris patches
+Olivier Mengué
 Olivier Roussy: minor patches 
 Pablo Nicola: AIX testing samples
 Philippe Camelio: AIX testing samples
@@ -61,6 +62,7 @@ Pierre Chifflier: Debian maintainer
 Raphaël Surcouf: patch
 Remi Collet: code, bug fixes, Fedora/RedHat maintainer and much more
 Scott Hannahs: MacOSX patches
+Sébastien Aperghis-Tramoni
 Sebastien Chapelant: AIX testing samples
 Sebastien Dagnicourt: AIX and Solaris patches
 Sébastien Prud'homme: bug reports and HPVM support

@@ -0,0 +1,593 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use lib './lib';
+
+use English qw(-no_match_vars);
+use Getopt::Long;
+use Pod::Usage;
+
+use FusionInventory::Agent;
+
+Getopt::Long::Configure( "no_ignorecase" );
+
+my $options = {};
+
+GetOptions(
+    $options,
+    'additional-content=s',
+    'backend-collect-timeout=s',
+    'ca-cert-dir=s',
+    'ca-cert-file=s',
+    'conf-file=s',
+    'config=s',
+    'color',
+    'daemon|d',
+    'no-fork',
+    'debug+',
+    'delaytime=s',
+    'force|f',
+    'help|h',
+    'html',
+    'lazy',
+    'list-tasks',
+    'setup',
+    'local|l=s',
+    'logger=s',
+    'logfile=s',
+    'logfile-maxsize=i',
+    'no-category=s',
+    'no-httpd',
+    'no-ssl-check',
+    'no-task=s',
+    'no-p2p',
+    'password|p=s',
+    'proxy|P=s',
+    'httpd-ip=s',
+    'httpd-port=s',
+    'httpd-trust=s',
+    'scan-homedirs',
+    'scan-profiles',
+    'server|s=s',
+    'tag|t=s',
+    'timeout=i',
+    'user|u=s',
+    'version',
+    'wait|w=s',
+    # deprecated options
+    'stdout',
+) or pod2usage(-verbose => 0);
+
+pod2usage(-verbose => 0, -exitstatus => 0) if $options->{help};
+
+if ($options->{version}) {
+    print $FusionInventory::Agent::VERSION_STRING . "\n";
+    exit 0;
+}
+
+my %setup = (
+    confdir => './etc',
+    datadir => './share',
+    libdir  => './lib',
+    vardir  => './var',
+);
+
+if ($options->{setup}) {
+    foreach my $key (keys %setup) {
+        print "$key: $setup{$key}\n";
+    }
+    exit 0;
+}
+
+if ($options->{'conf-file'}) {
+    if ($options->{config}) {
+        if ($options->{config} ne 'file') {
+            print STDERR
+                "don't use --conf-file with $options->{config} backend";
+            exit 1;
+        }
+    } else {
+        $options->{config} = 'file';
+    }
+}
+
+my $agent = FusionInventory::Agent->new(%setup);
+
+if ($options->{'list-tasks'}) {
+    my %tasks = $agent->getAvailableTasks();
+    foreach my $task (keys %tasks) {
+        print "$task (v$tasks{$task})\n";
+    }
+    exit 0;
+}
+
+if ($options->{wait}) {
+    my $time = int rand($options->{wait});
+    sleep $time;
+}
+
+eval {
+    $agent->init(options => $options);
+    $agent->run();
+};
+
+if ($EVAL_ERROR) {
+    print STDERR "Execution failure:.\n";
+    print STDERR $EVAL_ERROR;
+    exit 1;
+}
+
+exit(0);
+
+__END__
+
+=head1 NAME
+
+fusioninventory-agent - FusionInventory agent For Linux/UNIX, Windows and MacOSX
+
+=head1 SYNOPSIS
+
+B<fusioninventory-agent> [options] [--server server|--local path]
+
+  Target definition options:
+    -s --server=URI                send tasks result to a server
+    -l --local=PATH                write tasks results locally
+
+  Target scheduling options:
+    --delaytime=LIMIT              maximum delay before first target,
+                                     in seconds (3600)
+    --lazy                         do not contact the target before
+                                   next scheduled time
+
+  Task selection options:
+    --list-tasks                   list available tasks and exit
+    --no-task=TASK                 do not run given task
+
+  Inventory task specific options:
+    --no-category=CATEGORY         do not list given category items
+    --scan-homedirs                scan user home directories (false)
+    --scan-profiles                scan user profiles (false)
+    --html                         save the inventory as HTML (false)
+    -f --force                     always send data to server (false)
+    --backend-collect-timeout=TIME timeout for inventory modules
+                                     execution (30)
+    --additional-content=FILE      additional inventory content file
+
+  Package deployment task specific options:
+    --no-p2p                       do not use peer to peer to download
+                                     files (false)
+
+  Network options:
+    -P --proxy=PROXY               proxy address
+    -u --user=USER                 user name for server authentication
+    -p --password=PASSWORD         password for server authentication
+    --ca-cert-dir=DIRECTORY        CA certificates directory
+    --ca-cert-file=FILE            CA certificates file
+    --no-ssl-check                 do not check server SSL certificate
+                                     (false)
+    --timeout=TIME                 connection timeout, in seconds (180)
+
+  Web interface options:
+    --no-httpd                     disable embedded web server (false)
+    --httpd-ip=IP                  network interface to listen to (all)
+    --httpd-port=PORT              network port to listen to (62354)
+    --httpd-trust=IP               trust requests without authentication
+                                     token (false)
+
+  Logging options:
+    --logger=BACKEND               logger backend (stderr)
+    --logfile=FILE                 log file
+    --logfile-maxsize=SIZE         maximum size of the log file in MB (0)
+    --logfacility=FACILITY         syslog facility (LOG_USER)
+    --color                        use color in the console (false)
+
+  Configuration options:
+    --config=BACKEND               configuration backend
+    --conf-file=FILE               configuration file
+
+  Execution mode options:
+    -w --wait=LIMIT                maximum delay before execution,
+                                     in seconds
+    -d --daemon                    run the agent as a daemon (false)
+    --no-fork                      don't fork in background (false)
+    -t --tag=TAG                   add given tag to inventory results
+    --debug                        debug mode (false)
+    --setup                        print the agent setup directories
+                                     and exit
+    --version                      print the version and exit
+
+=head1 DESCRIPTION
+
+The F<fusioninventory-agent> agent is a generic multi-platform agent. It can
+perform a large array of management tasks, such as local inventory, software
+deployment or network discovery. It can be used either standalone, or in
+combination with a compatible server (OCS, GLPI, OTRS) acting as a centralized
+control point.
+
+=head1 OPTIONS
+
+Most of the options are available in a I<short> form and a I<long> form.  For
+example, the two lines below are all equivalent:
+
+    % fusioninventory-agent -s localhost
+    % fusioninventory-agent --server localhost
+
+=head2 Target definition options
+
+=over
+
+=item B<-s>, B<--server>=I<URI>
+
+Send the results of tasks execution to given server.
+
+If I<URI> doesn't start with http:// or https://, the agent assume the
+parameter is a hostname and rewrite it as:
+
+    % --server=http://servername/ocsinventory
+
+In general, OCS Inventory server URL have this format:
+
+    http://servername/ocsinventory
+
+and FusionInventory for GLPI this one:
+
+    http://servername/glpi/plugins/fusioninventory/front/plugin_fusioninventory.communication.php
+
+Multiple values can be specified, using comma as a separator.
+
+=item B<-l>, B<--local>=I<PATH>
+
+Write the results of tasks execution locally.
+
+Exact behaviour according to given path:
+
+=over
+
+=item *
+
+if I<PATH> is a directory, a file will be created therein
+
+=item *
+
+if I<PATH> is a file, it will be used directly
+
+=item *
+
+if I<PATH> is '-', STDOUT will be used
+
+=back
+
+Multiple values can be specified, using comma as a separator.
+
+=back
+
+=head2 Target scheduling options
+
+=over
+
+=item B<--delaytime>=I<LIMIT>
+
+Set an initial delay before the first target, whose value is computed randomly
+between LIMIT / 2 and LIMIT seconds. This setting is ignored for server targets
+after the initial contact, in favor of server-specified parameter
+(PROLOG_FREQ).
+
+=item B<--lazy>
+
+Do not contact the target before next scheduled time.
+
+This option is only available when the agent is not run as a server.
+
+=back
+
+=head2 Task selection options
+
+=over
+
+=item B<--list-tasks>
+
+List available tasks and exit
+
+=item B<--no-task>=I<TASK>
+
+Do not run given task.
+
+Multiple values can be specified, using comma as a separator. See option
+I<--list-tasks> for the list of available tasks.
+
+=back
+
+=head2 Inventory task specific options
+
+=over
+
+=item B<--no-category>=I<CATEGORY>
+
+Do not list given category items in inventory.
+
+Multiple values can be specified, using comma as a separator. The available
+categories are:
+
+=over 4
+
+=item * battery
+
+=item * controller
+
+=item * cpu
+
+=item * drive
+
+=item * environment
+
+=item * input
+
+=item * license
+
+=item * local_group
+
+=item * local_user
+
+=item * lvm
+
+=item * memory
+
+=item * modem
+
+=item * monitor
+
+=item * network
+
+=item * printer
+
+=item * process
+
+=item * slot
+
+=item * software
+
+=item * sound
+
+=item * storage
+
+=item * usb
+
+=item * user
+
+=item * video
+
+=item * virtualmachine
+
+=back
+
+=item B<--scan-homedirs>
+
+Allow the agent to scan home directories for virtual machines.
+
+=item B<--scan-profiles>
+
+Allow the agent to scan user profiles for softwares.
+
+=item B<--html>
+
+Save the inventory as HTML.
+
+This is only used for local inventories.
+
+=item B<-f>, B<--force>
+
+Send an inventory to the server, even if this last one doesn't ask for it.
+
+=item B<--backend-collect-timeout>=I<TIME>
+
+Timeout for inventory modules execution.
+
+=item B<--additional-content>=I<FILE>
+
+Additional inventory content file.
+
+This file should be an XML file, using same syntax as the one produced by the
+agent.
+
+=back
+
+=head2 Package deployment task specific options
+
+=over
+
+=item B<--no-p2p>
+
+Do not use peer to peer to download files.
+
+=back
+
+=head2 Server target specific options
+
+=over
+
+=item B<-P>, B<--proxy>=I<PROXY>
+
+Use I<PROXY> as HTTP proxy.
+
+By default, the agent uses HTTP_PROXY environment variable.
+
+=item B<-u> I<USER>, B<--user>=I<USER>
+
+Use I<USER> for server authentication.
+
+=item B<-p>, B<--password>=I<PASSWORD>
+
+Use I<PASSWORD> for server authentication.
+
+=item B<--ca-cert-dir>=I<DIRECTORY>
+
+CA certificates directory.
+
+=item B<--ca-cert-file>=I<FILE>
+
+CA certificates file.
+
+=item B<--no-ssl-check>
+
+Do not check server SSL certificate.
+
+=item B<--timeout>=I<TIME>
+
+Timeout for server connections.
+
+=back
+
+=head2 Web interface options
+
+=over
+
+=item B<--no-httpd>
+
+Disable the embedded web server.
+
+=item B<--httpd-ip>=I<IP>
+
+The network interface to use for the embedded web server (all).
+
+=item B<--httpd-port>=I<PORT>
+
+The network port to use for the embedded web server (62354).
+
+=item B<--httpd-trust>=I<IP>
+
+Trust requests from given addresses without authentication token (false).
+
+For example: "192.168.0.0/24", "192.168.168.0.5" or an IP range like
+"20.34.101.207 - 201.3.9.99". Hostnames are also accepted. See L<Net::IP>
+documentation to get more example.
+
+Multiple values can be specified, using comma as a separator.
+
+=back
+
+=head2 Logging options
+
+=over
+
+=item B<--logger>=I<BACKEND>
+
+Logger backend to use.
+
+Multiple values can be specified, using comma as a separator. The available
+backends are:
+
+=over 4
+
+=item
+
+stderr: log messages directly in the console.
+
+=item
+
+file: log messages in a file.
+
+=item
+
+syslog: log messages through the local syslog server.
+
+=back
+
+Multiple values can be specified, using comma as a separator.
+
+=item B<--logfile>=I<FILE>
+
+Log message in I<FILE> (implies File logger backend).
+
+=item B<--logfile-maxsize>=I<SIZE>
+
+Max logfile size in MB, default is unlimited. When the max size is reached, the
+file is truncated. This is only useful if there is no log rotation mechanism on
+the system.
+
+=item B<--logfacility>=I<FACILITY>
+
+Syslog facility to use (default LOG_USER).
+
+=item B<--color>
+
+Display color on the terminal, when the Stderr backend is used.
+
+This options is ignored on Windows.
+
+=back
+
+=head2 Configuration options
+
+=over
+
+
+=item B<--config>=I<BACKEND>
+
+Configuration backend to use.
+
+The available backends are:
+
+=over 4
+
+=item
+
+file: read configuration from a file (default anywhere else as Windows).
+
+=item
+
+registry: read configuration from the registry (default on Windows).
+
+=item
+
+none: don't read any configuration.
+
+=back
+
+=item B<--conf-file>=I<FILE>
+
+Use I<FILE> as configuration file (implies file configuration backend).
+
+=back
+
+=head2 Execution mode options
+
+=over
+
+=item B<-w> I<LIMIT>, B<--wait>=I<LIMIT>
+
+Wait a random delay whose value is computed randomly between 0 and LIMIT
+seconds, before execution. This is useful when execution is triggered from some
+kind of system scheduling on multiple clients, to spread the server load.
+
+=item B<-d>, B<--daemon>
+
+Run the agent as a daemon.
+
+=item B<--no-fork>
+
+Don't fork in background.
+
+This is only useful when running as a daemon.
+
+=item B<--tag>=I<TAG>
+
+Add the given tag to every inventory results.
+
+=item B<--debug>
+
+Turn the debug mode on. You can use the parameter up to 3 times in a row
+to increase the verbosity (e.g: B<--debug --debug>).
+
+Level 3 turns on the debug mode of some external libraries like Net::SSLeay.
+These messages will only be be printed on STDERR.
+
+=item B<--setup>
+
+Print the agent setup directories and exit.
+
+=item B<--version>
+
+Print the version and exit.
+
+=back

@@ -0,0 +1,138 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use lib './lib';
+
+use English qw(-no_match_vars) ;
+use Getopt::Long;
+use Pod::Usage;
+
+use FusionInventory::Agent::Task::ESX;
+use FusionInventory::Agent::Logger;
+
+my $options = {
+};
+
+GetOptions(
+    $options,
+    'host=s',
+    'user=s',
+    'password=s',
+    'directory=s',
+    'tag=s',
+    'help',
+    'version',
+) or pod2usage(-verbose => 0);
+
+pod2usage(-verbose => 0, -exitstatus => 0) if $options->{help};
+
+if ($options->{version}) {
+    print "fusioninventory-esx $FusionInventory::Agent::Task::ESX::VERSION\n";
+    exit 0;
+}
+
+pod2usage(-verbose => 0) unless
+    $options->{host}      and
+    $options->{user}      and
+    $options->{password}  and
+    $options->{directory};
+
+my $esx = FusionInventory::Agent::Task::ESX->new(
+    target => {},
+);
+
+if (!$esx->connect(
+    host     => $options->{host},
+    user     => $options->{user},
+    password => $options->{password},
+)) {
+    exit 1;
+}
+
+my $logger = FusionInventory::Agent::Logger->new();
+
+my $hasError = 0;
+my $hostIds = $esx->getHostIds();
+foreach my $hostId (@$hostIds) {
+    my $inventory = $esx->createInventory($hostId, $options->{tag});
+
+    my $file =  $options->{directory} . '/' . $inventory->{deviceid} . ".ocs";
+
+    if (open my $handle, '>', $file) {
+        my $tpp = XML::TreePP->new(indent => 2);
+        print $handle $tpp->write({
+            REQUEST  => {
+                CONTENT  => $inventory->{content},
+                DEVICEID => $inventory->{deviceid},
+                QUERY    => "INVENTORY",
+            }
+        });
+
+        close $handle;
+        print("Inventory saved in $file\n");
+    } else {
+        $hasError = 1;
+        print("Can't write to $file: $ERRNO\n");
+    }
+
+}
+exit($hasError);
+__END__
+
+=head1 NAME
+
+fusioninventory-esx - vCenter/ESX/ESXi remote inventory from command line
+
+=head1 SYNOPSIS
+
+fusioninventory-esx --host <host> --user <user> --password <password> --directory <directory>
+
+  Options:
+    --help                 this menu
+    --host hostname        ESX server hostname
+    --user username        user name
+    --password xxxx        user password
+    --directory directory  output directory
+    --tag tag              tag for the inventoried machine
+
+=head1 EXAMPLES
+
+    % fusioninventory-esx --host myesx --user foo --password bar --directory /tmp
+
+
+You can import the .ocs file in your inventory server with the fusioninventory-injector tool.
+    %fusioninventory-injector -v --file /tmp/*.ocs -u https://myserver/ocsinventory
+
+=head1 DESCRIPTION
+
+F<fusioninventory-esx> creates inventory of remote ESX/ESXi and vCenter VMware.
+It uses the SOAP interface of the remote server.
+
+Supported systems:
+
+=over 4
+
+=item F<ESX and ESXi 3.5>
+
+=item F<ESX and ESXi 4.1>
+
+=item F<ESXi 5.0>
+
+=item F<vCenter 4.1>
+
+=item F<vCenter 5.0>
+
+=back
+
+
+Active Directory users, please note the AD authentication doesn't work. You must
+create a account on the VMware server.
+
+=head1 LIMITATION
+
+So far, ESX serial number are not collected.
+
+=head1 SECURITY
+
+The SSL hostname check of the server is disabled.

@@ -0,0 +1,139 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Compress::Zlib;
+use English qw(-no_match_vars);
+use Fcntl qw(:flock);
+use Getopt::Long;
+use LWP::UserAgent;
+use Pod::Usage;
+
+my $options = {
+    useragent => 'FusionInventory-Injector'
+};
+
+GetOptions(
+    $options,
+    'help|h',
+    'directory|d=s',
+    'file|f=s',
+    'url|u=s',
+    'useragent=s',
+    'remove|r',
+    'verbose|v',
+    'stdin',
+);
+
+$OUTPUT_AUTOFLUSH = 1;
+pod2usage(-verbose => 0, -exitstatus => 0) if $options->{help};
+
+if ($options->{stdin}) {
+    loadstdin();
+} elsif ($options->{file}) {
+    loadfile($options->{file});
+} elsif ($options->{directory}) {
+   loaddirectory($options->{directory});
+} else {
+    pod2usage();
+}
+
+exit(0);
+
+sub loadfile {
+    my ($file) = @_;
+
+    die "file $file does not exist" unless -f $file;
+    die "file $file is not readable" unless -r $file;
+
+    print "Loading $file..." if $options->{verbose};
+
+    open (my $handle, '<', $file) or die "can't open file $file: $ERRNO\n";
+    ## no critic (ProhibitBitwise)
+    flock ($handle, LOCK_EX | LOCK_NB) or die "can't lock file $file: $ERRNO\n";
+    local $RS;
+    my $content = <$handle>;
+    close $handle or die "Can't close file $file: $ERRNO\n";
+
+    my $success = sendContent($content);
+    if ($success && $options->{remove}) {
+        unlink $file or warn "Can't remove $file: $ERRNO\n"
+    }
+}
+
+sub loaddirectory {
+    my ($directory) = @_;
+
+    die "directory $directory does not exist" unless -d $directory;
+    die "directory $directory is not readable" unless -r $directory;
+
+    opendir (my $handle, $directory)
+        or die "can't open directory $directory: $ERRNO\n";
+    foreach my $file (readdir($handle)) {
+        loadfile("$directory/$file") if $file =~ /\.ocs$/;
+    }
+    closedir $handle;
+}
+
+sub loadstdin {
+    my $content;
+    undef $RS;
+    $content = <STDIN>;
+    sendContent($content);
+}
+
+sub sendContent {
+    my $content = shift;
+
+    my $ua = LWP::UserAgent->new(
+        agent => $options->{useragent},
+        parse_head => 0, # No need to parse HTML
+        keep_alive => 1,
+        requests_redirectable => ['POST', 'GET', 'HEAD']
+    );
+    my $request = HTTP::Request->new( POST => $options->{url} );
+    $request->header(
+        'Pragma' => 'no-cache',
+        'Content-type', 'Application/x-compress'
+    );
+    if (uncompress($content)) {
+        $content = uncompress($content);
+    }
+    $request->content(compress($content));
+    my $res = $ua->request($request);
+
+    if ($options->{verbose}) {
+        print $res->is_success() ?
+            "OK\n" : "ERROR: " . $res->status_line() . "\n";
+    }
+
+    return $res->is_success();
+}
+
+__END__
+
+=head1 NAME
+
+fusioninventory-injector - A tool to push inventory in an OCS Inventory or compatible server.
+
+=head1 SYNOPSIS
+
+fusioninventory-injector [options] [--file <file>|--directory <directory>|--stdin]
+
+  Options:
+    -h --help      this menu
+    -d --directory load every .ocs files from a directory
+    -f --file      load a speficic file
+    -u --url       server URL
+    -r --remove    remove succesfuly injected files
+    -v --verbose   verbose mode
+    --stdin        read data from STDIN
+
+  Examples:
+    fusioninventory-injector -v -f /tmp/toto-2010-09-10-11-42-22.ocs --url https://login:pw@server/ocsinventory
+
+=head1 DESCRIPTION
+
+This tool can be used to test your server, do benchmark or push inventory from
+off-line machine.

@@ -0,0 +1,101 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use lib './lib';
+
+use English qw(-no_match_vars);
+use Getopt::Long;
+use File::Temp;
+use Pod::Usage;
+
+use FusionInventory::Agent::Task::Inventory;
+use FusionInventory::Agent::Target::Local;
+use FusionInventory::Agent::Logger;
+use FusionInventory::Agent::Config;
+
+my %setup = (
+    confdir => './etc',
+    datadir => './share',
+    libdir  => './lib',
+    vardir  => './var',
+);
+
+my $options = {
+    debug  => 0,
+    config => 'none'
+};
+
+GetOptions(
+    $options,
+    'additional-content=s',
+    'backend-collect-timeout=s',
+    'html',
+    'no-category=s',
+    'scan-homedirs',
+    'scan-profiles',
+    'tag|t=s',
+    'verbose',
+    'debug+',
+    'help',
+    'version',
+) or pod2usage(-verbose => 0);
+
+if ($options->{version}) {
+  print "Inventory task $FusionInventory::Agent::Task::Inventory::VERSION\n";
+  exit 0;
+}
+pod2usage(-verbose => 0, -exitval => 0) if $options->{help};
+
+my $config = FusionInventory::Agent::Config->new(
+    options => $options,
+);
+
+my $verbosity =
+    $options->{debug} == 0 ? LOG_INFO   :
+    $options->{debug} == 1 ? LOG_DEBUG  :
+    $options->{debug} == 2 ? LOG_DEBUG2 :
+                             LOG_DEBUG2 ;
+
+my $inventory = FusionInventory::Agent::Task::Inventory->new(
+    target => FusionInventory::Agent::Target::Local->new(
+        path       => '-',
+        html       => $options->{html},
+        basevardir => File::Temp->newdir(CLEANUP => 1),
+    ),
+    logger  => FusionInventory::Agent::Logger->new(verbosity => $verbosity),
+    datadir => $setup{datadir},
+    confdir => $setup{confdir},
+    config  => $config
+);
+
+$inventory->run();
+
+__END__
+
+=head1 NAME
+
+fusioninventory-inventory - Standalone inventory
+
+=head1 SYNOPSIS
+
+fusioninventory-inventory [options]
+
+  Options:
+    --scan-homedirs                scan use home directories (false)
+    --scan-profiles                scan user profiles (false)
+    --html                         save the inventory as HTML (false)
+    --no-category=CATEGORY         do not list given category items
+    -t --tag=TAG                   mark the machine with given tag
+    --backend-collect-timeout=TIME timeout for inventory modules
+                                     execution (30)
+    --additional-content=FILE      additional inventory content file
+    --verbose                      verbose output (control messages)
+    --debug                        debug output (execution traces)
+    -h --help                      print this message and exit
+    --version                      print the task version and exit
+
+=head1 DESCRIPTION
+
+F<fusioninventory-inventory> allows to run an inventory task without a GLPI
+server.

@@ -0,0 +1,177 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use lib './lib';
+
+use English qw(-no_match_vars);
+use Getopt::Long;
+use Pod::Usage;
+
+use FusionInventory::Agent::Task::NetDiscovery;
+use FusionInventory::Agent::Logger;
+
+my $options = {
+    debug   => 0,
+    threads => 1
+};
+
+my %setup = (
+    confdir => './etc',
+    datadir => './share',
+    libdir  => './lib',
+    vardir  => './var',
+);
+
+GetOptions(
+    $options,
+    'first=s',
+    'last=s',
+    'community=s@',
+    'credential=s@',
+    'entity=s',
+    'threads=i',
+    'timeout=i',
+    'control',
+    'debug+',
+    'help',
+    'version'
+) or pod2usage(-verbose => 0);
+
+if ($options->{version}) {
+  print "NetDiscovery task $FusionInventory::Agent::Task::NetDiscovery::VERSION\n";
+  exit 0;
+}
+pod2usage(-verbose => 0, -exitval => 0) if $options->{help};
+
+pod2usage(
+    -message => "no first address, aborting\n", -verbose => 0
+) unless $options->{first};
+pod2usage(
+    -message => "no last address, aborting\n", -verbose => 0
+) unless $options->{last};
+
+my $verbosity =
+    $options->{debug} == 0 ? LOG_INFO   :
+    $options->{debug} == 1 ? LOG_DEBUG  :
+    $options->{debug} == 2 ? LOG_DEBUG2 :
+                             LOG_DEBUG2 ;
+
+my $discovery = FusionInventory::Agent::Task::NetDiscovery->new(
+    %setup,
+    target => FusionInventory::Agent::Task::NetInventory::Target->new(),
+    logger => FusionInventory::Agent::Logger->new(verbosity => $verbosity)
+);
+
+my $credentials_id = 1;
+my @credentials;
+if ($options->{community}) {
+    foreach my $community (@{$options->{community}}) {
+        push @credentials,
+            { ID => $credentials_id++, VERSION => 1, COMMUNITY => $community };
+    }
+} elsif ($options->{credential}) {
+    foreach my $specification (@{$options->{credential}}) {
+        my $credential = { ID => $credentials_id++ };
+        foreach my $parameter (split(',', $specification)) {
+            my ($key, $value) = split(':', $parameter);
+            $credential->{uc($key)} = $value;
+        }
+        push @credentials, $credential;
+    }
+} else {
+    push @credentials, {
+        ID => $credentials_id++, VERSION => 1, COMMUNITY => 'public'
+    };
+}
+
+$discovery->{options} = {
+    NAME => 'NETDISCOVERY',
+    PARAM => [
+        {
+            PID               => 1,
+            THREADS_DISCOVERY => $options->{threads},
+            TIMEOUT           => $options->{timeout},
+        }
+    ],
+    RANGEIP => [
+        {
+            ID      => 1,
+            IPSTART => $options->{first},
+            IPEND   => $options->{last},
+        }
+    ],
+    AUTHENTICATION => \@credentials
+};
+if (defined($options->{entity})) {
+    $discovery->{options}->{RANGEIP}->[0]->{ENTITY} = $options->{entity};
+}
+$discovery->{client} =
+    FusionInventory::Agent::Task::NetInventory::Client->new(
+        control => $options->{control}
+    );
+$discovery->{deviceid} = 'foo';
+
+$discovery->run();
+
+package FusionInventory::Agent::Task::NetInventory::Client;
+
+sub new {
+    my ($class, %params) = @_;
+
+    return bless {
+        control => $params{control}
+    }, $class;
+}
+
+sub send {
+    my ($self, %params) = @_;
+
+    # don't display control message by default
+    return unless $self->{control}
+        or $params{message}->{h}->{CONTENT}->{DEVICE};
+
+    print $params{message}->getContent();
+}
+
+package FusionInventory::Agent::Task::NetInventory::Target;
+
+sub new {
+    my ($class, %params) = @_;
+
+    return bless {}, $class;
+}
+
+sub getUrl {
+    my ($self, %params) = @_;
+
+    ## no critic (ExplicitReturnUndef)
+    return undef;
+}
+
+__END__
+
+=head1 NAME
+
+fusioninventory-netdiscovery - Standalone network discovery
+
+=head1 SYNOPSIS
+
+fusioninventory-netdiscovery [options] --first <start> --last <stop>
+
+  Options:
+    --first address IP range first address
+    --last address  IP range last address
+    --credential    SNMP credential (default: version:1,community:public)
+    --entity        GLPI entity
+    --threads nb    number of discovery threads (default: 1)
+    --timeout val   SNMP timeout (default: 1s)
+    --control       output control messages
+    --debug         debug output (execution traces)
+    -h --help       print this message and exit
+    --version       print the task version and exit
+
+=head1 DESCRIPTION
+
+F<fusioninventory-netdiscovery> allows to run a network discovery task without a
+GLPI server.

@@ -0,0 +1,196 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use lib './lib';
+
+use English qw(-no_match_vars);
+use Getopt::Long;
+use Pod::Usage;
+use XML::TreePP;
+
+use FusionInventory::Agent::Task::NetInventory;
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Logger;
+
+my %types = (
+    1 => 'COMPUTER',
+    2 => 'NETWORKING',
+    3 => 'PRINTER',
+    4 => 'STORAGE',
+    5 => 'POWER',
+    6 => 'PHONE',
+    7 => 'VIDEO',
+);
+
+my $options = {
+    debug => 0
+};
+
+my %setup = (
+    confdir => './etc',
+    datadir => './share',
+    libdir  => './lib',
+    vardir  => './var',
+);
+
+GetOptions(
+    $options,
+    'model=s',
+    'type=s',
+    'host=s',
+    'file=s',
+    'community=s',
+    'credentials=s',
+    'entity=s',
+    'timeout=i',
+    'control',
+    'debug+',
+    'help',
+    'version',
+) or pod2usage(-verbose => 0);
+
+if ($options->{version}) {
+  print "NetInventory task $FusionInventory::Agent::Task::NetInventory::VERSION\n";
+  exit 0;
+}
+pod2usage(-verbose => 0, -exitval => 0) if $options->{help};
+
+pod2usage(
+    -message => "no host nor file given, aborting\n", -verbose => 0
+) unless $options->{host} or $options->{file};
+
+warn "deprecated option model, ignoring\n" if $options->{model};
+
+my $device = {
+    ID           => 0,
+    IP           => $options->{host},
+    FILE         => $options->{file},
+    AUTHSNMP_ID  => 1,
+    MODELSNMP_ID => 1
+};
+
+my $credentials = { ID => 1 };
+
+if ($options->{type}) {
+    pod2usage(
+        -message => "invalid type '$options->{type}', aborting\n",
+        -verbose => 0
+    ) unless any { $options->{type} eq $_ } values %types;
+    $device->{TYPE} = $options->{type};
+}
+
+if ($options->{community}) {
+    $credentials->{COMMUNITY} = $options->{community};
+} elsif (defined $options->{credentials}) {
+    foreach my $parameter (split(',', $options->{credentials})) {
+        my ($key, $value) = split(':', $parameter);
+        my $newkey =
+            $key eq 'authpassword' ? 'AUTHPASSPHRASE' :
+            $key eq 'privpassword' ? 'PRIVPASSPHRASE' :
+                                     uc($key);
+        $credentials->{$newkey} = $value;
+    }
+} else {
+    $credentials->{COMMUNITY} = 'public';
+}
+
+if ($options->{entity}) {
+    $device = $options->{entity};
+}
+
+my $verbosity =
+    $options->{debug} == 0 ? LOG_INFO   :
+    $options->{debug} == 1 ? LOG_DEBUG  :
+    $options->{debug} == 2 ? LOG_DEBUG2 :
+                             LOG_DEBUG2 ;
+
+my $inventory = FusionInventory::Agent::Task::NetInventory->new(
+    %setup,
+    target => FusionInventory::Agent::Task::NetInventory::Target->new(),
+    logger => FusionInventory::Agent::Logger->new(verbosity => $verbosity)
+);
+
+$inventory->{options} = {
+    NAME => 'SNMPQUERY',
+    PARAM => [
+        {
+            PID           => 1,
+            THREADS_QUERY => 1,
+            TIMEOUT       => $options->{timeout},
+        }
+    ],
+    DEVICE         => [ $device ],
+    AUTHENTICATION => [ $credentials ]
+};
+
+$inventory->{client} =
+    FusionInventory::Agent::Task::NetInventory::Client->new(
+        control => $options->{control}
+    );
+# TODO: need to be dropped the day we will depend on agent >= 2.3.0
+$inventory->{deviceid} = 'foo';
+
+$inventory->run();
+
+package FusionInventory::Agent::Task::NetInventory::Client;
+
+sub new {
+    my ($class, %params) = @_;
+
+    return bless {
+        control => $params{control}
+    }, $class;
+}
+
+sub send {
+    my ($self, %params) = @_;
+
+    # don't display control message by default
+    return unless $self->{control}
+        or $params{message}->{h}->{CONTENT}->{DEVICE};
+
+    print $params{message}->getContent();
+}
+
+package FusionInventory::Agent::Task::NetInventory::Target;
+
+sub new {
+    my ($class) = @_;
+
+    return bless {}, $class;
+}
+
+sub getUrl {
+    my ($self, %params) = @_;
+
+    ## no critic (ExplicitReturnUndef)
+    return undef;
+}
+
+__END__
+
+=head1 NAME
+
+fusioninventory-netinventory - Standalone network inventory
+
+=head1 SYNOPSIS
+
+fusioninventory-netinventory [options] [--host <host>--file <file>]
+
+  Options:
+    --host host    host to inventorize
+    --file         snmpwalk output file
+    --community    community string (default: public)
+    --credentials  SNMP credentials
+    --timeout val  SNMP timeout (default: 15s)
+    --entity       GLPI entity
+    --control      output control messages
+    --debug        debug output (execution traces)
+    -h --help      print this message and exit
+    --version      print the task version and exit
+
+=head1 DESCRIPTION
+
+F<fusioninventory-netinventory> allows to run a network inventory task without
+a GLPI server.

@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use lib './lib';
+
+use English qw(-no_match_vars);
+use Getopt::Long;
+use Pod::Usage;
+
+use FusionInventory::Agent::Task::WakeOnLan;
+use FusionInventory::Agent::Logger;
+use FusionInventory::Agent::Tools::Network;
+
+my $options = {
+    debug => 0,
+};
+
+GetOptions(
+    $options,
+    'mac=s',
+    'methods=s',
+    'debug+',
+    'help',
+    'version',
+) or pod2usage(-verbose => 0);
+
+if ($options->{version}) {
+  print "WakeOnLan task $FusionInventory::Agent::Task::WakeOnLan::VERSION\n";
+  exit 0;
+}
+pod2usage(-verbose => 0, -exitval => 0) if $options->{help};
+pod2usage(
+    -message => "no mac address given, aborting\n", -verbose => 0
+) unless $options->{mac};
+pod2usage(
+    -message => "invalid mac address given, aborting\n", -verbose => 0
+) if $options->{mac} !~ /^$mac_address_pattern$/;
+
+my $verbosity =
+    $options->{debug} == 0 ? LOG_INFO   :
+    $options->{debug} == 1 ? LOG_DEBUG  :
+    $options->{debug} == 2 ? LOG_DEBUG2 :
+                             LOG_DEBUG2 ;
+
+my $task = FusionInventory::Agent::Task::WakeOnLan->new(
+    target => {},
+    logger => FusionInventory::Agent::Logger->new(verbosity => $verbosity)
+);
+
+$task->{options} = {
+    NAME => 'WAKEONLAN',
+    PARAM => [
+        {
+            MAC           => $options->{mac},
+        }
+    ],
+};
+
+my %params = $options->{methods} ?
+    (methods => [ split(/,/, $options->{methods}) ]) : ();
+$task->run(%params);
+
+__END__
+
+=head1 NAME
+
+fusioninventory-wakeonlan - Standalone wake-on-lan
+
+=head1 SYNOPSIS
+
+fusioninventory-wakeonlan [options]
+
+  Options:
+    --mac=MAC         target mac address
+    --methods=METHODS comma-separated list of methods to use (ethernet, udp)
+    --debug           debug output (execution traces)
+    -h --help         print this message and exit
+    --version         print the task version and exit
+
+=head1 DESCRIPTION
+
+F<fusioninventory-wakeonlan> allows to run a wakeonlan task without a GLPI
+server.

@@ -0,0 +1,123 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use lib './lib';
+use threads;
+use threads::shared;
+use constant SERVICE_SLEEP_TIME => 2000; # 20 milliseconds
+
+use File::Spec;
+use File::Basename;
+
+use English qw(-no_match_vars);
+use Win32;
+use Win32::Daemon;
+
+use FusionInventory::Agent;
+
+delete($ENV{PERL5LIB});
+delete($ENV{PERLLIB});
+
+my $directory = dirname(File::Spec->rel2abs( __FILE__ ));
+# on Win2k, Windows do not chdir to the bin directory
+# we need to do it by ourself
+chdir($directory);
+
+Win32::Daemon::StartService();
+
+my $thread;
+my $state;
+my $previousState = SERVICE_START_PENDING;
+
+while (($state = Win32::Daemon::State()) != SERVICE_STOPPED) {
+    if ($state == SERVICE_START_PENDING) {
+        # Initialization code
+        startAgent();
+        Win32::Daemon::State(SERVICE_RUNNING);
+        $previousState = SERVICE_RUNNING;
+    } elsif ($state == SERVICE_STOP_PENDING) {
+        killAgent();
+        Win32::Daemon::State(SERVICE_STOPPED);
+    } elsif ($state == SERVICE_PAUSE_PENDING) {
+        # "Pausing...";
+        killAgent();
+        Win32::Daemon::State(SERVICE_PAUSED);
+        $previousState = SERVICE_PAUSED;
+        killAgent();
+        next;
+    } elsif ($state == SERVICE_CONTINUE_PENDING) {
+        # "Resuming...";
+        startAgent();
+        Win32::Daemon::State(SERVICE_RUNNING);
+        $previousState = SERVICE_RUNNING;
+        next;
+    } elsif ($state == SERVICE_STOP_PENDING) {
+        # "Stopping...";
+        killAgent();
+        Win32::Daemon::State(SERVICE_STOPPED);
+        $previousState = SERVICE_STOPPED;
+        next;
+    } elsif ($state == SERVICE_RUNNING) {
+        # The service is running as normal...
+        # ...add the main code here...
+        startAgent();
+    } else {
+        # Got an unhandled control message. Set the state to
+        # whatever the previous state was.
+        Win32::Daemon::State($previousState);
+    }
+
+    # Check for any outstanding commands. Pass in a non zero value
+    # and it resets the Last Message to SERVICE_CONTROL_NONE.
+    if (SERVICE_CONTROL_NONE != (my $message = getMessage())) {
+        if (SERVICE_CONTROL_INTERROGATE == $message) {
+            # Got here if the Service Control Manager is requesting
+            # the current state of the service. This can happen for
+            # a variety of reasons. Report the last state we set.
+            Win32::Daemon::State($previousState);
+        } elsif (SERVICE_CONTROL_SHUTDOWN == $message) {
+            # Yikes! The system is shutting down. We had better clean up
+            # and stop.
+            # Tell the SCM that we are preparing to shutdown and that we expect
+            # it to take 25 seconds, so don't terminate us for at least
+            # 25 seconds...
+            Win32::Daemon::State(SERVICE_STOP_PENDING, 25000);
+        }
+    }
+    # Snoose for awhile so we don't suck up cpu time...
+    Win32::Sleep(SERVICE_SLEEP_TIME);
+}
+
+sub getMessage {
+    if ($Win32::Daemon::VERSION < 20101014) {
+        return Win32::Daemon::LastControlMessage(1);
+    } else {
+        return Win32::Daemon::QueryLastMessage();
+    }
+}
+
+sub startAgent {
+    return if $thread;
+    $thread = threads->create(sub {
+        my $agent = FusionInventory::Agent->new(
+            confdir => $directory . '/../../etc/fusioninventory',
+            datadir => $directory . '/../../share',
+            vardir  => $directory . '/../../var',
+            libdir  => $directory . '/../../lib',
+        );
+        $agent->init(options => { service => 1 });
+        $agent->run();
+    });
+}
+
+sub killAgent {
+    $thread->kill('KILL');
+    $thread = undef;
+}
+
+__END__
+
+=head1 NAME
+
+fusioninventory-win32-service - FusionInventory Agent service for Windows

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
-  <displayName>entrer le nom complet ici</displayName>
-  <description>entrer la description ici</description>
-  <resources>
-    <stringTable>
-      <string id="FusionInventory_ROOT">Agent Fusion Inventory</string>
-      <string id="FusionInventory_CONFIGURE64">Configurer l'agent (64 bits)</string>
-      <string id="FusionInventory_CONFIGURE32">Configurer l'agent (32 bits)</string>
-      <string id="FusionInventory_CONFIGURE_EXPLAIN">Spécifie un jeu de paramètres pour l'agent Fusion Inventory.</string>
-    </stringTable>
-    <presentationTable>
-      <presentation id="FusionInventory_CONFIGURE">
-        <textBox refId="FusionInventory_Server">
-          <label>Server</label>
-        </textBox>
-        <textBox refId="FusionInventory_User">
-          <label>User</label>
-        </textBox>
-        <textBox refId="FusionInventory_Password">
-          <label>Password</label>
-        </textBox>
-        <textBox refId="FusionInventory_Realm">
-          <label>Realm</label>
-        </textBox>
-        <textBox refId="FusionInventory_Tag">
-          <label>Tag</label>
-        </textBox>
-      </presentation>
-    </presentationTable>
-  </resources>
-</policyDefinitionResources>

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
-  <policyNamespaces>
-    <target prefix="FusionInventory" namespace="FusionInventory" />
-    <using prefix="windows" namespace="Microsoft.Policies.Windows" />
-  </policyNamespaces>
-  <resources minRequiredRevision="1.0" />
-  <categories>
-    <category name="FusionInventory_ROOT" displayName="$(string.FusionInventory_ROOT)">
-      <parentCategory ref="windows:System" />
-    </category>
-  </categories>
-  <policies>
-    <policy name="FusionInventory_CONFIGURE32" class="Machine" displayName="$(string.FusionInventory_CONFIGURE32)" explainText="$(string.FusionInventory_CONFIGURE_EXPLAIN)" presentation="$(presentation.FusionInventory_CONFIGURE)" key="SOFTWARE\FusionInventory-Agent">
-      <parentCategory ref="FusionInventory_ROOT" />
-      <supportedOn ref="windows:SUPPORTED_WindowsXP" />
-      <elements>
-        <text id="FusionInventory_Server" valueName="server" />
-	<text id="FusionInventory_User" valueName="user" />
-	<text id="FusionInventory_Password" valueName="password" />
-	<text id="FusionInventory_Realm" valueName="realm" />
-	<text id="FusionInventory_Tag" valueName="tag" />
-      </elements>
-    </policy>
-    <policy name="FusionInventory_CONFIGURE64" class="Machine" displayName="$(string.FusionInventory_CONFIGURE64)" explainText="$(string.FusionInventory_CONFIGURE_EXPLAIN)" presentation="$(presentation.FusionInventory_CONFIGURE)" key="SOFTWARE\Wow6432Node\FusionInventory-Agent">
-      <parentCategory ref="FusionInventory_ROOT" />
-      <supportedOn ref="windows:SUPPORTED_WindowsXP" />
-      <elements>
-        <text id="FusionInventory_Server" valueName="server" />
-	<text id="FusionInventory_User" valueName="user" />
-	<text id="FusionInventory_Password" valueName="password" />
-	<text id="FusionInventory_Realm" valueName="realm" />
-	<text id="FusionInventory_Tag" valueName="tag" />
-      </elements>
-    </policy>
-  </policies>
-</policyDefinitions>

@@ -1,43 +0,0 @@
-# Write by Simon CLARA 2010-01-25
-#
-# The complete name of the package
-# the path MUST be valid or the package won't be loaded
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Tarballs;
-use strict;
-# I need to declare $runAfter because of the strict mode 
-use vars qw($runAfter);
-# The package must be run after OS::Generic
-$runAfter = ["FusionInventory::Agent::Backend::OS::Generic"];
-
-# This is the check function. The agent runs it just once the module is loaded.
-# If the function return false, the module and its children are not executed
-# eg: OS::Linux and OS::Linux::* won't executed if this run() function return
-# false
-
-# Check if we are on a linux server
-sub check { $^O =~ /^linux$/ }
-# uncomment this if you want check for FreeBSD server
-# sub check {canRun("pkg_info")}
-
-# its the main function of the script, it's called during the hardware inventory
-sub run {
-  my $params = shift;
-  # I need to get the inventory object to update it
-  my $inventory = $params->{inventory};
-
-# our software are in /usr/local/src/
-foreach (`ls /usr/local/src/*.{bz2,tar.gz}`){
-    /^(\/.*\/)(\S+)-(\d+\S*)(\.tar.gz|\.bz2)$/i;
-    my $name = $2;
-    my $version = $3;
-    my $comments = "Software in /usr/local/src/ \n".`$2 --version`;
-    # and I updated the information collected
-      $inventory->addSoftwares({
-          COMMENTS => $comments,
-          NAME => $name,
-          VERSION => $version
-        });
-  }
-}
-
-1;

@@ -1,152 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:         fusioninventory-agent 
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: FusionInventory Agent 
-# Description:	     This script launch FusionInventory Agent as daemon 
-### END INIT INFO
-
-# Author: Gonéri Le Bouder <goneri@rulezlan.org> 
-#
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="FusionInventory Agent"
-NAME=fusioninventory-agent
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-DAEMON_ARGS="-d -s $SERVER"
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# chkconfig: - 88 12
+# description:  FusionInventory Agent
+# processname: fusioninventory-agent
+# config: /etc/sysconfig/fusioninventory-agent.pid
+# pidfile: /var/run/fusioninventory-agent.pid
+### BEGIN INIT INFO
+# Provides: fusioninventory-agent
+# Required-Start: $remote_fs $network $named $syslog
+# Required-Stop: $remote_fs $network $named $syslog
+# Default-Start: 3 5
+# Default-Stop: 0 1 6
+# Short-Description: FusionInventory agent
+# Description: FusionInventory agent
+### END INIT INFO
+
+# source function library
+. /etc/rc.d/init.d/functions
+
+desc="FusionInventory Agent"
+prog=fusioninventory-agent
+lockfile=/var/lock/subsys/$prog
+pidfile=/var/run/$prog.pid
+
+if [ -r /etc/sysconfig/fusioninventory-agent ]; then
+    . /etc/sysconfig/fusioninventory-agent
+fi
+
+start() {
+    echo -n "Starting $prog: "
+    daemon fusioninventory-agent --daemon $OPTIONS 2>/dev/null
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch $lockfile
+}
+
+stop() {
+    echo -n "Stopping $prog: "
+    killproc $prog
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && rm -f $lockfile
+}
+
+case "$1" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    status)
+        status $prog
+        ;;
+    restart|reload|force-reload)
+        stop
+        start
+        ;;
+    condrestart)
+        if [ -f $lockfile ]; then
+            stop
+            start
+        fi
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
+        exit 1
+        ;;
+esac
+

@@ -0,0 +1,11 @@
+[Unit]
+Description=FusionInventory agent
+After=syslog.target network.target
+ 
+[Service]
+EnvironmentFile=-/etc/sysconfig/fusioninventory-agent
+Type=forking
+ExecStart=/usr/bin/fusioninventory-agent --daemon $OPTIONS
+ 
+[Install]
+WantedBy=multi-user.target

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+  <displayName>entrer le nom complet ici</displayName>
+  <description>entrer la description ici</description>
+  <resources>
+    <stringTable>
+      <string id="FusionInventory_ROOT">Agent Fusion Inventory</string>
+      <string id="FusionInventory_CONFIGURE64">Configurer l'agent (64 bits)</string>
+      <string id="FusionInventory_CONFIGURE32">Configurer l'agent (32 bits)</string>
+      <string id="FusionInventory_CONFIGURE_EXPLAIN">Spécifie un jeu de paramètres pour l'agent Fusion Inventory.</string>
+    </stringTable>
+    <presentationTable>
+      <presentation id="FusionInventory_CONFIGURE">
+        <textBox refId="FusionInventory_Server">
+          <label>Server</label>
+        </textBox>
+        <textBox refId="FusionInventory_User">
+          <label>User</label>
+        </textBox>
+        <textBox refId="FusionInventory_Password">
+          <label>Password</label>
+        </textBox>
+        <textBox refId="FusionInventory_Realm">
+          <label>Realm</label>
+        </textBox>
+        <textBox refId="FusionInventory_Tag">
+          <label>Tag</label>
+        </textBox>
+      </presentation>
+    </presentationTable>
+  </resources>
+</policyDefinitionResources>

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+  <policyNamespaces>
+    <target prefix="FusionInventory" namespace="FusionInventory" />
+    <using prefix="windows" namespace="Microsoft.Policies.Windows" />
+  </policyNamespaces>
+  <resources minRequiredRevision="1.0" />
+  <categories>
+    <category name="FusionInventory_ROOT" displayName="$(string.FusionInventory_ROOT)">
+      <parentCategory ref="windows:System" />
+    </category>
+  </categories>
+  <policies>
+    <policy name="FusionInventory_CONFIGURE32" class="Machine" displayName="$(string.FusionInventory_CONFIGURE32)" explainText="$(string.FusionInventory_CONFIGURE_EXPLAIN)" presentation="$(presentation.FusionInventory_CONFIGURE)" key="SOFTWARE\FusionInventory-Agent">
+      <parentCategory ref="FusionInventory_ROOT" />
+      <supportedOn ref="windows:SUPPORTED_WindowsXP" />
+      <elements>
+        <text id="FusionInventory_Server" valueName="server" />
+	<text id="FusionInventory_User" valueName="user" />
+	<text id="FusionInventory_Password" valueName="password" />
+	<text id="FusionInventory_Realm" valueName="realm" />
+	<text id="FusionInventory_Tag" valueName="tag" />
+      </elements>
+    </policy>
+    <policy name="FusionInventory_CONFIGURE64" class="Machine" displayName="$(string.FusionInventory_CONFIGURE64)" explainText="$(string.FusionInventory_CONFIGURE_EXPLAIN)" presentation="$(presentation.FusionInventory_CONFIGURE)" key="SOFTWARE\Wow6432Node\FusionInventory-Agent">
+      <parentCategory ref="FusionInventory_ROOT" />
+      <supportedOn ref="windows:SUPPORTED_WindowsXP" />
+      <elements>
+        <text id="FusionInventory_Server" valueName="server" />
+	<text id="FusionInventory_User" valueName="user" />
+	<text id="FusionInventory_Password" valueName="password" />
+	<text id="FusionInventory_Realm" valueName="realm" />
+	<text id="FusionInventory_Tag" valueName="tag" />
+      </elements>
+    </policy>
+  </policies>
+</policyDefinitions>

@@ -0,0 +1,414 @@
+'
+'  ------------------------------------------------------------------------
+'  fusioninventory-agent-deployment.vbs
+'  Copyright (C) 2010-2013 by the FusionInventory Development Team.
+'
+'  http://www.fusioninventory.org/ http://forge.fusioninventory.org/
+'  ------------------------------------------------------------------------
+'
+'  LICENSE
+'
+'  This file is part of FusionInventory project.
+'
+'  This file is free software; you can redistribute it and/or modify it
+'  under the terms of the GNU General Public License as published by the
+'  Free Software Foundation; either version 2 of the License, or (at your
+'  option) any later version.
+'
+'
+'  This file is distributed in the hope that it will be useful, but WITHOUT
+'  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+'  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+'  more details.
+'
+'  You should have received a copy of the GNU General Public License
+'  along with this program; if not, write to the Free Software Foundation,
+'  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA,
+'  or see <http://www.gnu.org/licenses/>.
+'
+'  ------------------------------------------------------------------------
+'
+'  @package   FusionInventory Agent
+'  @file      .\contrib\windows\fusioninventory-agent-deployment.vbs
+'  @author(s) Benjamin Accary <meldrone@orange.fr>
+'             Christophe Pujol <chpujol@gmail.com>
+'             Marc Caissial <marc.caissial@zenitique.fr>
+'             Tomas Abad <tabadgp@gmail.com>
+'  @copyright Copyright (c) 2010-2013 FusionInventory Team
+'  @license   GNU GPL version 2 or (at your option) any later version
+'             http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+'  @link      http://www.fusioninventory.org/
+'  @link      http://forge.fusioninventory.org/projects/fusioninventory-agent
+'  @since     2012
+'
+'  ------------------------------------------------------------------------
+'
+
+'
+'
+' Purpose:
+'     FusionInventory Agent Unatended Deployment.
+'
+'
+
+Option Explicit
+Dim Force, Verbose
+Dim Setup, SetupArchitecture, SetupLocation, SetupOptions, SetupVersion
+
+'
+'
+' USER SETTINGS
+'
+'
+
+' SetupLocation
+'    Depending on your needs or your environment, you can use either a HTTP or
+'    CIFS/SMB.
+'
+'    If you use HTTP, please, set to SetupLocation a URL:
+'
+'       SetupLocation = "http://host[:port]/[absolut_path]" or
+'       SetupLocation = "https://host[:port]/[absolut_path]"
+'
+'    If you use CIFS, please, set to SetupLocation a UNC path name:
+'
+'       SetupLocation = "\\host\share\[path]"
+'
+'       You also must be sure that you have removed the "Open File Security Warning"
+'       from programs accessed from that UNC.
+'
+SetupLocation = "http://freefr.dl.sourceforge.net/project/fiawi/2.3.x/2.3.0"
+
+' SetupVersion
+'    Setup version with the pattern <major>.<minor>.<release>[-<package>]
+'
+SetupVersion = "2.3.0-1"
+
+' SetupArchitecture
+'    The setup architecture can be 'x86', 'x64' or 'Auto'
+'
+'    If you set SetupArchitecture = "Auto" be sure that both installers are in
+'    the same SetupLocation.
+'
+SetupArchitecture = "Auto"
+
+' SetupOptions
+'    Consult the installer documentation to know its list of options.
+'
+'    You should use simple quotes (') to set between quotation marks those values
+'    that require it; double quotes (") doesn't work with UNCs.
+'
+SetupOptions = "/acceptlicense /runnow /server='http://glpi.yourcompany.com/glpi/plugins/fusioninventory/' /S"
+
+' Setup
+'    The installer file name. You should not have to modify this variable ever.
+'
+Setup = "fusioninventory-agent_windows-" & SetupArchitecture & "_" & SetupVersion & ".exe"
+
+' Force
+'    Force the installation even whether Setup is previously installed.
+'
+Force = "No"
+
+' Verbose
+'    Enable or disable the information messages.
+'
+'    It's advisable to use Verbose = "Yes" with 'cscript //nologo ...'.
+'
+Verbose = "No"
+
+'
+'
+' DO NOT EDIT BELOW
+'
+'
+
+Function AdvanceTime(nMinutes)
+   Dim nMinimalMinutes, dtmTimeFuture
+   ' As protection
+   nMinimalMinutes = 5
+   If nMinutes < nMinimalMinutes Then
+      nMinutes = nMinimalMinutes
+   End If
+   ' Add nMinutes to the current time
+   dtmTimeFuture = DateAdd ("n", nMinutes, Time)
+   ' Format the result value
+   '    The command AT accepts 'HH:MM' values only
+   AdvanceTime = Hour(dtmTimeFuture) & ":" & Minute(dtmTimeFuture)
+End Function
+
+Function baseName (strng)
+   Dim regEx, ret
+   Set regEx = New RegExp
+   regEx.Global = true
+   regEx.IgnoreCase = True
+   regEx.Pattern = ".*[/\\]([^/\\]+)$"
+   baseName = regEx.Replace(strng,"$1")
+End Function
+
+Function GetSystemArchitecture()
+   Dim strSystemArchitecture
+   Err.Clear
+   ' Get operative system architecture
+   On Error Resume Next
+   strSystemArchitecture = CreateObject("WScript.Shell").ExpandEnvironmentStrings("%PROCESSOR_ARCHITECTURE%")
+   If Err.Number = 0 Then
+      ' Check the operative system architecture
+      Select Case strSystemArchitecture
+         Case "x86"
+            ' The system architecture is 32-bit
+            GetSystemArchitecture = "x86"
+         Case "AMD64"
+            ' The system architecture is 64-bit
+            GetSystemArchitecture = "x64"
+         Case Else
+            ' The system architecture is not supported
+            GetSystemArchitecture = "NotSupported"
+      End Select
+   Else
+      ' It has been not possible to get the system architecture
+      GetSystemArchitecture = "Unknown"
+   End If
+End Function
+
+Function isHttp(strng)
+   Dim regEx, matches
+   Set regEx = New RegExp
+   regEx.Global = true
+   regEx.IgnoreCase = True
+   regEx.Pattern = "^(http(s?)).*"
+   If regEx.Execute(strng).count > 0 Then
+      isHttp = True
+   Else
+      isHttp = False
+   End If
+   Exit Function
+End Function
+
+Function IsInstallationNeeded(strSetupVersion, strSetupArchitecture, strSystemArchitecture)
+   Dim strCurrentSetupVersion
+   ' Compare the current version, whether it exists, with strSetupVersion
+   If strSystemArchitecture = "x86" Then
+      ' The system architecture is 32-bit
+      ' Check if the subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory Agent' exists
+      '    This subkey is now deprecated
+      On error resume next
+      strCurrentSetupVersion = WshShell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory Agent\DisplayVersion")
+      If Err.Number = 0 Then
+      ' The subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory Agent' exists
+         If strCurrentSetupVersion <> strSetupVersion Then
+            ShowMessage("Installation needed: " & strCurrentSetupVersion & " -> " & strSetupVersion)
+            IsInstallationNeeded = True
+         End If
+         Exit Function
+      Else
+         ' The subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory Agent' doesn't exist
+         Err.Clear
+         ' Check if the subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' exists
+         On error resume next
+         strCurrentSetupVersion = WshShell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent\DisplayVersion")
+         If Err.Number = 0 Then
+         ' The subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' exists
+            If strCurrentSetupVersion <> strSetupVersion Then
+               ShowMessage("Installation needed: " & strCurrentSetupVersion & " -> " & strSetupVersion)
+               IsInstallationNeeded = True
+            End If
+            Exit Function
+         Else
+            ' The subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' doesn't exist
+            Err.Clear
+            ShowMessage("Installation needed: " & strSetupVersion)
+            IsInstallationNeeded = True
+         End If
+      End If
+   Else
+      ' The system architecture is 64-bit
+      ' Check if the subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory Agent' exists
+      '    This subkey is now deprecated
+      On error resume next
+      strCurrentSetupVersion = WshShell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory Agent\DisplayVersion")
+      If Err.Number = 0 Then
+      ' The subkey 'SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory Agent' exists
+         If strCurrentSetupVersion <> strSetupVersion Then
+            ShowMessage("Installation needed: " & strCurrentSetupVersion & " -> " & strSetupVersion)
+            IsInstallationNeeded = True
+         End If
+         Exit Function
+      Else
+         ' The subkey 'SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory Agent' doesn't exist
+         Err.Clear
+         ' Check if the subkey 'SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' exists
+         On error resume next
+         strCurrentSetupVersion = WshShell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent\DisplayVersion")
+         If Err.Number = 0 Then
+         ' The subkey 'SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' exists
+            If strCurrentSetupVersion <> strSetupVersion Then
+               ShowMessage("Installation needed: " & strCurrentSetupVersion & " -> " & strSetupVersion)
+               IsInstallationNeeded = True
+            End If
+            Exit Function
+         Else
+            ' The subkey 'SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' doesn't exist
+            Err.Clear
+            ' Check if the subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' exists
+            On error resume next
+            strCurrentSetupVersion = WshShell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent\DisplayVersion")
+            If Err.Number = 0 Then
+            ' The subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' exists
+               If strCurrentSetupVersion <> strSetupVersion Then
+                  ShowMessage("Installation needed: " & strCurrentSetupVersion & " -> " & strSetupVersion)
+                  IsInstallationNeeded = True
+               End If
+               Exit Function
+            Else
+               ' The subkey 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FusionInventory-Agent' doesn't exist
+               Err.Clear
+               ShowMessage("Installation needed: " & strSetupVersion)
+               IsInstallationNeeded = True
+            End If
+         End If
+      End If
+   End If
+End Function
+
+Function IsSelectedForce()
+   If LCase(Force) <> "no" Then
+      ShowMessage("Installation forced: " & SetupVersion)
+      IsSelectedForce = True
+   Else
+      IsSelectedForce = False
+   End If
+End Function
+
+' http://www.ericphelps.com/scripting/samples/wget/index.html
+Function SaveWebBinary(strSetupLocation, strSetup)
+   Const adTypeBinary = 1
+   Const adSaveCreateOverWrite = 2
+   Const ForWriting = 2
+   Dim web, varByteArray, strData, strBuffer, lngCounter, ado, strUrl
+   strUrl = strSetupLocation & "/" & strSetup
+   'On Error Resume Next
+   'Download the file with any available object
+   Err.Clear
+   Set web = Nothing
+   Set web = CreateObject("WinHttp.WinHttpRequest.5.1")
+   If web Is Nothing Then Set web = CreateObject("WinHttp.WinHttpRequest")
+   If web Is Nothing Then Set web = CreateObject("MSXML2.ServerXMLHTTP")
+   If web Is Nothing Then Set web = CreateObject("Microsoft.XMLHTTP")
+   web.Open "GET", strURL, False
+   web.Send
+   If Err.Number <> 0 Then
+      SaveWebBinary = False
+      Set web = Nothing
+      Exit Function
+   End If
+   If web.Status <> "200" Then
+      SaveWebBinary = False
+      Set web = Nothing
+      Exit Function
+   End If
+   varByteArray = web.ResponseBody
+   Set web = Nothing
+   'Now save the file with any available method
+   On Error Resume Next
+   Set ado = Nothing
+   Set ado = CreateObject("ADODB.Stream")
+   If ado Is Nothing Then
+      Set fs = CreateObject("Scripting.FileSystemObject")
+      Set ts = fs.OpenTextFile(baseName(strUrl), ForWriting, True)
+      strData = ""
+      strBuffer = ""
+      For lngCounter = 0 to UBound(varByteArray)
+         ts.Write Chr(255 And Ascb(Midb(varByteArray,lngCounter + 1, 1)))
+      Next
+      ts.Close
+   Else
+      ado.Type = adTypeBinary
+      ado.Open
+      ado.Write varByteArray
+      ado.SaveToFile CreateObject("WScript.Shell").ExpandEnvironmentStrings("%TEMP%") & "\" & strSetup, adSaveCreateOverWrite
+      ado.Close
+   End If
+   SaveWebBinary = True
+End Function
+
+Function ShowMessage(strMessage)
+   If LCase(Verbose) <> "no" Then
+      WScript.Echo strMessage
+   End If
+End Function
+
+'
+'
+' MAIN
+'
+'
+
+Dim nMinutesToAdvance, strCmd, strSystemArchitecture, strTempDir, WshShell
+Set WshShell = WScript.CreateObject("WScript.shell")
+
+nMinutesToAdvance = 5
+
+' Get system architecture
+strSystemArchitecture = GetSystemArchitecture()
+If (strSystemArchitecture <> "x86") And (strSystemArchitecture <> "x64") Then
+   ShowMessage("The system architecture is unknown or not supported.")
+   ShowMessage("Deployment aborted!")
+   WScript.Quit 1
+Else
+   ShowMessage("System architecture detected: " & strSystemArchitecture)
+End If
+
+' Check and auto detect SetupArchitecture
+Select Case LCase(SetupArchitecture)
+   Case "x86"
+      ' The setup architecture is 32-bit
+      SetupArchitecture = "x86"
+      Setup = Replace(Setup, "x86", SetupArchitecture, 1, 1, vbTextCompare)
+      ShowMessage("Setup architecture: " & SetupArchitecture)
+   Case "x64"
+      ' The setup architecture is 64-bit
+      SetupArchitecture = "x64"
+      Setup = Replace(Setup, "x64", SetupArchitecture, 1, 1, vbTextCompare)
+      ShowMessage("Setup architecture: " & SetupArchitecture)
+   Case "auto"
+      ' Auto detection of SetupArchitecture
+      SetupArchitecture = strSystemArchitecture
+      Setup = Replace(Setup, "Auto", SetupArchitecture, 1, 1, vbTextCompare)
+      ShowMessage("Setup architecture detected: " & SetupArchitecture)
+   Case Else
+      ' The setup architecture is not supported
+      ShowMessage("The setup architecture '" & SetupArchitecture & "' is not supported.")
+      WScript.Quit 2
+End Select
+
+' Check the relation between strSystemArchitecture and SetupArchitecture
+If (strSystemArchitecture = "x86") And (SetupArchitecture = "x64") Then
+   ' It isn't possible to execute a 64-bit setup on a 32-bit operative system
+   ShowMessage("It isn't possible to execute a 64-bit setup on a 32-bit operative system.")
+   ShowMessage("Deployment aborted!")
+   WScript.Quit 3
+End If
+
+If IsSelectedForce() Or IsInstallationNeeded(SetupVersion, SetupArchitecture, strSystemArchitecture) Then
+   If isHttp(SetupLocation) Then
+      ShowMessage("Downloading: " & SetupLocation & "/" & Setup)
+      If SaveWebBinary(SetupLocation, Setup) Then
+         strCmd = WshShell.ExpandEnvironmentStrings("%ComSpec%")
+         strTempDir = WshShell.ExpandEnvironmentStrings("%TEMP%")
+         ShowMessage("Running: """ & strTempDir & "\" & Setup & """ " & SetupOptions)
+         WshShell.Run """" & strTempDir & "\" & Setup & """ " & SetupOptions, 0, True
+         ShowMessage("Scheduling: DEL /Q /F """ & strTempDir & "\" & Setup & """")
+         WshShell.Run "AT.EXE " & AdvanceTime(nMinutesToAdvance) & " " & strCmd & " /C ""DEL /Q /F """"" & strTempDir & "\" & Setup & """""", 0, True
+         ShowMessage("Deployment done!")
+      Else
+         ShowMessage("Error downloading '" & SetupLocation & "\" & Setup & "'!")
+      End If
+   Else
+      ShowMessage("Running: """ & SetupLocation & "\" & Setup & """ " & SetupOptions)
+      WshShell.Run "CMD.EXE /C """ & SetupLocation & "\" & Setup & """ " & SetupOptions, 0, True
+      ShowMessage("Deployment done!")
+   End If
+Else
+   ShowMessage("It isn't needed the installation of '" & Setup & "'.")
+End If

@@ -0,0 +1,8 @@
+# FusionInventory agent Deploy task
+
+## Description
+
+This task allows the agent to perform software installation on its host.
+
+If the P2P option is turned on, the agent will looks for peer in its
+network. The network range size will be limited at 255 machines.

@@ -0,0 +1,15 @@
+# FusionInventory agent ESX task
+
+## Summary
+
+This task allows the agent to perform remote inventory of ESX, ESXi, vCenter
+server using the SOAP interface.
+
+You can import the generated files in:
+ - GLPI with FusionInventory for GLPI
+ - ocsinventory
+ - Uranos
+
+## Description
+
+TODO.

@@ -0,0 +1,14 @@
+# FusionInventory agent inventory task
+
+## Summary
+
+This task allows the agent to perform local inventory of its own host.
+
+## Description
+
+TODO.
+
+## Command-line usage
+
+The fusioninventory-inventory tool allows to run the task without a control
+server. See the corresponding man page for details.

@@ -0,0 +1,78 @@
+# FusionInventory agent network tasks
+
+## Summary
+
+The NetDiscovery task allows the agent to scan the network to find remote
+devices, through nmap, NetBios or SNMP, and to identify them
+
+The NetInventory task allows the agent to extract various informations from a
+remote device through SNMP protocol
+
+## Description
+
+The NetDiscovery task uses the following methods to scan IP networks:
+
+* ICMP scan, using nmap external command
+* NetBIOS scan, using [[!cpan Net::NBName]] perl module
+* SNMP scan, using [[!Net::SNMP]] perl module
+
+Any device replying to one of those protocols will be discovered, with just
+minimal information, such as mac address and hostname.
+
+If the device replies to SNMP, an additional identification attempt is
+performed, using the device system description (SNMPv2-MIB::sysDescr.0) field.  
+First, this value is compared to a database of known values (the SNMP
+dictionnary). If there is an exact match, an SNMP description model can be used
+to fully identify the device (model-based identification). If there is no exact
+match, various rules are used to partially identify the device (rule-based
+identification).
+
+Discovered devices are then reported to the GLPI servers, and import rules are
+applied.  If the device type (printer, network device, etc...) has not been
+identified, they will be considered as 'unkown devices'.
+
+The NetInventory task can be applied to any device already present in the
+inventory, provided it is assigned an SNMP description model. If no such model
+has been automatically assigned during previous discovery phase, it can still
+be done manually though GLPI interface.
+
+## SNMP description models
+
+An SNMP description model maps specific device features (ports list, ink level,
+etc...) with SNMP OIDs. Given than manufacturers often change those OIDs
+between firmware releases, the same device may have to use different SNMP
+description models depending of its firmware. This means than the agent will
+only assign description models to specific hardware/software combinations, as
+identified from device SysDescr value. No model automaticall assigned doesn't
+mean than no one applies, but rather than no one is known to work in this
+specific case.
+
+The SNMP description models database is constitued by two elements:
+
+* the models, each of them defined in its own XML file, which have to be
+  imported in GLPI database before usage
+* the dictionnary, mapping those models to known sysdescr values,  defined in
+  another XML file, discovery.xml, which is used directly without prior import
+
+Those files are all distributed with the FusionInventory plugin for GLPI, in
+fusinvsnmp directory.
+
+If the network discovery is unable to automatically assign a suitable SNMP
+description model for your devices, your different options are:
+
+* use the SNMP description model generation tool, included in FusionInventory
+  for GLPI starting with version 0.83+2.0, to create a dedicated model
+* try a newer snapshot of the database, available from
+  <http://fusioninventory.org/snmpmodels>
+* try to use another model that seems close enough
+
+Only the first option brings some ensurance of full coverage of information:
+using an unadapted model may perfectly result in partial results.
+
+## Command-line usage
+
+The fusioninventory-netdiscovery and fusioninventory-netinventory command line
+tools allow to run the corresponding tasks without a GLPI server. However, they
+still requires some data files shipped in the server sources (SNMP dictionnary
+and SNMP description models). See the corresponding man pages for details.
+

@@ -0,0 +1,16 @@
+# FusionInventory agent wake-on-lan task
+
+## Summary
+
+This task allows the agent to send Wake On LAN magic packets to other computers
+on the same local network.
+
+## Description
+
+TODO.
+
+## Command-line usage
+
+The fusioninventory-wakeonlan tool allows to run the task without a control
+server. See the corresponding man page for details.
+

@@ -14,8 +14,6 @@
 #server = http://server.domain.com/glpi/plugins/fusioninventory/
 # write tasks results in a directory
 #local = /tmp
-# write tasks results on stdout
-#stdout = 1
 
 #
 # Task definition options
@@ -28,10 +26,8 @@
 # Target scheduling options
 #
 
-# maximum initial delay before first target, in seconds
+# maximum delay before first target, in seconds
 delaytime = 3600
-# maximum delay between each targets, in seconds
-wait =
 # do not contact the target before next scheduled time
 lazy = 0
 
@@ -41,17 +37,17 @@ lazy = 0
 
 # do not list local printers
 # no-category = printer
-# allow to scan use home directories
+# allow to scan user home directories
 scan-homedirs = 0
+# allow to scan user profiles
+scan-profiles = 0
 # save the inventory as HTML
 html = 0
 # timeout for inventory modules execution
 backend-collect-timeout = 30
 # always send data to server
 force = 0
-# mark the machine with given tag
-tag = 
-# additional content inventory file
+# additional inventory content file
 additional-content =
 
 #
@@ -65,30 +61,30 @@ no-p2p = 0
 # Network options
 #
 
-# proxy address, e.g: http://user:pass@proxy:port
+# proxy address
 proxy =
 # user name for server authentication
 user =
 # password for server authentication
 password =
-# path to the CA certificates directory
+# CA certificates directory
 ca-cert-dir =
-# path to the CA certificates file
+# CA certificates file
 ca-cert-file =
-# do not check server SSL certificates
+# do not check server SSL certificate
 no-ssl-check = 0
-# connection timeout
+# connection timeout, in seconds
 timeout = 180
 
 #
 # Web interface options
 #
 
-# do not use web interface
+# disable embedded web server
 no-httpd = 0
 # network interface to listen to
 httpd-ip =
-# network port to list to
+# network port to listen to
 httpd-port = 62354
 # trust requests without authentication token
 httpd-trust =
@@ -98,10 +94,10 @@ httpd-trust =
 #
 
 # Logger backend, either Stderr, File or Syslog (Stderr)
-logger = Stderr
+logger = stderr
 # log file
 #logfile = /var/log/fusioninventory.log
-# maximum log file size
+# maximum log file size, in MB
 #logfile-maxsize = 0
 # Syslog facility
 logfacility = LOG_USER
@@ -112,9 +108,7 @@ color = 0
 # Execution mode options
 #
 
-# run as daemon
-daemon = 0
-# don't fork in background
-no-fork = 0
+# add given tag to inventory results
+tag = 
 # debug mode
 debug = 0

@@ -1,612 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use lib './lib';
-
-use English qw(-no_match_vars);
-use Getopt::Long;
-use Pod::Usage;
-
-use FusionInventory::Agent;
-
-Getopt::Long::Configure( "no_ignorecase" );
-
-my $options = {};
-
-GetOptions(
-    $options,
-    'additional-content=s',
-    'backend-collect-timeout=s',
-    'ca-cert-dir=s',
-    'ca-cert-file=s',
-    'conf-file=s',
-    'config=s',
-    'color',
-    'daemon|d',
-    'no-fork',
-    'debug+',
-    'delaytime=s',
-    'force|f',
-    'help|h',
-    'html',
-    'lazy',
-    'list-tasks',
-    'setup',
-    'local|l=s',
-    'logger=s',
-    'logfile=s',
-    'logfile-maxsize=i',
-    'no-category=s',
-    'no-httpd',
-    'no-ssl-check',
-    'no-task=s',
-    'no-p2p',
-    'password|p=s',
-    'proxy|P=s',
-    'httpd-ip=s',
-    'httpd-port=s',
-    'httpd-trust=s',
-    'scan-homedirs',
-    'server|s=s',
-    'stdout',
-    'tag|t=s',
-    'timeout=i',
-    'user|u=s',
-    'version',
-    'wait|w=s',
-    # deprecated options
-    'daemon-no-fork|D',
-    'devlib',
-    'no-ocsdeploy',
-    'no-inventory',
-    'no-wakeonlan',
-    'no-snmpquery',
-    'no-netdiscovery',
-    'no-printer',
-    'no-software',
-    'rpc-trust-localhost',
-    'rpc-port',
-    'rpc-ip',
-    'no-socket',
-    'realm',
-    'info|i',
-) or pod2usage(-verbose => 0);
-
-pod2usage(-verbose => 0) if $options->{help};
-
-if ($options->{version}) {
-    print $FusionInventory::Agent::VERSION_STRING . "\n";
-    exit 0;
-}
-
-my %setup = (
-    confdir => './etc',
-    datadir => './share',
-    libdir  => './lib',
-    vardir  => './var',
-);
-
-if ($options->{setup}) {
-    foreach my $key (keys %setup) {
-        print "$key: $setup{$key}\n";
-    }
-    exit 0;
-}
-
-my $agent = FusionInventory::Agent->new(%setup);
-
-if ($options->{'list-tasks'}) {
-    my %tasks = $agent->getAvailableTasks();
-    foreach my $task (keys %tasks) {
-        print "$task (v$tasks{$task})\n";
-    }
-    exit 0;
-}
-
-eval {
-    $agent->init(options => $options);
-    $agent->run();
-};
-
-if ($EVAL_ERROR) {
-    print STDERR "Execution failure:.\n";
-    print STDERR $EVAL_ERROR;
-    exit 1;
-}
-
-exit(0);
-
-__END__
-
-=head1 NAME
-
-fusioninventory-agent - FusionInventory agent For Linux/UNIX, Windows and MacOSX
-
-=head1 SYNOPSIS
-
-B<fusioninventory-agent> [options] [--server server|--local directory|--sdout]
-
-  Target definition options
-    -s --server=URI     send tasks result to a server
-    -l --local=DIR      write tasks results in a directory
-    --stdout            write tasks result on STDOUT
-
-  Target scheduling options
-    --delaytime=DURATION        maximum initial delay before first target, in seconds (3600)
-    -w --wait=DURATION          maximum delay between each target, in seconds
-    --lazy                      do not contact the target before next scheduled time
-
-  Task selection options
-    --list-tasks        list available tasks and exit
-    --no-task=TASK      do not run given task
-
-  Inventory task specific options
-    --no-category=CATEGORY do not list given category items
-    --scan-homedirs     allow to scan use home directories (false)
-    --html              save the inventory as HTML (false)
-    -f --force          always send data to server (false)
-    -t --tag=TAG        mark the machine with given tag
-    --backend-collect-timeout   timeout for inventory modules execution (30)
-    --additional-content=FILE   additional inventory content
-
-  Package deployment task specific options
-    --no-p2p            do not use peer to peer to download files (false)
-
-  Network options:
-    -P --proxy=PROXY    proxy address
-    -u --user=USER      user name for server authentication
-    -p --password=PWD   password for server authentication
-    --ca-cert-dir=D     path to the CA certificates directory
-    --ca-cert-file=F    path to the CA certificates file
-    --no-ssl-check      do not check server SSL certificates (false)
-    --timeout           connection timeout (180)
-
-  Web interface options
-    --no-httpd                 disable embedded web server (false)
-    --httpd-ip=IP              network interface to listen to
-    --httpd-port=PORT          network port to listen to (62354)
-    --httpd-trust=RANGE        trust requests from range without authentication token (false)
-
-  Logging options
-    --logger=BACKEND            logger backend [Stderr|File|Syslog] (Stderr)
-    --logfile=FILE              log file
-    --logfile-maxsize=X         maximum size of the log file in MB (0)
-    --logfacility=FACILITY      syslog facility (LOG_USER)
-    --color                     use color in the console (false)
-
-  Configuration options
-    --config=BACKEND            configuration backend [file|registry|none]
-    --conf-file=FILE            configuration file
-
-  Execution mode options
-    -d --daemon                 run the agent as a daemon (false)
-    --no-fork                   don't fork in background (false)
-    --debug                     debug mode (false)
-    --version                   print the version and exit
-
-=head1 EXAMPLES
-
-    % fusioninventory-agent --server localhost
-    # execute all available tasks required by a local server
-
-    % fusioninventory-agent --server http://localhost/ocsinventory2
-    # execute all available tasks required by a local server, using a specific
-    # URI
-
-    % fusioninventory-agent --server https://localhost/ocsinventory
-    # execute all available tasks required by a local server, using a secure
-    # connection
-
-    % fusioninventory-agent --server localhost --user test --password s3cr3t
-    # execute all available tasks required by a local server, using HTTP
-    # authentication
-
-    % fusioninventory-agent --local /tmp
-    # execute all available tasks and write the result in /tmp directory
-
-    % fusioninventory-agent --local /tmp --html
-    # execute all available tasks and write the result in /tmp directory in
-    # HTML format
-
-=head1 DESCRIPTION
-
-F<fusioninventory-agent> is an agent for OCS Inventory server and
-FusionInventory for GLPI servers. It creates local inventory of the machines
-(hardware and software) and send it to the server. It can also write it
-in a local XML file.
-This agent is the successor of the former linux_agent which was released with
-OCS 1.01 and prior. It also replaces the Solaris/AIX/BSD unofficial agents.
-
-Supported systems:
-
-=over 4
-
-=item F<Windows> (since Windows 2000)
-
-=item F<GNU/Linux>
-
-=item F<MacOSX>
-
-=item F<Solaris>
-
-=item F<FreeBSD>
-
-=item F<NetBSD>
-
-=item F<OpenBSD>
-
-=item F<AIX>
-
-=item F<HP-UX>
-
-=item F<GNU/kFreeBSD>
-
-=back
-
-=head1 OCS INVENTORY PROTOCOL
-
-FusionInventory Agent uses OCS Inventory protocol and is compatible with OCS
-Inventory server. The agent uses the same protocol with the FusionInventory
-For GLPI plugin.
-
-The OCS protocol is basicly an exchange of XML file done over HTTP(S).
-
-=head2 First, The PROLOG
-
-The agent send a first message to give it's ID (DEVICEID). The
-server send back to the agent an XML file with a list of parameter. It's the
-PROLOG RESP. You can see it if you're in Debug mode.
-In this PROLOG, the server send the PROLOG_FREQ. The agent will use it to
-know when it need to contact the server for the next time.
-
-The agent compute the next query date this way:
-
-     PROLOG_FREQ/2+RANDOM(PROLOG_FREQ/2)
-
-
-=head2 Module execution
-
-The agent will launch each modules and pass the list of options found in the
-PROLOG RESP as parameter. The module can send information directly to the
-server (inventory, SNMP scan result, etc)
-
-=head2 Server mode (Windows service or Unix daemon)
-
-In server mode, the agent wait during a period between the last PROLOG and
-PROLOG_FREQ. If PROLOG_FREQ is not set, it will use --delaytime value.
-The default value is 3600.
-
-=head1 OPTIONS
-
-Most of the options are available in a I<short> form and a I<long> form.  For
-example, the two lines below are all equivalent:
-
-    % fusioninventory-agent -s localhost
-    % fusioninventory-agent --server localhost
-
-=head2 Target definition options
-
-=over
-
-
-=item B<-s>, B<--server>=I<URI>
-
-Send results of tasks execution to given server.
-
-If I<URI> doesn't start with http:// or https://, the agent assume the
-parameter is a hostname and rewrite it as:
-
-    % --server=http://servername/ocsinventory
-
-In general, OCS Inventory server URL have this format:
-
-    http://servername/ocsinventory
-
-and FusionInventory for GLPI this one:
-
-    http://servername/glpi/plugins/fusioninventory/front/plugin_fusioninventory.communication.php
-
-Multiple values can be specified, using comma as a separator.
-
-=item B<-l>, B<--local>=I<DIR>
-
-Write the results of tasks execution to given directory.
-
-=item B<--stdout>
-
-Write the results of tasks execution on stdout.
-
-=back
-
-=head2 Target scheduling options
-
-=over
-
-=item B<--delaytime>=I<LIMIT>
-
-Set an initial delay before the first target, whose value is computed randomly
-between LIMIT / 2 and LIMIT seconds. This setting is ignored for server targets
-after the initial contact, in favor of server-specified parameter
-(PROLOG_FREQ).
-
-=item B<-w> I<LIMIT>, B<--wait>=I<LIMIT>
-
-Set a delay between each targets, whose value is computed randomly between 0
-and LIMIT seconds.
-
-=item B<--lazy>
-
-Do not contact the target before next scheduled time.
-
-This option is only available when the agent is not run as a server.
-
-=back
-
-=head2 Task selection options
-
-=over
-
-=item B<--no-task>=I<TASK>
-
-Disable the given task
-
-=item B<--list-tasks>
-
-List available tasks and exit
-
-=back
-
-=head2 Inventory task specific options
-
-=over
-
-=item B<--no-category>=I<CATEGORY>
-
-Do not list given category items in inventory. It can be:
-
-=over 4
-
-=item
-
-printer
-
-=item
-
-software
-
-=item
-
-environment
-
-=item
-
-process
-
-=back 
-
-=item B<--scan-homedirs>
-
-Allow the agent to scan home directories for virtual machines.
-
-=item B<--html>
-
-Save the inventory as HTML.
-
-This is only used for local inventories.
-
-=item B<-f>, B<--force>
-
-Send an inventory to the server, even if this last one doesn't ask for it.
-
-=item B<--tag>=I<TAG>
-
-Mark the machine with given tag.
-
-=item B<--backend-collect-timeout>=I<TIME>
-
-Timeout for inventory modules execution.
-
-=back
-
-=head2 Package deployment task specific options
-
-=over
-
-=item B<--no-p2p>
-
-Do not use peer to peer to download files.
-
-=back
-
-=head2 Server target specific options
-
-=over
-
-=item B<-P>, B<--proxy>=I<PROXY>
-
-Use I<PROXY> as HTTP proxy.
-
-By default, the agent uses HTTP_PROXY environment variable.
-
-=item B<-u> I<USER>, B<--user>=I<USER>
-
-Use I<USER> for server authentication.
-
-=item B<-p>, B<--password>=I<PASSWORD>
-
-Use I<PASSWORD> for server authentication.
-
-=item B<--ca-cert-dir>=I<PATH>
-
-Path to the CA certificates directory.
-
-=item B<--ca-cert-file>=I<FILE>
-
-Path to the CA certificates file.
-
-=item B<--no-ssl-check>
-
-Do not check server SSL certificates.
-
-Hint: you can set HTTPS_DEBUG environment variable to get SSL error messages in
-the console.
-
-=back
-
-=head2 Web interface options
-
-=over
-
-=item B<--no-httpd>
-
-Disable the embedded web server.
-
-=item B<--httpd-ip>=I<IP>
-
-The network interface to use for the embedded web server (all 
-available interfaces).
-
-=item B<--httpd-port>=I<PORT>
-
-The network port to use for the embedded web server (62354).
-
-=item B<--httpd-trust>=I<RANGE>
-
-Trust requests from given range without authentication token (false).
-
-For example: "192.168.0.0/24", "192.68.168.0.5" or an IP range like
-"20.34.101.207 - 201.3.9.99". See L<Net::IP> documentation to get more example.
-
-=back
-
-=head2 Logging options
-
-=over
-
-=item B<--logger>=I<BACKEND>
-
-Logger backend to use. It can be:
-
-=over 4
-
-=item
-
-Stderr: log messages directly in the console.
-
-=item
-
-File: log messages in a file.
-
-=item
-
-Syslog: log messages through the local syslog server
-
-=back
-
-Multiple values can be specified, using comma as a separator.
-
-=item B<--logfile>=I<FILE>
-
-Log message in I<FILE> (implies File logger backend)
-
-=item B<--logfile-maxsize>=I<FILE>
-
-Max logfile size in MB, default is unlimited. When the max size is reached, the
-file is truncated. This is only useful if there is no log rotation mechanism on
-the system.
-
-=item B<--logfacility>=I<FACILITY>
-
-Syslog facility to use (default LOG_USER)
-
-=item B<--color>
-
-Display color on the terminal, when the Stderr backend is used.
-
-This options is ignored on Windows.
-
-=back
-
-=head2 Configuration options
-
-=over
-
-=item B<--conf-file>=I<FILE>
-
-Use I<FILE> as configuration file (implies file configuration backend)
-
-=item B<--config>=I<BACKEND>
-
-Configuration backend to use. It can be:
-
-=over 4
-
-=item
-
-file: read configuration from a file (default anywhere else as Windows)
-
-=item
-
-registry: read configuration from the registry (default on Windows)
-
-=item
-
-none: don't read any configuration
-
-=back
-
-=back
-
-=head2 Execution mode options
-
-=over
-
-=item B<-d>, B<--daemon>
-
-Run the agent as a daemon.
-
-=item B<--no-fork>
-
-Don't fork in background.
-
-This is only useful when running as a daemon.
-
-=item B<--debug>
-
-Turn the debug mode on.
-
-=item B<--setup>
-
-Print the agent setup directories and exit.
-
-=item B<--version>
-
-Print the version and exit.
-
-=back
-
-=head1 CONFIGURATION
-
-The agent is able to use multiple configuration backends. The registry backend
-is the default on Windows platform, and the file backend is the default
-everywhere else. Another backend can be specified using the B<--config> option.
-
-The I<file> backend reads configuration directives from a configuration file,
-whose default location is determined at installation time as
-PREFIX/etc/agent.cfg. An alternative location can also be given with
-B<--conf-file> option.
-
-The I<registry> backend reads configuration directives from the Windows
-registry, with an arch-dependant location:
-
-=over
-
-=item * F<HKEY_LOCAL_MACHINE\SOFTWARE\FusionInventory-Agent> for 32 bits machines
-
-=item * F<HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\FusionInventory-Agent> for 64 bits machines
-
-=back
-
-The I<none> backend doesn't read any configuration directive at all, allowing
-to isolate the agent execution from any installed configuration.

@@ -1,145 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-##Copyleft Pascal DANEK 2005
-##Copyleft Goneri Le Bouder 2006
-##Copyleft FusionInventory Project 2010-2012
-##Web : http://www.FusionInventory.org
-##
-##This code is open source and may be copied and modified as long as the source
-##code is always made freely available.
-##Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt
-################################################################################
-
-use strict;
-use warnings;
-
-use Compress::Zlib;
-use English qw(-no_match_vars);
-use Fcntl qw/:flock/;
-use Getopt::Long;
-use LWP::UserAgent;
-use Pod::Usage;
-
-my %options = (
-    useragent => 'FusionInventory-Injector'
-);
-
-sub loadfile {
-    my $file = shift;
-
-    die "can't read file $file" unless -r $file;
-
-    print "Loading $file..." if $options{verbose};
-
-    open (my $fh, '<', $file) or die "can't open file $file: $ERRNO";
-    ## no critic (ProhibitBitwise)
-    flock ($fh, LOCK_EX | LOCK_NB) or die "can't lock file $file: $ERRNO";
-    local $RS;
-    my $content = <$fh>;
-    close $fh or die "Can't close file $file: $ERRNO";
-
-    sendContent($content);
-}
-
-sub loaddirectory {
-    my $directory = shift;
-
-    die "can't read directory $directory" unless -r $directory;
-
-    opendir (my $dh, $directory) or die "can't open directory $directory: $ERRNO";
-    foreach ( readdir($dh) ) {
-        loadfile("$directory/$_") if (/\.ocs$/);
-    }
-    closedir $dh;
-}
-
-sub loadstdin {
-    my $content;
-    undef $RS;
-    $content = <STDIN>;
-    sendContent($content);
-}
-
-sub sendContent {
-    my $content = shift;
-
-    my $ua = LWP::UserAgent->new;
-    $ua->agent($options{useragent});
-    my $request = HTTP::Request->new( POST => $options{url} );
-    $request->header(
-        'Pragma' => 'no-cache',
-        'Content-type', 'Application/x-compress'
-    );
-    if (uncompress($content)) {
-        $content = uncompress($content);
-    }
-    $request->content(compress($content));
-    my $res = $ua->request($request);
-
-    if ($res->is_success()) {
-        print "OK\n" if $options{verbose};
-        print STDERR "Can't remove $options{file}: $ERRNO\n"
-            if ($options{remove} && (!unlink $options{file}));
-    } else {
-        if ($options{verbose}) {
-            print "ERROR: ";
-            print $res->status_line(), "\n";
-        }
-    }
-}
-
-GetOptions(
-    \%options,
-    'help|h',
-    'directory|d=s',
-    'file|f=s',
-    'url|u=s',
-    'useragent=s',
-    'remove|r',
-    'verbose|v',
-    'stdin',
-);
-
-$OUTPUT_AUTOFLUSH = 1;
-pod2usage() if $options{help};
-
-if ($options{file}) {
-    die "file $options{file} does not exist" unless -f $options{file};
-    loadfile($options{file});
-} elsif ($options{stdin}) {
-    loadstdin();
-} elsif ($options{directory}) {
-    die "directory $options{directory} does not exist" unless -d $options{directory};
-   loaddirectory($options{directory});
-} else {
-    pod2usage();
-}
-
-exit(0);
-
-__END__
-
-=head1 NAME
-
-fusioninventory-injector - A tool to push inventory in an OCS Inventory or compatible server.
-
-=head1 SYNOPSIS
-
-fusioninventory-injector [options] [--file <file>|--directory <directory|--stdin]
-
-  Options:
-    -h --help      this menu
-    -d --directory load every .ocs files from a directory
-    -f --file      load a speficic file
-    -u --url       server URL
-    -r --remove    remove succesfuly injected files
-    -v --verbose   verbose mode
-    --stdin        read data from STDIN
-
-  Examples:
-    fusioninventory-injector -v -f /tmp/toto-2010-09-10-11-42-22.ocs --url https://login:pw@server/ocsinventory
-
-=head1 DESCRIPTION
-
-This tool can be used to test your server, do benchmark or push inventory from
-off-line machine.

@@ -1,124 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use lib './lib';
-use threads;
-use threads::shared;
-use constant SERVICE_SLEEP_TIME => 2000; # 20 milliseconds
-
-use File::Spec;
-use File::Basename;
-
-use English qw(-no_match_vars);
-use Win32;
-use Win32::Daemon;
-
-use FusionInventory::Agent;
-
-delete($ENV{PERL5LIB});
-delete($ENV{PERLLIB});
-
-my $directory = dirname(File::Spec->rel2abs( __FILE__ ));
-# on Win2k, Windows do not chdir to the bin directory
-# we need to do it by ourself
-chdir($directory);
-
-Win32::Daemon::StartService();
-
-my $thread;
-my $state;
-my $previousState = SERVICE_START_PENDING;
-
-while (($state = Win32::Daemon::State()) != SERVICE_STOPPED) { 
-    if ($state == SERVICE_START_PENDING) {
-        # Initialization code
-        startAgent();
-        Win32::Daemon::State(SERVICE_RUNNING);
-        $previousState = SERVICE_RUNNING;
-    } elsif ($state == SERVICE_STOP_PENDING) {
-        killAgent();
-        Win32::Daemon::State(SERVICE_STOPPED);
-    } elsif ($state == SERVICE_PAUSE_PENDING) {
-        # "Pausing...";
-        killAgent();
-        Win32::Daemon::State(SERVICE_PAUSED);
-        $previousState = SERVICE_PAUSED;
-        killAgent();
-        next;
-    } elsif ($state == SERVICE_CONTINUE_PENDING) {
-        # "Resuming...";
-        startAgent();
-        Win32::Daemon::State(SERVICE_RUNNING);
-        $previousState = SERVICE_RUNNING;
-        next;
-    } elsif ($state == SERVICE_STOP_PENDING) {
-        # "Stopping...";
-        killAgent();
-        Win32::Daemon::State(SERVICE_STOPPED);
-        $previousState = SERVICE_STOPPED;
-        next;
-    } elsif ($state == SERVICE_RUNNING) {
-        # The service is running as normal...
-        # ...add the main code here...
-        startAgent();
-    } else {
-        # Got an unhandled control message. Set the state to
-        # whatever the previous state was.
-        Win32::Daemon::State($previousState);
-    }
-
-    # Check for any outstanding commands. Pass in a non zero value
-    # and it resets the Last Message to SERVICE_CONTROL_NONE.
-    if (SERVICE_CONTROL_NONE != (my $message = getMessage())) {
-        if (SERVICE_CONTROL_INTERROGATE == $message) {
-            # Got here if the Service Control Manager is requesting
-            # the current state of the service. This can happen for
-            # a variety of reasons. Report the last state we set.
-            Win32::Daemon::State($previousState);
-        } elsif (SERVICE_CONTROL_SHUTDOWN == $message) {
-            # Yikes! The system is shutting down. We had better clean up
-            # and stop.
-            # Tell the SCM that we are preparing to shutdown and that we expect
-            # it to take 25 seconds, so don't terminate us for at least
-            # 25 seconds...
-            Win32::Daemon::State(SERVICE_STOP_PENDING, 25000);
-        }
-    }
-    # Snoose for awhile so we don't suck up cpu time...
-    Win32::Sleep(SERVICE_SLEEP_TIME);
-}
-
-sub getMessage {
-    if ($Win32::Daemon::VERSION < 20101014) {
-        return Win32::Daemon::LastControlMessage(1);
-    } else {
-        return Win32::Daemon::QueryLastMessage();
-    }
-}
-
-sub startAgent {
-    return if $thread;
-    $thread = threads->create(sub {
-        my $agent = FusionInventory::Agent->new(
-            confdir => $directory . '/../../etc/fusioninventory',
-            datadir => $directory . '/../../share',
-            vardir  => $directory . '/../../var',
-            libdir  => $directory . '/../../lib',
-        );
-        $agent->init(options => { service => 1 });
-        $agent->run();
-    });
-}
-
-sub killAgent {
-    $thread->kill('KILL');
-    $thread = undef;
-}
-
-__END__
-
-=head1 NAME
-
-fusioninventory-win32-service - FusionInventory Agent service for Windows
-

@@ -8,7 +8,7 @@ use ExtUtils::MakeMaker ();
 
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 }
 
 # special map on pre-defined feature sets
@@ -115,7 +115,7 @@ sub import {
     print "*** $class version " . $class->VERSION . "\n";
     print "*** Checking for Perl dependencies...\n";
 
-    my $cwd = Cwd::cwd();
+    my $cwd = Cwd::getcwd();
 
     $Config = [];
 
@@ -166,7 +166,7 @@ sub import {
         $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' );
 
         unshift @$modules, -default => &{ shift(@$modules) }
-          if ( ref( $modules->[0] ) eq 'CODE' );    # XXX: bugward combatability
+          if ( ref( $modules->[0] ) eq 'CODE' );    # XXX: bugward compatibility
 
         while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) {
             if ( $mod =~ m/^-(\w+)$/ ) {
@@ -345,22 +345,26 @@ sub install {
     my $i;    # used below to strip leading '-' from config keys
     my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } );
 
-    my ( @modules, @installed );
-    while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
+	my ( @modules, @installed, @modules_to_upgrade );
+	while (my ($pkg, $ver) = splice(@_, 0, 2)) {
 
-        # grep out those already installed
-        if ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) {
-            push @installed, $pkg;
-        }
-        else {
-            push @modules, $pkg, $ver;
-        }
-    }
+		# grep out those already installed
+		if (_version_cmp(_version_of($pkg), $ver) >= 0) {
+			push @installed, $pkg;
+			if ($UpgradeDeps) {
+				push @modules_to_upgrade, $pkg, $ver;
+			}
+		}
+		else {
+			push @modules, $pkg, $ver;
+		}
+	}
 
-    if ($UpgradeDeps) {
-        push @modules, @installed;
-        @installed = ();
-    }
+	if ($UpgradeDeps) {
+		push @modules, @modules_to_upgrade;
+		@installed          = ();
+		@modules_to_upgrade = ();
+	}
 
     return @installed unless @modules;  # nothing to do
     return @installed if _check_lock(); # defer to the CPAN shell
@@ -611,7 +615,7 @@ sub _under_cpan {
     require Cwd;
     require File::Spec;
 
-    my $cwd  = File::Spec->canonpath( Cwd::cwd() );
+    my $cwd  = File::Spec->canonpath( Cwd::getcwd() );
     my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} );
 
     return ( index( $cwd, $cpan ) > -1 );
@@ -927,4 +931,4 @@ END_MAKE
 
 __END__
 
-#line 1193
+#line 1197

@@ -4,7 +4,7 @@ package Module::Install::Base;
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 }
 
 # Suspend handler for "redefined" warnings

@@ -8,7 +8,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -133,7 +133,7 @@ sub makemaker_args {
 	return $args;
 }
 
-# For mm args that take multiple space-seperated args,
+# For mm args that take multiple space-separated args,
 # append an argument to the current list.
 sub makemaker_append {
 	my $self = shift;

@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -347,7 +347,7 @@ sub name_from {
 		^ \s*
 		package \s*
 		([\w:]+)
-		\s* ;
+		[\s|;]*
 		/ixms
 	) {
 		my ($name, $module_name) = ($1, $1);
@@ -705,7 +705,7 @@ sub _write_mymeta_data {
 	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
 	my $meta = $yaml[0];
 
-	# Overwrite the non-configure dependency hashs
+	# Overwrite the non-configure dependency hashes
 	delete $meta->{requires};
 	delete $meta->{build_requires};
 	delete $meta->{recommends};

@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

@@ -17,7 +17,7 @@ package Module::Install;
 #     3. The ./inc/ version of Module::Install loads
 # }
 
-use 5.005;
+use 5.006;
 use strict 'vars';
 use Cwd        ();
 use File::Find ();
@@ -31,7 +31,7 @@ BEGIN {
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '1.06';
+	$VERSION = '1.12';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -156,10 +156,10 @@ END_DIE
 sub autoload {
 	my $self = shift;
 	my $who  = $self->_caller;
-	my $cwd  = Cwd::cwd();
+	my $cwd  = Cwd::getcwd();
 	my $sym  = "${who}::AUTOLOAD";
 	$sym->{$cwd} = sub {
-		my $pwd = Cwd::cwd();
+		my $pwd = Cwd::getcwd();
 		if ( my $code = $sym->{$pwd} ) {
 			# Delegate back to parent dirs
 			goto &$code unless $cwd eq $pwd;
@@ -239,7 +239,7 @@ sub new {
 
 	# ignore the prefix on extension modules built from top level.
 	my $base_path = Cwd::abs_path($FindBin::Bin);
-	unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
+	unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) {
 		delete $args{prefix};
 	}
 	return $args{_self} if $args{_self};
@@ -338,7 +338,7 @@ sub find_extensions {
 		if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
 			my $content = Module::Install::_read($subpath . '.pm');
 			my $in_pod  = 0;
-			foreach ( split //, $content ) {
+			foreach ( split /\n/, $content ) {
 				$in_pod = 1 if /^=\w/;
 				$in_pod = 0 if /^=cut/;
 				next if ($in_pod || /^=cut/);  # skip pod text
@@ -434,7 +434,7 @@ END_OLD
 
 # _version is for processing module versions (eg, 1.03_05) not
 # Perl versions (eg, 5.8.1).
-sub _version ($) {
+sub _version {
 	my $s = shift || 0;
 	my $d =()= $s =~ /(\.)/g;
 	if ( $d >= 2 ) {
@@ -450,12 +450,12 @@ sub _version ($) {
 	return $l + 0;
 }
 
-sub _cmp ($$) {
+sub _cmp {
 	_version($_[1]) <=> _version($_[2]);
 }
 
 # Cloned from Params::Util::_CLASS
-sub _CLASS ($) {
+sub _CLASS {
 	(
 		defined $_[0]
 		and

@@ -9,74 +9,49 @@ use Getopt::Long;
 use UNIVERSAL::require;
 
 my $default = {
+    'additional-content'      => undef,
+    'backend-collect-timeout' => 180,
+    'ca-cert-dir'             => undef,
+    'ca-cert-file'            => undef,
+    'color'                   => undef,
+    'debug'                   => undef,
+    'delaytime'               => 3600,
+    'force'                   => undef,
+    'html'                    => undef,
+    'lazy'                    => undef,
+    'local'                   => undef,
     'logger'                  => 'Stderr',
+    'logfile'                 => undef,
     'logfacility'             => 'LOG_USER',
-    'delaytime'               => 3600,
-    'backend-collect-timeout' => 30,
+    'logfile-maxsize'         => undef,
+    'no-category'             => [],
+    'no-httpd'                => undef,
+    'no-ssl-check'            => undef,
+    'no-task'                 => [],
+    'no-p2p'                  => undef,
+    'password'                => undef,
+    'proxy'                   => undef,
+    'httpd-ip'                => undef,
     'httpd-port'              => 62354,
+    'httpd-trust'             => [],
+    'scan-homedirs'           => undef,
+    'scan-profiles'           => undef,
+    'server'                  => undef,
+    'tag'                     => undef,
     'timeout'                 => 180,
-    'no-task'                 => [],
-    'no-category'             => []
+    'user'                    => undef,
+    # deprecated options
+    'stdout'                  => undef,
+    # multi-values options that will be converted to array ref
+    'httpd-trust'             => "",
+    'no-task'                 => "",
+    'no-category'             => ""
 };
 
 my $deprecated = {
-    'info' => {
-        message => 'it was useless anyway'
-    },
-    'realm' => {
-        message => 'it is now useless'
-    },
-    'no-socket' => {
-        message => 'use --no-httpd option instead',
-        new     => 'no-httpd'
-    },
-    'rpc-ip' => {
-        message => 'use --httpd-ip option instead',
-        new     => 'httpd-ip'
-    },
-    'rpc-port' => {
-        message => 'use --httpd-port option instead',
-        new     => 'httpd-port'
-    },
-    'rpc-trust-localhost' => {
-        message => 'use --httpd-trust 127.0.0.1 option instead',
-        new     => { 'httpd-trust' => '127.0.0.1' }
-    },
-    'daemon-no-fork' => {
-        message => 'use --daemon and --no-fork options instead',
-        new     => [ 'daemon', 'no-fork' ]
-    },
-    'D' => {
-        message => 'use --daemon and --no-fork options instead',
-        new     => [ 'daemon', 'no-fork' ]
-    },
-    'no-inventory' => {
-        message => 'use --no-task inventory option instead',
-        new     => { 'no-task' => 'inventory' }
-    },
-    'no-wakeonlan' => {
-        message => 'use --no-task wakeonlan option instead',
-        new     => { 'no-task' => 'wakeonlan' }
-    },
-    'no-netdiscovery' => {
-        message => 'use --no-task netdiscovery option instead',
-        new     => { 'no-task' => 'netdiscovery' }
-    },
-    'no-snmpquery' => {
-        message => 'use --no-task snmpquery option instead',
-        new     => { 'no-task' => 'snmpquery' }
-    },
-    'no-ocsdeploy' => {
-        message => 'use --no-task ocsdeploy option instead',
-        new     => { 'no-task' => 'ocsdeploy' }
-    },
-    'no-printer' => {
-        message => 'use --no-category printer option instead',
-        new     => { 'no-category' => 'printer' }
-    },
-    'no-software' => {
-        message => 'use --no-category software option instead',
-        new     => { 'no-category' => 'software' }
+    'stdout' => {
+        message => 'use --local - option instead',
+        new     => { 'local' => '-' }
     },
 };
 
@@ -86,7 +61,6 @@ sub new {
     my $self = {};
     bless $self, $class;
     $self->_loadDefaults();
-
     my $backend =
         $params{options}->{'conf-file'} ? 'file'                     :
         $params{options}->{config}      ? $params{options}->{config} :
@@ -150,19 +124,23 @@ sub _loadFromRegistry {
 
     foreach my $rawKey (keys %$settings) {
         next unless $rawKey =~ /^\/(\S+)/;
-        my $key = $1;
+        my $key = lc($1);
         my $val = $settings->{$rawKey};
         # Remove the quotes
         $val =~ s/\s+$//;
         $val =~ s/^'(.*)'$/$1/;
         $val =~ s/^"(.*)"$/$1/;
-        $self->{lc($key)} = $val;
+
+        if (exists $default->{$key}) {
+            $self->{$key} = $val;
+        } else {
+            warn "unknown configuration directive $key";
+        }
     }
 }
 
 sub _loadFromFile {
     my ($self, $params) = @_;
-
     my $file = $params->{file} ?
         $params->{file} : $params->{directory} . '/agent.cfg';
 
@@ -184,11 +162,17 @@ sub _loadFromFile {
         if ($line =~ /([\w-]+)\s*=\s*(.+)/) {
             my $key = $1;
             my $val = $2;
+
             # Remove the quotes
             $val =~ s/\s+$//;
             $val =~ s/^'(.*)'$/$1/;
             $val =~ s/^"(.*)"$/$1/;
-            $self->{$key} = $val;
+
+            if (exists $default->{$key}) {
+                $self->{$key} = $val;
+            } else {
+                warn "unknown configuration directive $key";
+            }
         }
     }
     close $handle;
@@ -209,27 +193,35 @@ sub _checkContent {
     foreach my $old (keys %$deprecated) {
         next unless defined $self->{$old};
 
+        next if $old =~ /^no-/ and !$self->{$old};
+
         my $handler = $deprecated->{$old};
 
         # notify user of deprecation
-        print STDERR "the '$old' option is deprecated, $handler->{message}\n";
+        warn "the '$old' option is deprecated, $handler->{message}\n";
 
         # transfer the value to the new option, if possible
         if ($handler->{new}) {
             if (ref $handler->{new} eq 'HASH') {
-                # list of new options with new values
+                # old boolean option replaced by new non-boolean options
                 foreach my $key (keys %{$handler->{new}}) {
-                    $self->{$key} = $self->{$key} ?
-                        $self->{$key} . ',' . $handler->{new}->{$key} :
-                        $handler->{new}->{$key};
+                    my $value = $handler->{new}->{$key};
+                    if ($value =~ /^\+(\S+)/) {
+                        # multiple values: add it to exiting one
+                        $self->{$key} = $self->{$key} ?
+                            $self->{$key} . ',' . $1 : $1;
+                    } else {
+                        # unique value: replace exiting value
+                        $self->{$key} = $value;
+                    }
                 }
             } elsif (ref $handler->{new} eq 'ARRAY') {
-                # list of new options, with same value
+                # old boolean option replaced by new boolean options
                 foreach my $new (@{$handler->{new}}) {
                     $self->{$new} = $self->{$old};
                 }
             } else {
-                # new option, with same value
+                # old non-boolean option replaced by new option
                 $self->{$handler->{new}} = $self->{$old};
             }
         }
@@ -243,11 +235,32 @@ sub _checkContent {
         $self->{logger} .= ',File';
     }
 
-    # multi-values options
-    $self->{logger} = [ split(/,/, $self->{logger}) ] if $self->{logger};
-    $self->{server} = [ split(/,/, $self->{server}) ] if $self->{server};
-    $self->{'no-task'} = [ split(/,/, $self->{'no-task'}) ];
-    $self->{'no-category'} = [ split(/,/, $self->{'no-category'}) ];
+    # ca-cert-file and ca-cert-dir are antagonists
+    if ($self->{'ca-cert-file'} && $self->{'ca-cert-dir'}) {
+        die "use either 'ca-cert-file' or 'ca-cert-dir' option, not both\n";
+    }
+
+    # logger backend without a logfile isn't enoguh
+    if ($self->{'logger'} =~ /file/i && ! $self->{'logfile'}) {
+        die "usage of 'file' logger backend makes 'logfile' option mandatory\n";
+    }
+
+    # multi-values options, the default separator is a ','
+    foreach my $option (qw/
+            logger
+            local
+            server
+            httpd-trust
+            no-task
+            no-category
+            /) {
+
+        if ($self->{$option}) {
+            $self->{$option} = [split(/,/, $self->{$option})];
+        } else {
+            $self->{$option} = [];
+        }
+    }
 
     # files location
     $self->{'ca-cert-file'} =
@@ -285,3 +298,5 @@ the configuration directory.
 =item I<options>
 
 additional options override.
+
+=back

@@ -29,11 +29,11 @@ sub _prepareVal {
     return '' unless length($val);
 
 # forbid to long argument.
-    while (length(uri_escape($val)) > 1500) {
+    while (length(URI::Escape::uri_escape_utf8($val)) > 1500) {
         $val =~ s/^.{5}/…/;
     }
 
-    return uri_escape($val);
+    return URI::Escape::uri_escape_utf8($val);
 }
 
 sub send { ## no critic (ProhibitBuiltinHomonyms)

@@ -8,6 +8,7 @@ use English qw(-no_match_vars);
 use HTTP::Request;
 use UNIVERSAL::require;
 use URI;
+use Encode;
 
 use FusionInventory::Agent::Tools;
 use FusionInventory::Agent::XML::Response;
@@ -27,7 +28,7 @@ sub new {
         $self->{compression} = 'zlib';
         $self->{ua}->default_header('Content-type' => 'application/x-compress-zlib');
         $self->{logger}->debug(
-            $log_prefix . 
+            $log_prefix .
             'Using Compress::Zlib for compression'
         );
     } elsif (canRun('gzip')) {
@@ -35,14 +36,14 @@ sub new {
         $self->{compression} = 'gzip';
         $self->{ua}->default_header('Content-type' => 'application/x-compress-gzip');
         $self->{logger}->debug(
-            $log_prefix . 
+            $log_prefix .
             'Using gzip for compression'
         );
     } else {
         $self->{compression} = 'none';
         $self->{ua}->default_header('Content-type' => 'application/xml');
         $self->{logger}->debug(
-            $log_prefix . 
+            $log_prefix .
             'Not using compression'
         );
     }
@@ -61,7 +62,7 @@ sub send { ## no critic (ProhibitBuiltinHomonyms)
     my $request_content = $message->getContent();
     $logger->debug2($log_prefix . "sending message:\n $request_content");
 
-    $request_content = $self->_compress($request_content);
+    $request_content = $self->_compress(encode('UTF-8', $request_content));
     if (!$request_content) {
         $logger->error($log_prefix . 'inflating problem');
         return;
@@ -112,7 +113,7 @@ sub send { ## no critic (ProhibitBuiltinHomonyms)
 sub _compress {
     my ($self, $data) = @_;
 
-    return 
+    return
         $self->{compression} eq 'zlib' ? $self->_compressZlib($data) :
         $self->{compression} eq 'gzip' ? $self->_compressGzip($data) :
                                          $data;

@@ -8,6 +8,7 @@ use HTTP::Status;
 use LWP::UserAgent;
 use UNIVERSAL::require;
 
+use FusionInventory::Agent;
 use FusionInventory::Agent::Logger;
 
 my $log_prefix = "[http client] ";
@@ -26,7 +27,6 @@ sub new {
                           FusionInventory::Agent::Logger->new(),
         user         => $params{user},
         password     => $params{password},
-        timeout      => $params{timeout} || 180,
         ssl_set      => 0,
         no_ssl_check => $params{no_ssl_check},
         ca_cert_dir  => $params{ca_cert_dir},
@@ -36,9 +36,11 @@ sub new {
 
     # create user agent
     $self->{ua} = LWP::UserAgent->new(
-        parse_head => 0, # No need to parse HTML
-        keep_alive => 1,
-        requests_redirectable => ['POST', 'GET', 'HEAD']
+        requests_redirectable => ['POST', 'GET', 'HEAD'],
+        agent                 => $FusionInventory::Agent::AGENT_STRING,
+        timeout               => $params{timeout} || 180,
+        parse_head            => 0, # No need to parse HTML
+        keep_alive            => 1,
     );
 
     if ($params{proxy}) {
@@ -47,9 +49,6 @@ sub new {
         $self->{ua}->env_proxy();
     }
 
-    $self->{ua}->agent($FusionInventory::Agent::AGENT_STRING);
-    $self->{ua}->timeout($self->{timeout});
-
     return $self;
 }
 
@@ -60,12 +59,12 @@ sub request {
 
     my $url = $request->uri();
     my $scheme = $url->scheme();
-    $self->_setSSLOptions() if $scheme eq 'https' && !$self->{ssl_set}; 
+    $self->_setSSLOptions() if $scheme eq 'https' && !$self->{ssl_set};
 
-    my $result;
+    my $result = HTTP::Response->new( 500 );
     eval {
         if ($OSNAME eq 'MSWin32' && $scheme eq 'https') {
-            alarm $self->{timeout};
+            alarm $self->{ua}->timeout();
         }
         $result = $self->{ua}->request($request, $file);
         alarm 0;
@@ -132,7 +131,7 @@ sub _setSSLOptions {
        # LWP 6 default behaviour is to check hostname
        # Fedora also backported this behaviour change in its LWP5 package, so
        # just checking on LWP version is not enough
-       $self->{ua}->ssl_opts(verify_hostname => 0)
+       $self->{ua}->ssl_opts(verify_hostname => 0, SSL_verify_mode => 0)
            if $self->{ua}->can('ssl_opts');
     } else {
         # only IO::Socket::SSL can perform full server certificate validation,
@@ -140,11 +139,15 @@ sub _setSSLOptions {
         # certificate hostname
         IO::Socket::SSL->require();
         die
-            "failed to load IO::Socket::SSL, "                 .
-            "unable to perform SSL certificate validation.\n"  .
-            "You can use 'no-ssl-check' option to disable it."
+            "IO::Socket::SSL Perl module not available, "              .
+            "unable to validate SSL certificates "                     .
+            "(workaround: use 'no-ssl-check' configuration parameter)"
             if $EVAL_ERROR;
 
+        if ($self->{logger}{verbosity} > LOG_DEBUG2) {
+            $Net::SSLeay::trace = 2;
+        }
+
         if ($LWP::VERSION >= 6) {
             $self->{ua}->ssl_opts(SSL_ca_file => $self->{ca_cert_file})
                 if $self->{ca_cert_file};
@@ -152,10 +155,11 @@ sub _setSSLOptions {
                 if $self->{ca_cert_dir};
         } else {
             # SSL_verifycn_scheme and SSL_verifycn_name are required
-            die 
-                "IO::Socket::SSL $IO::Socket::SSL::VERSION is too old, "     .
-                "version 1.14 is required for SSL certificate validation.\n" .
-                " You can use 'no-ssl-check' option to disable SSL it."
+            die
+                "IO::Socket::SSL Perl module too old "                     .
+                "(available: $IO::Socket::SSL::VERSION, required: 1.14), " .
+                "unable to validate SSL certificates "                     .
+                "(workaround: use 'no-ssl-check' configuration parameter)"
                 if $IO::Socket::SSL::VERSION < 1.14;
 
             # use a custom HTTPS handler to workaround default LWP5 behaviour
@@ -163,11 +167,6 @@ sub _setSSLOptions {
                 ca_cert_file => $self->{ca_cert_file},
                 ca_cert_dir  => $self->{ca_cert_dir},
             );
-            die 
-                "failed to load FusionInventory::Agent::HTTP::Protocol::https" .
-                ", unable to perform SSL certificate validation.\n"            .
-                "You can use 'no-ssl-check' option to disable it."
-                if $EVAL_ERROR;
 
             LWP::Protocol::implementor(
                 'https', 'FusionInventory::Agent::HTTP::Protocol::https'

@@ -2,16 +2,18 @@ package FusionInventory::Agent::HTTP::Server;
 
 use strict;
 use warnings;
-use threads;
-use threads::shared;
 
 use English qw(-no_match_vars);
+use File::Basename;
 use HTTP::Daemon;
+use IO::Handle;
 use Net::IP;
 use Text::Template;
-use File::Basename;
+use File::Glob;
+use URI;
 
 use FusionInventory::Agent::Logger;
+use FusionInventory::Agent::Tools::Network;
 
 my $log_prefix = "[http server] ";
 
@@ -22,25 +24,33 @@ sub new {
         logger    => $params{logger} ||
                      FusionInventory::Agent::Logger->new(),
         agent     => $params{agent},
-        scheduler => $params{scheduler},
         htmldir   => $params{htmldir},
         ip        => $params{ip},
         port      => $params{port} || 62354,
-        trust     => $params{trust}
     };
     bless $self, $class;
 
-    $self->{stop} = 0;
-    my $stop = \$self->{stop};
-    threads::shared::share($stop);
-    $self->{listener} = threads->create('_listen', $self);
+    # compute addresses allowed for push requests
+    foreach my $target ($self->{agent}->getTargets()) {
+        next unless $target->isa('FusionInventory::Agent::Target::Server');
+        my $url  = $target->getUrl();
+        my $host = URI->new($url)->host();
+        my @addresses = compile($host, $self->{logger});
+        $self->{trust}->{$url} = \@addresses;
+    }
+    if ($params{trust}) {
+        foreach my $string (@{$params{trust}}) {
+            my @addresses = compile($string);
+            $self->{trust}->{$string} = \@addresses if @addresses;
+        }
+    }
 
     return $self;
 }
 
 sub _handle {
     my ($self, $client, $request, $clientIp) = @_;
-    
+
     my $logger = $self->{logger};
 
     if (!$request) {
@@ -51,53 +61,54 @@ sub _handle {
     my $path = $request->uri()->path();
     $logger->debug($log_prefix . "request $path from client $clientIp");
 
-    # non-GET requests
     my $method = $request->method();
+    my $status;
     if ($method ne 'GET') {
-        $logger->debug($log_prefix . "error, invalid request type: $method");
+        $logger->error($log_prefix . "invalid request type: $method");
         $client->send_error(400);
-        $client->close;
-        undef($client);
-        return;
-    }
-
-    # GET requests
-    SWITCH: {
-        # root request
-        if ($path eq '/') {
-            $self->_handle_root($client, $request, $clientIp);
-            last SWITCH;
-        } 
-
-        # deploy request
-        if ($path =~ m{^/deploy/getFile/./../([\w\d/-]+)$}) {
-            $self->_handle_deploy($client, $request, $clientIp, $1);
-            last SWITCH;
-        }
-
-        # now request
-        if ($path =~ m{^/now(?:/(\S*))?$}) {
-            $self->_handle_now($client, $request, $clientIp, $1);
-            last SWITCH;
-        }
-
-        # status request
-        if ($path eq '/status') {
-            $self->_handle_status($client, $request, $clientIp);
-            last SWITCH;
-        }
-
-        # static content request
-        if ($path =~ m{^/(logo.png|site.css|favicon.ico)$}) {
-            my $file = $1;
-            $client->send_file_response("$self->{htmldir}/$file");
-            last SWITCH;
+        $status = 400;
+    } else {
+        SWITCH: {
+            # root request
+            if ($path eq '/') {
+                $status = $self->_handle_root($client, $request, $clientIp);
+                last SWITCH;
+            }
+
+            # deploy request
+            if ($path =~ m{^/deploy/getFile/./../([\w\d/-]+)$}) {
+                $status = $self->_handle_deploy($client, $request, $clientIp, $1);
+                last SWITCH;
+            }
+
+            # now request
+            if ($path =~ m{^/now(?:/(\S*))?$}) {
+                $status = $self->_handle_now($client, $request, $clientIp, $1);
+                last SWITCH;
+            }
+
+            # status request
+            if ($path eq '/status') {
+                $status = $self->_handle_status($client, $request, $clientIp);
+                last SWITCH;
+            }
+
+            # static content request
+            if ($path =~ m{^/(logo.png|site.css|favicon.ico)$}) {
+                my $file = $1;
+                $client->send_file_response("$self->{htmldir}/$file");
+                $status = 200;
+                last SWITCH;
+            }
+
+            $logger->error($log_prefix . "unknown path: $path");
+            $client->send_error(400);
+            $status = 400;
         }
-
-        $logger->debug("error, unknown path: $path");
-        $client->send_error(400);
     }
 
+    $logger->debug($log_prefix . "response status $status");
+
     $client->close();
 }
 
@@ -110,8 +121,9 @@ sub _handle_root {
         TYPE => 'FILE', SOURCE => "$self->{htmldir}/index.tpl"
     );
     if (!$template) {
-        $logger->error($log_prefix . "Template access failed: $Text::Template::ERROR");
-        ;
+        $logger->error(
+            $log_prefix . "Template access failed: $Text::Template::ERROR"
+        );
 
         my $response = HTTP::Response->new(
             500,
@@ -121,16 +133,25 @@ sub _handle_root {
         );
 
         $client->send_response($response);
-        return;
+        return 500;
     }
 
+    my @server_targets =
+        map { { name => $_->getUrl(), date => $_->getFormatedNextRunDate() } }
+        grep { $_->isa('FusionInventory::Agent::Target::Server') }
+        $self->{agent}->getTargets();
+
+    my @local_targets =
+        map { { name => $_->getPath(), date => $_->getFormatedNextRunDate() } }
+        grep { $_->isa('FusionInventory::Agent::Target::Local') }
+        $self->{agent}->getTargets();
+
     my $hash = {
-        version => $FusionInventory::Agent::VERSION,
-        trust   => $self->_is_trusted($clientIp),
-        status  => $self->{agent}->getStatus(),
-        targets => [
-            map { $_->getStatus() } $self->{scheduler}->getTargets()
-        ]
+        version        => $FusionInventory::Agent::VERSION,
+        trust          => $self->_isTrusted($clientIp),
+        status         => $self->{agent}->getStatus(),
+        server_targets => \@server_targets,
+        local_targets  => \@local_targets
     };
 
     my $response = HTTP::Response->new(
@@ -141,22 +162,20 @@ sub _handle_root {
     );
 
     $client->send_response($response);
+    return 200;
 }
 
 sub _handle_deploy {
     my ($self, $client, $request, $clientIp, $sha512) = @_;
 
-    my $logger = $self->{logger};
-
     return unless $sha512 =~ /^(.)(.)(.{6})/;
     my $subFilePath = $1.'/'.$2.'/'.$3;
 
-    File::Glob->require();
     Digest::SHA->require();
 
     my $path;
-    LOOP: foreach my $target ($self->{scheduler}->getTargets()) {
-        foreach (File::Glob::glob($target->{storage}->getDirectory()."/deploy/fileparts/shared/*")) {
+    LOOP: foreach my $target ($self->{agent}->getTargets()) {
+        foreach (File::Glob::glob($target->{storage}->getDirectory() . "/deploy/fileparts/shared/*")) {
             next unless -f $_.'/'.$subFilePath;
 
             my $sha = Digest::SHA->new('512');
@@ -168,35 +187,47 @@ sub _handle_deploy {
         }
     }
     if ($path) {
-        $logger->debug($log_prefix . "file $sha512 found");
         $client->send_file_response($path);
-        $logger->debug($log_prefix . "file $path sent");
+        return 200;
     } else {
         $client->send_error(404);
+        return 404;
     }
 }
 
 sub _handle_now {
-    my ($self, $client, $request, $clientIp, $token) = @_;
+    my ($self, $client, $request, $clientIp) = @_;
 
     my $logger = $self->{logger};
 
     my ($code, $message, $trace);
-    if (
-        $self->_is_trusted($clientIp) ||
-        $self->_is_authenticated($token)
-    ) {
-        foreach my $target ($self->{scheduler}->getTargets()) {
+
+    BLOCK: {
+        foreach my $target ($self->{agent}->getTargets()) {
+            next unless $target->isa('FusionInventory::Agent::Target::Server');
+            my $url       = $target->getUrl();
+            my $addresses = $self->{trust}->{$url};
+            next unless isPartOf($clientIp, $addresses, $logger);
             $target->setNextRunDate(1);
+            $code    = 200;
+            $message = "OK";
+            $trace   = "rescheduling next contact for target $url right now";
+            last BLOCK;
         }
-        $self->{agent}->resetToken();
-        $code    = 200;
-        $message = "OK";
-        $trace   = "valid request, forcing execution right now";
-    } else {
+
+        if ($self->_isTrusted($clientIp)) {
+            foreach my $target ($self->{agent}->getTargets()) {
+                $target->setNextRunDate(1);
+            }
+            $code    = 200;
+            $message = "OK";
+            $trace   = "rescheduling next contact for all targets right now";
+            last BLOCK;
+        }
+
         $code    = 403;
         $message = "Access denied";
-        $trace   = "invalid request (bad token or bad address)";
+        $trace   = "invalid request (untrusted address)";
     }
 
     my $template = Text::Template->new(
@@ -216,6 +247,7 @@ sub _handle_now {
 
     $client->send_response($response);
     $logger->debug($log_prefix . $trace);
+    return $code;
 }
 
 sub _handle_status {
@@ -229,81 +261,58 @@ sub _handle_status {
        "status: ".$status
     );
     $client->send_response($response);
+    return 200;
 }
 
-sub _is_trusted {
+sub _isTrusted {
     my ($self, $address) = @_;
 
-    return 0 unless $self->{trust};
-
-    my $source  = Net::IP->new($address);
-    my $trusted = Net::IP->new($self->{trust});
-    my $result = $source->overlaps($trusted);
-
-    return 
-        $result == $IP_A_IN_B_OVERLAP || # included in trusted range
-        $result == $IP_IDENTICAL;        # equals trusted address
-}
-
-sub _is_authenticated {
-    my ($self, $token) = @_;
-
-    return 0 unless $token;
+    foreach my $trusted_addresses (values %{$self->{trust}}) {
+        return 1
+            if isPartOf(
+                $address,
+                $trusted_addresses,
+                $self->{logger}
+            );
+    }
 
-    return $token eq $self->{agent}->getToken();
+    return 0;
 }
 
-sub _listen {
+sub init {
     my ($self) = @_;
 
     my $logger = $self->{logger};
 
-    my $daemon = HTTP::Daemon->new(
+    $self->{listener} = HTTP::Daemon->new(
         LocalAddr => $self->{ip},
         LocalPort => $self->{port},
         Reuse     => 1,
         Timeout   => 5
     );
-  
-    if (!$daemon) {
+
+    if (!$self->{listener}) {
         $logger->error($log_prefix . "failed to start the HTTPD service");
         return;
-    } 
-
-    my $url = $self->{ip} ?
-        "http://$self->{ip}:$self->{port}" :
-        "http://localhost:$self->{port}" ;
-
-    $logger->info($log_prefix . "HTTPD service started at $url");
-
-    while (1) {
-        my ($client, $socket) = $daemon->accept();
-        last if $self->{stop};
-        next unless $socket;
-        my (undef, $iaddr) = sockaddr_in($socket);
-        my $clientIp = inet_ntoa($iaddr);
-        my $request = $client->get_request();
-        $self->_handle($client, $request, $clientIp);
     }
-}
 
-sub terminate {
-    my ($self) = @_;
-
-    lock $self->{stop};
-    $self->{stop} = 1;
+    $logger->debug(
+        $log_prefix . "HTTPD service started on port $self->{port}"
+    );
 }
 
-sub DESTROY {
+sub handleRequests {
     my ($self) = @_;
 
-    return unless $self->{listener};
+    return unless $self->{listener}; # init() call failed
 
-    if ($self->{listener}->is_joinable()) {
-        $self->{listener}->join();
-    } elsif (!$self->{listener}->is_detached()) {
-        $self->{listener}->detach();
-    }
+    my ($client, $socket) = $self->{listener}->accept();
+    return unless $socket;
+
+    my (undef, $iaddr) = sockaddr_in($socket);
+    my $clientIp = inet_ntoa($iaddr);
+    my $request = $client->get_request();
+    $self->_handle($client, $request, $clientIp);
 }
 
 1;
@@ -331,11 +340,10 @@ requests are accepted:
 
 =back
 
-Authentication is based on a token created by the agent, and sent to the
-server at initial connection. Connection from addresses matching the trust
-parameter are trusted without token.
+Authentication is based on connection source address: trusted requests are
+accepted, other are rejected.
 
-=head1 METHODS
+=head1 CLASS METHODS
 
 =head2 new(%params)
 
@@ -348,14 +356,6 @@ hash:
 
 the logger object to use
 
-=item I<scheduler>
-
-the scheduler object to use
-
-=item I<agent>
-
-the agent object
-
 =item I<htmldir>
 
 the directory where HTML templates and static files are stored
@@ -371,10 +371,16 @@ the network port to listen to
 =item I<trust>
 
 an IP address or an IP address range from which to trust incoming requests
-without authentication token (default: none)
+(default: none)
 
 =back
 
-=head2 terminate
+=head1 INSTANCE METHODS
+
+=head2 $server->init()
+
+Start the server internal listener.
+
+=head2 $server->handleRequests()
 
-Ensure the listening thread terminates.
+Check if there any incoming request, and honours it if needed.

@@ -0,0 +1,538 @@
+package FusionInventory::Agent::Inventory;
+
+use strict;
+use warnings;
+
+use Config;
+use Data::Dumper;
+use Digest::MD5 qw(md5_base64);
+use English qw(-no_match_vars);
+use XML::TreePP;
+
+use FusionInventory::Agent::Tools;
+
+my %fields = (
+    BIOS             => [ qw/SMODEL SMANUFACTURER SSN BDATE BVERSION
+                             BMANUFACTURER MMANUFACTURER MSN MMODEL ASSETTAG
+                             ENCLOSURESERIAL BIOSSERIAL
+                             TYPE SKUNUMBER/ ],
+    HARDWARE         => [ qw/USERID OSVERSION PROCESSORN OSCOMMENTS CHECKSUM
+                             PROCESSORT NAME PROCESSORS SWAP ETIME TYPE OSNAME
+                             IPADDR WORKGROUP DESCRIPTION MEMORY UUID VMID DNS
+                             LASTLOGGEDUSER USERDOMAIN DATELASTLOGGEDUSER
+                             DEFAULTGATEWAY VMSYSTEM WINOWNER WINPRODID
+                             WINPRODKEY WINCOMPANY WINLANG CHASSIS_TYPE VMID
+                             VMNAME VMHOSTSERIAL/ ],
+    OPERATINGSYSTEM  => [ qw/KERNEL_NAME KERNEL_VERSION NAME VERSION FULL_NAME
+                             SERVICE_PACK INSTALL_DATE FQDN DNS_DOMAIN
+                             SSH_KEY ARCH BOOT_TIME/ ],
+    ACCESSLOG        => [ qw/USERID LOGDATE/ ],
+
+    ANTIVIRUS        => [ qw/COMPANY ENABLED GUID NAME UPTODATE VERSION/ ],
+    BATTERIES        => [ qw/CAPACITY CHEMISTRY DATE NAME SERIAL MANUFACTURER
+                             VOLTAGE/ ],
+    CONTROLLERS      => [ qw/CAPTION DRIVER NAME MANUFACTURER PCICLASS VENDORID
+                             PRODUCTID PCISUBSYSTEMID PCISLOT TYPE REV/ ],
+    CPUS             => [ qw/CACHE CORE DESCRIPTION MANUFACTURER NAME THREAD
+                             SERIAL STEPPING FAMILYNAME FAMILYNUMBER MODEL
+                             SPEED ID EXTERNAL_CLOCK ARCH/ ],
+    DRIVES           => [ qw/CREATEDATE DESCRIPTION FREE FILESYSTEM LABEL
+                             LETTER SERIAL SYSTEMDRIVE TOTAL TYPE VOLUMN/ ],
+    ENVS             => [ qw/KEY VAL/ ],
+    INPUTS           => [ qw/NAME MANUFACTURER CAPTION DESCRIPTION INTERFACE
+                             LAYOUT POINTINGTYPE TYPE/ ],
+    LICENSEINFOS     => [ qw/NAME FULLNAME KEY COMPONENTS TRIAL UPDATE OEM
+                             ACTIVATION_DATE PRODUCTID/ ],
+    LOCAL_GROUPS     => [ qw/ID MEMBER NAME/ ],
+    LOCAL_USERS      => [ qw/HOME ID LOGIN NAME SHELL/ ],
+    LOGICAL_VOLUMES  => [ qw/LV_NAME VG_NAME ATTR SIZE LV_UUID SEG_COUNT
+                             VG_UUID/ ],
+    MEMORIES         => [ qw/CAPACITY CAPTION FORMFACTOR REMOVABLE PURPOSE
+                             SPEED SERIALNUMBER TYPE DESCRIPTION NUMSLOTS
+                             MEMORYCORRECTION MANUFACTURER/ ],
+    MODEMS           => [ qw/DESCRIPTION NAME TYPE MODEL/ ],
+    MONITORS         => [ qw/BASE64 CAPTION DESCRIPTION MANUFACTURER SERIAL
+                             UUENCODE NAME TYPE/ ],
+    NETWORKS         => [ qw/DESCRIPTION MANUFACTURER MODEL MANAGEMENT TYPE
+                             VIRTUALDEV MACADDR WWN DRIVER FIRMWARE PCIID
+                             PCISLOT PNPDEVICEID MTU SPEED STATUS SLAVES BASE
+                             IPADDRESS IPSUBNET IPMASK IPDHCP IPGATEWAY
+                             IPADDRESS6 IPSUBNET6 IPMASK6 WIFI_BSSID WIFI_SSID
+                             WIFI_MODE WIFI_VERSION/ ],
+    PHYSICAL_VOLUMES => [ qw/DEVICE PV_PE_COUNT PV_UUID FORMAT ATTR
+                             SIZE FREE PE_SIZE VG_UUID/ ],
+    PORTS            => [ qw/CAPTION DESCRIPTION NAME TYPE/ ],
+    PRINTERS         => [ qw/COMMENT DESCRIPTION DRIVER NAME NETWORK PORT
+                             RESOLUTION SHARED STATUS ERRSTATUS SERVERNAME
+                             SHARENAME PRINTPROCESSOR SERIAL/ ],
+    PROCESSES        => [ qw/USER PID CPUUSAGE MEM VIRTUALMEMORY TTY STARTED
+                             CMD/ ],
+    REGISTRY         => [ qw/NAME REGVALUE HIVE/ ],
+    RUDDER           => [ qw/AGENT UUID HOSTNAME/ ],
+    SLOTS            => [ qw/DESCRIPTION DESIGNATION NAME STATUS/ ],
+    SOFTWARES        => [ qw/COMMENTS FILESIZE FOLDER FROM HELPLINK INSTALLDATE
+                            NAME NO_REMOVE RELEASE_TYPE PUBLISHER
+                            UNINSTALL_STRING URL_INFO_ABOUT VERSION
+                            VERSION_MINOR VERSION_MAJOR GUID ARCH USERNAME
+                            USERID/ ],
+    SOUNDS           => [ qw/CAPTION DESCRIPTION MANUFACTURER NAME/ ],
+    STORAGES         => [ qw/DESCRIPTION DISKSIZE INTERFACE MANUFACTURER MODEL
+                            NAME TYPE SERIAL SERIALNUMBER FIRMWARE SCSI_COID
+                            SCSI_CHID SCSI_UNID SCSI_LUN WWN/ ],
+    VIDEOS           => [ qw/CHIPSET MEMORY NAME RESOLUTION PCISLOT PCIID/ ],
+    USBDEVICES       => [ qw/VENDORID PRODUCTID MANUFACTURER CAPTION SERIAL
+                            CLASS SUBCLASS NAME/ ],
+    USERS            => [ qw/LOGIN DOMAIN/ ],
+    VIRTUALMACHINES  => [ qw/MEMORY NAME UUID STATUS SUBSYSTEM VMTYPE VCPU
+                             VMID MAC COMMENT OWNER SERIAL/ ],
+    VOLUME_GROUPS    => [ qw/VG_NAME PV_COUNT LV_COUNT ATTR SIZE FREE VG_UUID
+                             VG_EXTENT_SIZE/ ],
+);
+
+my %checks = (
+    STORAGES => {
+        INTERFACE => qr/^(SCSI|HDC|IDE|USB|1394|Serial-ATA|SAS)$/
+    },
+    VIRTUALMACHINES => {
+        STATUS => qr/^(running|blocked|idle|paused|shutdown|crashed|dying|off)$/
+    },
+    SLOTS => {
+        STATUS => qr/^(free|used)$/
+    },
+    NETWORKS => {
+        TYPE => qr/^(ethernet|wifi|aggregate|alias|dialup|loopback|bridge|fibrechannel)$/
+    },
+    CPUS => {
+        ARCH => qr/^(MIPS|MIPS64|Alpha|SPARC|SPARC64|m68k|i386|x86_64|PowerPC|PowerPC64|ARM|AArch64)$/
+    }
+);
+
+# convert fields list into fields hashes, for fast lookup
+foreach my $section (keys %fields) {
+    $fields{$section} = { map { $_ => 1 } @{$fields{$section}} };
+}
+
+sub new {
+    my ($class, %params) = @_;
+
+    my $self = {
+        logger         => $params{logger},
+        fields         => \%fields,
+        content        => {
+            HARDWARE => {
+                ARCHNAME => $Config{archname},
+                VMSYSTEM => "Physical" # Default value
+            },
+            VERSIONCLIENT => $FusionInventory::Agent::AGENT_STRING
+        }
+    };
+    bless $self, $class;
+
+    $self->setTag($params{tag});
+    $self->{last_state_file} = $params{statedir} . '/last_state'
+        if $params{statedir};
+
+    return $self;
+}
+
+sub getContent {
+    my ($self) = @_;
+
+    return $self->{content};
+}
+
+sub mergeContent {
+    my ($self, $content) = @_;
+
+    die "no content" unless $content;
+
+    foreach my $section (keys %$content) {
+        if (ref $content->{$section} eq 'ARRAY') {
+            # a list of entry
+            foreach my $entry (@{$content->{$section}}) {
+                $self->addEntry(section => $section, entry => $entry);
+            }
+        } else {
+            # single entry
+            SWITCH: {
+                if ($section eq 'HARDWARE') {
+                    $self->setHardware($content->{$section});
+                    last SWITCH;
+                }
+                if ($section eq 'BIOS') {
+                    $self->setBios($content->{$section});
+                    last SWITCH;
+                }
+                if ($section eq 'ACCESSLOG') {
+                    $self->setAccessLog($content->{$section});
+                    last SWITCH;
+                }
+                $self->addEntry(
+                    section => $section, entry => $content->{$section}
+                );
+            }
+        }
+    }
+}
+
+sub addEntry {
+    my ($self, %params) = @_;
+
+    my $entry = $params{entry};
+    die "no entry" unless $entry;
+
+    my $section = $params{section};
+    my $fields = $fields{$section};
+    my $checks = $checks{$section};
+    die "unknown section $section" unless $fields;
+
+    foreach my $field (keys %$entry) {
+        if (!$fields->{$field}) {
+            # unvalid field, log error and remove
+            $self->{logger}->debug("unknown field $field for section $section");
+            delete $entry->{$field};
+            next;
+        }
+        if (!defined $entry->{$field}) {
+            # undefined value, remove
+            delete $entry->{$field};
+            next;
+        }
+        # sanitize value
+        my $value = getSanitizedString($entry->{$field});
+        # check value if appliable
+        if ($checks->{$field}) {
+            $self->{logger}->debug(
+                "invalid value $value for field $field for section $section"
+            ) unless $value =~ $checks->{$field};
+        }
+        $entry->{$field} = $value;
+    }
+
+    # avoid duplicate entries
+    if ($params{noDuplicated}) {
+        my $md5 = md5_base64(Dumper($entry));
+        return if $self->{seen}->{$section}->{$md5};
+        $self->{seen}->{$section}->{$md5} = 1;
+    }
+
+    if ($section eq 'STORAGES') {
+        $entry->{SERIALNUMBER} = $entry->{SERIAL} if !$entry->{SERIALNUMBER}
+    }
+
+    push @{$self->{content}{$section}}, $entry;
+}
+
+sub computeLegacyValues {
+    my ($self) = @_;
+
+    # CPU-related values
+    my $cpus = $self->{content}->{CPUS};
+    if ($cpus) {
+        my $cpu = $cpus->[0];
+
+        $self->setHardware({
+            PROCESSORN => scalar @$cpus,
+            PROCESSORS => $cpu->{SPEED},
+            PROCESSORT => $cpu->{NAME},
+        });
+    }
+
+    # network related values
+    my $interfaces = $self->{content}->{NETWORKS};
+    if ($interfaces) {
+        my @ip_addresses =
+            grep { ! /^127/ }
+            grep { $_ }
+            map { $_->{IPADDRESS} }
+            @$interfaces;
+
+        $self->setHardware({
+            IPADDR => join('/', @ip_addresses),
+        });
+    }
+
+    # user-related values
+    my $users = $self->{content}->{USERS};
+    if ($users) {
+        my $user = $users->[-1];
+
+        my ($domain, $id);
+        if ($user->{LOGIN} =~ /(\S+)\\(\S+)/) {
+            # Windows fully qualified username: domain\user
+            $domain = $1;
+            $id = $2;
+        } else {
+            # simple username: user
+            $id = $user->{LOGIN};
+        }
+
+        $self->setHardware({
+            USERID     => $id,
+            USERDOMAIN => $domain,
+        });
+    }
+}
+
+sub setHardware {
+    my ($self, $args) = @_;
+
+    foreach my $field (keys %$args) {
+        if (!$fields{HARDWARE}->{$field}) {
+            $self->{logger}->debug("unknown field $field for section HARDWARE");
+            next
+        }
+
+        # Do not overwrite existing value with undef
+        next unless $args->{$field};
+
+        $self->{content}->{HARDWARE}->{$field} =
+            getSanitizedString($args->{$field});
+    }
+}
+
+sub setOperatingSystem {
+    my ($self, $args) = @_;
+
+    foreach my $field (keys %$args) {
+        if (!$fields{OPERATINGSYSTEM}->{$field}) {
+            $self->{logger}->debug(
+                "unknown field $field for section OPERATINGSYSTEM"
+            );
+            next
+        }
+        $self->{content}->{OPERATINGSYSTEM}->{$field} =
+            getSanitizedString($args->{$field});
+    }
+}
+
+sub setBios {
+    my ($self, $args) = @_;
+
+    foreach my $field (keys %$args) {
+        if (!$fields{BIOS}->{$field}) {
+            $self->{logger}->debug("unknown field $field for section BIOS");
+            next
+        }
+
+        $self->{content}->{BIOS}->{$field} =
+            getSanitizedString($args->{$field});
+    }
+}
+
+sub setAccessLog {
+    my ($self, $args) = @_;
+
+    foreach my $field (keys %$args) {
+        if (!$fields{ACCESSLOG}->{$field}) {
+            $self->{logger}->debug(
+                "unknown field $field for section ACCESSLOG"
+            );
+            next
+        }
+
+        $self->{content}->{ACCESSLOG}->{$field} =
+            getSanitizedString($args->{$field});
+    }
+}
+
+sub setTag {
+    my ($self, $tag) = @_;
+
+    return unless $tag;
+
+    $self->{content}{ACCOUNTINFO} = [{
+        KEYNAME  => "TAG",
+        KEYVALUE => $tag
+    }];
+
+}
+
+sub computeChecksum {
+    my ($self) = @_;
+
+    my $logger = $self->{logger};
+
+    # to apply to $checksum with an OR
+    my %mask = (
+        HARDWARE      => 1,
+        BIOS          => 2,
+        MEMORIES      => 4,
+        SLOTS         => 8,
+        REGISTRY      => 16,
+        CONTROLLERS   => 32,
+        MONITORS      => 64,
+        PORTS         => 128,
+        STORAGES      => 256,
+        DRIVES        => 512,
+        INPUT         => 1024,
+        MODEMS        => 2048,
+        NETWORKS      => 4096,
+        PRINTERS      => 8192,
+        SOUNDS        => 16384,
+        VIDEOS        => 32768,
+        SOFTWARES     => 65536,
+    );
+    # TODO CPUS is not in the list
+
+    if ($self->{last_state_file}) {
+        if (-f $self->{last_state_file}) {
+            eval {
+                $self->{last_state_content} = XML::TreePP->new()->parsefile(
+                    $self->{last_state_file}
+                );
+            };
+            if (ref($self->{last_state_content}) ne 'HASH') {
+                $self->{last_state_file} = {};
+            }
+        } else {
+            $logger->debug(
+                "last state file '$self->{last_state_file}' doesn't exist"
+            );
+        }
+    }
+
+    my $checksum = 0;
+    foreach my $section (keys %mask) {
+        my $hash =
+            md5_base64(Dumper($self->{content}->{$section}));
+
+        # check if the section did change since the last run
+        next if
+            $self->{last_state_content}->{$section} &&
+            $self->{last_state_content}->{$section} eq $hash;
+
+        $logger->debug("Section $section has changed since last inventory");
+
+        # add the mask of the current section to the checksum
+        $checksum |= $mask{$section}; ## no critic (ProhibitBitwise)
+
+        # store the new value.
+        $self->{last_state_content}->{$section} = $hash;
+    }
+
+
+    $self->setHardware({CHECKSUM => $checksum});
+}
+
+sub saveLastState {
+    my ($self) = @_;
+
+    my $logger = $self->{logger};
+
+    if (!defined($self->{last_state_content})) {
+        $self->processChecksum();
+    }
+    if ($self->{last_state_file}) {
+        eval {
+            XML::TreePP->new()->writefile(
+                $self->{last_state_file}, $self->{last_state_content}
+            );
+        }
+    } else {
+        $logger->debug(
+            "last state file is not defined, last state not saved"
+        );
+    }
+
+    my $tpp = XML::TreePP->new();
+}
+
+1;
+__END__
+
+=head1 NAME
+
+FusionInventory::Agent::Inventory - Inventory data structure
+
+=head1 DESCRIPTION
+
+This is a data structure corresponding to an hardware and software inventory.
+
+=head1 METHODS
+
+=head2 new(%params)
+
+The constructor. The following parameters are allowed, as keys of the
+%params hash:
+
+=over
+
+=item I<logger>
+
+a logger object
+
+=item I<statedir>
+
+a path to a writable directory containing the last serialized inventory
+
+=item I<tag>
+
+an arbitrary label, used for server-side filtering
+
+=back
+
+=head2 getContent()
+
+Get content attribute.
+
+=head2 mergeContent($content)
+
+Merge content to the inventory.
+
+=head2 addEntry(%params)
+
+Add a new entry to the inventory. The following parameters are allowed, as keys
+of the %params hash:
+
+=over
+
+=item I<section>
+
+the entry section (mandatory)
+
+=item I<entry>
+
+the entry (mandatory)
+
+=item I<noDuplicated>
+
+ignore entry if already present
+
+=back
+
+=head2 setTag($tag)
+
+Set inventory tag, an arbitrary label used for filtering on server side.
+
+=head2 setHardware()
+
+Save global information regarding the machine.
+
+=head2 setOperatingSystem()
+
+Operating System information.
+
+=head2 setBios()
+
+Set BIOS information.
+
+=head2 setAccessLog()
+
+What is that for? :)
+
+=head2 computeChecksum()
+
+Compute the inventory checksum. This information is used by the server to
+know which parts of the inventory have changed since the last one.
+
+=head2 computeLegacyValues()
+
+Compute the inventory global values, meaning values in hardware section such as
+CPU number, speed and model, computed from other values, but needed for OCS
+compatibility.
+
+=head2 saveLastState()
+
+At the end of the process IF the inventory was saved
+correctly, the last_state is saved.

@@ -45,9 +45,9 @@ Can be one of:
 
 =item info
 
-=item error
+=item warning
 
-=item fault
+=item error
 
 =back
 

@@ -27,32 +27,43 @@ sub addMessage {
     my $level = $params{level};
     my $message = $params{message};
 
+    my $handle;
     if ($self->{logfile_maxsize}) {
         my $stat = stat($self->{logfile});
         if ($stat && $stat->size() > $self->{logfile_maxsize}) {
-            unlink $self->{logfile}
-                or warn "Can't unlink $self->{logfile}: $ERRNO";
+            if (!open $handle, '>', $self->{logfile}) {
+                warn "Can't open $self->{logfile}: $ERRNO";
+                return;
+            }
         }
     }
 
-    my $handle;
-    if (open $handle, '>>', $self->{logfile}) {
+    if (!$handle && !open $handle, '>>', $self->{logfile}) {
+        warn "can't open $self->{logfile}: $ERRNO";
+        return;
+    }
+
+    my $locked;
+    my $retryTill = time + 60;
 
+    while ($retryTill > time && !$locked) {
+        ## no critic (ProhibitBitwise)
         # get an exclusive lock on log file
-        flock($handle, LOCK_EX|LOCK_NB)
-            or die "can't get an exclusive lock on $self->{logfile}: $ERRNO";
-
-        print {$handle}
-            "[". localtime() ."]" .
-            "[$level]" .
-            " $message\n";
-
-        # closing handle release the lock automatically
-        close $handle;
-    } else {
-        die "can't open $self->{logfile}: $ERRNO";
+        $locked = 1 if flock($handle, LOCK_EX|LOCK_NB);
     }
 
+    if (!$locked) {
+        die "can't get an exclusive lock on $self->{logfile}: $ERRNO";
+    }
+
+    print {$handle}
+        "[". localtime() ."]" .
+        "[$level]" .
+        " $message\n";
+
+    # closing handle release the lock automatically
+    close $handle;
+
 }
 
 1;

@@ -25,9 +25,9 @@ sub addMessage {
 
     my $format;
     if ($self->{color}) {
-        if ($level eq 'error') {
+        if ($level eq 'warning') {
             $format = "\033[1;35m[%s] %s\033[0m\n";
-        } elsif ($level eq 'fault') {
+        } elsif ($level eq 'error') {
             $format = "\033[1;31m[%s] %s\033[0m\n";
         } elsif ($level eq 'info') {
             $format = "\033[1;34m[%s]\033[0m %s\n";

@@ -7,10 +7,11 @@ use base 'FusionInventory::Agent::Logger::Backend';
 use Sys::Syslog qw(:standard :macros);
 
 my %syslog_levels = (
-    fault => LOG_ERR,
-    error => LOG_WARNING,
-    info  => LOG_INFO,
-    debug => LOG_DEBUG
+    error   => LOG_ERR,
+    warning => LOG_WARNING,
+    info    => LOG_INFO,
+    debug   => LOG_DEBUG,
+    debu2   => LOG_DEBUG
 );
 
 sub new {

@@ -2,23 +2,36 @@ package FusionInventory::Agent::Logger;
 
 use strict;
 use warnings;
+use base qw/Exporter/;
+
+use constant {
+    LOG_DEBUG2  => 5,
+    LOG_DEBUG   => 4,
+    LOG_INFO    => 3,
+    LOG_WARNING => 1,
+    LOG_ERROR   => 1,
+    LOG_NONE    => 0,
+};
 
 use English qw(-no_match_vars);
 use UNIVERSAL::require;
 
+our @EXPORT = qw/LOG_DEBUG2 LOG_DEBUG LOG_INFO LOG_WARNING LOG_ERROR LOG_NONE/;
+
 sub new {
     my ($class, %params) = @_;
 
     my $self = {
-        debug => $params{debug} || 0,
+        verbosity => defined $params{verbosity} ? $params{verbosity} : LOG_INFO,
     };
     bless $self, $class;
 
     my %backends;
-    foreach my $backend (
+    foreach (
         $params{backends} ? @{$params{backends}} : 'Stderr'
     ) {
-	next if $backends{$backend};
+        my $backend = ucfirst($_);
+        next if $backends{$backend};
         my $package = "FusionInventory::Agent::Logger::$backend";
         $package->require();
         if ($EVAL_ERROR) {
@@ -26,7 +39,7 @@ sub new {
                 "Failed to load Logger backend $backend: ($EVAL_ERROR)\n";
             next;
         }
-	$backends{$backend} = 1;
+        $backends{$backend} = 1;
 
         $self->debug("Logger backend $backend initialised");
         push
@@ -39,7 +52,7 @@ sub new {
     return $self;
 }
 
-sub log {
+sub _log {
     my ($self, %params) = @_;
 
     # levels: debug2, debug, info, error, fault
@@ -47,8 +60,8 @@ sub log {
     my $message = $params{message};
 
     return unless $message;
-    return if $level eq 'debug2' && $self->{debug} < 2;
-    return if $level eq 'debug'  && $self->{debug} < 1;
+
+    chomp($message);
 
     foreach my $backend (@{$self->{backends}}) {
         $backend->addMessage (
@@ -61,31 +74,49 @@ sub log {
 sub debug2 {
     my ($self, $message) = @_;
 
-    $self->log(level => 'debug2', message => $message);
+    return unless $self->{verbosity} >= LOG_DEBUG2;
+    $self->_log(level => 'debug2', message => $message);
 }
 
 sub debug {
     my ($self, $message) = @_;
 
-    $self->log(level => 'debug', message => $message);
+    return unless $self->{verbosity} >= LOG_DEBUG;
+    $self->_log(level => 'debug', message => $message);
+}
+
+sub debug_result {
+    my ($self, %params) = @_;
+
+    return unless $self->{verbosity} >= LOG_DEBUG;
+
+    my $status = $params{status} || ($params{data} ? 'success' : 'no result');
+
+    $self->_log(
+        level   => 'debug',
+        message => sprintf('- %s: %s', $params{action}, $status)
+    );
 }
 
 sub info {
     my ($self, $message) = @_;
 
-    $self->log(level => 'info', message => $message);
+    return unless $self->{verbosity} >= LOG_INFO;
+    $self->_log(level => 'info', message => $message);
 }
 
-sub error {
+sub warning {
     my ($self, $message) = @_;
 
-    $self->log(level => 'error', message => $message);
+    return unless $self->{verbosity} >= LOG_WARNING;
+    $self->_log(level => 'warning', message => $message);
 }
 
-sub fault {
+sub error {
     my ($self, $message) = @_;
 
-    $self->log(level => 'fault', message => $message);
+    return unless $self->{verbosity} >= LOG_ERROR;
+    $self->_log(level => 'error', message => $message);
 }
 
 1;
@@ -116,36 +147,9 @@ the agent configuration object, to be passed to backends
 
 a list of backends to use (default: Stderr)
 
-=item I<debug>
-
-a flag allowing debug messages (default: false)
-
-=back
-
-=head2 log(%params)
+=item I<verbosity>
 
-Add a log message, with a specific level. %params is an hash, with the
-following keys:
-
-=over
-
-=item I<level>
-
-Can be one of:
-
-=over
-
-=item debug
-
-=item info
-
-=item error
-
-=item fault
-
-=back
-
-=item I<message>
+the verbosity level (default: LOG_INFO)
 
 =back
 
@@ -161,10 +165,14 @@ Add a log message with debug level.
 
 Add a log message with info level.
 
+=head2 warning($message)
+
+Add a log message with warning level.
+
 =head2 error($message)
 
 Add a log message with error level.
 
-=head2 fault($message)
+=head2 debug_result(%params)
 
-Add a log message with fault level.
+Add a log message with debug level related to an action result.

@@ -0,0 +1,225 @@
+package FusionInventory::Agent::SNMP::Live;
+
+use strict;
+use warnings;
+use base 'FusionInventory::Agent::SNMP';
+
+use Encode qw(encode);
+use English qw(-no_match_vars);
+use Net::SNMP;
+
+sub new {
+    my ($class, %params) = @_;
+
+    die "no hostname parameters" unless $params{hostname};
+
+    my $version =
+        ! $params{version}       ? 'snmpv1'  :
+        $params{version} eq '1'  ? 'snmpv1'  :
+        $params{version} eq '2c' ? 'snmpv2c' :
+        $params{version} eq '3'  ? 'snmpv3'  :
+                                     undef   ;
+
+    die "invalid SNMP version $params{version}" unless $version;
+
+    my $self;
+
+    # shared options
+    my %options = (
+        -retries  => 0,
+        -version  => $version,
+        -hostname => $params{hostname},
+    );
+    $options{'-timeout'} = $params{timeout} if $params{timeout};
+
+    # version-specific options
+    if ($version eq 'snmpv3') {
+        # only username is mandatory
+        $options{'-username'}     = $params{username};
+        $options{'-authprotocol'} = $params{authprotocol}
+            if $params{authprotocol};
+        $options{'-authpassword'} = $params{authpassword}
+            if $params{authpassword};
+        $options{'-privprotocol'} = $params{privprotocol}
+            if $params{privprotocol};
+        $options{'-privpassword'} = $params{privpassword}
+            if $params{privpassword};
+    } else { # snmpv2c && snmpv1 #
+        $options{'-community'} = $params{community};
+        $self->{community} = $params{community};
+    }
+
+    ($self->{session}, my $error) = Net::SNMP->session(%options);
+    if (!$self->{session}) {
+        die "no response from host $params{hostname}\n"
+            if $error =~ /^No response from remote host/;
+        die "authentication error on host $params{hostname}\n"
+            if $error =~ /^Received usmStats(WrongDigests|UnknownUserNames)/;
+        die $error . "\n";
+    }
+
+    if ($version ne 'snmpv3') {
+        my $oid = '.1.3.6.1.2.1.1.1.0';
+        my $response = $self->{session}->get_request(
+            -varbindlist => [$oid]
+        );
+        die "no response from host $params{hostname}\n"
+            if !$response;
+        die "no response from host $params{hostname}\n"
+            if $response->{$oid} =~ /No response from remote host/;
+    }
+
+    bless $self, $class;
+
+    return $self;
+}
+
+sub switch_vlan_context {
+    my ($self, $vlan_id) = @_;
+
+    my $version_id = $self->{session}->version();
+
+    my $version =
+        $version_id == 0 ? 'snmpv1'  :
+        $version_id == 1 ? 'snmpv2c' :
+        $version_id == 3 ? 'snmpv3'  :
+                             undef   ;
+
+    my $error;
+    if ($version eq 'snmpv3') {
+        $self->{context} = 'vlan-' . $vlan_id;
+    } else {
+        # save original session
+        $self->{oldsession} = $self->{session} unless $self->{oldsession};
+        ($self->{session}, $error) = Net::SNMP->session(
+            -timeout   => $self->{session}->timeout(),
+            -retries   => 0,
+            -version   => $version,
+            -hostname  => $self->{session}->hostname(),
+            -community => $self->{community} . '@' . $vlan_id
+        );
+    }
+
+    die $error unless $self->{session};
+}
+
+sub reset_original_context {
+    my ($self) = @_;
+
+    my $version_id = $self->{session}->version();
+
+    my $version =
+        $version_id == 0 ? 'snmpv1'  :
+        $version_id == 1 ? 'snmpv2c' :
+        $version_id == 3 ? 'snmpv3'  :
+                             undef   ;
+
+    if ($version eq 'snmpv3') {
+        delete $self->{context};
+    } else {
+        $self->{session} = $self->{oldsession};
+        delete $self->{oldsession};
+    }
+}
+
+sub get {
+    my ($self, $oid) = @_;
+
+    return unless $oid;
+
+    my $session = $self->{session};
+    my %options = (-varbindlist => [$oid]);
+    $options{'-contextname'} = $self->{context} if $self->{context};
+
+    my $response = $session->get_request(%options);
+
+    return unless $response;
+
+    return if $response->{$oid} =~ /noSuchInstance/;
+    return if $response->{$oid} =~ /noSuchObject/;
+    return if $response->{$oid} =~ /No response from remote host/;
+
+
+    my $value = $response->{$oid};
+
+    return $value;
+}
+
+sub walk {
+    my ($self, $oid) = @_;
+
+    return unless $oid;
+
+    my $session = $self->{session};
+    my %options = (-baseoid => $oid);
+    $options{'-contextname'}    = $self->{context} if $self->{context};
+    $options{'-maxrepetitions'} = 1                if $session->version() != 0;
+
+    my $response = $session->get_table(%options);
+
+    return unless $response;
+
+    my $values;
+    my $offset = length($oid) + 1;
+
+    foreach my $oid (keys %{$response}) {
+        my $value = $response->{$oid};
+        $values->{substr($oid, $offset)} = $value;
+    }
+
+    return $values;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+FusionInventory::Agent::SNMP::Live - Live SNMP client
+
+=head1 DESCRIPTION
+
+This is the object used by the agent to perform SNMP queries on live host.
+
+=head1 METHODS
+
+=head2 new(%params)
+
+The constructor. The following parameters are allowed, as keys of the %params
+hash:
+
+=over
+
+=item version (mandatory)
+
+Can be one of:
+
+=over
+
+=item '1'
+
+=item '2c'
+
+=item '3'
+
+=back
+
+=item timeout
+
+The transport layer timeout
+
+=item hostname (mandatory)
+
+=item community
+
+=item username
+
+=item authpassword
+
+=item authprotocol
+
+=item privpassword
+
+=item privprotocol
+
+=back

@@ -0,0 +1,259 @@
+package FusionInventory::Agent::SNMP::Mock;
+
+use strict;
+use warnings;
+use base 'FusionInventory::Agent::SNMP';
+
+use FusionInventory::Agent::Tools;
+
+sub new {
+    my ($class, %params) = @_;
+
+    my $self = {};
+    bless $self, $class;
+
+    SWITCH: {
+        if ($params{file}) {
+            die "non-existing file '$params{file}'\n"
+                unless -f $params{file};
+            die "unreadable file '$params{file}'\n"
+                unless -r $params{file};
+            $self->{values} = _getIndexedValues($params{file});
+            $self->{file}   = $params{file};
+            last SWITCH;
+        }
+
+        if ($params{hash}) {
+            $self->{values} = $params{hash};
+            last SWITCH;
+        }
+    }
+
+    return $self;
+}
+
+sub switch_vlan_context {
+    my ($self, $vlan_id) = @_;
+
+    $self->{oldvalues} = $self->{values} unless $self->{oldvalues};
+
+    my $file = $self->{file} . '@' . $vlan_id;
+    if (-r $file && -f $file) {
+        $self->{values} = _getIndexedValues($file);
+    } else {
+        delete $self->{values};
+    }
+}
+
+sub reset_original_context {
+    my ($self) = @_;
+
+    $self->{values} = $self->{oldvalues};
+    delete $self->{oldvalues};
+}
+
+sub _getIndexedValues {
+    my ($file) = @_;
+
+    my $handle = getFileHandle(file => $file);
+
+    # check first line
+    my $first_line = <$handle>;
+    seek($handle, 0, 0);
+
+    # check first line for safety
+    die "invalid file format\n" unless $first_line =~ /^(\S+) = .*/;
+
+    my $values = substr($first_line, 0, 1) eq '.' ?
+        _readNumericalOids($handle) :
+        _readSymbolicOids($handle)  ;
+    close ($handle);
+
+    return $values;
+}
+
+sub _readNumericalOids {
+    my ($handle) = @_;
+
+    my ($values, $last_oid);
+    while (my $line = <$handle>) {
+
+        if ($line =~ /^
+           (\S+) \s
+           = \s
+           (?:Wrong \s Type \s \(should \s be \s [^:]+\): \s)?
+           ([^:]+): \s
+           (.*)
+           /x
+        ) {
+            my ($oid, $type, $value) = ($1, $2, $3);
+            $values->{$oid} = [ $type, $value ];
+            $last_oid = $oid;
+            next;
+        }
+
+        # potential continuation
+        if ($line !~ /^$/ && $line !~ /= ""$/ && $last_oid) {
+            if ($values->{$last_oid}->[0] eq 'STRING' &&
+                $values->{$last_oid}->[1] !~ /"$/
+            ) {
+                chomp $line;
+                $values->{$last_oid}->[1] .= "\n" . $line;
+                next;
+            }
+            if ($values->{$last_oid}->[0] eq 'Hex-STRING') {
+                chomp $line;
+                $values->{$last_oid}->[1] .= $line;
+                next;
+            }
+        }
+
+        $last_oid = undef;
+    }
+
+    return $values;
+}
+
+sub _readSymbolicOids {
+    my ($handle) = @_;
+
+    my %prefixes = (
+        'iso'                               => '.1',
+        'SNMPv2-MIB::sysDescr'              => '.1.3.6.1.2.1.1.1',
+        'SNMPv2-MIB::sysObjectID'           => '.1.3.6.1.2.1.1.2',
+        'SNMPv2-MIB::sysUpTime'             => '.1.3.6.1.2.1.1.3',
+        'SNMPv2-MIB::sysContact'            => '.1.3.6.1.2.1.1.4',
+        'SNMPv2-MIB::sysName'               => '.1.3.6.1.2.1.1.5',
+        'SNMPv2-MIB::sysLocation'           => '.1.3.6.1.2.1.1.6',
+        'SNMPv2-SMI::mib-2'                 => '.1.3.6.1.2.1',
+        'SNMPv2-SMI::enterprises'           => '.1.3.6.1.4.1',
+        'IF-MIB::ifIndex'                   => '.1.3.6.1.2.1.2.2.1.1',
+        'IF-MIB::ifDescr'                   => '.1.3.6.1.2.1.2.2.1.2',
+        'IF-MIB::ifType'                    => '.1.3.6.1.2.1.2.2.1.3',
+        'IF-MIB::ifMtu'                     => '.1.3.6.1.2.1.2.2.1.4',
+        'IF-MIB::ifSpeed'                   => '.1.3.6.1.2.1.2.2.1.5',
+        'IF-MIB::ifPhysAddress'             => '.1.3.6.1.2.1.2.2.1.6',
+        'IF-MIB::ifLastChange'              => '.1.3.6.1.2.1.2.2.1.9',
+        'IF-MIB::ifInOctets'                => '.1.3.6.1.2.1.2.2.1.10',
+        'IF-MIB::ifInErrors'                => '.1.3.6.1.2.1.2.2.1.14',
+        'IF-MIB::ifOutOctets'               => '.1.3.6.1.2.1.2.2.1.16',
+        'IF-MIB::ifOutErrors'               => '.1.3.6.1.2.1.2.2.1.20',
+        'IF-MIB::ifName'                    => '.1.3.6.1.2.1.31.1.1.1.1',
+        'HOST-RESOURCES-MIB::hrDeviceDescr' => '.1.3.6.1.2.1.25.3.2.1.3',
+    );
+
+    my ($values, $last_oid);
+    while (my $line = <$handle>) {
+
+        if ($line =~ /^
+           ([^.]+) \. ([\d.]+) \s
+           = \s
+           (?:Wrong \s Type \s \(should \s be \s [^:]+\): \s)?
+           ([^:]+): \s
+           (.*)
+           /x
+        ) {
+            my ($mib, $suffix, $type, $value) = ($1, $2, $3, $4);
+
+            if ($prefixes{$mib}) {
+                my $oid = $prefixes{$mib} . '.' . $suffix;
+                $values->{$oid} = [ $type, $value ];
+                $last_oid = $oid;
+            } else {
+                # irrelevant OID
+                $last_oid = undef;
+            }
+
+            next;
+        }
+
+        # potential continuation
+        if ($line !~ /^$/ && $line !~ /= ""$/ && $last_oid) {
+            if ($values->{$last_oid}->[0] eq 'STRING' &&
+                $values->{$last_oid}->[1] !~ /"$/
+            ) {
+                chomp $line;
+                $values->{$last_oid}->[1] .= "\n" . $line;
+                next
+            }
+            if ($values->{$last_oid}->[0] eq 'Hex-STRING' &&
+                $line =~ /^([A-F0-9]{2})( [A-F0-9]{2})?/
+            ) {
+                chomp $line;
+                $values->{$last_oid}->[1] .= $line;
+                next
+            }
+        }
+
+        $last_oid = undef;
+    }
+
+    return $values;
+}
+
+sub get {
+    my ($self, $oid) = @_;
+
+    return unless $oid;
+    return unless $self->{values}->{$oid};
+
+    return _getSanitizedValue(
+        $self->{values}->{$oid}->[0],
+        $self->{values}->{$oid}->[1],
+    );
+}
+
+sub walk {
+    my ($self, $oid) = @_;
+
+    return unless $oid;
+
+    my $values;
+    foreach my $key (keys %{$self->{values}}) {
+       next unless $key =~ /^$oid\.(.+)/;
+       $values->{$1} = _getSanitizedValue(
+           $self->{values}->{$key}->[0],
+           $self->{values}->{$key}->[1]
+       );
+    }
+
+    return $values;
+}
+
+sub _getSanitizedValue {
+    my ($format, $value) = @_;
+
+    if ($format eq 'Hex-STRING') {
+        $value =~ s/\s//g;
+        $value = "0x".$value;
+    } elsif ($format eq 'STRING') {
+        $value =~ s/^(?<!\\)"//;
+        $value =~ s/(?<!\\)"$//;
+    }
+
+    return $value;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+FusionInventory::Agent::SNMP::Mock - Mock SNMP client
+
+=head1 DESCRIPTION
+
+This is the object used by the agent to replay SNMP queries on snmpwalk files.
+
+=head1 METHODS
+
+=head2 new(%params)
+
+The constructor. The following parameters are allowed, as keys of the %params
+hash:
+
+=over
+
+=item file (mandatory)
+
+=back

@@ -0,0 +1,46 @@
+package FusionInventory::Agent::SNMP;
+
+use strict;
+use warnings;
+
+use Encode qw(encode);
+use English qw(-no_match_vars);
+
+our $VERSION = '1.1';
+
+1;
+__END__
+
+=head1 NAME
+
+FusionInventory::Agent::SNMP - Base class for SNMP client
+
+=head1 DESCRIPTION
+
+This is the object used by the agent to perform SNMP queries.
+
+=head1 METHODS
+
+=head2 switch_vlan_context($vlan_id)
+
+Switch to a new vlan-specific context.
+
+With SNMPv1 and SNMPv2, this creates a new SNMP connection, using a community
+derived from original one, with vlan ID appended as a suffix. With SNMPv3,
+ensure all subsequent requests use relevant context.
+
+=head2 reset_original_context()
+
+Reset to original context.
+
+=head2 get($oid)
+
+This method returns a single value, corresponding to a single OID. The value is
+normalised to remove any control character, and hexadecimal mac addresses are
+translated into plain ascii.
+
+=head2 walk($oid)
+
+This method returns an hashref of values, indexed by their OIDs, starting from
+the given one. The values are normalised to remove any control character, and
+hexadecimal mac addresses are translated into plain ascii.

@@ -0,0 +1,409 @@
+package FusionInventory::Agent::SOAP::VMware::Host;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub new {
+    my ($class, %params) = @_;
+
+    my $self = {
+        hash => $params{hash},
+        vms  => $params{vms}
+    };
+
+    bless $self, $class;
+
+    return $self;
+}
+
+sub _asArray {
+    my $h = shift;
+
+    return
+        ref $h eq 'ARRAY' ? @$h  :
+            $h            ? ($h) :
+                            ()   ;
+}
+
+sub getBootTime {
+    my ($self) = @_;
+
+    return $self->{hash}[0]{summary}{runtime}{bootTime};
+}
+
+sub getHostname {
+    my ($self) = @_;
+
+    return $self->{hash}[0]{name}
+
+}
+
+sub getBiosInfo {
+    my ($self) = @_;
+
+    my $hardware   = $self->{hash}[0]{hardware};
+    my $biosInfo   = $hardware->{biosInfo};
+    my $systemInfo = $hardware->{systemInfo};
+    my $ssn;
+
+    return unless ref($biosInfo) eq 'HASH';
+
+    my $identifierValue;
+    if (ref($systemInfo->{otherIdentifyingInfo}) eq 'HASH') {
+        $identifierValue = $systemInfo->{otherIdentifyingInfo}->{identifierValue};
+    }
+    elsif (ref($systemInfo->{otherIdentifyingInfo}) eq 'ARRAY') {
+        foreach (@{$systemInfo->{otherIdentifyingInfo}}) {
+            if ($_->{identifierType}->{key} eq 'ServiceTag') {
+                $ssn = $_->{identifierValue};
+                last;
+            }
+        }
+    }
+
+    return {
+        BDATE         => $biosInfo->{releaseDate},
+        BVERSION      => $biosInfo->{biosVersion},
+        SMODEL        => $systemInfo->{model},
+        SMANUFACTURER => $systemInfo->{vendor},
+        ASSETTAG      => $identifierValue,
+        SSN           => $ssn
+    };
+}
+
+sub getHardwareInfo {
+    my ($self) = @_;
+
+    my $dnsConfig  = $self->{hash}[0]{config}{network}{dnsConfig};
+    my $hardware   = $self->{hash}[0]{hardware};
+    my $summary    = $self->{hash}[0]{summary};
+    my $product    = $summary->{config}->{product};
+    my $systemInfo = $hardware->{systemInfo};
+
+    return {
+        NAME       => $dnsConfig->{hostName},
+        DNS        => join('/', _asArray($dnsConfig->{address})),
+        WORKGROUP  => $dnsConfig->{domainName},
+        MEMORY     => int($hardware->{memorySize} / (1024 * 1024)),
+        UUID       => $summary->{hardware}->{uuid} || $systemInfo->{uuid},
+        OSVERSION  => $product->{version},
+        OSNAME     => $product->{name},
+        OSCOMMENTS => $product->{fullName}
+    };
+}
+
+sub getCPUs {
+    my ($self) = @_;
+
+    my %cpuManufacturor = (
+        amd   => 'AMD',
+        intel => 'Intel',
+    );
+
+    my $hardware    = $self->{hash}[0]{hardware};
+    my $totalCore   = $hardware->{cpuInfo}{numCpuCores};
+    my $totalThread = $hardware->{cpuInfo}{numCpuThreads};
+    my $cpuEntries  = $hardware->{cpuPkg};
+
+    my @cpus;
+    foreach (_asArray($cpuEntries)) {
+        push @cpus,
+          {
+            CORE         => $totalCore / _asArray($cpuEntries),
+            MANUFACTURER => $cpuManufacturor{ $_->{vendor} } || $_->{vendor},
+            NAME         => $_->{description},
+            SPEED        => int( $_->{hz} / ( 1000 * 1000 ) ),
+            THREAD       => eval { $totalThread / $totalCore }
+          };
+    }
+
+    return @cpus;
+}
+
+sub getControllers {
+    my ($self) = @_;
+
+    my @controllers;
+
+    foreach ( @{ $self->{hash}[0]{hardware}{pciDevice} } ) {
+
+        my $pciid = sprintf( "%x:%x", $_->{vendorId}, $_->{deviceId} );
+        my $pcisubsystemid =
+          sprintf( "%x:%x", $_->{subVendorId}, $_->{subDeviceId} );
+        my $pciclass = sprintf( "%x", $_->{classId} );
+
+        $pcisubsystemid = '' if $pcisubsystemid =~ /^[0:]+$/;
+
+        # Workaround: sometime the pciid are odd negative number.
+        # e.g: 111d:ffff8018, ffff8086:244e, ffff8086:ffffa02c
+        foreach ( $pciid, $pcisubsystemid, $pciclass ) {
+            s/(\w+:)/000$1:/;
+            s/:(\w+)/:000$1/;
+            s/.*(\w{4}:).*(\w{4}).*/$1$2/g;
+        }
+        push @controllers,
+          {
+            NAME           => $_->{deviceName},
+            MANUFACTURER   => $_->{vendorName},
+            PCICLASS       => $pciclass,
+            PCIID          => $pciid,
+            PCISUBSYSTEMID => $pcisubsystemid,
+            PCISLOT        => $_->{id},
+          };
+
+    }
+
+    return @controllers;
+}
+
+sub _getNic {
+    my ($ref, $isVirtual) = @_;
+
+    return {
+        DESCRIPTION => $ref->{device},
+        DRIVER      => $ref->{driver},
+        IPADDRESS   => $ref->{spec}{ip}{ipAddress},
+        IPMASK      => $ref->{spec}{ip}{subnetMask},
+        MACADDR     => $ref->{mac} || $ref->{spec}{mac},
+        MTU         => $ref->{spec}{mtu},
+        PCISLOT     => $ref->{pci},
+        STATUS      => $ref->{spec}{ip}{ipAddress} ? 'Up' : 'Down',
+        VIRTUALDEV  => $isVirtual,
+        SPEED       => $ref->{spec}{linkSpeed}{speedMb},
+    }
+}
+
+sub getNetworks {
+    my ($self) = @_;
+
+    my @networks;
+
+    my $seen = {};
+
+    foreach my $nicType (qw/vnic pnic consoleVnic/)  {
+        foreach (_asArray($self->{hash}[0]{config}{network}{$nicType}))
+        {
+
+            next if $seen->{$_->{device}}++;
+            my $isVirtual = $nicType eq 'vnic'?1:0;
+            push @networks, _getNic($_, $isVirtual);
+        }
+    }
+
+    my @vnic;
+    push @vnic, $self->{hash}[0]{config}{network}{consoleVnic}
+        if $self->{hash}[0]{config}{network}{consoleVnic};
+    push @vnic, $self->{hash}[0]{config}{vmotion}{netConfig}{candidateVnic}
+        if $self->{hash}[0]{config}{vmotion}{netConfig}{candidateVnic};
+    foreach my $entry (@vnic) {
+        foreach (_asArray($entry)) {
+            next if $seen->{$_->{device}}++;
+
+            push @networks, _getNic($_, 1);
+        }
+    }
+
+    return @networks;
+}
+
+sub getStorages {
+    my ($self) = @_;
+
+    my @storages;
+    foreach my $entry (
+        _asArray($self->{hash}[0]{config}{storageDevice}{scsiLun}))
+    {
+        my $serialnumber;
+        my $size;
+
+        # TODO
+        #$volumnMapping{$entry->{canonicalName}} = $entry->{deviceName};
+
+        foreach my $altName (_asArray($entry->{alternateName})) {
+            next unless ref($altName) eq 'HASH';
+            next unless $altName->{namespace};
+            next unless $altName->{data};
+            if ( $altName->{namespace} eq 'SERIALNUM' ) {
+                $serialnumber .= $_ foreach ( @{ $altName->{data} } );
+            }
+        }
+        if ( $entry->{capacity}{blockSize} && $entry->{capacity}{block} ) {
+            $size = int(($entry->{capacity}{blockSize} *$entry->{capacity}{block})/1024/1024);
+        }
+        my $manufacturer;
+        if ( $entry->{vendor} && ( $entry->{vendor} !~ /^\s*ATA\s*$/ ) ) {
+            $manufacturer = $entry->{vendor};
+        } else {
+            $manufacturer = getCanonicalManufacturer( $entry->{model} );
+        }
+
+        $manufacturer =~ s/\s*(\S.*\S)\s*/$1/;
+
+        my $model = $entry->{model};
+        $model =~ s/\s*(\S.*\S)\s*/$1/;
+
+        push @storages, {
+            DESCRIPTION => $entry->{displayName},
+            DISKSIZE    => $size,
+
+            #        INTERFACE
+            MANUFACTURER => $manufacturer,
+            MODEL        => $model,
+            NAME         => $entry->{deviceName},
+            TYPE         => $entry->{deviceType},
+            SERIAL       => $serialnumber,
+            FIRMWARE     => $entry->{revision},
+
+            #        SCSI_COID
+            #        SCSI_CHID
+            #        SCSI_UNID
+            #        SCSI_LUN
+        };
+
+    }
+
+    return @storages;
+
+}
+
+sub getDrives {
+    my ($self) = @_;
+
+    my @drives;
+
+    foreach (
+        _asArray($self->{hash}[0]{config}{fileSystemVolume}{mountInfo}))
+    {
+        my $volumn;
+        if ( $_->{volume}{type} && ( $_->{volume}{type} =~ /NFS/i ) ) {
+            $volumn = $_->{volume}{remoteHost} . ':' . $_->{volume}{remotePath};
+
+# TODO
+#        } else {
+#            $volumn = $volumnMapping{$_->{volume}{extent}{diskName}}." ".$_->{volume}{extent}{partition};
+        }
+        push @drives,
+          {
+            SERIAL => $_->{volume}{uuid},
+            TOTAL  => int( ( $_->{volume}{capacity} || 0 ) / ( 1000 * 1000 ) ),
+            TYPE   => $_->{mountInfo}{path},
+            VOLUMN => $volumn,
+            NAME   => $_->{volume}{name},
+            FILESYSTEM => lc( $_->{volume}{type} )
+          };
+    }
+
+    return @drives;
+}
+
+sub getVirtualMachines {
+    my ($self) = @_;
+
+    my @virtualMachines;
+
+    foreach my $vm (@{$self->{vms}}) {
+        my $machine = $vm->[0];
+        my $status =
+            $machine->{summary}{runtime}{powerState} eq 'poweredOn'  ? 'running' :
+            $machine->{summary}{runtime}{powerState} eq 'poweredOff' ? 'off'     :
+            $machine->{summary}{runtime}{powerState} eq 'suspended'  ? 'pause'   :
+                                                                    undef     ;
+        print "Unknown status (".$machine->{summary}{runtime}{powerState}.")\n" if !$status;
+
+        my @mac;
+        foreach my $device (_asArray($machine->{config}{hardware}{device})) {
+            push @mac, $device->{macAddress} if $device->{macAddress};
+        }
+
+        my $comment = $machine->{config}{annotation};
+
+        # hack to preserve  annotation / comment formating
+        $comment =~ s/\n/
/gm if $comment;
+
+        if (
+            defined($_->[0]{summary}{config}{template})
+            &&
+            $_->[0]{summary}{config}{template} eq 'true'
+            ) {
+            next;
+        }
+
+        push @virtualMachines,
+          {
+            VMID    => $machine->{summary}{vm},
+            NAME    => $machine->{name},
+            STATUS  => $status,
+            UUID    => $machine->{summary}{config}{uuid},
+            MEMORY  => $machine->{summary}{config}{memorySizeMB},
+            VMTYPE  => 'VMware',
+            VCPU    => $machine->{summary}{config}{numCpu},
+            MAC     => join( '/', @mac ),
+            COMMENT => $comment
+          };
+    }
+
+    return @virtualMachines;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+FusionInventory::Agent::SOAP::VMware::Host - VMware Host abstraction layer
+
+=head1 DESCRIPTION
+
+The module is an abstraction layer to access the VMware host.
+
+=head1 FUNCTIONS
+
+=head2 new($class, %params)
+
+Returns an object.
+
+=head2 getBootTime( $self )
+
+Returns the date in the following format: 2012-12-31T12:59:59
+
+=head2 getHostname( $self )
+
+Returns the host name.
+
+=head2 getBiosInfo( $self )
+
+Returns the BIOS (BDATE, BVERSION, SMODEL, SMANUFACTURER, ASSETTAG, SSN)
+information in an HASH reference.
+
+=head2 getHardwareInfo( $self )
+
+Returns hardware information in a hash reference.
+
+=head2 getCPUs( $self )
+
+Returns CPU information (hash ref) in an array.
+
+=head2 getControllers( $self )
+
+Returns PCI controller information (hash ref) in an
+array.
+
+=head2 getNetworks( $self )
+
+Returns the networks configuration in an array.
+
+
+=head2 getStorages( $self )
+
+Returns the storage devices in an array.
+
+=head2 getDrives( $self )
+
+Returns the hard drive partitions in an array.
+
+=head2 getVirtualMachines( $self )
+
+Retuns the Virtual Machines in an array.

@@ -0,0 +1,325 @@
+package FusionInventory::Agent::SOAP::VMware;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use XML::TreePP;
+use LWP::UserAgent;
+use HTTP::Cookies;
+
+use FusionInventory::Agent;
+use FusionInventory::Agent::SOAP::VMware::Host;
+
+sub new {
+    my ($class, %params) = @_;
+
+    my $self = {
+        url => $params{url},
+        tpp => XML::TreePP->new(force_array => [qw(returnval propSet)]),
+    };
+    bless $self, $class;
+
+    # create user agent
+    $self->{ua} = LWP::UserAgent->new(
+        requests_redirectable => ['POST', 'GET', 'HEAD'],
+        agent                 => $FusionInventory::Agent::AGENT_STRING,
+        timeout               => $params{timeout} || 180,
+        ssl_opts              => { verify_hostname => 0 },
+        cookie_jar            => HTTP::Cookies->new(ignore_discard => 1),
+    );
+
+    return $self;
+}
+
+sub _send {
+    my ( $self, $action, $xmlToSend ) = @_;
+
+    my $req = HTTP::Request->new( POST => $self->{url} );
+    $req->content($xmlToSend);
+    $req->{_headers}->{soapaction}       = "\"urn:vim25#" . $action . "\"";
+    $req->{_headers}->{accept}           = [ 'text/xml', 'application/soap' ];
+    $req->{_headers}->{'content-length'} = length($xmlToSend);
+    $req->{_protocol}                    = 'HTTP/1.1';
+    $req->content_type('text/xml; charset=utf-8');
+
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success ) {
+        return $res->content;
+    } else {
+        my $err    = $res->content;
+        my $tmpRef = {};
+
+        eval {
+            $err =~ s/.*(<faultstring>.*<\/faultstring>).*/$1/sg;
+            $tmpRef = $self->{tpp}->parse($err);
+        };
+
+        my $errorString = $res->status_line;
+        if ( $tmpRef && $tmpRef->{faultstring} ) {
+            $errorString .= ": " . $tmpRef->{faultstring};
+        }
+        print STDERR $errorString . "\n";
+        $self->{lastError} = $errorString;
+        return;
+    }
+
+    return 1;
+}
+
+sub _parseAnswer {
+    my ( $self, $answer ) = @_;
+
+    return unless $answer;
+
+    local $INPUT_RECORD_SEPARATOR; # Set input to "slurp" mode.
+
+    # We simplify the XML structure
+    my $pattern = '.*<\w+Response xmlns="urn:vim25">(.+)</\w+Response>.*$';
+    $answer =~ s/$pattern/$1/sg,;
+    $answer =~ s/ (xsi:|)type="[:\w]+"//sg;
+    $answer =~ s/[[:cntrl:]]//g;
+    my $tmpRef = $self->{tpp}->parse($answer);
+
+    my $ref = [];
+    foreach ( @{ $tmpRef->{returnval} } ) {
+        if ( $_->{propSet} ) {
+            my %tmp;
+            foreach my $p ( @{ $_->{propSet} } ) {
+                next unless $p->{val};
+                $tmp{ $p->{name} } = $p->{val};
+            }
+            push @$ref, \%tmp;
+        } else {
+            push @$ref, $_;
+        }
+    }
+
+    return $ref;
+
+}
+
+sub connect {
+    my ( $self, $user, $password ) = @_;
+
+    my $req = '<?xml version="1.0" encoding="UTF-8"?>
+   <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+                     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <soapenv:Body>
+<RetrieveServiceContent xmlns="urn:vim25"><_this type="ServiceInstance">ServiceInstance</_this>
+</RetrieveServiceContent></soapenv:Body></soapenv:Envelope>';
+
+    my $answer = $self->_send( 'ServiceInstance', $req );
+    return unless $answer;
+
+    my $serviceInstance = $self->_parseAnswer($answer);
+    return unless $serviceInstance;
+
+    if ( $serviceInstance->[0]{about}{apiType} eq 'VirtualCenter' ) {
+        $self->{vcenter}           = 1;                     # TODO
+        $self->{sessionManager}    = "SessionManager";
+        $self->{propertyCollector} = "propertyCollector";
+    } else {
+        $self->{vcenter}           = 0;
+        $self->{sessionManager}    = "ha-sessionmgr";
+        $self->{propertyCollector} = "ha-property-collector";
+    }
+
+    $req = '<?xml version="1.0" encoding="UTF-8"?>
+        <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <soapenv:Body>
+        <Login xmlns="urn:vim25"><_this type="SessionManager">%s</_this>
+        <userName>%s</userName><password>%s</password></Login></soapenv:Body></soapenv:Envelope>';
+
+    $answer = $self->_send(
+        'Login',
+        sprintf( $req, $self->{sessionManager}, $user, $password )
+    );
+    return unless $answer;
+    return if $answer =~ /ServerFaultCode/m;
+
+    return $self->_parseAnswer($answer);
+
+}
+
+#sub getHostInfo {
+#    my ($self) = @_;
+#
+#
+#    my $req =
+#        '<?xml version="1.0" encoding="UTF-8"?><soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><RetrieveServiceContent xmlns="urn:vim25"><_this type="ServiceInstance">ServiceInstance</_this></RetrieveServiceContent></soap:Body></soap:Envelope>';
+#
+#
+#    my $answer = $self->_send('RetrieveServiceContent', 'RetrieveServiceContent', $req);
+#    my $ref = $self->_parseAnswer($answer);
+#
+#    return $host;
+#}
+
+sub _getVirtualMachineList {
+    my ($self) = @_;
+
+    my $req =
+
+      '<?xml version="1.0" encoding="UTF-8"?>
+        <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <soapenv:Body>
+        <RetrieveProperties xmlns="urn:vim25"><_this type="PropertyCollector">ha-property-collector</_this>
+        <specSet><propSet><type>VirtualMachine</type><all>0</all></propSet><objectSet><obj type="Folder">ha-folder-root</obj>
+        <skip>0</skip><selectSet xsi:type="TraversalSpec"><name>folderTraversalSpec</name><type>Folder</type><path>childEntity</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet><selectSet><name>datacenterHostTraversalSpec</name></selectSet><selectSet><name>datacenterVmTraversalSpec</name></selectSet><selectSet><name>datacenterDatastoreTraversalSpec</name></selectSet><selectSet><name>datacenterNetworkTraversalSpec</name></selectSet><selectSet><name>computeResourceRpTraversalSpec</name></selectSet><selectSet><name>computeResourceHostTraversalSpec</name></selectSet><selectSet><name>hostVmTraversalSpec</name></selectSet><selectSet><name>resourcePoolVmTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>datacenterDatastoreTraversalSpec</name><type>Datacenter</type><path>datastoreFolder</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>datacenterNetworkTraversalSpec</name><type>Datacenter</type><path>networkFolder</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>datacenterVmTraversalSpec</name><type>Datacenter</type><path>vmFolder</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>datacenterHostTraversalSpec</name><type>Datacenter</type><path>hostFolder</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>computeResourceHostTraversalSpec</name><type>ComputeResource</type><path>host</path><skip>0</skip></selectSet><selectSet xsi:type="TraversalSpec"><name>computeResourceRpTraversalSpec</name><type>ComputeResource</type><path>resourcePool</path><skip>0</skip><selectSet><name>resourcePoolTraversalSpec</name></selectSet><selectSet><name>resourcePoolVmTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>resourcePoolTraversalSpec</name><type>ResourcePool</type><path>resourcePool</path><skip>0</skip><selectSet><name>resourcePoolTraversalSpec</name></selectSet><selectSet><name>resourcePoolVmTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>hostVmTraversalSpec</name><type>HostSystem</type><path>vm</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>resourcePoolVmTraversalSpec</name><type>ResourcePool</type><path>vm</path><skip>0</skip></selectSet></objectSet></specSet></RetrieveProperties></soapenv:Body></soapenv:Envelope>
+        ';
+
+    my $answer = $self->_send(
+        'RetrievePropertiesVMList',
+        $req
+    );
+    my $ref = $self->_parseAnswer($answer);
+    my @list;
+    if ( ref($ref) eq 'HASH' ) {
+        push @list, $ref;
+    }
+    elsif ($ref) {
+        @list = @{$ref};
+    }
+
+    my @ids;
+    foreach (@list) {
+        push @ids, $_->{obj};
+    }
+
+    return \@ids;
+
+}
+
+sub _getVirtualMachineById {
+    my ( $self, $id ) = @_;
+
+    my $req = '<?xml version="1.0" encoding="UTF-8"?>
+        <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <soapenv:Body>
+        <RetrieveProperties xmlns="urn:vim25"><_this type="PropertyCollector">%s</_this>
+        <specSet><propSet><type>VirtualMachine</type><all>1</all></propSet><objectSet><obj type="VirtualMachine">%s</obj>
+        </objectSet></specSet></RetrieveProperties></soapenv:Body></soapenv:Envelope>
+        ';
+
+    my $answer = $self->_send(
+        'RetrieveProperties',
+        sprintf( $req, $self->{propertyCollector}, $id )
+    );
+    return [] unless $answer;
+
+    # hack to preserve  annotation / comment formating
+    $answer =~ s/\n/&#10;/gm;
+
+    my $ref = $self->_parseAnswer($answer);
+    return $ref;
+}
+
+sub getHostFullInfo {
+    my ( $self, $id ) = @_;
+
+    $id = 'ha-host' unless $id;
+
+    my $req = '<?xml version="1.0" encoding="UTF-8"?>
+        <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <soapenv:Body>
+        <RetrieveProperties xmlns="urn:vim25"><_this type="PropertyCollector">%s</_this>
+        <specSet><propSet><type>HostSystem</type><all>1</all></propSet><objectSet><obj type="HostSystem">%s</obj>
+        </objectSet></specSet></RetrieveProperties></soapenv:Body></soapenv:Envelope>
+        ';
+
+    my $answer = $self->_send(
+        'RetrieveProperties',
+        sprintf( $req, $self->{propertyCollector}, $id )
+    );
+    my $ref = $self->_parseAnswer($answer);
+    my $vms = [];
+    my $machineIdList;
+    if ( exists( $ref->[0]{vm}{ManagedObjectReference} ) ) {    # ESX 3.5
+        if ( ref( $ref->[0]{vm}{ManagedObjectReference} ) eq 'ARRAY' ) {
+            $machineIdList = $ref->[0]{vm}{ManagedObjectReference};
+        } else {
+            push @$machineIdList, $ref->[0]{vm}{ManagedObjectReference};
+        }
+    } else {
+        $machineIdList = $self->_getVirtualMachineList();
+    }
+
+    #$vm = $ref->[0]{vm};
+    foreach my $id (@$machineIdList) {
+        push @$vms, $self->_getVirtualMachineById($id);
+    }
+
+    my $host = FusionInventory::Agent::SOAP::VMware::Host->new(
+        hash => $ref, vms => $vms
+    );
+    return $host;
+}
+
+sub getHostIds {
+    my ($self) = @_;
+
+    if ( !$self->{vcenter} ) {
+        return ['ha-host'];
+    }
+
+    my $req = '<?xml version="1.0" encoding="UTF-8"?>
+   <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+                     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <soapenv:Body>
+<RetrieveProperties xmlns="urn:vim25"><_this type="PropertyCollector">propertyCollector</_this>
+<specSet><propSet><type>HostSystem</type><all>0</all></propSet><objectSet><obj type="Folder">group-d1</obj>
+<skip>0</skip><selectSet xsi:type="TraversalSpec"><name>folderTraversalSpec</name><type>Folder</type><path>childEntity</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet><selectSet><name>datacenterHostTraversalSpec</name></selectSet><selectSet><name>datacenterVmTraversalSpec</name></selectSet><selectSet><name>datacenterDatastoreTraversalSpec</name></selectSet><selectSet><name>datacenterNetworkTraversalSpec</name></selectSet><selectSet><name>computeResourceRpTraversalSpec</name></selectSet><selectSet><name>computeResourceHostTraversalSpec</name></selectSet><selectSet><name>hostVmTraversalSpec</name></selectSet><selectSet><name>resourcePoolVmTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>datacenterDatastoreTraversalSpec</name><type>Datacenter</type><path>datastoreFolder</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>datacenterNetworkTraversalSpec</name><type>Datacenter</type><path>networkFolder</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>datacenterVmTraversalSpec</name><type>Datacenter</type><path>vmFolder</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>datacenterHostTraversalSpec</name><type>Datacenter</type><path>hostFolder</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>computeResourceHostTraversalSpec</name><type>ComputeResource</type><path>host</path><skip>0</skip></selectSet><selectSet xsi:type="TraversalSpec"><name>computeResourceRpTraversalSpec</name><type>ComputeResource</type><path>resourcePool</path><skip>0</skip><selectSet><name>resourcePoolTraversalSpec</name></selectSet><selectSet><name>resourcePoolVmTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>resourcePoolTraversalSpec</name><type>ResourcePool</type><path>resourcePool</path><skip>0</skip><selectSet><name>resourcePoolTraversalSpec</name></selectSet><selectSet><name>resourcePoolVmTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>hostVmTraversalSpec</name><type>HostSystem</type><path>vm</path><skip>0</skip><selectSet><name>folderTraversalSpec</name></selectSet></selectSet><selectSet xsi:type="TraversalSpec"><name>resourcePoolVmTraversalSpec</name><type>ResourcePool</type><path>vm</path><skip>0</skip></selectSet></objectSet></specSet></RetrieveProperties></soapenv:Body></soapenv:Envelope>';
+
+    my $answer = $self->_send('RetrieveProperties', sprintf($req) );
+    my $ref = $self->_parseAnswer($answer);
+
+    my @ids;
+    foreach (@$ref) {
+        push @ids, $_->{obj};
+    }
+
+    return \@ids;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+FusionInventory::Agent::SOAP::VMware - Access to VMware hypervisor
+
+=head1 DESCRIPTION
+
+This module allow access to VMware hypervisor using VMware SOAP API
+and _WITHOUT_ their Perl library.
+
+=head1 METHODS
+
+=head2 new(%params)
+
+Returns a VMware object.
+
+=head2 connect($user, $password)
+
+Connect the VMware object with the given credentials.
+
+=head2 getHostFullInfo($id)
+
+Returns a large hash structure with the host information.
+
+=head2 getHostIds()
+
+Returns the list of the virtual machine ID in an array reference.

@@ -1,137 +0,0 @@
-package FusionInventory::Agent::Scheduler;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Logger;
-
-sub new {
-    my ($class, %params) = @_;
-
-    my $self = {
-        logger     => $params{logger} ||
-                      FusionInventory::Agent::Logger->new(),
-        lazy       => $params{lazy},
-        wait       => $params{wait},
-        background => $params{background},
-        targets    => []
-    };
-    bless $self, $class;
-
-    return $self;
-}
-
-sub addTarget {
-    my ($self, $target) = @_;
-
-    push @{$self->{targets}}, $target;
-}
-
-sub getNextTarget {
-    my ($self) = @_;
-
-    my $logger = $self->{'logger'};
-
-    return unless @{$self->{targets}};
-
-    if ($self->{background}) {
-        # block until a target is eligible to run, then return it
-        while (1) {
-            foreach my $target (@{$self->{targets}}) {
-                if (time > $target->getNextRunDate()) {
-                    return $target;
-                }
-            }
-            sleep(10);
-        }
-    }
-
-    my $target = shift @{$self->{targets}};
-
-    if ($self->{lazy}) {
-        # return next target if eligible, nothing otherwise
-        if (time > $target->getNextRunDate()) {
-            $logger->debug("[scheduler] $target->{id} is ready");
-            return $target;
-        } else {
-            $logger->info(
-                "$target->{id} is not ready yet, next server " .
-                "contact planned for " . localtime($target->getNextRunDate())
-            );
-            return;
-        }
-    }
-
-    if ($self->{wait}) {
-        # return next target after waiting for a random delay
-        my $time = int rand($self->{wait});
-        $logger->info(
-            "[scheduler] sleeping for $time second(s) because of the wait " .
-            "parameter"
-        );
-        sleep $time;
-        return $target;
-    }
-
-    # return next target immediatly
-    return $target;
-}
-
-sub getTargets {
-    my ($self) = @_;
-
-    return @{$self->{targets}}
-}
-
-1;
-__END__
-
-=head1 NAME
-
-FusionInventory::Agent::Scheduler - A target scheduler
-
-=head1 DESCRIPTION
-
-This is the object used by the agent to schedule various targets.
-
-=head1 METHODS
-
-=head2 new(%params)
-
-The constructor. The following parameters are allowed, as keys of the %params
-hash:
-
-=over
-
-=item I<logger>
-
-the logger object to use (default: a new stderr logger)
-
-=item I<lazy>
-
-a flag to ensure targets whose next scheduled execution date has not been
-reached yet will get ignored. Only useful when I<background> flag is not set.
-
-=item I<wait>
-
-a number of second to wait before returning each target. Only useful when
-I<background> flag is not set.
-
-=item I<background>
-
-a flag to set if the agent is running as a resident program, aka a daemon in
-Unix world, and a service in Windows world (default: false)
-
-=back
-
-=head2 addTarget()
-
-Add a new target to schedule.
-
-=head2 getNextTarget()
-
-Get the next scheduled target.
-
-=head2 getTargets()
-
-Get all targets.

@@ -1,11 +1,10 @@
 package FusionInventory::Agent::Storage;
-        
+
 use strict;
 use warnings;
 
 use Config;
 use English qw(-no_match_vars);
-use File::Glob qw(:glob);
 use File::Path qw(mkpath);
 use Storable;
 
@@ -15,13 +14,14 @@ sub new {
     my ($class, %params) = @_;
 
     die "no directory parameter" unless $params{directory};
-
     if (!-d $params{directory}) {
-        mkpath($params{directory}, {error => \my $err});
-        if (@$err) {
-            my (undef, $message) = %{$err->[0]};
-            die "Can't create $params{directory}: $message";
-        }
+        # {error => \my $err} is not supported on RHEL 5,
+        # we let mkpath call die() itself
+        # http://forge.fusioninventory.org/issues/1817
+        eval {
+            mkpath($params{directory});
+        };
+        die "Can't create $params{directory}: $EVAL_ERROR" if $EVAL_ERROR;
     }
 
     if (! -w $params{directory}) {

@@ -31,10 +31,16 @@ sub getPath {
     return $self->{path};
 }
 
-sub getDescription {
+sub _getName {
     my ($self) = @_;
 
-    return "local, $self->{path}";
+    return $self->{path};
+}
+
+sub _getType {
+    my ($self) = @_;
+
+    return 'local';
 }
 
 1;

@@ -59,10 +59,16 @@ sub getUrl {
     return $self->{url};
 }
 
-sub getDescription {
+sub _getName {
     my ($self) = @_;
 
-    return "server, $self->{url}";
+    return $self->{url};
+}
+
+sub _getType {
+    my ($self) = @_;
+
+    return 'server';
 }
 
 1;
@@ -96,4 +102,3 @@ the server URL (mandatory)
 =head2 getUrl()
 
 Return the server URL for this target.
-

@@ -1,38 +0,0 @@
-package FusionInventory::Agent::Target::Stdout;
-
-use strict;
-use warnings;
-use base 'FusionInventory::Agent::Target';
-
-use English qw(-no_match_vars);
-
-my $count = 0;
-
-sub new {
-    my ($class, %params) = @_;
-
-    my $self = $class->SUPER::new(%params);
-
-    $self->_init(
-        id     => 'stdout' . $count++,
-        vardir => $params{basevardir} . '/__LOCAL__',
-    );
-
-    return $self;
-}
-
-sub getDescription {
-    my ($self) = @_;
-
-    return "stdout";
-}
-
-1;
-
-1;
-
-__END__
-
-=head1 NAME
-
-FusionInventory::Agent::Target::Stdout - Stdout target

@@ -52,19 +52,6 @@ sub _init {
 
 }
 
-sub setShared {
-    my ($self) = @_;
-
-    # make sure relevant attributes are shared between threads
-    threads::shared->require();
-    # calling share(\$self->{status}) directly breaks in testing
-    # context, hence the need to use an intermediate variable
-    my $nextRunDate = \$self->{nextRunDate};
-    threads::shared::share($nextRunDate);
-
-    $self->{shared} = 1;
-}
-
 sub getStorage {
     my ($self) = @_;
 
@@ -93,6 +80,13 @@ sub getNextRunDate {
     return $self->{nextRunDate};
 }
 
+sub getFormatedNextRunDate {
+    my ($self) = @_;
+
+    return $self->{nextRunDate} > 1 ?
+        scalar localtime($self->{nextRunDate}) : "now";
+}
+
 sub getMaxDelay {
     my ($self) = @_;
 
@@ -106,15 +100,6 @@ sub setMaxDelay {
     $self->_saveState();
 }
 
-sub getStatus {
-    my ($self) = @_;
-
-    return
-        $self->getDescription() .
-        ': '                    .
-         ($self->{nextRunDate} > 1 ? localtime($self->{nextRunDate}) : "now" );
-}
-
 # compute a run date, as current date and a random delay
 # between maxDelay / 2 and maxDelay
 sub _computeNextRunDate {
@@ -122,7 +107,7 @@ sub _computeNextRunDate {
 
     my $ret;
     if ($self->{initialDelay}) {
-        $ret = time + $self->{initialDelay};
+        $ret = time + ($self->{initialDelay} / 2) + int rand($self->{initialDelay} / 2);
         $self->{initialDelay} = undef;
     } else {
         $ret =
@@ -181,7 +166,7 @@ the logger object to use
 
 =item I<maxDelay>
 
-the maximum delay before contacting the target, in seconds 
+the maximum delay before contacting the target, in seconds
 (default: 3600)
 
 =item I<basevardir>
@@ -190,14 +175,14 @@ the base directory of the storage area (mandatory)
 
 =back
 
-=head2 setShared()
-
-Ensure the target can be shared among threads
-
 =head2 getNextRunDate()
 
 Get nextRunDate attribute.
 
+=head2 getFormatedNextRunDate()
+
+Get nextRunDate attribute as a formated string.
+
 =head2 setNextRunDate($nextRunDate)
 
 Set next execution date.
@@ -217,11 +202,3 @@ Set maxDelay attribute.
 =head2 getStorage()
 
 Return the storage object for this target.
-
-=head2 getDescription()
-
-Return a string description of the target.
-
-=head2 getStatus()
-
-Return a string status for the target.

@@ -0,0 +1,154 @@
+package FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Cmd;
+
+use strict;
+use warnings;
+
+use Fcntl qw(SEEK_END);
+use UNIVERSAL::require;
+
+use English qw(-no_match_vars);
+
+sub _evaluateRet {
+    my ($retChecks, $buf, $exitStatus) = @_;
+
+    if (ref($retChecks) ne 'ARRAY') {
+        return [ 1, 'ok, no check to evaluate.' ];
+    }
+
+    foreach my $retCheck (@$retChecks) {
+
+        if ($retCheck->{type} eq 'okCode') {
+            foreach (@{$retCheck->{values}}) {
+                if ($exitStatus == $_) {
+                    return [ 1, "exit status is ok: $_" ];
+                }
+            }
+        } elsif ($retCheck->{type} eq 'okPattern') {
+            foreach (@{$retCheck->{values}}) {
+                next unless length($_);
+                if ($$buf =~ /$_/) {
+                    return [ 1, "ok pattern found in log: /$_/" ];
+                }
+            }
+        } elsif ($retCheck->{type} eq 'errorCode') {
+            foreach (@{$retCheck->{values}}) {
+                if ($exitStatus == $_) {
+                    return [ 0, "exit status is not ok: `$_'" ];
+                }
+            }
+        } elsif ($retCheck->{type} eq 'errorPattern') {
+            foreach (@{$retCheck->{values}}) {
+                next unless length($_);
+                if ($$buf =~ /$_/) {
+                    return [ 0, "error pattern found in log: /$_/" ];
+                }
+            }
+        }
+    }
+    return [ 0, '' ];
+}
+
+sub runOnUnix {
+    my ($params, $logger) = @_;
+
+    my $buf = `$params->{exec} 2>&1` || '';
+    my $errMsg = $ERRNO;
+    $logger->debug("Run: ".$buf);
+    my $exitStatus = $CHILD_ERROR >> 8;
+    $logger->debug("exitStatus: ".$exitStatus);
+
+    return ($buf, $errMsg, $exitStatus);
+}
+
+sub runOnWindows {
+    my ($params) = @_;
+
+    FusionInventory::Agent::Tools::Win32->require;
+
+    my ($exitcode, $fd) = FusionInventory::Agent::Tools::Win32::runCommand(
+        command => $params->{exec}
+    );
+
+
+    $fd->seek(-2000, SEEK_END);
+
+    my $buf;
+    while(my $line = readline($fd)) {
+        $buf .= $line;
+    }
+
+    my $errMsg;
+    if ($exitcode eq '293') {
+        $errMsg = "timeout";
+    }
+
+
+    return ($buf, $errMsg, $exitcode);
+}
+
+
+sub do {
+    my ($params, $logger) = @_;
+    return { 0, ["Internal agent error"]} unless $params->{exec};
+
+    my %envsSaved;
+
+
+    if ($params->{envs}) {
+        foreach my $key (keys %{$params->{envs}}) {
+            $envsSaved{$key} = $ENV{$key};
+            $ENV{$key} = $params->{envs}{$key};
+        }
+    }
+
+    my $buf;
+    my $errMsg;
+    my $exitStatus;
+
+
+    if ($OSNAME eq 'MSWin32') {
+        ($buf, $errMsg, $exitStatus) = runOnWindows(@_);
+    } else {
+        ($buf, $errMsg, $exitStatus) = runOnUnix(@_);
+    }
+
+    my $logLineLimit =  $params->{logLineLimit} || 10;
+
+    my @msg;
+    if($buf) {
+        my @lines = split('\n', $buf);
+        foreach my $line (reverse @lines) {
+            chomp($line);
+            shift @msg if @msg > $logLineLimit;
+            unshift @msg, $line;
+        }
+    }
+    shift @msg if @msg > $logLineLimit;
+
+# Use the retChecks key to know if the command exec is successful
+    my $t = _evaluateRet ($params->{retChecks}, \$buf, $exitStatus);
+
+    my $status = $t->[0];
+    push @msg, "--------------------------------";
+    push @msg, "error msg: `$errMsg'" if $errMsg;
+    push @msg, "exit status: `$exitStatus'";
+    push @msg, $t->[1];
+
+    foreach (@msg) {
+        $logger->debug($_);
+    }
+    $logger->debug("exitStatus: ".$exitStatus);;
+
+    if ($params->{envs}) {
+        foreach my $key (keys %envsSaved) {
+            $ENV{$key} = $envsSaved{$key};
+        }
+    }
+
+    return {
+        status => $status,
+        msg => \@msg,
+    }
+}
+
+1;

@@ -0,0 +1,51 @@
+package FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Copy;
+
+use strict;
+use warnings;
+
+$File::Copy::Recursive::CPRFComp = 1;
+use English qw(-no_match_vars);
+use Encode;
+use File::Copy::Recursive qw(rcopy);
+use File::Glob;
+use UNIVERSAL::require;
+
+sub do {
+    my ($params, $logger) = @_;
+
+    my $msg = [];
+    my $status = 1;
+    foreach my $from (File::Glob::glob($params->{from})) {
+
+        my $to = $params->{to};
+
+        my $from_local = $from;
+        my $to_local = $to;
+
+        if ($OSNAME eq 'MSWin32') {
+            FusionInventory::Agent::Tools::Win32->require;
+            my $localCodepage = FusionInventory::Agent::Tools::Win32::getLocalCodepage();
+            if (Encode::is_utf8($from)) {
+                $from_local = encode($localCodepage, $from);
+            }
+            if (Encode::is_utf8($to)) {
+                $to_local = encode($localCodepage, $to);
+            }
+        }
+
+        if (!File::Copy::Recursive::rcopy($from_local, $to_local)) {
+            my $m = "Failed to copy: `".$from."' to '".$to;
+            push @$msg, $m;
+            push @$msg, $ERRNO;
+            $logger->debug($m);
+
+            $status = 0;
+        }
+    }
+    return {
+        status => $status,
+        msg => $msg,
+    };
+}
+
+1;

@@ -0,0 +1,41 @@
+package FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Delete;
+
+use strict;
+use warnings;
+
+use File::Path;
+use UNIVERSAL::require;
+
+use English qw(-no_match_vars);
+
+sub do {
+    my ($params, $logger) = @_;
+
+    my $msg = [];
+    my $status = 1;
+
+    foreach my $loc (@{$params->{list}}) {
+
+        my $loc_local = $loc;
+
+        if ($OSNAME eq 'MSWin32') {
+            FusionInventory::Agent::Tools::Win32->require;
+            my $localCodepage = FusionInventory::Agent::Tools::Win32::getLocalCodepage();
+            if (Encode::is_utf8($loc)) {
+                $loc_local = encode($localCodepage, $loc);
+            }
+        }
+
+        File::Path::remove_tree($loc_local);
+        $status = 0 if -e $loc;
+        my $m = "Failed to delete $loc";
+        push @$msg, $m;
+        $logger->debug($m);
+    }
+    return {
+    status => $status,
+    msg => $msg,
+    };
+}
+
+1;

@@ -0,0 +1,49 @@
+package FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Mkdir;
+
+use strict;
+use warnings;
+
+use File::Path;
+use Encode;
+
+use English qw(-no_match_vars);
+
+use UNIVERSAL::require;
+
+sub do {
+    my ($params, $logger) = @_;
+
+
+    my $msg = [];
+    my $status = 1;
+    foreach my $dir (@{$params->{list}}) {
+
+        my $dir_local = $dir;
+
+        if ($OSNAME eq 'MSWin32' && Encode::is_utf8($dir)) {
+            FusionInventory::Agent::Tools::Win32->require;
+            my $localCodepage = FusionInventory::Agent::Tools::Win32::getLocalCodepage();
+            $dir_local = encode($localCodepage, $dir);
+        }
+
+        if (-d $dir_local) {
+            my $m = "Directory $dir already exists";
+            push @$msg, $m;
+            $logger->debug($m);
+        } else {
+            File::Path::mkpath($dir_local);
+            if (!-d $dir_local) {
+                $status = 0;
+                my $m = "Failed to create $dir directory";
+                push @$msg, $m;
+                $logger->debug($m);
+            }
+        }
+    }
+    return {
+    status => $status,
+    msg => $msg,
+    };
+}
+
+1;

@@ -0,0 +1,50 @@
+package FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Move;
+
+use strict;
+use warnings;
+
+$File::Copy::Recursive::CPRFComp = 1;
+use English qw(-no_match_vars);
+use File::Copy::Recursive;
+use File::Glob;
+use UNIVERSAL::require;
+
+sub do {
+    my ($params, $logger) = @_;
+
+    my $msg = [];
+    my $status = 1;
+    foreach my $from (File::Glob::glob($params->{from})) {
+
+        my $to = $params->{to};
+
+        my $from_local = $from;
+        my $to_local = $to;
+
+        if ($OSNAME eq 'MSWin32') {
+            FusionInventory::Agent::Tools::Win32->require;
+            my $localCodepage = FusionInventory::Agent::Tools::Win32::getLocalCodepage();
+            if (Encode::is_utf8($from)) {
+                $from_local = encode($localCodepage, $from);
+            }
+            if (Encode::is_utf8($to)) {
+                $to_local = encode($localCodepage, $to);
+            }
+        }
+
+        if (!File::Copy::Recursive::rmove($from_local, $to_local)) {
+            my $m = "Failed to move: `".$from."' to '".$to;
+            push @$msg, $m;
+            push @$msg, $ERRNO;
+            $logger->debug($m);
+
+            $status = 0;
+        }
+    }
+    return {
+        status => $status,
+        msg => $msg,
+    };
+}
+
+1;

@@ -0,0 +1,79 @@
+package FusionInventory::Agent::Task::Deploy::ActionProcessor;
+
+use strict;
+use warnings;
+
+use Cwd;
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Move;
+use FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Copy;
+use FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Mkdir;
+use FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Delete;
+use FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Cmd;
+
+sub new {
+    my ($class, %params) = @_;
+
+    die "no workdir parameter" unless $params{workdir};
+
+    my $self = {
+        workdir => $params{workdir}
+    };
+
+    bless $self, $class;
+
+    return $self;
+}
+
+sub process {
+    my ( $self, $actionName, $params, $logger ) = @_;
+
+    my $workdir = $self->{workdir};
+
+    if ( ( $OSNAME ne 'MSWin32' ) && ( $actionName eq 'messageBox' ) ) {
+        return {
+            status => 1,
+            msg    => ["not Windows: action `$actionName' ignored"]
+        };
+    }
+
+    my $ret;
+    my $cwd = getcwd();
+    chdir( $workdir->{path} );
+    if ( $actionName eq 'checks' ) {
+        # not an action
+    } elsif ( $actionName eq 'move' ) {
+        $ret =
+          FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Move::do(
+            $params, $logger);
+    } elsif ( $actionName eq 'copy' ) {
+        $ret =
+          FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Copy::do(
+            $params, $logger);
+    } elsif ( $actionName eq 'mkdir' ) {
+        $ret =
+          FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Mkdir::do(
+            $params, $logger);
+    } elsif ( $actionName eq 'delete' ) {
+        $ret =
+          FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Delete::do(
+            $params, $logger);
+    } elsif ( $actionName eq 'cmd' ) {
+        $ret =
+          FusionInventory::Agent::Task::Deploy::ActionProcessor::Action::Cmd::do(
+            $params, $logger);
+   } else {
+        $logger->debug("Unknown action type: `$actionName'");
+        chdir($cwd);
+        return {
+            status => 0,
+            msg    => ["unknown action `$actionName'"]
+        };
+    }
+    chdir($cwd);
+
+    return $ret;
+}
+
+1;

@@ -0,0 +1,115 @@
+package FusionInventory::Agent::Task::Deploy::CheckProcessor;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use Digest::SHA;
+
+use FusionInventory::Agent::Task::Deploy::DiskFree;
+
+sub process {
+    my ($self, %params) = @_;
+
+    # the code to return in case of failure of the check,
+    # the default is 'ko'
+    my $failureCode = $params{check}->{return} || "ko";
+
+    my $path = $params{check}->{path};
+
+    # Expend the env vars from the path
+    $path =~ s#\$(\w+)#$ENV{$1}#ge;
+    $path =~ s#%(\w+)%#$ENV{$1}#ge;
+
+    if ($params{check}->{type} eq 'winkeyExists') {
+        return unless $OSNAME eq 'MSWin32';
+        require FusionInventory::Agent::Tools::Win32;
+
+        my $path = $path;
+        $path =~ s{\\}{/}g;
+
+        my $r = FusionInventory::Agent::Tools::Win32::getRegistryKey(path => $path);
+
+        return defined $r ? 'ok' : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'winkeyEquals') {
+        return unless $OSNAME eq 'MSWin32';
+        require FusionInventory::Agent::Tools::Win32;
+
+        $path =~ s{\\}{/}g;
+
+        my $r = FusionInventory::Agent::Tools::Win32::getRegistryValue(path => $path);
+
+        return defined $r && $params{check}->{value} eq $r ? 'ok' : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'winkeyMissing') {
+        return unless $OSNAME eq 'MSWin32';
+        require FusionInventory::Agent::Tools::Win32;
+
+        my $path = $path;
+        $path =~ s{\\}{/}g;
+
+        my $r = FusionInventory::Agent::Tools::Win32::getRegistryKey(path => $path);
+
+        return defined $r ? $failureCode : 'ok';
+    }
+
+    if ($params{check}->{type} eq 'fileExists') {
+        return -f $path ? 'ok' : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'fileSizeEquals') {
+        my @s = stat($path);
+        return @s ? 'ok' : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'fileSizeGreater') {
+        my @s = stat($path);
+        return $failureCode unless @s;
+
+        return $params{check}->{value} < $s[7] ? 'ok' : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'fileSizeLower') {
+        my @s = stat($path);
+        return $failureCode unless @s;
+        return $params{check}->{value} > $s[7] ? 'ok' : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'fileMissing') {
+        return -f $path ? $failureCode : 'ok';
+    }
+
+    if ($params{check}->{type} eq 'freespaceGreater') {
+        my $freespace = getFreeSpace(logger => $params{logger}, path => $path);
+        return $freespace>$params{check}->{value}? "ok" : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'fileSHA512') {
+        my $sha = Digest::SHA->new('512');
+
+        my $sha512 = "";
+        eval {
+            $sha->addfile($path, 'b');
+            $sha512 = $sha->hexdigest;
+        };
+
+        return $sha512 eq $params{check}->{value} ? "ok" : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'directoryExists') {
+        return -d $path ? 'ok' : $failureCode;
+    }
+
+    if ($params{check}->{type} eq 'directoryMissing') {
+        return -d $path ? $failureCode : 'ok';
+    }
+
+    print "Unknown check: `".$params{check}->{type}."'\n";
+
+    return "ok";
+}
+
+1;

@@ -0,0 +1,141 @@
+package FusionInventory::Agent::Task::Deploy::Datastore::WorkDir;
+
+use strict;
+use warnings;
+
+use Compress::Zlib;
+use English qw(-no_match_vars);
+use File::Path qw(mkpath);
+use UNIVERSAL::require;
+use FusionInventory::Agent::Tools;
+use Encode;
+
+sub new {
+    my ($class, %params) = @_;
+
+    my $self = {
+        path  => $params{path},
+        logger => $params{logger},
+        files => []
+    };
+
+    if (! -d $self->{path}) {
+        die "path `".$self->{path}."' doesn't exit.";
+    }
+
+
+    bless $self, $class;
+}
+
+sub addFile {
+    my ($self, $file) = @_;
+
+    push @{$self->{files}}, $file;
+
+}
+
+sub prepare {
+    my ($self) = @_;
+
+    my $logger = $self->{logger};
+
+    # Rebuild the complet file from the filepart
+    foreach my $file (@{$self->{files}}) {
+        $file->{name_local} = $file->{name};
+
+        if ($OSNAME eq 'MSWin32') {
+            FusionInventory::Agent::Tools::Win32->require;
+            my $localCodepage = FusionInventory::Agent::Tools::Win32::getLocalCodepage();
+            if (Encode::is_utf8($file->{name})) {
+                $file->{name_local} = encode($localCodepage, $file->{name});
+            }
+        }
+
+        # If the file will be extracted, we simplify its name to avoid problem during
+        # the extraction process
+        if ($file->{uncompress}) {
+            my $shortsha512 = substr($file->{sha512}, 0, 6);
+            $file->{name_local} =~ s/.*\.(tar\.gz)/$shortsha512.$1/i;
+            if (!$1) {
+                $file->{name_local} =~ s/.*\.(tar|gz|7z|bz2)/$shortsha512.$1/i
+            }
+        }
+
+
+        my $finalFilePath = $self->{path}.'/'.$file->{name_local};
+
+        my $fh;
+        if (!open($fh, '>', $finalFilePath)) {
+            $logger->debug("Failed to open '$finalFilePath': $ERRNO");
+            return;
+        }
+        binmode($fh);
+        foreach my $sha512 (@{$file->{multiparts}}) {
+            my $partFilePath = $file->getPartFilePath($sha512);
+            if (! -f $partFilePath) {
+                $logger->debug("Missing multipart element '$partFilePath'");
+            }
+
+            my $part;
+            my $buf;
+            if ($part = gzopen($partFilePath, 'rb')) {
+
+                $logger->debug("reading $sha512");
+                while ($part->gzread($buf, 1024) > 0) {
+                    print $fh $buf;
+                }
+                $part->gzclose;
+            } else {
+                $logger->info("Failed to open '$partFilePath'");
+            }
+        }
+        close($fh);
+
+        if (!$file->validateFileByPath($finalFilePath)) {
+            $logger->info("Failed to construct the final file.: $finalFilePath");
+            return;
+        }
+
+    }
+
+    # Now uncompress
+    foreach my $file (@{$self->{files}}) {
+        my $finalFilePath = $self->{path}.'/'.$file->{name_local};
+
+        if ($file->{uncompress}) {
+            if(canRun('7z')) {
+                my $tarball;
+                foreach (`7z x -o\"$self->{path}\" \"$finalFilePath\"`) {
+                    chomp;
+                    $logger->debug2("7z: $_");
+                    if (/Extracting\s+(.*\.tar)$/) {
+                        $tarball = $1;
+                    }
+                }
+                if ($tarball && ($finalFilePath =~ /tgz$/i || $finalFilePath =~ /tar\.(gz|xz|bz2)$/i)) {
+                    foreach (`7z x -o\"$self->{path}\" \"$self->{path}/$tarball\"`) {
+                       chomp;
+                        $logger->debug2("7z: $_");
+                    }
+                    unlink($self->{path}.'/'.$tarball);
+                }
+            } else {
+                Archive::Extract->require;
+                $Archive::Extract::DEBUG=1;
+                my $ae = Archive::Extract->new( archive => $finalFilePath );
+                if (!$ae) {
+                    $logger->info("Failed to create Archive::Extract object");
+                } elsif (!$ae->extract( to => $self->{path} )) {
+                    $logger->debug("Failed to extract '$finalFilePath'");
+                }
+# We ignore failure here because one my have activated the
+# extract flag on common file and this should be harmless
+            }
+            unlink($finalFilePath);
+        }
+    }
+
+    return 1;
+}
+
+1;

@@ -0,0 +1,109 @@
+package FusionInventory::Agent::Task::Deploy::Datastore;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use File::Glob;
+use File::Spec;
+use File::Path qw(mkpath rmtree);
+use UNIVERSAL::require;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Logger;
+use FusionInventory::Agent::Task::Deploy::Datastore::WorkDir;
+use FusionInventory::Agent::Task::Deploy::DiskFree;
+
+sub new {
+    my ($class, %params) = @_;
+
+    die "no path parameter" unless $params{path};
+
+    my $self = {
+        path   => File::Spec->rel2abs($params{path}),
+        logger => $params{logger} ||
+                  FusionInventory::Agent::Logger->new(),
+    };
+
+    if (!$self->{path}) {
+      die("No datastore path");
+    }
+
+    bless $self, $class;
+
+    return $self;
+}
+
+sub cleanUp {
+    my ($self) = @_;
+
+    return unless -d $self->{path};
+
+    my @storageDirs;
+    push @storageDirs, File::Glob::glob($self->{path}.'/fileparts/private/*');
+    push @storageDirs, File::Glob::glob($self->{path}.'/fileparts/shared/*');
+
+    my $diskFull=$self->diskIsFull();
+    if (-d $self->{path}.'/workdir/') {
+        remove_tree( $self->{path}.'/workdir/', {error => \my $err} );
+    }
+
+    foreach my $dir (@storageDirs) {
+
+        if (!-d $dir) {
+            unlink $dir;
+            next;
+        }
+
+        next unless $dir =~ /(\d+)$/;
+
+        if (time > $1 || $diskFull) {
+            remove_tree( $dir, {error => \my $err} );
+        }
+    }
+
+}
+
+sub createWorkDir {
+    my ($self, $uuid) = @_;
+
+#    mkpath($filePath);
+
+    my $path = $self->{path}.'/workdir/'.$uuid;
+
+    mkpath($path);
+    return unless -d $path;
+
+    return FusionInventory::Agent::Task::Deploy::Datastore::WorkDir->new(
+        path => $path,
+        logger => $self->{logger}
+    );
+}
+
+sub diskIsFull {
+    my ($self) = @_;
+
+    my $logger = $self->{logger};
+
+    my $freeSpace = getFreeSpace(
+        path => $self->{path},
+        logger => $logger
+    );
+
+    if (!$freeSpace) {
+        $logger->debug('$spaceFree is undef!');
+        $freeSpace = 0;
+    }
+
+    $logger->debug("Free space on $self->{path}: $freeSpace");
+    # 400MB Free, should be set by a config option
+    return ($freeSpace < 2000);
+}
+
+# imported from File-Path-2.09
+sub remove_tree {
+    push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
+    goto &rmtree;
+}
+
+1;

@@ -0,0 +1,86 @@
+package FusionInventory::Agent::Task::Deploy::DiskFree;
+
+use strict;
+use warnings;
+use base 'Exporter';
+
+use English qw(-no_match_vars);
+use FusionInventory::Agent::Tools;
+
+use UNIVERSAL::require;
+
+our @EXPORT = qw(
+    getFreeSpace
+);
+
+sub getFreeSpace {
+    my $freeSpace =
+        $OSNAME eq 'MSWin32' ? _getFreeSpaceWindows(@_) :
+        $OSNAME eq 'solaris' ? _getFreeSpaceSolaris(@_) :
+        _getFreeSpace(@_);
+
+    return $freeSpace;
+}
+
+sub _getFreeSpaceWindows {
+    my (%params) = @_;
+
+    my $logger = $params{logger};
+
+
+    FusionInventory::Agent::Tools::Win32->require();
+    if ($EVAL_ERROR) {
+        $logger->error(
+            "Failed to load FusionInventory::Agent::Tools::Win32: $EVAL_ERROR"
+        );
+        return;
+    }
+
+    my $letter;
+    if ($params{path} !~ /^(\w):/) {
+        $logger->error("Path parse error: ".$params{path});
+        return;
+    }
+    $letter = $1.':';
+
+    my $freeSpace;
+    foreach my $object (FusionInventory::Agent::Tools::Win32::getWMIObjects(
+        moniker    => 'winmgmts:{impersonationLevel=impersonate,(security)}!//./',
+        class      => 'Win32_LogicalDisk',
+        properties => [ qw/Caption FreeSpace/ ]
+    )) {
+        next unless lc($object->{Caption}) eq lc($letter);
+        my $t = $object->{FreeSpace};
+        if ($t && $t =~ /(\d+)\d{6}$/) {
+            $freeSpace = $1;
+        }
+    }
+
+    return $freeSpace;
+}
+
+sub _getFreeSpaceSolaris {
+    my (%params) = @_;
+
+    return unless -d $params{path};
+
+    return getFirstMatch(
+        command => "df -b $params{path}",
+        pattern => qr/^\S+\s+(\d+)\d{3}[^\d]/,
+        logger  => $params{logger}
+    );
+}
+
+sub _getFreeSpace {
+    my (%params) = @_;
+
+    return unless -d $params{path};
+
+    return getFirstMatch(
+        command => "df -Pk $params{path}",
+        pattern => qr/^\S+\s+\S+\s+\S+\s+(\d+)\d{3}[^\d]/,
+        logger  => $params{logger}
+    );
+}
+
+1;

@@ -0,0 +1,164 @@
+package FusionInventory::Agent::Task::Deploy::File;
+
+use strict;
+use warnings;
+
+use Digest::SHA;
+use File::Basename;
+use File::Path qw(mkpath);
+use File::Glob;
+use HTTP::Request;
+
+sub new {
+    my ($class, %params) = @_;
+
+    die "no datastore parameter" unless $params{datastore};
+    die "no sha512 parameter" unless $params{sha512};
+
+    my $self = {
+        p2p                => $params{data}->{p2p},
+        retention_duration => $params{data}->{'p2p-retention-duration'} || 60 * 24 * 3,
+        uncompress         => $params{data}->{uncompress},
+        mirrors            => $params{data}->{mirrors},
+        multiparts         => $params{data}->{multiparts},
+        name               => $params{data}->{name},
+        sha512             => $params{sha512},
+        datastore          => $params{datastore},
+        client             => $params{client},
+        logger             => $params{logger}
+    };
+
+    bless $self, $class;
+
+    return $self;
+}
+
+sub getPartFilePath {
+    my ($self, $sha512) = @_;
+
+    return unless $sha512 =~ /^(.)(.)(.{6})/;
+    my $subFilePath = $1.'/'.$2.'/'.$3;
+
+    my @storageDirs =
+        File::Glob::glob($self->{datastore}->{path}.'/fileparts/shared/*'),
+        File::Glob::glob($self->{datastore}->{path}.'/fileparts/private/*');
+
+    foreach my $dir (@storageDirs) {
+        if (-f $dir.'/'.$subFilePath) {
+            return $dir.'/'.$subFilePath;
+        }
+    }
+
+    my $filePath = $self->{datastore}->{path}.'/fileparts/';
+# filepart not found
+    if ($self->{p2p}) {
+        $filePath .= 'shared/';
+    } else {
+        $filePath .= 'private/';
+    }
+
+# Compute a directory name that will be used to know
+# if the file must be purge. We don't want a new directory
+# everytime, so we use a 10h frame
+    $filePath .= int(time/10000)*10000 + ($self->{retention_duration} * 60);
+    $filePath .= '/'.$subFilePath;
+
+    return $filePath;
+}
+
+sub download {
+    my ($self) = @_;
+
+    die unless $self->{mirrors};
+
+    my $mirrorList =  $self->{mirrors};
+
+
+    my $p2pHostList;
+
+MULTIPART: foreach my $sha512 (@{$self->{multiparts}}) {
+        my $partFilePath = $self->getPartFilePath($sha512);
+        File::Path::mkpath(dirname($partFilePath));
+        if (-f $partFilePath) {
+                next MULTIPART if $self->_getSha512ByFile($partFilePath) eq $sha512;
+        }
+
+        eval {
+            if ($self->{p2p} && (ref($p2pHostList) ne 'ARRAY') && FusionInventory::Agent::Task::Deploy::P2P->require) {
+                $p2pHostList = FusionInventory::Agent::Task::Deploy::P2P::findPeer(62354, $self->{logger});
+            }
+        };
+        $self->{logger}->debug("failed to enable P2P: $@") if $@;
+
+
+        my $lastGood;
+        my %remote = (p2p => $p2pHostList, mirror => $mirrorList);
+        foreach my $remoteType (qw/p2p mirror/)  {
+            foreach my $mirror ($lastGood, @{$remote{$remoteType}}) {
+                next unless $mirror;
+
+                next unless $sha512 =~ /^(.)(.)/;
+                my $sha512dir = $1.'/'.$1.$2.'/';
+
+                $self->{logger}->debug($mirror.$sha512dir.$sha512);
+
+                my $request = HTTP::Request->new(GET => $mirror.$sha512dir.$sha512);
+                my $response = $self->{client}->request($request, $partFilePath);
+
+                if ($response && ($response->code == 200) && -f $partFilePath) {
+                    if ($self->_getSha512ByFile($partFilePath) eq $sha512) {
+                        $lastGood = $mirror if $remoteType eq 'p2p';
+                        next MULTIPART;
+                    }
+                    $self->{logger}->debug("sha512 failure: $sha512");
+                }
+    # bad file, drop it
+                unlink($partFilePath);
+            }
+        }
+    }
+
+}
+
+sub filePartsExists {
+    my ($self) = @_;
+
+    foreach my $sha512 (@{$self->{multiparts}}) {
+
+        my $filePath  = $self->getPartFilePath($sha512);
+        return 0 unless -f $filePath;
+
+    }
+    return 1;
+}
+
+sub _getSha512ByFile {
+    my ($self, $filePath) = @_;
+
+    my $sha = Digest::SHA->new('512');
+
+    my $sha512;
+    eval {
+        $sha->addfile($filePath, 'b');
+        $sha512 = $sha->hexdigest;
+    };
+    $self->{logger}->debug("SHA512 failure: $@") if $@;
+
+    return $sha512;
+}
+
+sub validateFileByPath {
+    my ($self, $filePath) = @_;
+
+
+    if (-f $filePath) {
+        if ($self->_getSha512ByFile($filePath) eq $self->{sha512}) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+1;

@@ -0,0 +1,47 @@
+package FusionInventory::Agent::Task::Deploy::Job;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+sub new {
+    my ($class, %params) = @_;
+
+    my $self = {
+        uuid            => $params{data}->{uuid},
+        requires        => $params{data}->{requires},
+        checks          => $params{data}->{checks},
+        actions         => $params{data}->{actions},
+        associatedFiles => $params{associatedFiles}
+    };
+
+    bless $self, $class;
+
+    return $self;
+}
+
+
+sub checkWinkey {
+    my ($self) = @_;
+
+    return 1 unless $self->{requires}{winkey};
+
+    return unless $OSNAME eq 'MSWin32'
+}
+
+sub checkFreespace {
+    my ($self) = @_;
+
+    return 1;
+}
+
+sub getNextToProcess {
+    my ($self) = @_;
+
+    return unless $self->{actions};
+
+    shift @{$self->{actions}};
+}
+
+1;

@@ -0,0 +1,210 @@
+package FusionInventory::Agent::Task::Deploy::P2P;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use HTTP::Request::Common qw(GET);
+use Net::IP;
+use POE qw(Component::Client::TCP Component::Client::Ping);
+
+use UNIVERSAL::require;
+
+# POE Debug
+#sub POE::Kernel::TRACE_REFCNT () { 1 }
+
+my %cache = (
+    date => 0,
+    data => undef
+);
+
+sub _computeIPToTest {
+    my ($logger, $addresses, $ipLimit) = @_;
+
+    # Max number of IP to pick from a network range
+    $ipLimit = 255 unless $ipLimit;
+
+    my @ipToTest;
+    foreach my $address (@$addresses) {
+        my @ip_bytes   = split(/\./, $address->{ip});
+        my @mask_bytes = split(/\./, $address->{mask});
+        next if $ip_bytes[0] == 127; # Ignore 127.x.x.x addresses
+        next if $ip_bytes[0] == 169; # Ignore 169.x.x.x range too
+
+        # compute range
+        my @start;
+        my @end;
+
+        foreach my $idx (0..3) {
+            ## no critic (ProhibitBitwise)
+            push @start, $ip_bytes[$idx] & (255 & $mask_bytes[$idx]);
+            push @end,   $ip_bytes[$idx] | (255 - $mask_bytes[$idx]);
+        }
+
+        my $ipStart = join('.', @start);
+        my $ipEnd   = join('.', @end);
+
+        my $ipInterval = Net::IP->new($ipStart.' - '.$ipEnd) || die Net::IP::Error();
+
+        next if $ipStart eq $ipEnd;
+
+        if ($ipInterval->size() > 5000) {
+            $logger->debug("Range to large: ".$ipInterval->size()." (max 5000)");
+            next;
+        }
+
+        my $after = 0;
+        my @newIPs;
+        do {
+            push @newIPs, $ipInterval->ip();
+            if ($after || $address->{ip} eq $ipInterval->ip()) {
+                $after++;
+            } elsif (@newIPs > ($ipLimit / 2)) {
+                shift @newIPs;
+            }
+        } while (++$ipInterval && ($after < ($ipLimit / 2)));
+
+
+        $logger->debug("Scanning from ".$newIPs[0]." to ".$newIPs[@newIPs-1]) if $logger;
+
+        push @ipToTest, @newIPs;
+
+    }
+    return @ipToTest;
+
+}
+
+sub fisher_yates_shuffle {
+    my $deck = shift;  # $deck is a reference to an array
+
+    return unless @$deck; # must not be empty!
+
+    my $i = @$deck;
+    while (--$i) {
+        my $j = int rand ($i+1);
+        @$deck[$i,$j] = @$deck[$j,$i];
+    }
+}
+
+sub findPeer {
+    my ( $port, $logger ) = @_;
+
+#    $logger->debug("cachedate: ".$cache{date});
+    $logger->info("looking for a peer in the network");
+    return $cache{data} if $cache{date} + 600 > time;
+
+    my @interfaces;
+
+
+    if ($OSNAME eq 'linux') {
+        FusionInventory::Agent::Tools::Linux->require();
+        @interfaces = FusionInventory::Agent::Tools::Linux::getInterfacesFromIfconfig();
+
+    } elsif ($OSNAME eq 'MSWin32') {
+        FusionInventory::Agent::Tools::Win32->require();
+        @interfaces = FusionInventory::Agent::Tools::Win32::getInterfaces();
+    }
+
+
+    my @addresses;
+
+    foreach my $interface (@interfaces) {
+#if interface has both ip and netmask setup then push the address
+        next unless $interface->{IPADDRESS};
+        next unless $interface->{IPMASK};
+        next unless lc($interface->{STATUS}) eq 'up';
+        next if $interface->{IPADDRESS} =~ /^127\./;
+
+
+        push @addresses, {
+            ip   => $interface->{IPADDRESS},
+            mask => $interface->{IPMASK}
+        };
+    }
+
+
+    if (!@addresses) {
+        $logger->info("No network to scan...");
+        return;
+    }
+
+    $cache{date}=time;
+    $cache{data}=scan({logger => $logger, port => $port}, _computeIPToTest($logger, \@addresses));
+    return $cache{data};
+}
+
+
+sub scan {
+    my ($params, @ipToTestList) = @_;
+    my $port = $params->{port};
+    my $logger = $params->{logger};
+
+
+    fisher_yates_shuffle(\@ipToTestList);
+
+    POE::Component::Client::Ping->spawn(
+        Timeout => 5,           # defaults to 1 second
+    );
+
+    my $ipCpt = int(@ipToTestList);
+    my @ipFound;
+    POE::Session->create(
+        inline_states => {
+            _start => sub {
+                $_[HEAP]->{shutdown_on_error}=1;
+                $_[KERNEL]->yield( "add", 0 );
+            },
+            add => sub {
+            my $ipToTest = shift @ipToTestList;
+
+            return unless $ipToTest;
+
+            print ".";
+
+            $_[KERNEL]->post(
+                "pinger", # Post the request to the "pingthing" component.
+                "ping",      # Ask it to "ping" an address.
+                "pong",      # Have it post an answer as a "pong" event.
+                $ipToTest,    # This is the address we want to ping.
+                );
+
+            if (@ipToTestList && @ipFound < 30) {
+                $_[KERNEL]->delay(add => 0.1)
+            } else {
+                $_[KERNEL]->yield("shutdown");
+            }
+
+
+            },
+            pong => sub {
+                my ($response) = $_[ARG1];
+
+                my ($addr) = @$response;
+
+                if (!$addr) {
+                    $ipCpt--;
+                    $logger->debug("cpt:".$ipCpt);
+
+                    return;
+                }
+                $logger->debug($addr." is up");
+
+                POE::Component::Client::TCP->new(
+                    RemoteAddress  => $addr,
+                    RemotePort     => $port,
+                    ConnectTimeout => 10,
+                    Connected      => sub {
+                        push @ipFound, "http://$addr:$port/deploy/getFile/";
+                    },
+                    ServerInput   => sub { }
+                );
+            },
+        },
+    );
+# Run everything, and exit when it's all done.
+    $poe_kernel->run();
+    $logger->debug("end of POE loop");
+    return \@ipFound;
+}
+
+1;

@@ -0,0 +1,554 @@
+package FusionInventory::Agent::Task::Deploy;
+
+# Full protocol documentation available here:
+#  http://forge.fusioninventory.org/projects/fusioninventory-agent/wiki/API-REST-deploy
+
+use strict;
+use warnings;
+use base 'FusionInventory::Agent::Task';
+
+use JSON;
+use LWP;
+use URI::Escape;
+
+use FusionInventory::Agent::HTTP::Client::Fusion;
+use FusionInventory::Agent::Storage;
+use FusionInventory::Agent::Task::Deploy::ActionProcessor;
+use FusionInventory::Agent::Task::Deploy::CheckProcessor;
+use FusionInventory::Agent::Task::Deploy::Datastore;
+use FusionInventory::Agent::Task::Deploy::File;
+use FusionInventory::Agent::Task::Deploy::Job;
+
+our $VERSION = '2.0.4';
+
+sub isEnabled {
+    my ($self) = @_;
+
+    if (!$self->{target}->isa('FusionInventory::Agent::Target::Server')) {
+        $self->{logger}->debug("Deploy task not compatible with local target");
+        return;
+    }
+}
+
+sub _validateAnswer {
+    my ($msgRef, $answer) = @_;
+
+    $$msgRef = "";
+
+    if (!defined($answer)) {
+        $$msgRef = "No answer from server.";
+        return;
+    }
+
+    if (ref($answer) ne 'HASH') {
+        $$msgRef = "Bad answer from server. Not a hash reference.";
+        return;
+    }
+
+    if (!defined($answer->{associatedFiles})) {
+        $$msgRef = "missing associatedFiles key";
+        return;
+    }
+
+    if (ref($answer->{associatedFiles}) ne 'HASH') {
+        $$msgRef = "associatedFiles should be an hash";
+        return;
+    }
+    foreach my $k (keys %{$answer->{associatedFiles}}) {
+        foreach (qw/mirrors multiparts name p2p-retention-duration p2p uncompress/) {
+            if (!defined($answer->{associatedFiles}->{$k}->{$_})) {
+                $$msgRef = "Missing key `$_' in associatedFiles";
+                return;
+            }
+        }
+    }
+    foreach my $job (@{$answer->{jobs}}) {
+        foreach (qw/uuid associatedFiles actions checks/) {
+            if (!defined($job->{$_})) {
+                $$msgRef = "Missing key `$_' in jobs";
+                return;
+            }
+
+            if (ref($job->{actions}) ne 'ARRAY') {
+                $$msgRef = "jobs/actions must be an array";
+                return;
+            }
+        }
+    }
+
+    return 1;
+}
+
+sub processRemote {
+    my ($self, $remoteUrl) = @_;
+
+    if ( !$remoteUrl ) {
+        return;
+    }
+
+    my $datastore = FusionInventory::Agent::Task::Deploy::Datastore->new(
+        path => $self->{target}{storage}{directory}.'/deploy',
+        logger => $self->{logger}
+    );
+    $datastore->cleanUp();
+
+    my $jobList = [];
+    my $files;
+
+    my $answer = $self->{client}->send(
+        url  => $remoteUrl,
+        args => {
+            action    => "getJobs",
+            machineid => $self->{deviceid},
+        }
+    );
+    if (ref($answer) eq 'HASH' && !keys %$answer) {
+        $self->{logger}->debug("Nothing to do");
+        return;
+    }
+
+    my $msg;
+    if (!_validateAnswer(\$msg, $answer)) {
+        $self->{logger}->debug("bad JSON: ".$msg);
+        return;
+    }
+
+    foreach my $sha512 ( keys %{ $answer->{associatedFiles} } ) {
+        $files->{$sha512} = FusionInventory::Agent::Task::Deploy::File->new(
+            client    => $self->{client},
+            sha512    => $sha512,
+            data      => $answer->{associatedFiles}{$sha512},
+            datastore => $datastore,
+            logger    => $self->{logger}
+        );
+    }
+
+    foreach ( @{ $answer->{jobs} } ) {
+        my $associatedFiles = [];
+        if ( $_->{associatedFiles} ) {
+            foreach my $uuid ( @{ $_->{associatedFiles} } ) {
+                if ( !$files->{$uuid} ) {
+                    die "unknow file: `" . $uuid
+                      . "'. Not found in JSON answer!";
+                }
+                push @$associatedFiles, $files->{$uuid};
+            }
+        }
+        push @$jobList,
+          FusionInventory::Agent::Task::Deploy::Job->new(
+            data            => $_,
+            associatedFiles => $associatedFiles
+          );
+    }
+
+  JOB: foreach my $job (@$jobList) {
+
+        # RECEIVED
+        $self->{client}->send(
+            url  => $remoteUrl,
+            args => {
+                action      => "setStatus",
+                machineid   => $self->{deviceid},
+                part        => 'job',
+                uuid        => $job->{uuid},
+                currentStep => 'checking',
+                msg         => 'starting'
+            }
+        );
+
+        # CHECKING
+        if ( ref( $job->{checks} ) eq 'ARRAY' ) {
+            foreach my $checknum ( 0 .. @{ $job->{checks} } ) {
+                next unless $job->{checks}[$checknum];
+                my $checkStatus = FusionInventory::Agent::Task::Deploy::CheckProcessor->process(
+                    check => $job->{checks}[$checknum],
+                    logger => $self->{logger}
+                );
+                next if $checkStatus eq "ok";
+                next if $checkStatus eq "ignore";
+
+                $self->{client}->send(
+                    url  => $remoteUrl,
+                    args => {
+                        action      => "setStatus",
+                        machineid   => $self->{deviceid},
+                        part        => 'job',
+                        uuid        => $job->{uuid},
+                        currentStep => 'checking',
+                        status      => 'ko',
+                        msg         => "failure of check #".($checknum+1)." ($checkStatus)",
+                        cheknum     => $checknum
+                    }
+                );
+
+                next JOB;
+            }
+        }
+
+        $self->{client}->send(
+            url  => $remoteUrl,
+            args => {
+                action      => "setStatus",
+                machineid   => $self->{deviceid},
+                part        => 'job',
+                uuid        => $job->{uuid},
+                currentStep => 'checking',
+                status      => 'ok',
+                msg         => 'all checks are ok'
+            }
+        );
+
+
+        # DOWNLOADING
+
+        $self->{client}->send(
+            url  => $remoteUrl,
+            args => {
+                action      => "setStatus",
+                machineid   => $self->{deviceid},
+                part        => 'job',
+                uuid        => $job->{uuid},
+                currentStep => 'downloading',
+                msg         => 'downloading files'
+            }
+        );
+
+        my $retry = 5;
+        my $workdir = $datastore->createWorkDir( $job->{uuid} );
+        FETCHFILE: foreach my $file ( @{ $job->{associatedFiles} } ) {
+
+            # File exists, no need to download
+            if ( $file->filePartsExists() ) {
+                $self->{client}->send(
+                    url  => $remoteUrl,
+                    args => {
+                        action     => "setStatus",
+                        machineid  => $self->{deviceid},
+                        part       => 'file',
+                        uuid       => $job->{uuid},
+                        sha512     => $file->{sha512},
+                        status     => 'ok',
+                        currentStep=> 'downloading',
+                        msg        => $file->{name}.' already downloaded'
+                    }
+                );
+
+                $workdir->addFile($file);
+                next;
+            }
+
+            # File doesn't exist, lets try or retry a download
+            $self->{client}->send(
+                url  => $remoteUrl,
+                args => {
+                    action      => "setStatus",
+                    machineid   => $self->{deviceid},
+                    part        => 'file',
+                    uuid        => $job->{uuid},
+                    sha512      => $file->{sha512},
+                    currentStep => 'downloading',
+                    msg         => 'fetching '.$file->{name}
+                }
+            );
+
+            $file->download();
+
+            # Are all the fileparts here?
+            my $downloadIsOK = $file->filePartsExists();
+
+            if ( $downloadIsOK ) {
+
+                $self->{client}->send(
+                    url  => $remoteUrl,
+                    args => {
+                        action      => "setStatus",
+                        machineid   => $self->{deviceid},
+                        part        => 'file',
+                        uuid        => $job->{uuid},
+                        sha512      => $file->{sha512},
+                        currentStep => 'downloading',
+                        status      => 'ok',
+                        msg         => $file->{name}.' downloaded'
+                    }
+                );
+
+                $workdir->addFile($file);
+                next;
+            }
+
+            # Retry the download 5 times in a row and then give up
+            if ( !$downloadIsOK ) {
+
+                if ($retry--) { # Retry
+# OK, retry!
+                    $self->{client}->send(
+                        url  => $remoteUrl,
+                        args => {
+                            action      => "setStatus",
+                            machineid   => $self->{deviceid},
+                            part        => 'file',
+                            uuid        => $job->{uuid},
+                            sha512      => $file->{sha512},
+                            currentStep => 'downloading',
+                            msg         => 'retrying '.$file->{name}
+                        }
+                    );
+
+                    redo FETCHFILE;
+                } else { # Give up...
+
+                    $self->{client}->send(
+                        url  => $remoteUrl,
+                        args => {
+                            action      => "setStatus",
+                            machineid   => $self->{deviceid},
+                            part        => 'file',
+                            uuid        => $job->{uuid},
+                            sha512      => $file->{sha512},
+                            currentStep => 'downloading',
+                            status      => 'ko',
+                            msg         => $file->{name}.' download failed'
+                        }
+                    );
+
+                    next JOB;
+                }
+            }
+
+        }
+
+
+        $self->{client}->send(
+            url  => $remoteUrl,
+            args => {
+                action      => "setStatus",
+                machineid   => $self->{deviceid},
+                part        => 'job',
+                uuid        => $job->{uuid},
+                currentStep => 'downloading',
+                status      => 'ok',
+                msg         => 'success'
+            }
+        );
+
+#        # CHECKING
+#         if (!$job->checkWinkey()) {
+#             $self->setStatus({ machineid => 'DEVICEID', part => 'job', uuid => $job->{uuid}, status => 'ko', msg => 'rejected because of a Windows registry check' });
+#             next JOB;
+#         } elsif (!$job->checkFreespace()) {
+#             $self->setStatus({ machineid => 'DEVICEID', part => 'job', uuid => $job->{uuid}, status => 'ko', msg => 'rejected because of harddrive free space' });
+#             next JOB;
+#         }
+
+        if (!$workdir->prepare()) {
+            $self->{client}->send(
+                url  => $remoteUrl,
+                args => {
+                    action      => "setStatus",
+                    machineid   => $self->{deviceid},
+                    part        => 'job',
+                    uuid        => $job->{uuid},
+                    currentStep => 'prepare',
+                    status      => 'ko',
+                    msg         => 'failed to prepare work dir'
+                }
+            );
+            next JOB;
+        } else {
+            $self->{client}->send(
+                url  => $remoteUrl,
+                args => {
+                    action      => "setStatus",
+                    machineid   => $self->{deviceid},
+                    part        => 'job',
+                    uuid        => $job->{uuid},
+                    currentStep => 'prepare',
+                    status      => 'ok',
+                    msg         => 'success'
+                }
+            );
+        }
+
+        # PROCESSING
+#        $self->{client}->send(
+#            url  => $remoteUrl,
+#            args => {
+#                action      => "setStatus",
+#                machineid   => 'DEVICEID',
+#                part        => 'job',
+#                uuid        => $job->{uuid},
+#                currentStep => 'processing'
+#            }
+#        );
+        my $actionProcessor =
+          FusionInventory::Agent::Task::Deploy::ActionProcessor->new(
+            workdir => $workdir
+        );
+        my $actionnum = 0;
+        ACTION: while ( my $action = $job->getNextToProcess() ) {
+        my ($actionName, $params) = %$action;
+            if ( $params && (ref( $params->{checks} ) eq 'ARRAY') ) {
+                foreach my $checknum ( 0 .. @{ $params->{checks} } ) {
+                    next unless $job->{checks}[$checknum];
+                    my $checkStatus = FusionInventory::Agent::Task::Deploy::CheckProcessor->process(
+                        check => $params->{checks}[$checknum],
+                        logger => $self->{logger}
+
+                    );
+                    if ( $checkStatus ne 'ok') {
+
+                        $self->{client}->send(
+                            url  => $remoteUrl,
+                            args => {
+                                action      => "setStatus",
+                                machineid   => $self->{deviceid},
+                                part        => 'job',
+                                uuid        => $job->{uuid},
+                                currentStep => 'checking',
+                                status      => $checkStatus,
+                                msg         => "failure of check #".($checknum+1)." ($checkStatus)",
+                                actionnum   => $actionnum,
+                                cheknum     => $checknum
+                            }
+                        );
+
+                        next ACTION;
+                    }
+                }
+            }
+
+
+            my $ret;
+            eval { $ret = $actionProcessor->process($actionName, $params, $self->{logger}); };
+            $ret->{msg} = [] unless $ret->{msg};
+            push @{$ret->{msg}}, $@ if $@;
+            if ( !$ret->{status} ) {
+                $self->{client}->send(
+                    url  => $remoteUrl,
+                    args => {
+                        action    => "setStatus",
+                        machineid => $self->{deviceid},
+                        uuid      => $job->{uuid},
+                        msg       => $ret->{msg},
+                        actionnum => $actionnum,
+                    }
+                );
+
+                $self->{client}->send(
+                    url  => $remoteUrl,
+                    args => {
+                        action      => "setStatus",
+                        machineid   => $self->{deviceid},
+                        part        => 'job',
+                        uuid        => $job->{uuid},
+                        currentStep => 'processing',
+                        status      => 'ko',
+                        actionnum   => $actionnum,
+                        msg         => "action #".($actionnum+1)." processing failure"
+                    }
+                );
+
+                next JOB;
+            }
+            $self->{client}->send(
+                url  => $remoteUrl,
+                args => {
+                    action      => "setStatus",
+                    machineid   => $self->{deviceid},
+                    part        => 'job',
+                    uuid        => $job->{uuid},
+                    currentStep => 'processing',
+                    status      => 'ok',
+                    actionnum   => $actionnum,
+                    msg         => "action #".($actionnum+1)." processing success"
+                }
+            );
+
+            $actionnum++;
+        }
+
+        $self->{client}->send(
+            url  => $remoteUrl,
+            args => {
+                action    => "setStatus",
+                machineid => $self->{deviceid},
+                part      => 'job',
+                uuid      => $job->{uuid},
+                status    => 'ok',
+                msg       => "job successfully completed"
+            }
+        );
+    }
+
+    $datastore->cleanUp();
+    1;
+}
+
+
+sub run {
+    my ($self, %params) = @_;
+
+    # Turn off localised output for commands
+    $ENV{LC_ALL} = 'C'; # Turn off localised output for commands
+    $ENV{LANG} = 'C'; # Turn off localised output for commands
+
+    $self->{client} = FusionInventory::Agent::HTTP::Client::Fusion->new(
+        logger       => $self->{logger},
+        user         => $params{user},
+        password     => $params{password},
+        proxy        => $params{proxy},
+        ca_cert_file => $params{ca_cert_file},
+        ca_cert_dir  => $params{ca_cert_dir},
+        no_ssl_check => $params{no_ssl_check},
+        debug        => $self->{debug}
+    );
+
+    my $globalRemoteConfig = $self->{client}->send(
+        url  => $self->{target}->{url},
+        args => {
+            action    => "getConfig",
+            machineid => $self->{deviceid},
+            task      => { Deploy => $VERSION },
+        }
+    );
+
+    return unless $globalRemoteConfig->{schedule};
+    return unless ref( $globalRemoteConfig->{schedule} ) eq 'ARRAY';
+
+    foreach my $job ( @{ $globalRemoteConfig->{schedule} } ) {
+        next unless $job->{task} eq "Deploy";
+        $self->processRemote($job->{remote});
+    }
+
+    return 1;
+}
+
+__END__
+
+=head1 NAME
+
+FusionInventory::Agent::Task::Deploy - Software deployment support for FusionInventory Agent
+
+=head1 DESCRIPTION
+
+With this module, F<FusionInventory> can accept software deployment
+request from an GLPI server with the FusionInventory plugin.
+
+This module uses SSL certificat to authentificat the server. You may have
+to point F<--ca-cert-file> or F<--ca-cert-dir> to your public certificat.
+
+If the P2P option is turned on, the agent will looks for peer in its network. The network size will be limited at 255 machines.
+
+=head1 FUNCTIONS
+
+=head2 isEnabled ( $self )
+
+Returns true if the task is enabled.
+
+=head2 processRemote ( $self, $remoteUrl )
+
+Process orders from a remote server.
+
+=head2 run ( $self, %params )
+
+Run the task.

@@ -0,0 +1,324 @@
+package FusionInventory::Agent::Task::ESX;
+
+use strict;
+use warnings;
+use base 'FusionInventory::Agent::Task';
+
+use FusionInventory::Agent::Config;
+use FusionInventory::Agent::HTTP::Client::Fusion;
+use FusionInventory::Agent::Logger;
+use FusionInventory::Agent::Inventory;
+use FusionInventory::Agent::XML::Query::Inventory;
+use FusionInventory::Agent::SOAP::VMware;
+
+our $VERSION = "2.2.1";
+
+sub isEnabled {
+    my ($self) = @_;
+
+    if (!$self->{target}->isa('FusionInventory::Agent::Target::Server')) {
+        $self->{logger}->debug("ESX task not compatible with local target");
+        return;
+    }
+}
+
+sub connect {
+    my ( $self, %params ) = @_;
+
+    my $url = 'https://' . $params{host} . '/sdk/vimService';
+
+    my $vpbs =
+      FusionInventory::Agent::SOAP::VMware->new(url => $url, vcenter => 1 );
+    if ( !$vpbs->connect( $params{user}, $params{password} ) ) {
+        $self->{lastError} = $vpbs->{lastError};
+        return;
+    }
+
+    $self->{vpbs} = $vpbs;
+}
+
+sub createFakeDeviceid {
+    my ( $self, $host ) = @_;
+
+    my $hostname = $host->getHostname();
+    my $bootTime = $host->getBootTime();
+    my ( $year, $month, $day, $hour, $min, $sec );
+    if ( $bootTime =~
+        /(\d{4})-(\d{1,2})-(\d{1,2})T(\d{1,2}):(\d{1,2}):(\d{1,2})/ )
+    {
+        $year  = $1;
+        $month = $2;
+        $day   = $3;
+        $hour  = $4;
+        $min   = $5;
+        $sec   = $6;
+    }
+    else {
+        my $ty;
+        my $tm;
+        ( $ty, $tm, $day, $hour, $min, $sec ) =
+          ( localtime(time) )[ 5, 4, 3, 2, 1, 0 ];
+        $year  = $ty + 1900;
+        $month = $tm + 1;
+    }
+    my $deviceid = sprintf "%s-%02d-%02d-%02d-%02d-%02d-%02d",
+      $hostname, $year, $month, $day, $hour, $min, $sec;
+
+    return $deviceid;
+}
+
+sub createInventory {
+    my ( $self, $id, $tag ) = @_;
+
+    die unless $self->{vpbs};
+
+    my $vpbs = $self->{vpbs};
+
+    my $host;
+    $host = $vpbs->getHostFullInfo($id);
+
+    my $inventory = FusionInventory::Agent::Inventory->new(
+        logger => $self->{logger},
+        tag    => $tag
+    );
+    $inventory->{deviceid} = $self->createFakeDeviceid($host);
+
+    $inventory->{isInitialised} = 1;
+    $inventory->{h}{CONTENT}{HARDWARE}{ARCHNAME} = ['remote'];
+
+    $inventory->setBios( $host->getBiosInfo() );
+
+    $inventory->setHardware( $host->getHardwareInfo() );
+
+    foreach my $cpu ($host->getCPUs()) {
+        $inventory->addEntry(section => 'CPUS', entry => $cpu);
+    }
+
+    foreach my $controller ($host->getControllers()) {
+        $inventory->addEntry(section => 'CONTROLLERS', entry => $controller);
+
+        if ($controller->{PCICLASS} && $controller->{PCICLASS} eq '300') {
+            $inventory->addEntry(
+                section => 'VIDEOS',
+                entry   => {
+                    NAME    => $controller->{NAME},
+                    PCISLOT => $controller->{PCISLOT},
+                }
+            );
+        }
+    }
+
+    my %ipaddr;
+    foreach my $network ($host->getNetworks()) {
+        $ipaddr{ $network->{IPADDRESS} } = 1 if $network->{IPADDRESS};
+        $inventory->addEntry(section => 'NETWORKS', entry => $network);
+    }
+
+    $inventory->setHardware( { IPADDR => join '/', ( keys %ipaddr ) } );
+
+    # TODO
+    #    foreach (@{$host->[0]{config}{fileSystemVolume}{mountInfo}}) {
+    #
+    #    }
+
+    foreach my $storage ($host->getStorages()) {
+        # TODO
+        #        $volumnMapping{$entry->{canonicalName}} = $entry->{deviceName};
+        $inventory->addEntry(section => 'STORAGES', entry => $storage);
+    }
+
+    foreach my $drive ($host->getDrives()) {
+        $inventory->addEntry( section => 'DRIVES', entry => $drive);
+    }
+
+    foreach my $machine ($host->getVirtualMachines()) {
+        $inventory->addEntry(section => 'VIRTUALMACHINES', entry => $machine);
+    }
+
+    return $inventory;
+
+}
+
+#sub getJobs {
+#    my ($self) = @_;
+#
+#    my $logger = $self->{logger};
+#    my $network = $self->{network};
+#
+#    my $jsonText = $network->get ({
+#        source => $self->{backendURL}.'/?a=getJobs&d=TODO',
+#        timeout => 60,
+#        });
+#    if (!defined($jsonText)) {
+#        $logger->debug("No answer from server for deployment job.");
+#        return;
+#    }
+#
+#
+#    return from_json( $jsonText, { utf8  => 1 } );
+#}
+
+sub getHostIds {
+    my ($self) = @_;
+
+    return $self->{vpbs}->getHostIds();
+}
+
+sub run {
+    my ( $self, %params ) = @_;
+
+    $self->{client} = FusionInventory::Agent::HTTP::Client::Fusion->new(
+        logger       => $self->{logger},
+        user         => $params{user},
+        password     => $params{password},
+        proxy        => $params{proxy},
+        ca_cert_file => $params{ca_cert_file},
+        ca_cert_dir  => $params{ca_cert_dir},
+        no_ssl_check => $params{no_ssl_check},
+        debug        => $self->{debug}
+    );
+    die unless $self->{client};
+
+    my $globalRemoteConfig = $self->{client}->send(
+        "url" => $self->{target}->{url},
+        args  => {
+            action    => "getConfig",
+            machineid => $self->{deviceid},
+            task      => { ESX => $VERSION },
+        }
+    );
+
+    return unless $globalRemoteConfig->{schedule};
+    return unless ref( $globalRemoteConfig->{schedule} ) eq 'ARRAY';
+
+    foreach my $job ( @{ $globalRemoteConfig->{schedule} } ) {
+        next unless $job->{task} eq "ESX";
+        $self->{esxRemote} = $job->{remote};
+    }
+    if ( !$self->{esxRemote} ) {
+        $self->{logger}->info("ESX support disabled server side.");
+        return;
+    }
+
+    my $jobs = $self->{client}->send(
+        "url" => $self->{esxRemote},
+        args  => {
+            action    => "getJobs",
+            machineid => $self->{deviceid}
+        }
+    );
+
+    return unless $jobs;
+    return unless ref( $jobs->{jobs} ) eq 'ARRAY';
+    $self->{logger}->info(
+        "Got " . int( @{ $jobs->{jobs} } ) . " VMware host(s) to inventory." );
+
+    #    my $esx = FusionInventory::Agent::Task::ESX->new({
+    #            config => $config
+    #            });
+
+    my $ocsClient = FusionInventory::Agent::HTTP::Client::OCS->new(
+        logger       => $self->{logger},
+        user         => $params{user},
+        password     => $params{password},
+        proxy        => $params{proxy},
+        ca_cert_file => $params{ca_cert_file},
+        ca_cert_dir  => $params{ca_cert_dir},
+        no_ssl_check => $params{no_ssl_check},
+    );
+
+    foreach my $job ( @{ $jobs->{jobs} } ) {
+
+        if ( !$self->connect(
+                host     => $job->{host},
+                user     => $job->{user},
+                password => $job->{password}
+        )) {
+            $self->{client}->send(
+                "url" => $self->{esxRemote},
+                args  => {
+                    action => 'setLog',
+                    machineid => $self->{deviceid},
+                    part      => 'login',
+                    uuid      => $job->{uuid},
+                    msg       => $self->{lastError},
+                    code      => 'ko'
+                }
+            );
+
+            next;
+        }
+
+        my $hostIds = $self->getHostIds();
+        foreach my $hostId (@$hostIds) {
+            my $inventory = $self->createInventory(
+                $hostId, $self->{config}->{tag}
+            );
+
+            my $message = FusionInventory::Agent::XML::Query::Inventory->new(
+                deviceid => $self->{deviceid},
+                content  => $inventory->getContent()
+            );
+
+            $ocsClient->send(
+                url     => $self->{target}->getUrl(),
+                message => $message
+            );
+        }
+        $self->{client}->send(
+            "url" => $self->{esxRemote},
+            args  => {
+                action => 'setLog',
+                machineid => $self->{deviceid},
+                uuid      => $job->{uuid},
+                code      => 'ok'
+            }
+        );
+
+    }
+
+    return $self;
+}
+
+# Only used by the command line tool
+#sub new {
+#    my ( undef, $params ) = @_;
+#
+#    my $logger = FusionInventory::Agent::Logger->new();
+#
+#    my $self = { config => $params->{config}, logger => $logger };
+#    bless $self;
+#}
+
+1;
+
+__END__
+
+=head1 NAME
+
+FusionInventory::Agent::SOAP::VMware - Access to VMware hypervisor
+
+=head1 DESCRIPTION
+
+This module allow access to VMware hypervisor using VMware SOAP API
+and _WITHOUT_ their Perl library.
+
+=head1 FUNCTIONS
+
+=head2 connect ( $self, %params )
+
+Connect the task to the VMware ESX, ESXi or vCenter.
+
+=head2 createFakeDeviceid ( $self, $host )
+
+Generate a fake deviceid based on the machine name and the
+boot date.
+
+=head2 createInventory ( $self, $id, $tag )
+
+Returns an FusionInventory::Agent::Inventory object for a given
+host id.
+
+=head2 getHostIds
+
+Returns the list of the host id.

@@ -0,0 +1,116 @@
+package FusionInventory::Agent::Task::Inventory::AIX::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCPUs(
+        command => 'lsdev -Cc processor -F name',
+        logger  => $logger
+    )) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+sub _getCPUs {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my $aixversion = getFirstLine(command => 'uname -v');
+
+    my @cpus;
+    while (my $line = <$handle>) {
+        chomp $line;
+        my $device = $line;
+
+        my $format = $aixversion >= 5 ?
+            'type:frequency:frequency' : 'type';
+
+        my @lsattr = getAllLines(
+            command => "lsattr -EOl $device -a '$format'",
+        );
+
+        my $cpu = {
+            THREAD => 1
+        };
+
+        my $smt_threads = getFirstLine(command => "lsattr -EOl $device -a 'state:type:smt_threads'");
+        if ($smt_threads && $smt_threads =~ /:(\d+)$/) {
+            $cpu->{THREAD} = $1;
+        }
+
+
+        # drop headers
+        shift @lsattr;
+
+        # use first line to compute name, frequency and number of threads
+        my @infos = split(/:/, $lsattr[0]);
+
+        $cpu->{NAME} = $infos[0];
+        $cpu->{NAME} =~ s/_/ /;
+
+        if ($aixversion >= 5) {
+            $cpu->{SPEED} = ($infos[1] % 1000000) >= 50000 ?
+                int($infos[1] / 1000000) + 1 : int($infos[1] / 1000000);
+        } else {
+            # On older models, frequency is based on cpu model and uname
+            SWITCH: {
+                if (
+                    $infos[0] eq "PowerPC"     or
+                    $infos[0] eq "PowerPC_601" or
+                    $infos[0] eq "PowerPC_604"
+                ) {
+                    my $uname = getFirstLine(command => 'uname -m');
+                    $cpu->{SPEED} =
+                        $uname =~ /E1D|EAD|C1D|R04|C4D|R4D/ ?  12.2 :
+                        $uname =~ /34M/                     ? 133   :
+                        $uname =~ /N4D/                     ? 150   :
+                        $uname =~ /X4M|X4D/                 ? 200   :
+                        $uname =~ /N4E|K04|K44/             ? 225   :
+                        $uname =~ /N4F/                     ? 320   :
+                        $uname =~ /K45/                     ? 360   :
+                                                              undef ;
+                    last SWITCH;
+                }
+
+                if ($infos[0] eq "PowerPC_RS64_III") {
+                    $cpu->{SPEED} = 400;
+                    last SWITCH;
+                }
+
+                if ($infos[0] eq "PowerPC_620") {
+                    $cpu->{SPEED} = 172;
+                    last SWITCH;
+                }
+
+                $cpu->{SPEED} = 225;
+            }
+        }
+
+        # compute core number from lines number
+        $cpu->{CORE} = scalar @lsattr;
+
+        push @cpus, $cpu;
+    }
+    close $handle;
+
+    return @cpus;
+}
+
+1;

@@ -0,0 +1,44 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Controllers;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::AIX;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{controller};
+    return canRun('lsdev');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $controller (_getControllers(
+        logger  => $logger,
+    )) {
+        $inventory->addEntry(
+            section => 'CONTROLLERS',
+            entry   => $controller
+        );
+    }
+}
+
+sub _getControllers {
+    my @adapters = getAdaptersFromLsdev(@_);
+
+    my @controllers;
+    foreach my $adapter (@adapters) {
+        push @controllers, {
+            NAME => $adapter->{NAME},
+        };
+    }
+
+    return @controllers;
+}
+
+1;

@@ -0,0 +1,61 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Drives;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{drive};
+    return canRun('df');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # get filesystems
+    my @filesystems =
+        getFilesystemsFromDf(logger => $logger, command => 'df -P -k');
+
+    my $types = _getFilesystemTypes(logger => $logger);
+
+    # add filesystems to the inventory
+    foreach my $filesystem (@filesystems) {
+        $filesystem->{FILESYSTEM} = $types->{$filesystem->{TYPE}};
+
+        $inventory->addEntry(
+            section => 'DRIVES',
+            entry   => $filesystem
+        );
+    }
+}
+
+sub _getFilesystemTypes {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(
+        command => 'lsfs -c',
+        %params
+    );
+    return unless $handle;
+
+    my $types;
+
+    # skip headers
+    my $line = <$handle>;
+
+    foreach my $line (<$handle>) {
+        my ($mountpoint, undef, $type) =  split(/:/, $line);
+        $types->{$mountpoint} = $type;
+    }
+    close $handle;
+
+    return $types;
+}
+
+1;

@@ -0,0 +1,223 @@
+package FusionInventory::Agent::Task::Inventory::AIX::LVM;
+
+use FusionInventory::Agent::Tools;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{lvm};
+    return canRun('lspv');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $volume (_getPhysicalVolumes($logger)) {
+        $inventory->addEntry(section => 'PHYSICAL_VOLUMES', entry => $volume);
+    }
+
+    foreach my $group (_getVolumeGroups($logger)) {
+        $inventory->addEntry(section => 'VOLUME_GROUPS', entry => $group);
+
+        foreach my $volume (_getLogicalVolumes($logger, $group->{VG_NAME})) {
+            $inventory->addEntry(section => 'LOGICAL_VOLUMES', entry => $volume);
+        }
+    }
+}
+
+sub _getLogicalVolumes {
+    my ($logger, $group) = @_;
+
+    my $handle = getFileHandle(
+        command => "lsvg -l $group",
+        logger  => $logger
+    );
+    return unless $handle;
+
+    # skip headers
+    my $line;
+    $line = <$handle>;
+    $line = <$handle>;
+
+    # no logical volume if there is only one line of output
+    return unless $line;
+
+    my @volumes;
+
+    while (my $line = <$handle>) {
+        chomp $line;
+        my ($name) = split(/\s+/, $line);
+        push @volumes, _getLogicalVolume(logger => $logger, name => $name);
+    }
+
+    close $handle;
+
+    return @volumes;
+}
+
+sub _getLogicalVolume {
+    my (%params) = @_;
+
+    my $command = $params{name} ? "lslv $params{name}" : undef;
+    my $handle = getFileHandle(command => $command, %params);
+    return unless $handle;
+
+    my $volume = {
+        LV_NAME => $params{name}
+    };
+
+    my $size;
+    while (my $line = <$handle>) {
+        if ($line =~ /PP SIZE:\s+(\d+)/) {
+            $size = $1;
+        }
+        if ($line =~ /^LV IDENTIFIER:\s+(\S+)/) {
+            $volume->{LV_UUID} = $1;
+        }
+        if ($line =~ /^LPs:\s+(\S+)/) {
+            $volume->{SEG_COUNT} = $1;
+        }
+        if ($line =~ /^TYPE:\s+(\S+)/) {
+            $volume->{ATTR} = "Type $1",
+        }
+    }
+    close $handle;
+
+    $volume->{SIZE} = $volume->{SEG_COUNT} * $size;
+
+    return $volume;
+}
+
+sub _getPhysicalVolumes {
+    my ($logger) = @_;
+
+    my $handle = getFileHandle(
+        command => 'lspv',
+        logger  => $logger
+    );
+    return unless $handle;
+
+    my @volumes;
+
+    while (my $line = <$handle>) {
+        chomp $line;
+        my ($name) = split(/\s+/, $line);
+        push @volumes, _getPhysicalVolume(logger => $logger, name => $name);
+    }
+    close $handle;
+
+    return @volumes;
+}
+
+sub _getPhysicalVolume {
+    my (%params) = @_;
+
+    my $command = $params{name} ? "lspv $params{name}" : undef;
+    my $handle = getFileHandle(command => $command, %params);
+    return unless $handle;
+
+    my $volume = {
+        DEVICE  => "/dev/$params{name}"
+    };
+
+    my ($free, $total);
+    while (my $line = <$handle>) {
+        chomp $line;
+
+        if ($line =~ /PHYSICAL VOLUME:\s+(\S+)/) {
+            $volume->{FORMAT} = "AIX PV";
+        }
+        if ($line =~ /FREE PPs:\s+(\d+)/) {
+            $free = $1;
+        }
+        if ($line =~ /TOTAL PPs:\s+(\d+)/) {
+            $total = $1;
+        }
+        if ($line =~ /VOLUME GROUP:\s+(\S+)/) {
+            $volume->{ATTR} = "VG $1";
+        }
+        if ($line =~ /PP SIZE:\s+(\d+)/) {
+            $volume->{PE_SIZE} = $1;
+        }
+        if ($line =~ /PV IDENTIFIER:\s+(\S+)/) {
+            $volume->{PV_UUID} = $1;
+        }
+    }
+    close $handle;
+
+    if (defined $volume->{PE_SIZE}) {
+        $volume->{SIZE} = $total * $volume->{PE_SIZE} if defined $total;
+        $volume->{FREE} = $free * $volume->{PE_SIZE} if defined $free;
+    }
+    $volume->{PV_PE_COUNT} = $total if defined $total;
+
+    return $volume;
+}
+
+sub _getVolumeGroups {
+    my ($logger) = @_;
+
+    my $handle = getFileHandle(
+        command => 'lsvg',
+        logger  => $logger
+    );
+    return unless $handle;
+
+    my @groups;
+
+    while (my $line = <$handle>) {
+        chomp $line;
+        push @groups, _getVolumeGroup(logger => $logger, name => $line);
+    }
+    close $handle;
+
+    return @groups;
+}
+
+sub _getVolumeGroup {
+    my (%params) = @_;
+
+    my $command = $params{name} ? "lsvg $params{name}" : undef;
+    my $handle = getFileHandle(command => $command, %params);
+    return unless $handle;
+
+    my $group = {
+        VG_NAME => $params{name}
+    };
+
+    while (my $line = <$handle>) {
+        chomp $line;
+
+        if ($line =~ /TOTAL PPs:\s+(\d+)/) {
+            $group->{SIZE} = $1;
+        }
+        if ($line =~ /FREE PPs:\s+(\d+)/) {
+            $group->{FREE} = $1;
+        }
+        if ($line =~ /VG IDENTIFIER:\s+(\S+)/) {
+            $group->{VG_UUID} = $1;
+        }
+        if ($line =~ /PP SIZE:\s+(\d+)/) {
+            $group->{VG_EXTENT_SIZE} = $1;
+        }
+        if ($line =~ /LVs:\s+(\d+)/) {
+            $group->{LV_COUNT} = $1;
+        }
+        if ($line =~/ACTIVE PVs:\s+(\d+)/) {
+            $group->{PV_COUNT} = $1;
+        }
+
+    }
+    close $handle;
+
+    return $group;
+}
+
+1;

@@ -0,0 +1,88 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Memory;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::AIX;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{memory};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $memory (_getMemories()) {
+        $inventory->addEntry(
+            section => 'MEMORIES',
+            entry   => $memory
+        );
+    }
+
+    #Memory informations
+    #lsdev -Cc memory -F 'name' -t totmem
+    #lsattr -EOlmem0
+    my $memorySize = 0;
+    my @lsdev = getAllLines(
+        command => 'lsdev -Cc memory -F "name" -t totmem',
+        logger  => $logger
+    );
+    foreach (@lsdev){
+        my @lsattr = getAllLines(
+            command => "lsattr -EOl $_",
+            logger  => $logger
+        );
+        foreach (@lsattr) {
+            if (! /^#/){
+                # See: http://forge.fusioninventory.org/issues/399
+                # TODO: the regex should be improved here
+                /^(.+):(\d+)/;
+                $memorySize += $2;
+            }
+        }
+    }
+
+    #Paging Space
+    my $swapSize;
+    my @grep = getAllLines(command => 'lsps -s', logger => $logger);
+    foreach (@grep){
+        if ( ! /^Total/){
+            /^\s*(\d+)\w*\s+\d+.+/;
+            $swapSize = $1;
+        }
+    }
+
+    $inventory->setHardware({
+        MEMORY => $memorySize,
+        SWAP   => $swapSize
+    });
+
+}
+
+sub _getMemories {
+    my @infos = getLsvpdInfos(@_);
+    my @memories;
+    my $numslots = 0;
+
+    foreach my $info (@infos) {
+        next unless $info->{DS} eq 'Memory DIMM';
+
+        push @memories, {
+            DESCRIPTION => $info->{DS},
+            CAPACITY    => $info->{SZ},
+            CAPTION     => 'Slot ' . $info->{YL},
+            SERIALNUMBER=> $info->{SN},
+            NUMSLOTS    => $numslots++
+        };
+    }
+
+    return @memories;
+}
+
+1;

@@ -0,0 +1,46 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Modems;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::AIX;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{modem};
+    return canRun('lsdev');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $modem (_getModems(
+        logger  => $logger,
+    )) {
+        $inventory->addEntry(
+            section => 'MODEMS',
+            entry   => $modem,
+        );
+    }
+}
+
+sub _getModems {
+    my @adapters = getAdaptersFromLsdev(@_);
+
+    my @modems;
+    foreach my $adapter (@adapters) {
+        next unless $adapter->{DESCRIPTION} =~ /modem/i;
+        push @modems, {
+            NAME        => $adapter->{NAME},
+            DESCRIPTION => $adapter->{DESCRIPTION},
+        };
+    }
+
+    return @modems;
+}
+
+1;

@@ -0,0 +1,110 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Networks;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+use FusionInventory::Agent::Tools::Network;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{network};
+    return canRun('lscfg');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @interfaces = _getInterfaces(logger => $logger);
+    foreach my $interface (@interfaces) {
+        $inventory->addEntry(
+            section => 'NETWORKS',
+            entry   => $interface
+        );
+    }
+
+    my $routes = getRoutingTable(command => 'netstat -nr', logger => $logger);
+    $inventory->setHardware({
+        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
+    });
+}
+
+sub _getInterfaces {
+    my (%params) = @_;
+
+    my $logger = $params{logger};
+
+    # get a list of interfaces from ifconfig
+    my @interfaces =
+        map { { DESCRIPTION => $_ } }
+        split(/ /, getFirstLine(command => 'ifconfig -l'));
+
+    # complete with hardware addresses, extracted from lscfg
+    my %addresses = _parseLscfg(
+        command => 'lscfg -v -l ent*',
+        logger  => $logger
+    );
+
+    foreach my $interface (@interfaces) {
+        next unless $addresses{$interface->{DESCRIPTION}};
+        $interface->{TYPE}    = 'ethernet';
+        $interface->{MACADDR} = $addresses{$interface->{DESCRIPTION}};
+    }
+
+    # complete with network information, extracted from lsattr
+    foreach my $interface (@interfaces) {
+        my $handle = getFileHandle(
+            command => "lsattr -E -l $interface->{DESCRIPTION}",
+            logger  => $logger
+        );
+        next unless $handle;
+
+        while (my $line = <$handle>) {
+            $interface->{IPADDRESS} = $1
+                if $line =~ /^netaddr \s+ ($ip_address_pattern)/x;
+            $interface->{IPMASK} = $1
+                if $line =~ /^netmask \s+ ($ip_address_pattern)/x;
+            $interface->{STATUS} = $1
+                if $line =~ /^state \s+ (\w+)/x;
+        }
+        close $handle;
+    }
+
+    foreach my $interface (@interfaces) {
+        $interface->{IPSUBNET} = getSubnetAddress(
+            $interface->{IPADDRESS},
+            $interface->{IPMASK},
+        );
+
+        $interface->{STATUS} = "Down" unless $interface->{IPADDRESS};
+        $interface->{IPDHCP} = "No";
+
+    }
+
+    return @interfaces;
+}
+
+sub _parseLscfg {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my %addresses;
+    my $current_interface;
+    while (my $line = <$handle>) {
+        if ($line =~ /^\s+ ent(\d+) \s+ \S+ \s+/x) {
+            $current_interface = "en$1";
+        }
+        if ($line =~ /Network Address\.+($alt_mac_address_pattern)/) {
+            $addresses{$current_interface} = alt2canonical($1);
+        }
+    }
+    close $handle;
+
+    return %addresses;
+}
+
+1;

@@ -0,0 +1,63 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Slots;
+
+use strict;
+use warnings;
+
+use List::Util qw(first);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::AIX;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{slot};
+    return canRun('lsdev');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # index VPD infos by AX field
+    my %infos =
+        map  { $_->{AX} => $_ }
+        grep { $_->{AX} }
+        getLsvpdInfos(logger => $logger);
+
+    foreach my $slot (_getSlots(
+        command => 'lsdev -Cc bus -F "name:description"',
+        logger  => $logger
+    )) {
+
+        $slot->{DESCRIPTION} = $infos{$slot->{NAME}}->{YL}
+            if $infos{$slot->{NAME}};
+
+        $inventory->addEntry(
+            section => 'SLOTS',
+            entry   => $slot
+        );
+    }
+}
+
+sub _getSlots {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+
+    my @slots;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(.+):(.+)/;
+
+        push @slots, {
+            NAME        => $1,
+            DESIGNATION => $2,
+        };
+    }
+    close $handle;
+
+    return @slots;
+}
+
+1;

@@ -0,0 +1,63 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Softwares;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return
+        !$params{no_category}->{software} &&
+        canRun('lslpp');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $softwares = _getSoftwaresList(
+        command => 'lslpp -c -l',
+        logger  => $logger
+    );
+    return unless $softwares;
+
+    foreach my $software (@$softwares) {
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => $software
+        );
+    }
+
+}
+
+sub _getSoftwaresList {
+    my $handle = getFileHandle(@_);
+    next unless $handle;
+
+    # skip headers
+    my $line = <$handle>;
+
+    my @softwares;
+    while (my $line = <$handle>) {
+        my @entry = split(/:/, $line);
+        next if $entry[1] =~ /^device/;
+
+        $entry[6] =~ s/\s+$//;
+
+        push @softwares, {
+            COMMENTS => $entry[6],
+            FOLDER   => $entry[0],
+            NAME     => $entry[1],
+            VERSION  => $entry[2],
+        };
+    }
+    close $handle;
+
+    return \@softwares;
+}
+
+1;

@@ -0,0 +1,47 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Sounds;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::AIX;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{sound};
+    return canRun('lsdev');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $sound (_getSounds(
+        logger  => $logger
+    )) {
+        $inventory->addEntry(
+            section => 'SOUNDS',
+            entry   => $sound
+        );
+    }
+
+}
+
+sub _getSounds {
+    my @adapters = getAdaptersFromLsdev(@_);
+
+    my @sounds;
+    foreach my $adapter (@adapters) {
+        next unless $adapter->{DESCRIPTION} =~ /audio/i;
+        push @sounds, {
+            NAME        => $adapter->{NAME},
+            DESCRIPTION => $adapter->{DESCRIPTION}
+        };
+    }
+
+    return @sounds;
+}
+
+1;

@@ -0,0 +1,228 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Storages;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::AIX;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{storage};
+    return
+        canRun('lsdev') &&
+        canRun('lsattr');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # index VPD infos by AX field
+    my $infos = _getIndexedLsvpdInfos(logger => $logger);
+
+    foreach my $disk (_getDisks(logger => $logger, subclass => 'scsi', infos => $infos)) {
+        $disk->{DISKSIZE} = _getCapacity($disk->{NAME}, $params{logger});
+        $disk->{SERIAL}   = getFirstMatch(
+            command => "lscfg -p -v -s -l $disk->{NAME}",
+            logger  => $params{logger},
+            pattern => qr/Serial Number\.*(.*)/
+        );
+        $inventory->addEntry(section => 'STORAGES', entry => $disk);
+    }
+
+    foreach my $disk (_getDisks(logger => $logger, subclass => 'fcp', infos => $infos)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $disk);
+    }
+
+    foreach my $disk (_getDisks(logger => $logger, subclass => 'fdar', infos => $infos)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $disk);
+    }
+
+    foreach my $disk (_getDisks(logger => $logger, subclass => 'sas', infos => $infos)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $disk);
+    }
+
+    foreach my $disk (_getDisks(logger => $logger, subclass => 'vscsi', infos => $infos)) {
+        $disk->{DISKSIZE}     = _getVirtualCapacity(
+            name   => $disk->{NAME},
+            logger => $params{logger}
+        );
+        $disk->{MANUFACTURER} = "VIO Disk";
+        $disk->{MODEL}        = "Virtual Disk";
+        $inventory->addEntry(section => 'STORAGES', entry => $disk);
+    }
+
+    foreach my $cdrom (_getCdroms(logger => $logger, infos => $infos)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $cdrom);
+    }
+
+    foreach my $tape (_getTapes(logger => $logger, infos => $infos)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $tape);
+    }
+
+    foreach my $floppy (_getFloppies(logger => $logger, infos => $infos)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $floppy);
+    }
+}
+
+sub _getIndexedLsvpdInfos {
+    my %infos =
+        map  { $_->{AX} => $_ }
+        grep { $_->{AX} }
+        getLsvpdInfos(@_);
+
+    return \%infos;
+}
+
+sub _getDisks {
+    my (%params) = @_;
+
+    my $command = $params{subclass} ?
+        "lsdev -Cc disk -s $params{subclass} -F 'name:description'" : undef;
+
+    my @disks = _parseLsdev(
+        command => $command,
+        pattern => qr/^(.+):(.+)/,
+        @_
+    );
+
+    foreach my $disk (@disks) {
+        $disk->{TYPE} = 'disk';
+
+        my $info = $params{infos}->{$disk->{NAME}};
+        next unless $info;
+        $disk->{MANUFACTURER} = _getManufacturer($info);
+        $disk->{MODEL}        = _getModel($info);
+    }
+
+    return @disks;
+}
+
+sub _getCdroms {
+    my (%params) = @_;
+
+    my @cdroms = _parseLsdev(
+        command => "lsdev -Cc cdrom -s scsi -F 'name:description:status'",
+        pattern => qr/^(.+):(.+):.+Available.+/,
+        @_
+    );
+
+    foreach my $cdrom (@cdroms) {
+        $cdrom->{TYPE} = 'cd';
+        $cdrom->{DISKSIZE} = _getCapacity($cdrom->{NAME}, $params{logger});
+
+        my $info = $params{infos}->{$cdrom->{NAME}};
+        next unless $info;
+        $cdrom->{MANUFACTURER} = _getManufacturer($info);
+        $cdrom->{MODEL}        = _getModel($info);
+    }
+
+    return @cdroms;
+}
+
+sub _getTapes {
+    my (%params) = @_;
+
+    my @tapes = _parseLsdev(
+        command => "lsdev -Cc tape -s scsi -F 'name:description:status'",
+        pattern => qr/^(.+):(.+):.+Available.+/,
+        @_
+    );
+
+    foreach my $tape (@tapes) {
+        $tape->{TYPE} = 'tape';
+        $tape->{DISKSIZE} = _getCapacity($tape->{NAME}, $params{logger});
+
+        my $info = $params{infos}->{$tape->{NAME}};
+        next unless $info;
+        $tape->{MANUFACTURER} = _getManufacturer($info);
+        $tape->{MODEL}        = _getModel($info);
+    }
+
+    return @tapes;
+}
+
+sub _getFloppies {
+    my (%params) = @_;
+
+    my @floppies = _parseLsdev(
+        command => "lsdev -Cc diskette -F 'name:description:status'",
+        pattern => qr/^(.+):(.+):.+Available.+/,
+        @_
+    );
+
+    foreach my $floppy (@floppies) {
+        $floppy->{TYPE} = 'floppy';
+    }
+
+    return @floppies;
+}
+
+sub _parseLsdev {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @devices;
+
+    while (my $line = <$handle>) {
+        chomp $line;
+        next unless $line =~ $params{pattern};
+
+        push @devices, {
+            NAME        => $1,
+            DESCRIPTION => $2
+        };
+    }
+    close $handle;
+
+    return @devices;
+}
+
+sub _getCapacity {
+    my ($device, $logger) = @_;
+
+    return getLastLine(
+        command => "lsattr -EOl $device -a 'size_in_mb'",
+        logger  => $logger
+    );
+}
+
+sub _getVirtualCapacity {
+    my (%params) = @_;
+
+    my $command = $params{name} ? "lspv $params{name}" : undef;
+
+    my $capacity = getFirstMatch(
+        command => $command,
+        file    => $params{file},
+        pattern => qr/TOTAL PPs: +\d+ \((\d+) megabytes\)/,
+        logger  => $params{logger}
+    );
+
+    return $capacity;
+}
+
+sub _getManufacturer {
+    my ($device) = @_;
+
+    return unless $device;
+
+    return $device->{FN} ?
+        "$device->{MF},FRU number :$device->{FN}" :
+        "$device->{MF}"                           ;
+}
+
+sub _getModel {
+    my ($device) = @_;
+
+    return unless $device;
+
+    return $device->{TM};
+}
+
+1;

@@ -0,0 +1,45 @@
+package FusionInventory::Agent::Task::Inventory::AIX::Videos;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::AIX;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{video};
+    return canRun('lsdev');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $video (_getVideos(
+        logger  => $logger
+    )) {
+        $inventory->addEntry(
+            section => 'VIDEOS',
+            entry   => $video
+        );
+    }
+}
+
+sub _getVideos {
+    my @adapters = getAdaptersFromLsdev(@_);
+
+    my @videos;
+    foreach my $adapter (@adapters) {
+        next unless $adapter->{DESCRIPTION} =~ /graphics|vga|video/i;
+        push @videos, {
+            NAME => $adapter->{NAME},
+        };
+    }
+
+    return @videos;
+}
+
+1;

@@ -0,0 +1,103 @@
+package FusionInventory::Agent::Task::Inventory::AIX;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use List::Util qw(first);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::AIX;
+
+our $runAfter = ["FusionInventory::Agent::Task::Inventory::Generic"];
+
+sub isEnabled {
+    return $OSNAME eq 'aix';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger = $params{logger};
+
+    # Operating system informations
+    my $kernelName = getFirstLine(command => 'uname -s');
+
+    my $version = getFirstLine(command => 'oslevel');
+    $version =~ s/(.0)*$//;
+
+    my $OSLevel = getFirstLine(command => 'oslevel -r');
+    my @OSLevelParts = split(/-/, $OSLevel);
+
+    my $Revision = getFirstLine(command => 'oslevel -s');
+    my @RevisionParts = split(/-/, $Revision);
+
+    my $ssn;
+    my $vmsystem;
+    my $vmid;
+    my $vmname;
+    my $vmhostserial;
+
+    my @infos = getLsvpdInfos(logger => $logger);
+
+    # Get the BIOS version from the System Microcode Image (MI) version, in
+    # 'System Firmware' section of VPD, containing three space separated values:
+    # - the microcode image the system currently runs
+    # - the 'permanent' microcode image
+    # - the 'temporary' microcode image
+    # See http://www.systemscanaix.com/sample_reports/aix61/hardware_configuration.html
+    my $bios_version;
+
+    my $system = first { $_->{DS} eq 'System Firmware' } @infos;
+    if ($system) {
+        # we only return the currently booted firmware
+        my @firmwares = split(' ', $system->{MI});
+        $bios_version = $firmwares[0];
+    }
+
+    my $vpd = first { $_->{DS} eq 'System VPD' } @infos;
+
+    my $unameL = getFirstLine(command => 'uname -L');
+    # LPAR partition can access the serial number of the host computer
+    # If we are such system, the serial number must be stored in the
+    # VMHOSTSERIAL key.
+    if ($unameL && $unameL =~ /^(\d+)\s+(\S+)/) {
+        $vmsystem = "AIX_LPAR";
+        $vmid = $1;
+        $vmname = $2;
+        $vmhostserial = $vpd->{SE};
+        $ssn = "aixlpar-$vmhostserial-$vmid";
+    } else {
+        $ssn = $vpd->{SE};
+    }
+
+    $inventory->setHardware({
+        OSNAME     => "$kernelName $version",
+        OSVERSION  => $OSLevel,
+        OSCOMMENTS => "Maintenance Level: $OSLevelParts[1]",
+        VMID       => $vmid,
+        VMNAME     => $vmname,
+        VMSYSTEM   => $vmsystem,
+        VMHOSTSERIAL => $vmhostserial
+    });
+
+    $inventory->setOperatingSystem({
+        NAME         => 'AIX',
+        FULL_NAME    => "$kernelName $version",
+        VERSION      => $version,
+        SERVICE_PACK => "$RevisionParts[2]-$RevisionParts[3]",
+    });
+
+    $inventory->setBios({
+        BMANUFACTURER => 'IBM',
+        SMANUFACTURER => 'IBM',
+        SMODEL        => $vpd->{TM},
+        SSN           => $ssn,
+        BVERSION      => $bios_version,
+    });
+
+}
+
+1;

@@ -0,0 +1,24 @@
+package FusionInventory::Agent::Task::Inventory::AccessLog;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $date = getFormatedLocalTime(time());
+
+    $inventory->setAccessLog ({
+        LOGDATE => $date
+    });
+}
+
+1;

@@ -0,0 +1,61 @@
+package FusionInventory::Agent::Task::Inventory::BSD::Alpha;
+
+use strict;
+use warnings;
+
+use Config;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return $Config{archname} =~ /^alpha/;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $bios = {
+        SMANUFACTURER => 'DEC',
+    };
+
+    # sysctl infos
+
+    # example on *BSD: AlphaStation 255 4/232
+    $bios->{SMODEL} = getFirstLine(command => 'sysctl -n hw.model');
+
+    my $count = getFirstLine(command => 'sysctl -n hw.ncpu');
+
+    # dmesg infos
+
+    # NetBSD:
+    # AlphaStation 255 4/232, 232MHz, s/n
+    # cpu0 at mainbus0: ID 0 (primary), 21064A-2
+    # OpenBSD:
+    # AlphaStation 255 4/232, 232MHz
+    # cpu0 at mainbus0: ID 0 (primary), 21064A-2 (pass 1.1)
+    # FreeBSD:
+    # AlphaStation 255 4/232, 232MHz
+    # CPU: EV45 (21064A) major=6 minor=2
+
+    my $cpu;
+    foreach my $line (getAllLines(command => 'dmesg')) {
+        if ($line =~ /$bios->{SMODEL},\s*(\S+)\s*MHz/) { $cpu->{SPEED} = $1; }
+        if ($line =~ /^cpu[^:]*:\s*(.*)$/i)            { $cpu->{NAME} = $1;  }
+    }
+
+    $inventory->setBios($bios);
+
+    return if $params{no_category}->{cpu};
+
+    while ($count--) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+
+}
+
+1;

@@ -0,0 +1,36 @@
+package FusionInventory::Agent::Task::Inventory::BSD::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return canRun('dmidecode');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $speed;
+    my $hwModel = getFirstLine(command => 'sysctl -n hw.model');
+    if ($hwModel =~ /([\.\d]+)GHz/) {
+        $speed = $1 * 1000;
+    }
+
+    foreach my $cpu (getCpusFromDmidecode()) {
+        $cpu->{SPEED} = $speed;
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+
+}
+
+1;

@@ -0,0 +1,45 @@
+package FusionInventory::Agent::Task::Inventory::BSD::Drives;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{drive};
+    return canRun('df');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # get filesystem types
+    my @types =
+        grep { ! /^(?:fdesc|devfs|procfs|linprocfs|linsysfs|tmpfs|fdescfs)$/ }
+        getFilesystemsTypesFromMount(logger => $logger);
+
+    # get filesystem for each type
+    my @filesystems;
+    foreach my $type (@types) {
+        push @filesystems, getFilesystemsFromDf(
+            logger  => $logger,
+            command => "df -P -k -t $type",
+            type    => $type
+        );
+    }
+
+    # add filesystems to the inventory
+    foreach my $filesystem (@filesystems) {
+        $inventory->addEntry(
+            section => 'DRIVES',
+            entry   => $filesystem
+        );
+    }
+}
+
+1;

@@ -0,0 +1,67 @@
+package FusionInventory::Agent::Task::Inventory::BSD::MIPS;
+
+use strict;
+use warnings;
+
+use Config;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return $Config{archname} =~ /^mips/;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $bios = {
+        SMANUFACTURER => 'SGI',
+    };
+
+    # sysctl infos
+
+    # example on NetBSD: SGI-IP22
+    # example on OpenBSD: SGI-O2 (IP32)
+    $bios->{SMODEL} = getFirstLine(command => 'sysctl -n hw.model');
+
+    my $count = getFirstLine(command => 'sysctl -n hw.ncpu');
+
+    # dmesg infos
+
+    # I) Indy
+    # NetBSD:
+    # mainbus0 (root): SGI-IP22 [SGI, 6906e152], 1 processor
+    # cpu0 at mainbus0: MIPS R4400 CPU (0x450) Rev. 5.0 with MIPS R4010 FPC Rev. 0.0
+    # int0 at mainbus0 addr 0x1fbd9880: bus 75MHz, CPU 150MHz
+    #
+    # II) O2
+    # NetBSD:
+    # mainbus0 (root): SGI-IP32 [SGI, 8], 1 processor
+    # cpu0 at mainbus0: MIPS R5000 CPU (0x2321) Rev. 2.1 with built-in FPU Rev. 1.0
+    # OpenBSD:
+    # mainbus0 (root)
+    # cpu0 at mainbus0: MIPS R5000 CPU rev 2.1 180 MHz with R5000 based FPC rev 1.0
+    # cpu0: cache L1-I 32KB D 32KB 2 way, L2 512KB direct
+
+    my $cpu;
+    foreach my $line (getAllLines(command => 'dmesg')) {
+        if ($line =~ /$bios->{SMODEL}\s*\[\S*\s*(\S*)\]/) { $bios->{SSN} = $1; }
+        if ($line =~ /cpu0 at mainbus0:\s*(.*)$/)         { $cpu->{NAME} = $1; }
+        if ($line =~ /CPU\s*.*\D(\d+)\s*MHz/)             { $cpu->{SPEED} = $1;  }
+    }
+
+    $inventory->setBios($bios);
+
+    return if $params{no_category}->{cpu};
+
+    while ($count--) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+1;

@@ -0,0 +1,37 @@
+package FusionInventory::Agent::Task::Inventory::BSD::Memory;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{memory};
+    return
+        canRun('sysctl') &&
+        canRun('swapctl');
+};
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    # Swap
+    my $swapSize = getFirstMatch(
+        command => 'swapctl -sk',
+        pattern => qr/total:\s*(\d+)/i
+    );
+
+    # RAM
+    my $memorySize = getFirstLine(command => 'sysctl -n hw.physmem');
+    $memorySize = $memorySize / 1024;
+
+    $inventory->setHardware({
+        MEMORY => int($memorySize / 1024),
+        SWAP   => int($swapSize / 1024),
+    });
+}
+
+1;

@@ -0,0 +1,73 @@
+package FusionInventory::Agent::Task::Inventory::BSD::Networks;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Network;
+use FusionInventory::Agent::Tools::Unix;
+use FusionInventory::Agent::Tools::BSD;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{network};
+    return canRun('ifconfig');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @interfaces = _getInterfaces(logger => $logger);
+    foreach my $interface (@interfaces) {
+        $inventory->addEntry(
+            section => 'NETWORKS',
+            entry   => $interface
+        );
+    }
+
+    my $routes = getRoutingTable(logger => $logger);
+    $inventory->setHardware({
+        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
+    });
+}
+
+sub _getInterfaces {
+    my (%params) = @_;
+
+    my @interfaces = getInterfacesFromIfconfig(
+        logger => $params{logger}
+    );
+
+    foreach my $interface (@interfaces) {
+        $interface->{IPSUBNET} = getSubnetAddress(
+            $interface->{IPADDRESS},
+            $interface->{IPMASK}
+        );
+
+        $interface->{IPDHCP} = getIpDhcp(
+            $params{logger},
+            $interface->{DESCRIPTION}
+        );
+
+        if ($interface->{DESCRIPTION} =~ m/^(lo|vboxnet|vmnet|sit|tun|pflog|pfsync|enc|strip|plip|sl|ppp|faith)/) {
+            $interface->{VIRTUALDEV} = 1;
+
+            if ($interface->{DESCRIPTION} =~ m/^lo/) {
+                $interface->{TYPE} = 'loopback';
+            }
+
+            if ($interface->{DESCRIPTION} =~ m/^ppp/) {
+                $interface->{TYPE} = 'dialup';
+            }
+        } else {
+            $interface->{VIRTUALDEV} = 0;
+        }
+    }
+
+    return @interfaces;
+}
+
+1;

@@ -0,0 +1,91 @@
+package FusionInventory::Agent::Task::Inventory::BSD::SPARC;
+
+use strict;
+use warnings;
+
+use Config;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return $Config{archname} =~ /^sparc/;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $bios = {
+        SMANUFACTURER => 'SUN',
+    };
+
+    # sysctl infos
+
+    # it gives only the CPU on OpenBSD/sparc64
+    $bios->{SMODEL} = getFirstLine(command => 'sysctl -n hw.model');
+
+    # example on NetBSD: 0x807b65c
+    # example on OpenBSD: 2155570635
+    $bios->{SSN} = getFirstLine(command => 'sysctl -n kern.hostid');
+    # force hexadecimal, but remove 0x to make it appear as in the firmware
+    $bios->{SSN} = dec2hex($bios->{SSN});
+    $bios->{SSN} =~ s/^0x//;
+
+    my $count = getFirstLine(command => 'sysctl -n hw.ncpu');
+
+    # dmesg infos
+
+    # I) SPARC
+    # NetBSD:
+    # mainbus0 (root): SUNW,SPARCstation-20: hostid 72362bb1
+    # cpu0 at mainbus0: TMS390Z50 v0 or TMS390Z55 @ 50 MHz, on-chip FPU
+    # OpenBSD:
+    # mainbus0 (root): SUNW,SPARCstation-20
+    # cpu0 at mainbus0: TMS390Z50 v0 or TMS390Z55 @ 50 MHz, on-chip FPU
+    #
+    # II) SPARC64
+    # NetBSD:
+    # mainbus0 (root): SUNW,Ultra-1: hostid 807b65cb
+    # cpu0 at mainbus0: SUNW,UltraSPARC @ 166.999 MHz, version 0 FPU
+    # OpenBSD:
+    # mainbus0 (root): Sun Ultra 1 SBus (UltraSPARC 167MHz)
+    # cpu0 at mainbus0: SUNW,UltraSPARC @ 166.999 MHz, version 0 FPU
+    # FreeBSD:
+    # cpu0: Sun Microsystems UltraSparc-I Processor (167.00 MHz CPU)
+
+    my $cpu;
+    foreach my $line (getAllLines(command => 'dmesg')) {
+        if ($line=~ /^mainbus0 \(root\):\s*(.*)$/) { $bios->{SMODEL} = $1; }
+        if ($line =~ /^cpu[^:]*:\s*(.*)$/i)        { $cpu->{NAME}    = $1; }
+    }
+
+    $bios->{SMODEL} =~ s/SUNW,//;
+    $bios->{SMODEL} =~ s/[:\(].*$//;
+    $bios->{SMODEL} =~ s/^\s*//;
+    $bios->{SMODEL} =~ s/\s*$//;
+
+    $cpu->{NAME} =~ s/SUNW,//;
+    $cpu->{NAME} =~ s/^\s*//;
+    $cpu->{NAME} =~ s/\s*$//;
+
+    # XXX quick and dirty _attempt_ to get proc speed
+    if ($cpu->{NAME} =~ /(\d+)(\.\d+|)\s*mhz/i ) { # possible decimal point
+        $cpu->{SPEED} = sprintf("%.0f", "$1$2"); # round number
+    }
+
+    $inventory->setBios($bios);
+
+    return if $params{no_category}->{cpu};
+
+    while ($count--) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+
+}
+
+
+1;

@@ -0,0 +1,54 @@
+package FusionInventory::Agent::Task::Inventory::BSD::Softwares;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return if $params{no_category}->{software};
+
+    return canRun('pkg_info') || canRun('pkg');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $packages =
+        _getPackagesList(logger => $logger, command => 'pkg_info') ||
+        _getPackagesList(logger => $logger, command => 'pkg info');
+    return unless $packages;
+
+    foreach my $package (@$packages) {
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => $package
+        );
+    }
+}
+
+sub _getPackagesList {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @packages;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(\S+) - (\S+) \s+ (.*)/x;
+        push @packages, {
+            NAME     => $1,
+            VERSION  => $2,
+            COMMENTS => $3
+        };
+    }
+
+    close $handle;
+
+    return @packages ? \@packages : undef;
+}
+
+1;

@@ -0,0 +1,56 @@
+package FusionInventory::Agent::Task::Inventory::BSD::Storages::Megaraid;
+
+# Authors: Egor Shornikov <se@wbr.su>, Egor Morozov <akrus@flygroup.st>
+# License: GPLv2+
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Task::Inventory::BSD::Storages;
+
+sub isEnabled {
+    return canRun('mfiutil');
+}
+
+sub _parseMfiutil {
+    my $handle = getFileHandle(@_);
+
+    my @storages;
+    while (my $line = <$handle>) {
+        unless ( $line =~ m/^[^(]*\(\s+(\d+\w+)\)\s+\S+\s+<(\S+)\s+(\S+)\s+\S+\s+serial=(\S+)>\s+(\S+)\s+.*$/ ) { next; }
+        my ( $size, $vendor, $model, $serial, $type ) = ( $1, $2, $3, $4, $5 );
+
+        if ( $size =~ /(\d+)G/ ){
+            $size = $1 * 1024;
+        } elsif( $size =~ /(\d+)T/ ){
+            $size = $1 * 1024 * 1024;
+        }
+
+        my $storage;
+        $storage->{NAME} = "$vendor $model";
+        $storage->{DESCRIPTION} = $type;
+        $storage->{TYPE} = 'disk';
+        $storage->{DISKSIZE} = $size;
+        $storage->{SERIALNUMBER} = $serial;
+
+        push @storages, $storage;
+    }
+    close $handle;
+
+    return @storages;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    foreach my $storage (_parseMfiutil(
+                logger => $params{logger},
+                command => 'mfiutil show drives')) {
+        $inventory->addEntry(section => 'STORAGES', entry => $storage);
+    }
+}
+
+1;

@@ -0,0 +1,76 @@
+package FusionInventory::Agent::Task::Inventory::BSD::Storages;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{storage};
+    return -r '/etc/fstab';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # get a list of devices from /etc/fstab
+    my @devices = _getDevicesFromFstab(logger => $logger);
+
+    # parse dmesg
+    my @lines = getAllLines(
+        command => 'dmesg'
+    );
+
+    foreach my $device (@devices) {
+
+        foreach my $line (@lines) {
+            if ($line =~ /^$device->{DESCRIPTION}.*<(.*)>/) {
+                $device->{MODEL} = $1;
+            }
+            if ($line =~ /^$device->{DESCRIPTION}.*\s+(\d+)\s*MB/) {
+                $device->{CAPACITY} = $1;
+            }
+        }
+
+        if ($device->{MODEL}) {
+            if ($device->{MODEL} =~ s/^(SGI|SONY|WDC|ASUS|LG|TEAC|SAMSUNG|PHILIPS|PIONEER|MAXTOR|PLEXTOR|SEAGATE|IBM|SUN|SGI|DEC|FUJITSU|TOSHIBA|YAMAHA|HITACHI|VERITAS)\s*//i) {
+                $device->{MANUFACTURER} = $1;
+            }
+
+            # clean up the model
+            $device->{MODEL} =~ s/^(\s|,)*//;
+            $device->{MODEL} =~ s/(\s|,)*$//;
+        }
+
+        $inventory->addEntry(
+            section => 'STORAGES',
+            entry   => $device
+        );
+    }
+}
+
+sub _getDevicesFromFstab {
+    my (%params) = (
+        file => '/etc/fstab',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my (@devices, %seen);
+    while (my $line = <$handle>) {
+        next unless $line =~ m{^/dev/(\S+)};
+        next if $seen{$1}++;
+        push @devices, { DESCRIPTION => $1 };
+    }
+    close $handle;
+
+    return @devices;
+}
+
+1;

@@ -0,0 +1,38 @@
+package FusionInventory::Agent::Task::Inventory::BSD::Uptime;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('sysctl');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $arch = getFirstLine(command => 'uname -m');
+    my $uptime = _getUptime(command => 'sysctl -n kern.boottime');
+    $inventory->setHardware({
+        DESCRIPTION => "$arch/$uptime"
+    });
+}
+
+sub _getUptime {
+    my $line = getFirstLine(@_);
+
+    # the output of 'sysctl -n kern.boottime' differs between BSD flavours
+    my $boottime =
+        $line =~ /^(\d+)/      ? $1 : # OpenBSD format
+        $line =~ /sec = (\d+)/ ? $1 : # FreeBSD format
+        undef;
+    return unless $boottime;
+
+    my $uptime = $boottime - time();
+    return getFormatedGMTTime($uptime);
+}
+
+1;

@@ -0,0 +1,48 @@
+package FusionInventory::Agent::Task::Inventory::BSD::i386;
+
+use strict;
+use warnings;
+
+use Config;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    return $Config{archname} =~ /^(i\d86|x86_64)/;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # sysctl infos
+    my $bios = {
+        SMODEL => getFirstLine(command => 'sysctl -n hw.model')
+    };
+    my $cpu = {
+        NAME  => getFirstLine(command => 'sysctl -n hw.machine'),
+        SPEED => (getCanonicalSpeed(split(/\s+/, $bios->{SMODEL})))[-1]
+    };
+    my $count = getFirstLine(command => 'sysctl -n hw.ncpu');
+
+    $inventory->setBios($bios);
+
+    # don't deal with CPUs if information can be computed from dmidecode
+    my $infos = getDmidecodeInfos(logger => $logger);
+    return if $infos->{4};
+
+    return if $params{no_category}->{cpu};
+
+    while ($count--) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+
+}
+
+1;

@@ -0,0 +1,51 @@
+package FusionInventory::Agent::Task::Inventory::BSD;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+
+our $runAfter = ["FusionInventory::Agent::Task::Inventory::Generic"];
+
+sub isEnabled {
+    return $OSNAME =~ /freebsd|openbsd|netbsd|gnukfreebsd|gnuknetbsd|dragonfly/;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    # basic operating system informations
+    my $kernelVersion = getFirstLine(command => 'uname -v');
+    my $kernelRelease = getFirstLine(command => 'uname -r');
+
+    my $boottime = getFirstMatch(
+        command => "sysctl -n kern.boottime",
+        pattern => qr/sec = (\d+)/
+    );
+
+    my $name = canRun('lsb_release') ?
+        getFirstMatch(
+            command => 'lsb_release -d',
+            pattern => qr/Description:\s+(.+)/
+        ) : $OSNAME;
+
+    $inventory->setHardware({
+        OSNAME     => $name,
+        OSVERSION  => $kernelRelease,
+        OSCOMMENTS => $kernelVersion,
+    });
+
+    $inventory->setOperatingSystem({
+        NAME           => $name,
+        FULL_NAME      => $OSNAME,
+        VERSION        => $kernelRelease,
+        KERNEL_VERSION => $kernelRelease,
+        BOOT_TIME      => getFormatedLocalTime($boottime)
+    });
+}
+
+1;

@@ -0,0 +1,27 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Arch;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+my $seen;
+
+sub isEnabled {
+    return canRun('arch');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $arch = getFirstLine( command => 'arch' );
+
+    $inventory->setOperatingSystem({
+        ARCH     => $arch
+    });
+
+}
+
+1;

@@ -0,0 +1,85 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Dmidecode::Battery;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{battery};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $battery = _getBattery(logger => $logger);
+
+    return unless $battery;
+
+    $inventory->addEntry(
+        section => 'BATTERIES',
+        entry   => $battery
+    );
+}
+
+sub _getBattery {
+    my $infos = getDmidecodeInfos(@_);
+
+    return unless $infos->{22};
+
+    my $info    = $infos->{22}->[0];
+
+    my $battery = {
+        NAME         => $info->{'Name'},
+        MANUFACTURER => $info->{'Manufacturer'},
+        SERIAL       => $info->{'Serial Number'} ||
+                        $info->{'SBDS Serial Number'},
+        CHEMISTRY    => $info->{'Chemistry'} ||
+                        $info->{'SBDS Chemistry'},
+    };
+
+    if      ($info->{'Manufacture Date'}) {
+        $battery->{DATE} = _parseDate($info->{'Manufacture Date'});
+    } elsif ($info->{'SBDS Manufacture Date'}) {
+        $battery->{DATE} = _parseDate($info->{'SBDS Manufacture Date'});
+    }
+
+    if ($info->{'Design Capacity'} &&
+        $info->{'Design Capacity'} =~ /(\d+) \s m[WA]h$/x) {
+        $battery->{CAPACITY} = $1;
+    }
+
+    if ($info->{'Design Voltage'} &&
+        $info->{'Design Voltage'} =~ /(\d+) \s mV$/x) {
+        $battery->{VOLTAGE} = $1;
+    }
+
+    return $battery;
+}
+
+sub _parseDate {
+    my ($string) = @_;
+
+    my ($day, $month, $year);
+    if ($string =~ /(\d{1,2}) [\/-] (\d{1,2}) [\/-] (\d{2})/x) {
+        $day   = $1;
+        $month = $2;
+        $year  = ($3 > 90 ? "19" : "20" ) . $3;
+        return "$day/$month/$year";
+    } elsif ($string =~ /(\d{4}) [\/-] (\d{1,2}) [\/-] (\d{1,2})/x) {
+        $year  = $1;
+        $day   = $2;
+        $month = $3;
+        return "$day/$month/$year";
+    }
+
+    return;
+}
+
+1;

@@ -0,0 +1,87 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Dmidecode::Bios;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my ($bios, $hardware) = _getBiosHardware(logger => $logger);
+
+    $inventory->setBios($bios) if $bios;
+    $inventory->setHardware($hardware) if $hardware;
+}
+
+sub _getBiosHardware {
+    my $infos = getDmidecodeInfos(@_);
+
+    my $bios_info    = $infos->{0}->[0];
+    my $system_info  = $infos->{1}->[0];
+    my $base_info    = $infos->{2}->[0];
+    my $chassis_info = $infos->{3}->[0];
+
+    my $bios = {
+        BMANUFACTURER => $bios_info->{'Vendor'},
+        BDATE         => $bios_info->{'Release Date'},
+        BVERSION      => $bios_info->{'Version'},
+        ASSETTAG      => $chassis_info->{'Asset Tag'}
+    };
+
+    $bios->{SMODEL} =
+        $system_info->{'Product'}      ||
+        $system_info->{'Product Name'};
+    $bios->{MMODEL} = $base_info->{'Product Name'};
+    $bios->{SKUNUMBER} = $system_info->{'SKU Number'};
+
+    $bios->{SMANUFACTURER} =
+        $system_info->{'Manufacturer'} ||
+        $system_info->{'Vendor'};
+    $bios->{MMANUFACTURER} = $base_info->{'Manufacturer'};
+
+    $bios->{SSN} = $system_info->{'Serial Number'};
+    $bios->{MSN} = $base_info->{'Serial Number'};
+
+    my $hardware = {
+        UUID => $system_info->{'UUID'},
+        CHASSIS_TYPE  => $chassis_info->{'Type'}
+    };
+
+    my $vmsystem;
+    if ($bios->{SMANUFACTURER} &&
+        $bios->{SMANUFACTURER} =~ /^Microsoft Corporation$/ &&
+        $bios->{SMODEL} &&
+        $bios->{SMODEL} =~ /Virtual Machine/) {
+        $vmsystem = 'Hyper-V';
+         $bios->{SMODEL} = 'Hyper-V';
+         $bios->{MMODEL} = 'Hyper-V';
+    } elsif ($bios->{BMANUFACTURER}) {
+        $vmsystem =
+            $bios->{BMANUFACTURER} =~ /(QEMU|Bochs)/         ? 'QEMU'       :
+            $bios->{BMANUFACTURER} =~ /(VirtualBox|innotek)/ ? 'VirtualBox' :
+            $bios->{BMANUFACTURER} =~ /^Xen/                 ? 'Xen'        :
+                                                               undef        ;
+    } elsif ($bios->{SMODEL}) {
+        $vmsystem =
+            $bios->{SMODEL} =~ /VMware/          ? 'VMWare'          :
+            $bios->{SMODEL} =~ /Virtual Machine/ ? 'Virtual Machine' :
+                                                    undef            ;
+    } elsif ($bios->{BVERSION}) {
+        $vmsystem =
+            $bios->{BVERSION} =~ /VirtualBox/ ? 'VirtualBox' : undef;
+    }
+    $hardware->{VMSYSTEM} = $vmsystem if $vmsystem;
+
+    return $bios, $hardware;
+}
+
+1;

@@ -0,0 +1,106 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Dmidecode::Memory;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{memory};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $memories = _getMemories(logger => $logger);
+
+    return unless $memories;
+
+    foreach my $memory (@$memories) {
+        $inventory->addEntry(
+            section => 'MEMORIES',
+            entry   => $memory
+        );
+    }
+}
+
+sub _getMemories {
+    my $infos = getDmidecodeInfos(@_);
+
+    my ($memories, $slot);
+
+    if ($infos->{17}) {
+
+        foreach my $info (@{$infos->{17}}) {
+            $slot++;
+
+            # Flash is 'in general' an unrelated internal BIOS storage
+            # See bug: #1334
+            next if $info->{'Type'} && $info->{'Type'} =~ /Flash/i;
+
+            my $manufacturer;
+            if (
+                $info->{'Manufacturer'}
+                    &&
+                ( $info->{'Manufacturer'} !~ /
+                  Manufacturer
+                      |
+                  Undefined
+                      |
+                  None
+                      |
+                  ^0x
+                      |
+                  00000
+                      |
+                  \sDIMM
+                  /ix )
+            ) {
+                $manufacturer = $info->{'Manufacturer'};
+            }
+
+            my $memory = {
+                NUMSLOTS         => $slot,
+                DESCRIPTION      => $info->{'Form Factor'},
+                CAPTION          => $info->{'Locator'},
+                SPEED            => $info->{'Speed'},
+                TYPE             => $info->{'Type'},
+                SERIALNUMBER     => $info->{'Serial Number'},
+                MEMORYCORRECTION => $infos->{16}[0]{'Error Correction Type'},
+                MANUFACTURER     => $manufacturer
+            };
+
+            if ($info->{'Size'} && $info->{'Size'} =~ /^(\d+) \s MB$/x) {
+                $memory->{CAPACITY} = $1;
+            }
+
+            push @$memories, $memory;
+        }
+    } elsif ($infos->{6}) {
+
+        foreach my $info (@{$infos->{6}}) {
+            $slot++;
+
+            my $memory = {
+                NUMSLOTS => $slot,
+                TYPE     => $info->{'Type'},
+            };
+
+            if ($info->{'Installed Size'} && $info->{'Installed Size'} =~ /^(\d+)\s*(MB|Mbyte)/x) {
+                $memory->{CAPACITY} = $1;
+            }
+
+            push @$memories, $memory;
+        }
+    }
+
+    return $memories;
+}
+
+1;

@@ -0,0 +1,53 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Dmidecode::Ports;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{port};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $ports = _getPorts(logger => $logger);
+
+    return unless $ports;
+
+    foreach my $port (@$ports) {
+        $inventory->addEntry(
+            section => 'PORTS',
+            entry   => $port
+        );
+    }
+}
+
+sub _getPorts {
+    my $infos = getDmidecodeInfos(@_);
+
+    return unless $infos->{8};
+
+    my $ports;
+    foreach my $info (@{$infos->{8}}) {
+        my $port = {
+            CAPTION     => $info->{'External Connector Type'},
+            DESCRIPTION => $info->{'Internal Connector Type'},
+            NAME        => $info->{'Internal Reference Designator'},
+            TYPE        => $info->{'Port Type'},
+        };
+
+        push @$ports, $port;
+    }
+
+    return $ports;
+}
+
+1;

@@ -0,0 +1,60 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Dmidecode::Slots;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+my %status = (
+    'Unknown'   => undef,
+    'In Use'    => 'used',
+    'Available' => 'free'
+);
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{slot};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $slots = _getSlots(logger => $logger);
+
+    return unless $slots;
+
+    foreach my $slot (@$slots) {
+        $inventory->addEntry(
+            section => 'SLOTS',
+            entry   => $slot
+        );
+    }
+}
+
+sub _getSlots {
+    my $infos = getDmidecodeInfos(@_);
+
+    return unless $infos->{9};
+
+    my $slots;
+    foreach my $info (@{$infos->{9}}) {
+        my $slot = {
+            DESCRIPTION => $info->{'Type'},
+            DESIGNATION => $info->{'ID'},
+            NAME        => $info->{'Designation'},
+            STATUS      => $info->{'Current Usage'} ?
+                $status{$info->{'Current Usage'}} : undef,
+        };
+
+        push @$slots, $slot;
+    }
+
+    return $slots;
+}
+
+1;

@@ -0,0 +1,25 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Dmidecode;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use UNIVERSAL::require;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+
+    # don't run dmidecode on Win2003
+    # http://forge.fusioninventory.org/issues/379
+    if ($OSNAME eq 'MSWin32') {
+        Win32->require();
+        return if Win32::GetOSName() eq 'Win2003';
+    }
+
+    return canRun('dmidecode');
+}
+
+sub doInventory {}
+
+1;

@@ -0,0 +1,60 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Domains;
+
+use strict;
+use warnings;
+
+use Sys::Hostname;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return -f "/etc/resolv.conf";
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # first, parse /etc/resolv.conf for the DNS servers,
+    # and the domain search list
+    my %dns_list;
+    my %search_list;
+    my $handle = getFileHandle(
+        file => '/etc/resolv.conf',
+        logger => $logger
+    );
+    if ($handle) {
+        while (my $line = <$handle>) {
+            if ($line =~ /^nameserver\s+(\S+)/) {
+                $dns_list{$1} = 1;
+            } elsif ($line =~ /^(domain|search)\s+(\S+)/) {
+                $search_list{$2} = 1;
+            }
+        }
+        close $handle;
+    }
+
+    my $dns = join('/', keys %dns_list);
+
+    # attempt to deduce the actual domain from the host name
+    # and fallback on the domain search list
+    my $domain;
+    my $hostname = hostname();
+    my $pos = index $hostname, '.';
+
+    if ($pos >= 0) {
+        $domain = substr($hostname, $pos + 1);
+    } else {
+        $domain = join('/', keys %search_list);
+    }
+
+    $inventory->setHardware({
+        WORKGROUP => $domain,
+        DNS       => $dns
+    });
+
+}
+
+1;

@@ -0,0 +1,35 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Environment;
+
+use English qw(-no_match_vars);
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return
+        # We use WMI for Windows because of charset issue
+        $OSNAME ne 'MSWin32' &&
+        !$params{no_category}->{environment};
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    foreach my $key (keys %ENV) {
+        $inventory->addEntry(
+            section => 'ENVS',
+            entry   => {
+                KEY => $key,
+                VAL => $ENV{$key}
+            }
+        );
+    }
+}
+
+1;

@@ -0,0 +1,28 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Hostname;
+
+use English qw(-no_match_vars);
+
+use strict;
+use warnings;
+
+use Sys::Hostname;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    # We use WMI for Windows because of charset issue
+    return $OSNAME ne 'MSWin32';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $hostname = hostname();
+    $hostname =~ s/\..*//; # keep just the hostname
+
+    $inventory->setHardware({NAME => $hostname});
+}
+
+1;

@@ -0,0 +1,88 @@
+#
+# OcsInventory agent - IPMI lan channel report
+#
+# Copyright (c) 2008 Jean Parpaillon <jean.parpaillon@kerlabs.com>
+#
+# The Intelligent Platform Management Interface (IPMI) specification
+# defines a set of common interfaces to a computer system which system
+# administrators can use to monitor system health and manage the
+# system. The IPMI consists of a main controller called the Baseboard
+# Management Controller (BMC) and other satellite controllers.
+#
+# The BMC can be fetched through client like OpenIPMI drivers or
+# through the network. Though, the BMC hold a proper MAC address.
+#
+# This module reports the MAC address and, if any, the IP
+# configuration of the BMC. This is reported as a standard NIC.
+#
+package FusionInventory::Agent::Task::Inventory::Generic::Ipmi;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Network;
+
+sub isEnabled {
+    return unless canRun('ipmitool');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getFileHandle(
+        logger => $logger,
+        command => "ipmitool lan print",
+    );
+
+    return unless $handle;
+
+    my $ipaddress;
+    my $ipgateway;
+    my $ipmask;
+    my $macaddr;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /^IP Address\s+:\s+($ip_address_pattern)/) {
+            $ipaddress = $1;
+        }
+        if ($line =~ /^Default Gateway IP\s+:\s+($ip_address_pattern)/) {
+            $ipgateway = $1;
+        }
+        if ($line =~ /^Subnet Mask\s+:\s+($ip_address_pattern)/) {
+            $ipmask = $1;
+        }
+        if ($line =~ /^MAC Address\s+:\s+($mac_address_pattern)/) {
+            $macaddr = $1;
+        }
+    }
+    close $handle;
+
+    return unless $ipaddress && $ipmask;
+
+    my $ipsubnet = getSubnetAddress($ipaddress, $ipmask);
+
+    my $status = "Down";
+    if ($ipaddress && ($ipaddress ne '0.0.0.0')) {
+        $status = "Up";
+    }
+
+    $inventory->addEntry(
+        section => 'NETWORKS',
+        entry   => {
+            DESCRIPTION => 'bmc',
+            IPADDRESS   => $ipaddress,
+            IPGATEWAY   => $ipgateway,
+            IPMASK      => $ipmask,
+            IPSUBNET    => $ipsubnet,
+            MACADDR     => $macaddr,
+            STATUS      => $status,
+            TYPE        => 'Ethernet'
+        }
+    );
+}
+
+1;

@@ -0,0 +1,92 @@
+package FusionInventory::Agent::Task::Inventory::Generic::PCI::Controllers;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{controller};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    foreach my $controller (_getControllers(
+        logger  => $params{logger},
+        datadir => $params{datadir}
+    )) {
+        $inventory->addEntry(
+            section => 'CONTROLLERS',
+            entry   => $controller
+        );
+    }
+}
+
+sub _getControllers {
+    my @controllers;
+
+    foreach my $device (getPCIDevices(@_)) {
+
+        next unless $device->{PCIID};
+
+        # duplicate entry to avoid modifying it directly
+        my $controller = {
+            PCICLASS     => $device->{PCICLASS},
+            NAME         => $device->{NAME},
+            MANUFACTURER => $device->{MANUFACTURER},
+            REV          => $device->{REV},
+            PCISLOT      => $device->{PCISLOT},
+        };
+        $controller->{DRIVER} = $device->{DRIVER}
+            if $device->{DRIVER};
+        $controller->{PCISUBSYSTEMID} = $device->{PCISUBSYSTEMID}
+            if $device->{PCISUBSYSTEMID};
+
+        my ($vendor_id, $device_id) = split (/:/, $device->{PCIID});
+        $controller->{VENDORID}  = $vendor_id;
+        $controller->{PRODUCTID} = $device_id;
+        my $subdevice_id = $device->{PCISUBSYSTEMID};
+
+        my $vendor = getPCIDeviceVendor(id => $vendor_id, @_);
+        if ($vendor) {
+            $controller->{MANUFACTURER} = $vendor->{name};
+
+            if ($vendor->{devices}->{$device_id}) {
+                my $entry = $vendor->{devices}->{$device_id};
+                $controller->{CAPTION} = $entry->{name};
+
+                $controller->{NAME} =
+                    $subdevice_id && $entry->{subdevices}->{$subdevice_id} ?
+
+                    $entry->{subdevices}->{$subdevice_id}->{name} :
+                    $entry->{name};
+            }
+        }
+
+        next unless $device->{PCICLASS};
+
+        $device->{PCICLASS} =~ /^(\S\S)(\S\S)$/x;
+        my $class_id = $1;
+        my $subclass_id = $2;
+
+        my $class = getPCIDeviceClass(id => $class_id, @_);
+        if ($class) {
+            $controller->{TYPE} =
+                $subclass_id && $class->{subclasses}->{$subclass_id} ?
+                    $class->{subclasses}->{$subclass_id}->{name} :
+                    $class->{name};
+        }
+
+        push @controllers, $controller;
+    }
+
+    return @controllers;
+}
+
+1;

@@ -0,0 +1,43 @@
+package FusionInventory::Agent::Task::Inventory::Generic::PCI::Modems;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{modem};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $modem (_getModems(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'MODEMS',
+            entry   => $modem
+        );
+    }
+}
+
+sub _getModems {
+    my @modems;
+
+    foreach my $device (getPCIDevices(@_)) {
+        next unless $device->{NAME} =~ /modem/i;
+        push @modems, {
+            DESCRIPTION => $device->{NAME},
+            NAME        => $device->{MANUFACTURER},
+        };
+    }
+
+    return @modems;
+}
+
+1;

@@ -0,0 +1,44 @@
+package FusionInventory::Agent::Task::Inventory::Generic::PCI::Sounds;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{sound};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $sound (_getSounds(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'SOUNDS',
+            entry   => $sound
+        );
+    }
+}
+
+sub _getSounds {
+    my @sounds;
+
+    foreach my $device (getPCIDevices(@_)) {
+        next unless $device->{NAME} =~ /audio/i;
+        push @sounds, {
+            NAME         => $device->{NAME},
+            MANUFACTURER => $device->{MANUFACTURER},
+            DESCRIPTION  => $device->{REV} && "rev $device->{REV}",
+        };
+    }
+
+    return @sounds;
+}
+
+1;

@@ -0,0 +1,47 @@
+package FusionInventory::Agent::Task::Inventory::Generic::PCI::Videos;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{video};
+    # both windows and linux have dedicated modules
+    return
+        $OSNAME ne 'MSWin32' &&
+        $OSNAME ne 'linux';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $video (_getVideos(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'VIDEOS',
+            entry   => $video
+        );
+    }
+}
+
+sub _getVideos {
+    my @videos;
+
+    foreach my $device (getPCIDevices(@_)) {
+        next unless $device->{NAME} =~ /graphics|vga|video|display/i;
+        push @videos, {
+            CHIPSET => $device->{NAME},
+            NAME    => $device->{MANUFACTURER},
+        };
+    }
+
+    return @videos;
+}
+
+1;

@@ -0,0 +1,14 @@
+package FusionInventory::Agent::Task::Inventory::Generic::PCI;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('lspci');
+}
+
+sub doInventory {}
+
+1;

@@ -0,0 +1,70 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Printers;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use UNIVERSAL::require;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return 0 if $params{no_category}->{printer};
+
+    # we use system profiler on MacOS
+    return 0 if $OSNAME eq 'darwin';
+
+    # we use WMI on Windows
+    return 0 if $OSNAME eq 'MSWin32';
+
+    Net::CUPS->require();
+    if ($EVAL_ERROR) {
+        $params{logger}->debug(
+            "Net::CUPS Perl module not available, unable to retrieve printers"
+        );
+        return 0;
+    }
+
+    if ($Net::CUPS::VERSION < 0.60) {
+        $params{logger}->debug(
+            "Net::CUPS Perl module too old " .
+            "(available: $Net::CUPS::VERSION, required: 0.60), ".
+            "unable to retrieve printers"
+        );
+        return 0;
+    }
+
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $cups = Net::CUPS->new();
+    my @printers = $cups->getDestinations();
+
+    foreach my $printer (@printers) {
+        my $uri = $printer->getUri();
+        my $name = $uri;
+        $name =~ s/^.*\/\/([^\.]*).*$/$1/eg ;
+        $name =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
+        $inventory->addEntry(
+            section => 'PRINTERS',
+            entry   => {
+                NAME        => $name,
+                PORT        => $uri,
+                DESCRIPTION => $printer->getDescription(),
+                DRIVER      => $printer->getOptionValue(
+                                   "printer-make-and-model"
+                               ),
+            }
+        );
+    }
+
+}
+
+1;

@@ -0,0 +1,34 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Processes;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return
+        $OSNAME ne 'MSWin32' &&
+        !$params{no_category}->{process} &&
+        canRun('ps');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $process (getProcesses(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'PROCESSES',
+            entry   => $process
+        );
+    }
+}
+
+1;

@@ -0,0 +1,28 @@
+package FusionInventory::Agent::Task::Inventory::Generic::SSH;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('ssh-keyscan');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $ssh_key = getFirstMatch(
+        command => 'ssh-keyscan 127.0.0.1',
+        pattern => qr/^[^#]\S+\s(ssh.*)/,
+        @_,
+    );
+
+    $inventory->setOperatingSystem({
+        SSH_KEY => $ssh_key
+    });
+}
+
+1;

@@ -0,0 +1,262 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Screen;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use MIME::Base64;
+use UNIVERSAL::require;
+
+use File::Find;
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{monitor};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+    my $datadir   = $params{datadir};
+
+    foreach my $screen (_getScreens(logger => $logger, datadir => $datadir)) {
+        $inventory->addEntry(
+            section => 'MONITORS',
+            entry   => $screen
+        );
+    }
+}
+
+sub _getEdidInfo {
+    my (%params) = @_;
+
+    Parse::EDID->require();
+    if ($EVAL_ERROR) {
+        $params{logger}->debug(
+            "Parse::EDID Perl module not available, unable to parse EDID data"
+        ) if $params{logger};
+        return;
+    }
+
+    my $edid = Parse::EDID::parse_edid($params{edid});
+    if (my $error = Parse::EDID::check_parsed_edid($edid)) {
+        $params{logger}->debug("bad edid: $error") if $params{logger};
+        return;
+    }
+
+    my $info = {
+        CAPTION      => $edid->{monitor_name},
+        DESCRIPTION  => $edid->{week} . "/" . $edid->{year},
+        MANUFACTURER => getEDIDVendor(
+                            id      => $edid->{manufacturer_name},
+                            datadir => $params{datadir}
+                        ) || $edid->{manufacturer_name}
+    };
+
+    # they are two different serial numbers in EDID
+    # - a mandatory 4 bytes numeric value
+    # - an optional 13 bytes ASCII value
+    # we use the ASCII value if present, the numeric value as an hex string
+    # unless for a few list of known exceptions deserving specific handling
+    # References:
+    # http://forge.fusioninventory.org/issues/1607
+    # http://forge.fusioninventory.org/issues/1614
+    if (
+        $edid->{EISA_ID} &&
+        $edid->{EISA_ID} =~ /^ACR(0018|0020|0024|00A8|7883|ad49|adaf)$/
+    ) {
+        $info->{SERIAL} =
+            substr($edid->{serial_number2}->[0], 0, 8) .
+            sprintf("%08x", $edid->{serial_number})    .
+            substr($edid->{serial_number2}->[0], 8, 4) ;
+    } elsif (
+        $edid->{EISA_ID} &&
+        $edid->{EISA_ID} eq 'GSM4b21'
+    ) {
+        # split serial in two parts
+        my ($high, $low) = $edid->{serial_number} =~ /(\d+) (\d\d\d)$/x;
+
+        # translate the first part using a custom alphabet
+        my @alphabet = split(//, "0123456789ABCDEFGHJKLMNPQRSTUVWXYZ");
+        my $base     = scalar @alphabet;
+
+        $info->{SERIAL} =
+            $alphabet[$high / $base] . $alphabet[$high % $base] .
+            $low;
+    } else {
+        $info->{SERIAL} = $edid->{serial_number2} ?
+            $edid->{serial_number2}->[0]           :
+            sprintf("%08x", $edid->{serial_number});
+    }
+
+    return $info;
+}
+
+sub _getScreensFromWindows {
+    my (%params) = @_;
+
+    FusionInventory::Agent::Tools::Win32->use();
+
+    my @screens;
+
+    # Vista and upper, able to get the second screen
+    foreach my $object (getWMIObjects(
+        moniker    => 'winmgmts:{impersonationLevel=impersonate,authenticationLevel=Pkt}!//./root/wmi',
+        class      => 'WMIMonitorID',
+        properties => [ qw/InstanceName/ ]
+    )) {
+        next unless $object->{InstanceName};
+
+        $object->{InstanceName} =~ s/_\d+//;
+        push @screens, {
+            id => $object->{InstanceName}
+        };
+    }
+
+    # The generic Win32_DesktopMonitor class, the second screen will be missing
+    foreach my $object (getWMIObjects(
+        class => 'Win32_DesktopMonitor',
+        properties => [ qw/
+            Caption MonitorManufacturer MonitorType PNPDeviceID Availability
+        / ]
+    )) {
+        next unless $object->{Availability};
+        next unless $object->{PNPDeviceID};
+        next unless $object->{Availability} == 3;
+
+        push @screens, {
+            id           => $object->{PNPDeviceID},
+            NAME         => $object->{Caption},
+            TYPE         => $object->{MonitorType},
+            MANUFACTURER => $object->{MonitorManufacturer},
+            CAPTION      => $object->{Caption}
+        };
+    }
+
+    foreach my $screen (@screens) {
+        next unless $screen->{id};
+        $screen->{edid} = getRegistryValue(
+            path => "HKEY_LOCAL_MACHINE/SYSTEM/CurrentControlSet/Enum/$screen->{id}/Device Parameters/EDID",
+            logger => $params{logger}
+        ) || '';
+        $screen->{edid} =~ s/^\s+$//;
+        delete $screen->{id};
+    }
+
+    return @screens;
+}
+
+sub _getScreensFromUnix {
+    my (%params) = @_;
+
+    my $logger = $params{logger};
+    $logger->debug("retrieving EDID data:");
+
+    if (-d '/sys/devices') {
+        my @screens;
+        my $wanted = sub {
+            return unless $_ eq 'edid';
+            return unless -e $File::Find::name;
+            my $edid = getAllLines(file => $File::Find::name);
+            push @screens, { edid => $edid } if $edid;
+        };
+
+        no warnings 'File::Find';
+        File::Find::find($wanted, '/sys/devices');
+
+        $logger->debug_result(
+            action => 'reading /sys/devices content',
+            data   => scalar @screens
+        );
+
+        return @screens if @screens;
+    } else {
+        $logger->debug_result(
+            action => 'reading /sys/devices content',
+            status => 'directory not available'
+        );
+    }
+
+    if (canRun('monitor-get-edid-using-vbe')) {
+        my $edid = getAllLines(command => 'monitor-get-edid-using-vbe');
+        $logger->debug_result(
+            action => 'running monitor-get-edid-using-vbe command',
+            data   => $edid
+        );
+        return { edid => $edid } if $edid;
+    } else {
+        $logger->debug_result(
+            action => 'running monitor-get-edid-using-vbe command',
+            status => 'command not available'
+        );
+    }
+
+    if (canRun('monitor-get-edid')) {
+        my $edid = getAllLines(command => 'monitor-get-edid');
+        $logger->debug_result(
+            action => 'running monitor-get-edid command',
+            data   => $edid
+        );
+        return { edid => $edid } if $edid;
+    } else {
+        $logger->debug_result(
+            action => 'running monitor-get-edid command',
+            status => 'command not available'
+        );
+    }
+
+    if (canRun('get-edid')) {
+        my $edid;
+        foreach (1..5) { # Sometime get-edid return an empty string...
+            $edid = getFirstLine(command => 'get-edid');
+            last if $edid;
+        }
+        $logger->debug_result(
+            action => 'running get-edid command',
+            data   => $edid
+        );
+        return { edid => $edid } if $edid;
+    } else {
+        $logger->debug_result(
+            action => 'running get-edid command',
+            status => 'command not available'
+        );
+    }
+
+    return;
+}
+
+sub _getScreens {
+    my (%params) = @_;
+
+    my @screens = $OSNAME eq 'MSWin32' ?
+        _getScreensFromWindows(%params) :
+        _getScreensFromUnix(%params);
+
+    foreach my $screen (@screens) {
+        next unless $screen->{edid};
+
+        my $info = _getEdidInfo(
+            edid    => $screen->{edid},
+            logger  => $params{logger},
+            datadir => $params{datadir},
+        );
+        $screen->{CAPTION}      = $info->{CAPTION};
+        $screen->{DESCRIPTION}  = $info->{DESCRIPTION};
+        $screen->{MANUFACTURER} = $info->{MANUFACTURER};
+        $screen->{SERIAL}       = $info->{SERIAL};
+
+        $screen->{BASE64} = encode_base64($screen->{edid});
+
+        delete $screen->{edid};
+    }
+
+    return @screens;
+}
+
+1;

@@ -0,0 +1,72 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Softwares::Deb;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('dpkg-query');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $command =
+        'dpkg-query --show --showformat=\'' .
+        '${Package}\t' .
+        '${Architecture}\t' .
+        '${Version}\t'.
+        '${Installed-Size}\n' .
+        '\'';
+
+    my $packages = _getPackagesList(
+        logger => $logger, command => $command
+    );
+    return unless $packages;
+
+    # mimic RPM inventory behaviour, as GLPI aggregates software
+    # based on name and publisher
+    my $publisher = getFirstMatch(
+        logger  => $logger,
+        pattern => qr/^Distributor ID:\s(.+)/,
+        command => 'lsb_release -i',
+    );
+
+    foreach my $package (@$packages) {
+        $package->{PUBLISHER} = $publisher;
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => $package
+        );
+    }
+}
+
+sub _getPackagesList {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @packages;
+    while (my $line = <$handle>) {
+        # skip descriptions
+        next if $line =~ /^ /;
+        chomp $line;
+        my @infos = split("\t", $line);
+        push @packages, {
+            NAME        => $infos[0],
+            ARCH        => $infos[1],
+            VERSION     => $infos[2],
+            FILESIZE    => $infos[3],
+            COMMENTS    => $infos[4],
+            FROM        => 'deb'
+        };
+    }
+    close $handle;
+
+    return \@packages;
+}
+
+1;

@@ -0,0 +1,64 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Softwares::Gentoo;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('equery');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $command = _equeryNeedsWildcard() ?
+        "equery list -i '*'" : "equery list -i";
+
+    my $packages = _getPackagesList(
+        logger => $logger, command => $command
+    );
+
+    foreach my $package (@$packages) {
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => $package
+        );
+    }
+}
+
+sub _getPackagesList {
+    my $handle = getFileHandle(@_);
+
+    my @packages;
+    while (my $line = <$handle>) {
+        chomp $line;
+        next unless $line =~ /^(.*)-([0-9]+.*)/;
+        push @packages, {
+            NAME    => $1,
+            VERSION => $2,
+        };
+    }
+    close $handle;
+
+    return \@packages;
+}
+
+# http://forge.fusioninventory.org/issues/852
+sub _equeryNeedsWildcard {
+    my ($major, $minor) = getFirstMatch(
+        command => 'equery -V',
+        pattern => qr/^equery ?\((\d+)\.(\d+)\.\d+\)/,
+        @_
+    );
+
+    # true starting from version 0.3
+    return compareVersion($major, $minor, 0, 3);
+}
+
+1;

@@ -0,0 +1,40 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Softwares::Pacman;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('pacman');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getFileHandle(
+        logger  => $logger,
+        command => 'pacman -Q'
+    );
+    return unless $handle;
+
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(\S+)\s+(\S+)/;
+        my $name = $1;
+        my $version = $2;
+
+       $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => {
+                NAME    => $name,
+                VERSION => $version
+            }
+        );
+    }
+    close $handle;
+}
+
+1;

@@ -0,0 +1,70 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Softwares::RPM;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('rpm');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $command =
+        'rpm -qa --queryformat \'' .
+        '%{NAME}\t' .
+        '%{ARCH}\t' .
+        '%{VERSION}-%{RELEASE}\t' .
+        '%{INSTALLTIME:date}\t' .
+        '%{SIZE}\t' .
+        '%{VENDOR}\t' .
+        '%{SUMMARY}\n' .
+        '\'';
+
+    my $packages = _getPackagesList(
+        logger => $logger, command => $command
+    );
+    return unless $packages;
+
+    foreach my $package (@$packages) {
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => $package
+        );
+    }
+}
+
+sub _getPackagesList {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @packages;
+    while (my $line = <$handle>) {
+        chomp $line;
+        my @infos = split("\t", $line);
+        my $package = {
+            NAME        => $infos[0],
+            ARCH        => $infos[1],
+            VERSION     => $infos[2],
+            INSTALLDATE => $infos[3],
+            FILESIZE    => $infos[4],
+            COMMENTS    => $infos[6],
+            FROM        => 'rpm'
+        };
+
+        $package->{PUBLISHER} = $infos[5] if $infos[5] ne '(none)';
+
+        push @packages, $package;
+    }
+
+    close $handle;
+
+    return \@packages;
+}
+
+1;

@@ -0,0 +1,39 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Softwares::Slackware;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('pkgtool');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getDirectoryHandle(
+        directory => '/var/log/packages', logger => $logger
+    );
+    return unless $handle;
+
+    while (my $file = readdir($handle)) {
+        next unless $file =~ /^(.+)([^-]+-[^-]+-[^-]+)$/;
+        my $name = $1;
+        my $version = $2;
+
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => {
+                NAME    => $name,
+                VERSION => $version
+            }
+        );
+    }
+    closedir $handle;
+}
+
+1;

@@ -0,0 +1,14 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Softwares;
+
+use strict;
+use warnings;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return !$params{no_category}->{software};
+}
+
+sub doInventory {}
+
+1;

@@ -0,0 +1,178 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Storages::3ware;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+
+use English qw(-no_match_vars);
+
+# Tested on 2.6.* kernels
+#
+# Cards tested :
+#
+# 8006-2LP
+# 9500S-4LP
+# 9550SXU-4LP
+# 9550SXU-8LP
+# 9650SE-2LP
+# 9650SE-4LPML
+# 9650SE-8LPML
+#
+# AMCC/3ware CLI (version 2.00.0X.XXX)
+
+sub isEnabled {
+    return canRun('tw_cli');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @devices;
+
+    foreach my $card (_getCards()) {
+        foreach my $unit (_getUnits($card)) {
+
+            # Try do get unit's serial in order to compare it to what was found
+            # in udev db.
+            # Works only on newer cards.
+            # Allow us to associate a node to a drive : sda -> WD-WMANS1648590
+            my $sn = getFirstMatch(
+                logger => $logger,
+                command => "tw_cli info $card->{id} $unit->{id} serial",
+                pattern => qr/serial number\s=\s(\w+)/
+            );
+
+            foreach my $port (_getPorts($card, $unit)) {
+                # Finally, getting drives' values.
+                my $storage = _getStorage($card, $port);
+
+                if ($OSNAME eq 'Linux') {
+
+                    @devices = getDevicesFromUdev(logger => $logger) unless @devices;
+
+                    foreach my $device (@devices) {
+# How does this work with multiple older cards
+# where serial for units is not implemented ?
+# Need to be tested on a system with multiple
+# 3ware cards.
+                        if (
+                                $device->{SERIALNUMBER} eq 'AMCC_' . $sn ||
+                                $device->{MODEL} eq 'Logical_Disk_' . $unit->{index}
+                           ) {
+                            $storage->{NAME} = $device->{NAME};
+                        }
+                    }
+                }
+
+                $inventory->addEntry(section => 'STORAGES', entry => $storage);
+            }
+        }
+    }
+}
+
+
+sub _getCards {
+    my ($file) = @_;
+
+    my $handle = getFileHandle(
+        file => $file,
+        command => "tw_cli info"
+    );
+    return unless $handle;
+
+    my @cards;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(c\d+)\s+([\w-]+)/;
+        push @cards, { id => $1, model => $2 };
+    }
+    close $handle;
+
+    return @cards;
+}
+
+sub _getUnits {
+    my ($card, $file) = @_;
+
+    my $handle = getFileHandle(
+        file => $file,
+        command => "tw_cli info $card->{id}"
+    );
+    return unless $handle;
+
+    my @units;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(u(\d+))/;
+        push @units, { id => $1, index => $2 };
+    }
+    close $handle;
+
+    return @units;
+}
+
+sub _getPorts {
+    my ($card, $unit, $file) = @_;
+
+    my $handle = getFileHandle(
+        file => $file,
+        command => "tw_cli info $card->{id} $unit->{id}"
+    );
+    return unless $handle;
+
+    my @ports;
+    while (my $line = <$handle>) {
+        next unless $line =~ /(p\d+)/;
+        push @ports, { id => $1 };
+    }
+    close $handle;
+
+    return @ports;
+}
+
+sub _getStorage {
+    my ($card, $port, $file) = @_;
+
+    my $handle = getFileHandle(
+        file => $file,
+        command =>
+            "tw_cli info $card->{id} $port->{id} model serial capacity firmware"
+    );
+    return unless $handle;
+
+    my $storage;
+    while (my $line = <$handle>) {
+        if ($line =~ /Model\s=\s(.*)/) {
+            $storage->{MODEL} = $1;
+        } elsif ($line =~ /Serial\s=\s(.*)/) {
+            $storage->{SERIALNUMBER} = $1;
+        } elsif ($line =~ /Capacity\s=\s(\S+)\sGB.*/) {
+            $storage->{DISKSIZE} = 1024 * $1;
+        } elsif ($line =~ /Firmware Version\s=\s(.*)/) {
+            $storage->{FIRMWARE} = $1
+        }
+    }
+    close $handle;
+
+    $storage->{MANUFACTURER} = getCanonicalManufacturer(
+        $storage->{MODEL}
+    );
+    $storage->{TYPE} = 'disk';
+
+    # Getting description from card model, very basic
+    # and unreliable
+    # Assuming only IDE drives can be plugged in
+    # 5xxx/6xxx cards and
+    # SATA drives only to 7xxx/8xxx/9xxxx cards
+    $storage->{DESCRIPTION} =
+        $card->{model} =~ /^[56]/  ? 'IDE'  :
+        $card->{model} =~ /^[789]/ ? 'SATA' :
+        undef;
+
+    return $storage;
+}
+
+1;

@@ -0,0 +1,147 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Storages::HP;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use UNIVERSAL::require;
+
+use FusionInventory::Agent::Tools;
+# Tested on 2.6.* kernels
+#
+# Cards tested :
+#
+# Smart Array E200
+#
+# HP Array Configuration Utility CLI 7.85-18.0
+
+sub _getHpacuacliFromWinRegistry {
+
+    my $Registry;
+    Win32::TieRegistry->require();
+    Win32::TieRegistry->import(
+        Delimiter   => '/',
+        ArrayValues => 0,
+        TiedRef     => \$Registry,
+    );
+
+    my $machKey = $Registry->Open('LMachine', {
+        Access => Win32::TieRegistry::KEY_READ(),
+    }) or die "Can't open HKEY_LOCAL_MACHINE key: $EXTENDED_OS_ERROR";
+
+    my $uninstallValues =
+        $machKey->{'SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall/HP ACUCLI'};
+    return unless $uninstallValues;
+
+    my $uninstallString = $uninstallValues->{'/UninstallString'};
+    return unless $uninstallString;
+
+    return unless $uninstallString =~ /(.*\\)hpuninst\.exe/;
+    my $hpacuacliPath = $1 . 'bin\\hpacucli.exe';
+    return unless -f $hpacuacliPath;
+
+    return $hpacuacliPath;
+}
+
+sub isEnabled {
+    return
+        canRun('hpacucli') ||
+        ($OSNAME eq 'MSWin32' && _getHpacuacliFromWinRegistry());
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $path = canRun('hpacucli') ?
+        "hpacucli":
+        _getHpacuacliFromWinRegistry($logger);
+
+    foreach my $slot (_getSlots(path => $path)) {
+        foreach my $drive (_getDrives(path => $path, slot => $slot)) {
+
+            $inventory->addEntry(
+                section => 'STORAGES',
+                entry   => _getStorage(
+                    path => $path, slot => $slot, drive => $drive
+                )
+            );
+        }
+    }
+}
+
+sub _getSlots {
+    my %params = @_;
+
+    my $command = $params{path} ?
+        "$params{path} ctrl all show" : undef;
+    my $handle  = getFileHandle(%params, command => $command);
+    return unless $handle;
+
+    my @slots;
+    while (my $line = <$handle>) {
+        next unless $line =~ /Slot (\d+)/;
+        push @slots, $1;
+    }
+    close $handle;
+
+    return @slots;
+}
+
+sub _getDrives {
+    my %params = @_;
+
+    my $command = $params{path} && defined $params{slot} ?
+        "$params{path} ctrl slot=$params{slot} pd all show" : undef;
+    my $handle  = getFileHandle(%params, command => $command);
+    next unless $handle;
+
+    my @drives;
+    while (my $line = <$handle>) {
+        next unless $line =~ /physicaldrive (\S+)/;
+        push @drives, $1;
+    }
+    close $handle;
+
+    return @drives;
+}
+
+sub _getStorage {
+    my %params = @_;
+
+    my $command = $params{path} && defined $params{slot} && defined $params{drive} ?
+        "$params{path} ctrl slot=$params{slot} pd $params{drive} show" : undef;
+    my $handle  = getFileHandle(%params, command => $command);
+    next unless $handle;
+
+    my %data;
+    while (my $line = <$handle>) {
+        next unless $line =~ /(\S[^:]+) : \s+ (.+)/x;
+        $data{$1} = $2;
+    }
+    close $handle;
+
+    my $storage = {
+        DESCRIPTION  => $data{'Interface Type'},
+        SERIALNUMBER => $data{'Serial Number'},
+        FIRMWARE     => $data{'Firmware Revision'}
+    };
+
+    my $model = $data{'Model'};
+    $model =~ s/^ATA\s+//; # ex: ATA     WDC WD740ADFD-00
+    $model =~ s/\s+/ /;
+    $storage->{NAME}  = $model;
+    $storage->{MODEL} = $model;
+
+    $storage->{MANUFACTURER} = getCanonicalManufacturer($model);
+    $storage->{DISKSIZE} = getCanonicalSize($data{'Size'});
+
+    $storage->{TYPE} = $data{'Drive Type'} eq 'Data Drive' ?
+        'disk' : $data{'Drive Type'};
+
+    return $storage;
+}
+
+1;

@@ -0,0 +1,14 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Storages;
+
+use strict;
+use warnings;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{storage};
+    return 1;
+}
+
+sub doInventory {}
+
+1;

@@ -0,0 +1,96 @@
+package FusionInventory::Agent::Task::Inventory::Generic::USB;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{usb};
+    return canRun('lsusb');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    foreach my $device (_getDevices(
+        logger  => $params{logger},
+        datadir => $params{datadir})
+    ) {
+        $inventory->addEntry(
+            section => 'USBDEVICES',
+            entry   => $device,
+        );
+    }
+}
+
+sub _getDevices {
+    my @devices;
+
+    foreach my $device (_getDevicesFromLsusb(@_)) {
+        next unless $device->{PRODUCTID};
+        next unless $device->{VENDORID};
+
+        # ignore the USB Hub
+        next if
+            $device->{PRODUCTID} eq "0001" ||
+            $device->{PRODUCTID} eq "0002" ;
+
+        if (defined($device->{SERIAL}) && length($device->{SERIAL}) < 5) {
+            $device->{SERIAL} = undef;
+        }
+
+        my $vendor = getUSBDeviceVendor(id => $device->{VENDORID}, @_);
+        if ($vendor) {
+            $device->{MANUFACTURER} = $vendor->{name};
+
+            my $entry = $vendor->{devices}->{$device->{PRODUCTID}};
+            if ($entry) {
+                $device->{CAPTION} = $entry->{name};
+            }
+        }
+
+        push @devices, $device;
+    }
+
+    return @devices;
+}
+
+sub _getDevicesFromLsusb {
+    my $handle = getFileHandle(
+        @_,
+        command => 'lsusb -v',
+    );
+
+    return unless $handle;
+
+    my @devices;
+    my $device;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /^$/) {
+            push @devices, $device if $device;
+            undef $device;
+        } elsif ($line =~ /^\s*idVendor\s*0x(\w+)/i) {
+            $device->{VENDORID} = $1;
+        } elsif ($line =~ /^\s*idProduct\s*0x(\w+)/i) {
+            $device->{PRODUCTID} = $1;
+        } elsif ($line =~ /^\s*iSerial\s*\d+\s(\w+)/i) {
+            $device->{SERIAL} = $1;
+        } elsif ($line =~ /^\s*bInterfaceClass\s*(\d+)/i) {
+            $device->{CLASS} = $1;
+        } elsif ($line =~ /^\s*bInterfaceSubClass\s*(\d+)/i) {
+            $device->{SUBCLASS} = $1;
+        }
+    }
+    close $handle;
+    push @devices, $device if $device;
+
+    return @devices;
+}
+
+1;

@@ -0,0 +1,165 @@
+package FusionInventory::Agent::Task::Inventory::Generic::Users;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return if $params{no_category}->{user};
+
+    return
+        canRun('who')  ||
+        canRun('last') ||
+        -r '/etc/passwd';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my %users;
+
+    if (!$params{no_category}->{local_user}) {
+        foreach my $user (_getLocalUsers(logger => $logger)) {
+            # record user -> primary group relationship
+            push @{$users{$user->{gid}}}, $user->{LOGIN};
+            delete $user->{gid};
+
+            $inventory->addEntry(
+                section => 'LOCAL_USERS',
+                entry   => $user
+            );
+        }
+    }
+
+    if (!$params{no_category}->{local_group}) {
+        foreach my $group (_getLocalGroups(logger => $logger)) {
+            # add users having this group as primary group, if any
+            push @{$group->{MEMBER}}, @{$users{$group->{ID}}}
+                if $users{$group->{ID}};
+
+            $inventory->addEntry(
+                section => 'LOCAL_GROUPS',
+                entry   => $group
+            );
+        }
+    }
+
+    foreach my $user (_getLoggedUsers(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'USERS',
+            entry   => $user
+        );
+    }
+
+    my $last = _getLastUser(logger => $logger);
+    $inventory->setHardware($last);
+}
+
+sub _getLocalUsers {
+    my (%params) = (
+        file => '/etc/passwd',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @users;
+
+    while (my $line = <$handle>) {
+        next if $line =~ /^#/;
+        next if $line =~ /^[+-]/; # old format for external inclusion, see #2460
+        my ($login, undef, $uid, $gid, $gecos, $home, $shell) =
+            split(/:/, $line);
+
+        push @users, {
+            LOGIN => $login,
+            ID    => $uid,
+            gid   => $gid,
+            NAME  => $gecos,
+            HOME  => $home,
+            SHELL => $shell
+        };
+    }
+    close $handle;
+
+    return @users;
+}
+
+sub _getLocalGroups {
+    my (%params) = (
+        file => '/etc/group',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @groups;
+
+    while (my $line = <$handle>) {
+        next if $line =~ /^#/;
+        chomp $line;
+        my ($name, undef, $gid, $members) = split(/:/, $line);
+
+        # prevent warning for malformed group file (#2384)
+        next unless $members;
+        my @members = split(/,/, $members);
+
+        push @groups, {
+            ID     => $gid,
+            NAME   => $name,
+            MEMBER => \@members,
+        };
+    }
+    close $handle;
+
+    return @groups;
+}
+
+sub _getLoggedUsers {
+    my (%params) = (
+        command => 'who',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @users;
+    my $seen;
+
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(\S+)/;
+        next if $seen->{$1}++;
+        push @users, { LOGIN => $1 };
+    }
+    close $handle;
+
+    return @users;
+}
+
+sub _getLastUser {
+    my (%params) = (
+        command => 'last',
+        @_
+    );
+
+    my $last = getFirstLine(%params);
+    return unless $last;
+    return unless
+        $last =~ /^(\S+) \s+ \S+ \s+ \S+ \s+ (\S+ \s+ \S+ \s+ \S+ \s+ \S+)/x;
+
+    return {
+        LASTLOGGEDUSER     => $1,
+        DATELASTLOGGEDUSER => $2
+    };
+}
+
+1;

@@ -0,0 +1,25 @@
+package FusionInventory::Agent::Task::Inventory::Generic;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use Net::Domain qw(hostfqdn hostdomain);
+
+sub isEnabled {
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    $inventory->setOperatingSystem({
+            KERNEL_NAME => $OSNAME,
+            FQDN => hostfqdn(),
+            DNS_DOMAIN => hostdomain()
+    });
+}
+
+1;

@@ -0,0 +1,57 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Bios;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::HPUX;
+
+sub isEnabled {
+    return canRun('model');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $model = getFirstLine(command => 'model');
+
+    my ($version, $serial, $uuid);
+    if (canRun('/usr/contrib/bin/machinfo')) {
+        my $info = getInfoFromMachinfo(logger => $logger);
+        $version = $info->{'Firmware info'}->{'firmware revision'};
+        $serial  = $info->{'Platform info'}->{'machine serial number'};
+        $uuid    = uc($info->{'Platform info'}->{'machine id number'});
+    } else {
+        my $handle = getFileHandle(
+            command => "echo 'sc product cpu;il' | /usr/sbin/cstm",
+            logger  => $logger
+        );
+        while (my $line = <$handle>) {
+            next unless $line =~ /PDC Firmware/;
+            next unless $line =~ /Revision:\s+(\S+)/;
+            $version = "PDC $1";
+        }
+        close $handle;
+
+        $serial = getFirstMatch(
+            command => "echo 'sc product system;il' | /usr/sbin/cstm",
+            pattern => qr/^System Serial Number:\s+: (\S+)/
+        );
+    }
+
+    $inventory->setBios({
+        BVERSION      => $version,
+        BMANUFACTURER => "HP",
+        SMANUFACTURER => "HP",
+        SMODEL        => $model,
+        SSN           => $serial,
+    });
+    $inventory->setHardware({
+        UUID => $uuid
+    });
+}
+
+1;

@@ -0,0 +1,212 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::CPU;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::HPUX;
+
+sub isEnabled  {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # http://forge.fusioninventory.org/issues/755
+    if (canRun('/opt/propplus/bin/cprop') && !isHPVMGuest()) {
+        foreach my $cpu (_parseCprop(
+            command => '/opt/propplus/bin/cprop -summary -c Processors',
+            logger  => $logger
+        )) {
+            $inventory->addEntry(
+                section => 'CPUS',
+                entry   => $cpu
+            );
+        }
+        return;
+    }
+
+    my $CPUinfo;
+    if (canRun('/usr/contrib/bin/machinfo')) {
+        $CPUinfo = _parseMachinInfo(
+            command => '/usr/contrib/bin/machinfo',
+            logger  => $logger
+        );
+    } else {
+        # old HpUX without machinfo
+        my %cpuInfos = (
+            "D200" => { TYPE => "7100LC", SPEED => 75  },
+            "D210" => { TYPE => "7100LC", SPEED => 100 },
+            "D220" => { TYPE => "7300LC", SPEED => 132 },
+            "D230" => { TYPE => "7300LC", SPEED => 160 },
+            "D250" => { TYPE => "7200",   SPEED => 100 },
+            "D260" => { TYPE => "7200",   SPEED => 120 },
+            "D270" => { TYPE => "8000",   SPEED => 160 },
+            "D280" => { TYPE => "8000",   SPEED => 180 },
+            "D310" => { TYPE => "7100LC", SPEED => 100 },
+            "D320" => { TYPE => "7300LC", SPEED => 132 },
+            "D330" => { TYPE => "7300LC", SPEED => 160 },
+            "D350" => { TYPE => "7200",   SPEED => 100 },
+            "D360" => { TYPE => "7200",   SPEED => 120 },
+            "D370" => { TYPE => "8000",   SPEED => 160 },
+            "D380" => { TYPE => "8000",   SPEED => 180 },
+            "D390" => { TYPE => "8200",   SPEED => 240 },
+            "K360" => { TYPE => "8000",   SPEED => 180 },
+            "K370" => { TYPE => "8200",   SPEED => 200 },
+            "K380" => { TYPE => "8200",   SPEED => 240 },
+            "K400" => { TYPE => "7200",   SPEED => 140 },
+            "K410" => { TYPE => "7200",   SPEED => 120 },
+            "K420" => { TYPE => "7200",   SPEED => 120 },
+            "K460" => { TYPE => "8000",   SPEED => 180 },
+            "K570" => { TYPE => "8200",   SPEED => 200 },
+            "K580" => { TYPE => "8200",   SPEED => 240 },
+            "L1000-36" => { TYPE => "8500", SPEED => 360 },
+            "L1500-7x" => { TYPE => "8700", SPEED => 750 },
+            "L3000-7x" => { TYPE => "8700", SPEED => 750 },
+            "N4000-44" => { TYPE => "8500", SPEED => 440 },
+            "ia64 hp server rx1620" => { TYPE => "itanium", SPEED => 1600 }
+        );
+
+        my $device = getFirstLine(command => 'model |cut -f 3- -d/');
+        if ($cpuInfos{$device}) {
+            $CPUinfo = $cpuInfos{$device};
+        } else {
+            $CPUinfo->{TYPE} = getFirstMatch(
+                command => "echo 'sc product cpu;il' | /usr/sbin/cstm",
+                logger  => $logger,
+                pattern => qr/(\S+)\s+CPU\s+Module/,
+            );
+            $CPUinfo->{SPEED} = getFirstMatch(
+                command => "echo 'itick_per_usec/D' | adb -k /stand/vmunix /dev/kmem",
+                logger  => $logger,
+                pattern => qr/tick_per_usec:\s+(\d+)/
+            );
+        }
+        # NBR CPU
+        $CPUinfo->{CPUcount} = getLinesCount(
+            command => 'ioscan -Fk -C processor'
+        );
+    }
+
+    my $serie = getFirstLine(command => 'uname -m');
+    if ( $CPUinfo->{TYPE} eq 'unknow' and $serie =~ /ia64/) {
+        $CPUinfo->{TYPE} = "Itanium"
+    }
+    if ( $serie =~ /9000/) {
+        $CPUinfo->{TYPE} = "PA" . $CPUinfo->{TYPE};
+    }
+
+    foreach ( 1..$CPUinfo->{CPUcount} ) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $CPUinfo
+        );
+    }
+}
+
+sub _parseMachinInfo {
+    my $info = getInfoFromMachinfo(@_);
+    return unless $info;
+
+    my $result;
+    my $cpu_info = $info->{'CPU info'};
+    if (ref $cpu_info eq 'HASH') {
+        # HPUX 11.23
+        $result->{CPUcount} = $cpu_info->{'number of cpus'};
+
+        if ($cpu_info->{'clock speed'} =~ /(\d+) MHz/) {
+            $result->{SPEED} = $1;
+        }
+
+        if ($cpu_info->{'processor model'} =~ /Intel/) {
+            $result->{MANUFACTURER} = 'Intel';
+        }
+
+        if ($cpu_info->{'processor model'} =~ /Itanium/) {
+            $result->{NAME} = 'Itanium';
+        }
+    } else {
+        # HPUX 11.31
+        if ($cpu_info =~ /^(\d+) /) {
+            $result->{CPUcount} = $1;
+        }
+        if ($cpu_info =~ /([\d.]+) GHz/) {
+            $result->{SPEED} = $1 * 1000;
+        }
+        if ($cpu_info =~ /Intel/) {
+            $result->{MANUFACTURER} = 'Intel';
+        }
+        if ($cpu_info =~ /Itanium/) {
+            $result->{NAME} = 'Itanium';
+        }
+        if ($cpu_info =~ /(\d+) logical processors/ ) {
+            $result->{CORE} = $1 / $result->{CPUcount};
+        }
+    }
+
+    return $result;
+}
+
+sub _parseCprop {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @cpus;
+    my $instance;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /^\[Instance\]: \d+/) {
+            # new block
+            $instance = {};
+            next;
+        }
+
+        if ($line =~ /^ \s+ \[ ([^\]]+) \]: \s (.+)/x) {
+            $instance->{$1} = $2;
+            next;
+        }
+
+        if ($line =~ /^\*+/) {
+            next unless keys %$instance;
+
+            my $name = $instance->{'Processor Type'} =~ /Itanium/ ?
+                'Itanium' : undef;
+            my $manufacturer = $instance->{'Processor Type'} =~ /Intel/ ?
+                'Intel' : undef;
+            my $cpu = {
+                SPEED        => $instance->{'Processor Speed'},
+                ID           => $instance->{'Tag'},
+                NAME         => $name,
+                MANUFACTURER => $manufacturer
+            };
+
+            if ($instance->{'Location'} =~ /Cell Slot Number (\d+)\b/i) {
+                # this is a single core from a multi-core cpu
+                my $slotId = $1;
+                if ($cpus[$slotId]) {
+                    $cpus[$slotId]->{CORE}++;
+                } else {
+                    $cpus[$slotId] = $cpu;
+                    $cpus[$slotId]->{CORE}=1;
+                }
+            } else {
+                push @cpus, $cpu;
+            }
+        }
+    }
+    close $handle;
+
+    # filter missing cpus
+    @cpus = grep { $_ } @cpus;
+
+    return @cpus;
+}
+1;

@@ -0,0 +1,49 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Controllers;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return if $params{no_category}->{controller};
+    return canRun('ioscan');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $type (qw/ext_bus fc psi/) {
+        foreach my $controller (_getControllers(
+            command => "ioscan -kFC $type",
+            logger  => $logger
+        )) {
+            $inventory->addEntry(
+                section => 'CONTROLLERS',
+                entry   => $controller
+            );
+        }
+    }
+}
+
+sub _getControllers {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @controllers;
+    while (my $line = <$handle>) {
+        my @info = split(/:/, $line);
+        push @controllers, {
+            TYPE => $info[17]
+        };
+    }
+    close $handle;
+
+    return @controllers;
+}
+
+1;

@@ -0,0 +1,140 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Drives;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use POSIX qw(strftime);
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled  {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{drive};
+    return
+        canRun('fstyp') &&
+        canRun('bdf');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # get filesystem types
+    my @types = getAllLines(
+        command => 'fstyp -l',
+        logger  => $logger
+    );
+
+    # get filesystems for each type
+    foreach my $type (@types) {
+        foreach my $drive (_getDrives(type => $type, logger => $logger)) {
+            $inventory->addEntry(section => 'DRIVES', entry => $drive);
+        }
+    }
+}
+
+sub _getDrives {
+    my (%params) = @_;
+
+    my @drives = _parseBdf(
+        command => "bdf -t $params{type}", logger => $params{logger}
+    );
+
+    foreach my $drive (@drives) {
+        $drive->{FILESYSTEM} = $params{type};
+        $drive->{CREATEDATE} =  _getVxFSctime($drive->{VOLUMN}, $params{logger})
+            if $params{type} eq 'vxfs';
+    }
+
+    return @drives;
+}
+
+sub _parseBdf {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @drives;
+
+    # skip header
+    my $line = <$handle>;
+
+    my $device;
+    while (my $line = <$handle>) {
+        if ($line =~ /^(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+%)\s+(\S+)/) {
+            push @drives, {
+                VOLUMN     => $1,
+                TOTAL      => $2,
+                FREE       => $3,
+                TYPE       => $6,
+            };
+            next;
+        }
+
+        if ($line =~ /^(\S+)\s/) {
+            $device = $1;
+            next;
+        }
+
+        if ($line =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+%)\s+(\S+)/) {
+            push @drives, {
+                VOLUMN     => $device,
+                TOTAL      => $1,
+                FREE       => $3,
+                TYPE       => $5,
+            };
+            next;
+        }
+    }
+    close $handle;
+
+    return @drives;
+}
+
+# get filesystem creation time by reading binary value directly on the device
+sub _getVxFSctime {
+    my ($device, $logger) = @_;
+
+    # compute version-dependant read offset
+
+    # Output of 'fstyp' should be something like the following:
+    # $ fstyp -v /dev/vg00/lvol3
+    #   vxfs
+    #   version: 5
+    #   .
+    #   .
+    my $version = getFirstMatch(
+        command => "fstyp -v $device",
+        logger  => $logger,
+        pattern => qr/^version:\s+(\d+)$/
+    );
+
+    my $offset =
+        $version == 5 ? 8200 :
+        $version == 6 ? 8208 :
+        $version == 7 ? 8208 :
+                        undef;
+
+    if (!$offset) {
+      $logger->error("unable to compute offset from fstyp output ($device)");
+      return;
+    }
+
+    # read value
+    open (my $handle, "<:raw:bytes", $device)
+        or die "Can't open $device in raw mode: $ERRNO";
+    seek($handle, $offset, 0)
+        or die "Can't seek offset $offset on device $device: $ERRNO";
+    my $raw;
+    read($handle, $raw, 4)
+        or die "Can't read 4 bytes on device $device: $ERRNO";
+    close($handle);
+
+    # Convert the 4-byte raw data to long integer and
+    # return a string representation of this time stamp
+    return strftime("%Y/%m/%d %T", localtime(unpack('L', $raw)));
+}
+
+1;

@@ -0,0 +1,54 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::MP;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Network;
+
+#TODO driver pcislot virtualdev
+
+sub isEnabled {
+    return
+        canRun('/opt/hpsmh/data/htdocs/comppage/getMPInfo.cgi') ||
+        canRun('/opt/sfm/bin/CIMUtil');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $ipaddress = canRun('/opt/hpsmh/data/htdocs/comppage/getMPInfo.cgi') ?
+        _parseGetMPInfo(logger => $logger) : _parseCIMUtil(logger => $logger);
+
+    $inventory->addEntry(
+        section => 'NETWORKS',
+        entry => {
+            DESCRIPTION => 'Management Interface - HP MP',
+            TYPE        => 'Ethernet',
+            MANAGEMENT  => 'MP',
+            IPADDRESS   => $ipaddress,
+        }
+    );
+
+}
+
+sub _parseGetMPInfo {
+    return getFirstMatch(
+        command => '/opt/hpsmh/data/htdocs/comppage/getMPInfo.cgi',
+        pattern => qr{RIBLink = "https?://($ip_address_pattern)";},
+        @_
+    );
+}
+
+sub _parseCIMUtil {
+    return getFirstMatch(
+        command => '/opt/sfm/bin/CIMUtil -e root/cimv2 HP_ManagementProcessor',
+        pattern => qr{^IPAddress\s+:\s+($ip_address_pattern)},
+        @_
+    );
+}
+
+1;

@@ -0,0 +1,210 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Memory;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::HPUX;
+use English qw(-no_match_vars);
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{memory};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @memories;
+
+    # http://forge.fusioninventory.org/issues/754
+    if (canRun('/opt/propplus/bin/cprop') && !isHPVMGuest()) {
+        @memories = _parseCprop(
+            command => '/opt/propplus/bin/cprop -summary -c Memory',
+            logger  => $logger
+        );
+    } else {
+        my $arch = getFirstLine(command => 'uname -m');
+
+        if ($arch =~ /ia64/ ) {
+            # enable infolog
+            system("echo 'sc product  IPF_MEMORY;info' | /usr/sbin/cstm");
+            @memories = _parseCstm64(
+                command => "echo 'sc product IPF_MEMORY;il' | /usr/sbin/cstm",
+                logger  => $logger
+            );
+        } else {
+            @memories = _parseCstm(
+                command => "echo 'sc product mem;il'| /usr/sbin/cstm",
+                logger  => $logger
+            );
+        }
+    }
+
+    my $memorySize;
+    my $swapSize = getFirstMatch(
+        command => 'swapinfo -dt',
+        logger  => $logger,
+        pattern => qr/^total\s+(\d+)/
+    );
+
+    foreach my $memory (@memories) {
+        $inventory->addEntry(
+            section => 'MEMORIES',
+            entry   => $memory
+        );
+        $memorySize += $memory->{CAPACITY};
+    }
+
+    $inventory->setHardware({
+        SWAP   => int($swapSize / 1024),
+        MEMORY => $memorySize
+    });
+}
+
+sub _parseCprop {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @memories;
+    my $instance;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /\[Instance\]: \d+/) {
+            # new block
+            $instance = {};
+            next;
+        }
+
+        if ($line =~ /^ \s+ \[ ([^\]]+) \]: \s (\S+.*)/x) {
+            $instance->{$1} = $2;
+            next;
+        }
+
+        if ($line =~ /^\*+/) {
+            next unless keys %$instance;
+            next unless $instance->{Size};
+            push @memories, {
+                CAPACITY     => getCanonicalSize($instance->{Size}),
+                DESCRIPTION  => $instance->{'Part Number'},
+                SERIALNUMBER => $instance->{'Serial Number'},
+                TYPE         => $instance->{'Module Type'},
+            };
+        }
+    }
+    close $handle;
+
+    return @memories;
+}
+
+sub _parseCstm {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @memories;
+
+    my %capacities;
+    my $capacity = 0;
+    my $description;
+    my $numslot = 1;
+    my $subnumslot;
+    my $serialnumber = 'No Serial Number available!';
+    my $type;
+    my $ok = 0;
+
+    while (my $line = <$handle>) {
+
+        if ($line =~ /FRU\sSource\s+=\s+\S+\s+\(memory/ ) {
+            $ok = 0;
+        }
+        if ($line =~ /Source\s+Detail\s+=\s4/ ) {
+            $ok = 1;
+        }
+        if ($line =~ /\s+(\d+)\s+(\d+)/ ) {
+            $capacities{$1} = $2;
+        }
+        if ($line =~ /Extender\s+Location\s+=\s+(\S+)/ ) {
+            $subnumslot = $1;
+        };
+        if ($line =~ /DIMMS\s+Rank\s+=\s+(\S+)/ ) {
+            $numslot = sprintf("%02x",$1);
+        }
+
+        if ($line =~ /FRU\s+Name\.*:\s+(\S+)/ ) {
+            if ($line =~ /(\S+)_(\S+)/ ) {
+                $type = $1;
+                $capacity = $2;
+            } elsif ($line =~ /(\wIMM)(\S+)/ ) {
+                $ok = 1;
+                $type = $1;
+                $numslot = $2;
+            }
+        }
+        if ($line =~ /Part\s+Number\.*:\s*(\S+)\s+/ ) {
+            $description = $1;
+        }
+        if ($line =~ /Serial\s+Number\.*:\s*(\S+)\s+/ ) {
+            $serialnumber = $1;
+            if ( $ok eq 1 ) {
+                if ( $capacity eq 0 ) {
+                    $capacity = $capacities{$numslot};
+                }
+                push @memories, {
+                    CAPACITY     => $capacity,
+                    DESCRIPTION  => "Part Number $description",
+                    CAPTION      => "Ext $subnumslot Slot $numslot",
+                    TYPE         => $type,
+                    NUMSLOTS     => '1',
+                    SERIALNUMBER => $serialnumber,
+                };
+                $ok = 0;
+                $capacity = 0;
+            } # $ok eq 1
+        } # /Serial\s+Number\.*:\s*(\S+)\s+/
+
+    }
+    close $handle;
+
+    return @memories;
+}
+
+sub _parseCstm64 {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @memories;
+
+    while (my $line = <$handle>) {
+
+        # this pattern assumes memory slots are correctly
+        # balanced (slot A and slot B are occuped)
+        next unless $line =~ /
+            (\w+IMM)\s+(\w+)\s+(\d+) # first column
+            \s+
+            (\w+IMM)\s+(\w+)\s+(\d+) # second column
+        /x;
+
+        push @memories, {
+            CAPACITY     => $3,
+            DESCRIPTION  => $1,
+            CAPTION      => $1 . ' ' . $2,
+            TYPE         => $1,
+            NUMSLOTS     => $2,
+        }, {
+            CAPACITY     => $6,
+            DESCRIPTION  => $4,
+            CAPTION      => $4 . ' ' . $5,
+            TYPE         => $4,
+            NUMSLOTS     => $5,
+        };
+    }
+    close $handle;
+
+    return @memories;
+}
+
+1;

@@ -0,0 +1,250 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Networks;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+use FusionInventory::Agent::Tools::Network;
+
+#TODO Get pcislot virtualdev
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{network};
+    return canRun('lanscan');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @interfaces = _getInterfaces(logger => $logger);
+    foreach my $interface (@interfaces) {
+        $inventory->addEntry(
+            section => 'NETWORKS',
+            entry   => $interface
+        );
+    }
+
+    my $routes = getRoutingTable(command => 'netstat -nr', logger => $logger);
+    $inventory->setHardware({
+        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
+    });
+}
+
+sub _getInterfaces {
+    my (%params) = @_;
+
+    my @prototypes = _parseLanscan(
+        command => 'lanscan -iap',
+        logger  => $params{logger}
+    );
+
+    my %ifStatNrv = _parseNetstatNrv();
+
+    my @interfaces;
+    foreach my $prototype (@prototypes) {
+
+        my $lanadminInfo = _getLanadminInfo(
+            command => "lanadmin -g $prototype->{lan_id}",
+            logger  => $params{logger}
+        );
+        $prototype->{TYPE}  = $lanadminInfo->{'Type (value)'};
+        $prototype->{SPEED} = $lanadminInfo->{Speed} > 1000000 ?
+            $lanadminInfo->{Speed} / 1000000 : $lanadminInfo->{Speed};
+
+        if ($ifStatNrv{$prototype->{DESCRIPTION}}) {
+            # if this interface name has been found in netstat output, let's
+            # use the list of interfaces found there, using the prototype
+            # to provide additional informations
+            foreach my $interface (@{$ifStatNrv{$prototype->{DESCRIPTION}}}) {
+                foreach my $key (qw/MACADDR STATUS TYPE SPEED/) {
+                    next unless $prototype->{$key};
+                    $interface->{$key} = $prototype->{$key};
+                }
+                push @interfaces, $interface;
+            }
+        } else {
+            # otherwise, we promote this prototype to an interface, using
+            # ifconfig to provide additional informations
+            my $ifconfigInfo = _getIfconfigInfo(
+                command => "ifconfig $prototype->{DESCRIPTION}",
+                logger  => $params{logger}
+            );
+            $prototype->{STATUS}    = $ifconfigInfo->{status};
+            $prototype->{IPADDRESS} = $ifconfigInfo->{address};
+            $prototype->{IPMASK}    = $ifconfigInfo->{netmask};
+            delete $prototype->{lan_id};
+            push @interfaces, $prototype;
+        }
+    }
+
+    foreach my $interface (@interfaces) {
+        if ($interface->{IPADDRESS} && $interface->{IPADDRESS} eq '0.0.0.0') {
+            $interface->{IPADDRESS} = undef;
+            $interface->{IPMASK}    = undef;
+        } else {
+            $interface->{IPSUBNET} = getSubnetAddress(
+                $interface->{IPADDRESS},
+                $interface->{IPMASK}
+            );
+        }
+    }
+
+    return @interfaces;
+}
+
+sub _parseLanscan {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @interfaces;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^
+            0x($alt_mac_address_pattern)
+            \s
+            (\S+)
+            \s
+            \S+
+            \s+
+            (\S+)
+            /x;
+
+        # quick assertion: nothing else as ethernet interface
+        my $interface = {
+            MACADDR     => alt2canonical($1),
+            STATUS      => 'Down',
+            DESCRIPTION => $2,
+            TYPE        => 'ethernet',
+            lan_id      => $3,
+        };
+
+        push @interfaces, $interface;
+    }
+    close $handle;
+
+    return @interfaces;
+}
+
+sub _getLanadminInfo {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my $info;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(\S.+\S) \s+ = \s (.+)$/x;
+        $info->{$1} = $2;
+    }
+    close $handle;
+
+    return $info;
+}
+
+sub _getIfconfigInfo {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my $info;
+    while (my $line = <$handle>) {
+        if ($line =~ /<UP/) {
+            $info->{status} = 'Up';
+        }
+        if ($line =~ /inet ($ip_address_pattern)/) {
+            $info->{address} = $1;
+        }
+        if ($line =~ /netmask ($hex_ip_address_pattern)/) {
+            $info->{netmask} = hex2canonical($1);
+        }
+    }
+    close $handle;
+
+    return $info;
+}
+
+# will be need to get the bonding configuration
+sub _getNwmgrInfo {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my $info;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^
+            (\w+)
+            \s+
+            (\w+)
+            \s+
+            0x($alt_mac_address_pattern)
+            \s+
+            (\w+)
+            \s+
+            (\w*)
+            /x;
+        my $interface = $1;
+
+        $info->{$interface} = {
+            status     => $2,
+            mac        => alt2canonical($3),
+            driver     => $4,
+            media      => $5,
+            related_if => undef
+        }
+    }
+    close $handle;
+
+    return $info;
+}
+
+sub _parseNetstatNrv {
+    my (%params) = (
+        command => 'netstat -nrv',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my %interfaces;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^
+            ($ip_address_pattern) # address
+            \/
+            ($ip_address_pattern) # mask
+            \s+
+            ($ip_address_pattern) # gateway
+            \s+
+            [A-Z]* H [A-Z]*       # host flag
+            \s+
+            \d
+            \s+
+            (\w+) (?: :\d+)?      # interface name, with optional alias
+            \s+
+            (\d+)                 # MTU
+            $/x;
+
+        my $address   = $1;
+        my $mask      = $2;
+        my $gateway   = ($3 ne $1) ? $3 : undef;
+        my $interface = $4;
+        my $mtu       = $5;
+
+        # quick assertion: nothing else as ethernet interface
+        push @{$interfaces{$interface}}, {
+            IPADDRESS   => $address,
+            IPMASK      => $mask,
+            IPGATEWAY   => $gateway,
+            DESCRIPTION => $interface,
+            TYPE        => 'ethernet',
+            MTU         => $mtu
+        }
+    }
+    close $handle;
+
+    return %interfaces;
+}
+
+1;

@@ -0,0 +1,49 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Slots;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{slot};
+    return canRun('ioscan');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $type (qw/ioa ba/) {
+        foreach my $slot (_getSlots(
+            command => "ioscan -kFC $type",
+            logger  => $logger
+        )) {
+            $inventory->addEntry(
+                section => 'SLOTS',
+                entry   => $slot
+            );
+        }
+    }
+}
+
+sub _getSlots {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @slots;
+    while (my $line = <$handle>) {
+        my @info = split(/:/, $line);
+        push @slots, {
+            DESIGNATION => $info[17],
+        };
+    }
+    close $handle;
+
+    return @slots;
+}
+
+1;

@@ -0,0 +1,66 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Softwares;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled  {
+    my (%params) = @_;
+
+    return
+        !$params{no_category}->{software} &&
+        canRun('swlist');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $list = _getSoftwaresList(
+        command => 'swlist',
+        logger => $logger
+    );
+
+    return unless $list;
+
+    foreach my $software (@$list) {
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => $software
+        );
+    }
+}
+
+sub _getSoftwaresList {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @softwares;
+    while (my $line = <$handle>) {
+        chomp $line;
+        next unless $line =~ /^
+            \s\s     # two spaces
+            (\S+)    # name
+            \s+
+            (\S+)    # version
+            \s+
+            (\S.*\S) # comment
+        /x;
+        next if $1 =~ /^PH/;
+        push @softwares, {
+            NAME      => $1,
+            VERSION   => $2,
+            COMMENTS  => $3,
+            PUBLISHER => 'HP'
+        };
+    }
+
+    close $handle;
+
+    return \@softwares;
+}
+
+1;

@@ -0,0 +1,105 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Storages;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled  {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{storage};
+    return
+        canRun('ioscan');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $disk (_getDisks($logger)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $disk);
+    }
+
+    foreach my $tape (_getTapes($logger)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $tape);
+    }
+}
+
+sub _getDisks {
+    my ($logger) = @_;
+
+    my @disks;
+    foreach my $device (
+        _parseIoscan(command => 'ioscan -kFnC disk', logger => $logger)
+    ) {
+        # skip alternate links
+        next if getFirstMatch(
+            command => "pvdisplay $device->{NAME}",
+            pattern => qr/$device->{NAME}\.+lternate/
+        );
+
+        my $handle = getFileHandle(
+            command => "diskinfo -v $device->{NAME}",
+            logger  => $logger
+        );
+        while (my $line = <$handle>) {
+            if ($line =~ /^\s+size:\s+(\S+)/) {
+                $device->{DISKSIZE} = int($1/1024);
+            }
+            if ($line =~ /^\s+rev level:\s+(\S+)/) {
+                $device->{FIRMWARE} = $1;
+            }
+        }
+        close $handle;
+
+        $device->{TYPE} = 'disk';
+        push @disks, $device;
+    }
+
+    return @disks;
+}
+
+sub _getTapes {
+    my ($logger) = @_;
+
+    my @tapes;
+    foreach my $device (
+        _parseIoscan(command => 'ioscan -kFnC tape', logger => $logger)
+    ) {
+        $device->{TYPE} = 'tape';
+        push @tapes, $device;
+    }
+
+    return @tapes;
+}
+
+sub _parseIoscan {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @devices;
+    my ($description, $model, $manufacturer);
+    while (my $line = <$handle>) {
+        if ($line =~ /^\s+(\S+)/ ) {
+            my $device = $1;
+
+            push @devices, {
+                MANUFACTURER => $manufacturer,
+                MODEL        => $model,
+                NAME         => $device,
+                DESCRIPTION  => $description,
+            };
+        } else {
+            my @infos = split(/:/, $line);
+            $description = $infos[0];
+            ($manufacturer, $model) = $infos[17] =~ /^(\S+) \s+ (\S.*\S)$/x;
+        }
+    }
+    close $handle;
+
+    return @devices;
+}
+
+1;

@@ -0,0 +1,40 @@
+package FusionInventory::Agent::Task::Inventory::HPUX::Uptime;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return
+        canRun('uptime') &&
+        canRun('uname');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $arch = getFirstLine(command => 'uname -m');
+    my $uptime = _getUptime(command => 'uptime');
+    $inventory->setHardware({
+        DESCRIPTION => "$arch/$uptime"
+    });
+}
+
+sub _getUptime {
+    my ($days, $hours, $minutes) = getFirstMatch(
+        pattern => qr/up \s (?:(\d+)\sdays\D+)? (\d{1,2}) : (\d{1,2})/x,
+        @_
+    );
+
+    my $uptime = 0;
+    $uptime += $days * 24 * 3600 if $days;
+    $uptime += $hours * 3600;
+    $uptime += $minutes * 60;
+
+    return getFormatedGMTTime($uptime);
+}
+
+1;

@@ -0,0 +1,39 @@
+package FusionInventory::Agent::Task::Inventory::HPUX;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+
+our $runAfter = ["FusionInventory::Agent::Task::Inventory::Generic"];
+
+sub isEnabled  {
+    return $OSNAME eq 'hpux';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    # Operating system informations
+    my $kernelVersion = getFirstLine(command => 'uname -v');
+    my $kernelRelease = getFirstLine(command => 'uname -r');
+    my $OSLicense     = getFirstLine(command => 'uname -l');
+
+    $inventory->setHardware({
+        OSNAME     => 'HP-UX',
+        OSVERSION  => $kernelVersion . ' ' . $OSLicense,
+        OSCOMMENTS => $kernelRelease,
+    });
+
+    $inventory->setOperatingSystem({
+        NAME           => 'HP-UX',
+        VERSION        => $kernelRelease,
+        KERNEL_VERSION => $kernelRelease,
+    });
+}
+
+1;

@@ -1,47 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Bios;
-
-use strict;
-use warnings;
-
-use List::Util qw(first);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::AIX;
-
-sub isEnabled {
-    return 1;
-}
-
-# NOTE:
-# Q: SSN can also use `uname -n`? What is the best?
-# A: uname -n since it doesn't need root priv
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $bios = {
-        BMANUFACTURER => 'IBM',
-        SMANUFACTURER => 'IBM',
-    };
-
-    my @infos = getLsvpdInfos(logger => $logger);
-
-    my $system = first { $_->{DS} eq 'System Firmware' } @infos;
-    $bios->{BVERSION} = $system->{RM} if $system;
-
-    my $platform = first { $_->{DS} eq 'Platform Firmware' } @infos;
-    $bios->{BVERSION} .= "(Firmware : $platform->{RM})" if $platform;
-
-    my $vpd = first { $_->{DS} eq 'System VPD' } @infos;
-    if ($vpd) {
-        $bios->{SMODEL} = $vpd->{TM};
-        $bios->{SSN} = $vpd->{SE};
-    }
-
-    $inventory->setBios($bios);
-}
-
-1;

@@ -1,115 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::CPU;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return 1;
-}
-
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $cpu (_getCPUs(
-        command => 'lsdev -Cc processor -F name',
-        logger  => $logger
-    )) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-}
-
-sub _getCPUs {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my $aixversion = getFirstLine(command => 'uname -v');
-
-    my @cpus;
-    while (my $line = <$handle>) {
-        chomp $line;
-        my $device = $line;
-
-        my $format = $aixversion >= 5 ?
-            'type:frequency:frequency' : 'type';
-
-        my @lsattr = getAllLines(
-            command => "lsattr -EOl $device -a '$format'",
-        );
-
-        my $cpu = {
-            THREAD => 1
-        };
-
-        my $smt_threads = getFirstLine(command => "lsattr -EOl $device -a 'state:type:smt_threads'");
-        if ($smt_threads && $smt_threads =~ /:(\d+)$/) {
-            $cpu->{THREAD} = $1;
-        }
-
-
-        # drop headers
-        shift @lsattr;
-        
-        # use first line to compute name, frequency and number of threads
-        my @infos = split(/:/, $lsattr[0]);
-
-        $cpu->{NAME} = $infos[0];
-        $cpu->{NAME} =~ s/_/ /;
-
-        if ($aixversion >= 5) {
-            $cpu->{SPEED} = ($infos[1] % 1000000) >= 50000 ? 
-                int($infos[1] / 1000000) + 1 : int($infos[1] / 1000000);
-        } else {
-            # On older models, frequency is based on cpu model and uname
-            SWITCH: {
-                if (
-                    $infos[0] eq "PowerPC"     or
-                    $infos[0] eq "PowerPC_601" or
-                    $infos[0] eq "PowerPC_604"
-                ) {
-                    my $uname = getFirstLine(command => 'uname -m');
-                    $cpu->{SPEED} =
-                        $uname =~ /E1D|EAD|C1D|R04|C4D|R4D/ ?  12.2 :
-                        $uname =~ /34M/                     ? 133   :
-                        $uname =~ /N4D/                     ? 150   :
-                        $uname =~ /X4M|X4D/                 ? 200   :
-                        $uname =~ /N4E|K04|K44/             ? 225   :
-                        $uname =~ /N4F/                     ? 320   :
-                        $uname =~ /K45/                     ? 360   :
-                                                              undef ;
-                    last SWITCH;
-                }
-
-                if ($infos[0] eq "PowerPC_RS64_III") {
-                    $cpu->{SPEED} = 400;
-                    last SWITCH;
-                }
-
-                if ($infos[0] eq "PowerPC_620") {
-                    $cpu->{SPEED} = 172;
-                    last SWITCH;
-                }
-
-                $cpu->{SPEED} = 225;
-            }
-        }
-
-        # compute core number from lines number
-        $cpu->{CORE} = scalar @lsattr;
-
-        push @cpus, $cpu;
-    }
-    close $handle;
-
-    return @cpus;
-}
-
-1;

@@ -1,42 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Controllers;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::AIX;
-
-sub isEnabled {
-    return canRun('lsdev');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $controller (_getControllers(
-        logger  => $logger,
-    )) {
-        $inventory->addEntry(
-            section => 'CONTROLLERS',
-            entry   => $controller
-        );
-    }
-}
-
-sub _getControllers {
-    my @adapters = getAdaptersFromLsdev(@_);
-
-    my @controllers;
-    foreach my $adapter (@adapters) {
-        push @controllers, {
-            NAME => $adapter->{NAME},
-        };
-    }
-
-    return @controllers;
-}
-
-1;

@@ -1,41 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Drives;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return canRun('df');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # get filesystems
-    my @filesystems =
-        getFilesystemsFromDf(logger => $logger, command => 'df -P -k');
-
-    # get additional informations
-    foreach my $filesystem (@filesystems) {
-        my @lines = getAllLines(
-            logger => $logger, command => "lsfs -c $filesystem->{TYPE}"
-        );
-        my @info = split /:/, $lines[1];     
-        $filesystem->{FILESYSTEM} = $info[2];
-    }
-
-    # add filesystems to the inventory
-    foreach my $filesystem (@filesystems) {
-        $inventory->addEntry(
-            section => 'DRIVES',
-            entry   => $filesystem
-        );
-    }
-}
-
-1;

@@ -1,239 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::LVM;
-
-use FusionInventory::Agent::Tools;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-sub isEnabled {
-    canRun('lspv');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $volume (_getPhysicalVolumes($logger)) {
-        $inventory->addEntry(section => 'PHYSICAL_VOLUMES', entry => $volume);
-    }
-
-    foreach my $volume (_getLogicalVolumes($logger)) {
-        $inventory->addEntry(section => 'LOGICAL_VOLUMES', entry => $volume);
-    }
-
-    foreach my $group (_getVolumeGroups($logger)) {
-        $inventory->addEntry(section => 'VOLUME_GROUPS', entry => $group);
-    }
-
-}
-
-sub _getLogicalVolumes {
-    my ($logger) = @_;
-
-    my $handle = getFileHandle(
-        command => "lsvg",
-        logger  => $logger
-    );
-    return unless $handle;
-
-    my @volumes;
-
-    while (my $line = <$handle>) {
-        chomp $line;
-        push @volumes, _getLogicalVolume($logger, $line);
-    }
-    close $handle;
-
-    return @volumes;
-}
-
-sub _getLogicalVolume {
-    my ($logger, $name) = @_;
-
-    my $handle = getFileHandle(
-        command => "lsvg -l $name",
-        logger  => $logger
-    );
-    return unless $handle;
-
-    my $volume;
-
-    while (my $line = <$handle>) {
-        chomp $line;
-
-        if ($line =~ /(\S+):/) {
-            $volume->{VG_UUID} = $1;
-        }
-        if ($line !~ !/^LV NAME/ && $line =~ /(\S+) *(\S+) *(\d+) *(\d+) *(\d+) *(\S+) *(\S+)/) {
-            $volume->{LV_NAME}   = $1;
-            $volume->{SEG_COUNT} = $3;
-            $volume->{ATTR}      = "Type $2,PV: $5";
-        }
-    }
-    close $handle;
-
-    my ($size, $uuid) = _getVolumeInfo(
-        name   => $volume->{LV_NAME},
-        logger => $logger
-    );
-    $volume->{SIZE} = int($volume->{SEG_COUNT} * $size);
-    $volume->{LV_UUID} = $uuid;
-
-    return $volume;
-}
-
-sub _getVolumeInfo {
-    my (%params) = @_;
-
-    my $handle = getFileHandle( 
-        command => "lslv $params{name}",
-        logger  => $params{logger}
-    );
-    return unless $handle;
-
-    my ($size, $uuid);
-    while (my $line = <$handle>) {
-        if ($line =~ /.*PP SIZE:\s+(\d+) .*/) {
-            $size = $1;
-        }
-        if ($line =~ /LV IDENTIFIER:\s+(\S+)/) {
-            $uuid = $1;
-        }
-    }
-    close $handle;
-
-    return ($size, $uuid);
-}
-
-sub _getPhysicalVolumes {
-    my ($logger) = @_;
-
-    my $handle = getFileHandle(
-        command => "lspv | cut -f1 -d' '",
-        logger  => $logger
-    );
-    return unless $handle;
-
-    my @volumes;
-
-    while (my $line = <$handle>) {
-        chomp $line;
-        push @volumes, _getPhysicalVolume($logger, $line);
-    }
-    close $handle;
-
-    return @volumes;
-}
-
-sub _getPhysicalVolume {
-    my ($logger, $name) = @_;
-
-    my $handle = getFileHandle(
-        command => "lspv $name",
-        logger  => $logger
-    );
-    return unless $handle;
-
-    my $volume = {
-        DEVICE  => "/dev/$name",
-        PV_NAME => $name,
-    };
-
-    my ($free, $total);
-    while (my $line = <$handle>) {
-        chomp $line;
-
-        if ($line =~ /PHYSICAL VOLUME:\s+(\S+)/) {
-            $volume->{FORMAT} = "AIX PV $1";
-        }
-        if ($line =~ /FREE PPs:\s+(\d+)/) {
-            $free = $1;
-        }
-        if ($line =~ /TOTAL PPs:\s+(\d+)/) {
-            $total = $1;
-        }
-        if ($line =~ /VOLUME GROUP:\s+(\S+)/) {
-            $volume->{ATTR} = "VG $1";
-        }
-        if ($line =~ /PP SIZE:\s+(\d+)/) {
-            $volume->{PE_SIZE} = $1;
-        }
-        if ($line =~ /PV IDENTIFIER:\s+(\S+)/) {
-            $volume->{PV_UUID} = $1;
-        }
-    }
-    close $handle;
-
-    $volume->{SIZE} = $total * $volume->{PE_SIZE};
-    $volume->{FREE} = $free * $volume->{PE_SIZE};
-    $volume->{PV_PE_COUNT} = $total;
-
-    return $volume;
-}
-
-sub _getVolumeGroups {
-    my ($logger) = @_;
-
-    my $handle = getFileHandle(
-        command => 'lsvg',
-        logger  => $logger
-    );
-    return unless $handle;
-
-    my @groups;
-
-    while (my $line = <$handle>) {
-        chomp $line;
-        push @groups, _getVolumeGroup($logger, $line);
-    }
-    close $handle;
-
-    return @groups;
-}
-
-sub _getVolumeGroup {
-    my ($logger, $name) = @_;
-
-    my $handle = getFileHandle(
-        command => "lsvg $name",
-        logger  => $logger
-    );
-    return unless $handle;
-
-    my $group = {
-        VG_NAME => $name
-    };
-
-    while (my $line = <$handle>) {
-        chomp $line;
-
-        if ($line =~ /TOTAL PPs:\s+(\d+)/) {
-            $group->{SIZE} = $1;
-        }
-        if ($line =~ /FREE PPs:\s+(\d+)/) {
-            $group->{FREE} = $1;
-        }
-        if ($line =~ /VG IDENTIFIER:\s+(\S+)/) {
-            $group->{VG_UUID} = $1;
-        }
-        if ($line =~ /PP SIZE:\s+(\d+)/) {
-            $group->{VG_EXTENT_SIZE} = $1;
-        }
-        if ($line =~ /LVs:\s+(\d+)/) {
-            $group->{LV_COUNT} = $1;
-        }
-        if ($line =~/ACTIVE PVs:\s+(\d+)/) {
-            $group->{PV_COUNT} = $1;
-        }
-
-    }
-    close $handle;
-
-    return $group;
-}
-
-1;

@@ -1,87 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Memory;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::AIX;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $memory (_getMemories()) {
-        $inventory->addEntry(
-            section => 'MEMORIES',
-            entry   => $memory
-        );
-    }
-
-    #Memory informations
-    #lsdev -Cc memory -F 'name' -t totmem
-    #lsattr -EOlmem0
-    my $memorySize = 0;
-    my @lsdev = getAllLines(
-        command => 'lsdev -Cc memory -F "name" -t totmem',
-        logger  => $logger
-    );
-    foreach (@lsdev){
-        my @lsattr = getAllLines(
-            command => "lsattr -EOl $_",
-            logger  => $logger
-        );
-        foreach (@lsattr) {
-            if (! /^#/){
-                # See: http://forge.fusioninventory.org/issues/399
-                # TODO: the regex should be improved here
-                /^(.+):(\d+)/;
-                $memorySize += $2;
-            }
-        }
-    }
-
-    #Paging Space
-    my $swapSize;
-    my @grep = getAllLines(command => 'lsps -s', logger => $logger);
-    foreach (@grep){
-        if ( ! /^Total/){
-            /^\s*(\d+)\w*\s+\d+.+/;
-            $swapSize = $1;
-        }
-    }
-
-    $inventory->setHardware({
-        MEMORY => $memorySize,
-        SWAP   => $swapSize 
-    });
-
-}
-
-sub _getMemories {
-    my @infos = getLsvpdInfos(@_);
-    my @memories;
-    my $numslots = 0;
-
-    foreach my $info (@infos) {
-        next unless $info->{DS} eq 'Memory DIMM';
-
-        push @memories, {
-            DESCRIPTION => $info->{DS},
-            CAPACITY    => $info->{SZ},
-            TYPE        => $info->{PN},
-            CAPTION     => 'Slot ' . $info->{YL},
-            SERIALNUMBER=> $info->{SN},
-            NUMSLOTS    => $numslots++
-        };
-    }
-
-    return @memories;
-}
-
-1;

@@ -1,44 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Modems;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::AIX;
-
-sub isEnabled {
-    return canRun('lsdev');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $modem (_getModems(
-        logger  => $logger,
-    )) {
-        $inventory->addEntry(
-            section => 'MODEMS',
-            entry   => $modem,
-        );
-    }
-}
-
-sub _getModems {
-    my @adapters = getAdaptersFromLsdev(@_);
-
-    my @modems;
-    foreach my $adapter (@adapters) {
-        next unless $adapter->{DESCRIPTION} =~ /modem/i;
-        push @modems, {
-            NAME        => $adapter->{NAME},
-            DESCRIPTION => $adapter->{DESCRIPTION},
-        };
-    }
-
-    return @modems;
-}
-
-1;

@@ -1,109 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Networks;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-use FusionInventory::Agent::Tools::Network;
-
-sub isEnabled {
-    return canRun('lscfg');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # set list of network interfaces
-    my $routes = getRoutingTable(command => 'netstat -nr', logger => $logger);
-    my @interfaces = _getInterfaces(logger => $logger);
-
-    foreach my $interface (@interfaces) {
-        $interface->{IPGATEWAY} = $params{routes}->{$interface->{IPSUBNET}}
-            if $interface->{IPSUBNET};
-
-        $inventory->addEntry(
-            section => 'NETWORKS',
-            entry   => $interface
-        );
-    }
-
-    $inventory->setHardware({
-        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
-    });
-}
-
-sub _getInterfaces {
-    my (%params) = @_;
-
-    my $logger = $params{logger};
-
-    # get a first list of interfaces objects from lscfg
-    my @interfaces = _parseLscfg(
-        command => 'lscfg -v -l en*',
-        logger  => $logger
-    );
-
-    # complete with empty interfaces objects from ifconfig
-    push @interfaces,
-        map { { DESCRIPTION => $_ } }
-        split(/ /, getFirstLine(command => 'ifconfig -l'));
-
-    foreach my $interface (@interfaces) {
-        my $handle = getFileHandle(
-            command => "lsattr -E -l $interface->{DESCRIPTION}",
-            logger  => $logger
-        );
-        next unless $handle;
-
-        while (my $line = <$handle>) {
-            $interface->{IPADDRESS} = $1
-                if $line =~ /^netaddr \s+ ($ip_address_pattern)/x;
-            $interface->{IPMASK} = $1
-                if $line =~ /^netmask \s+ ($ip_address_pattern)/x;
-            $interface->{STATUS} = $1
-                if $line =~ /^state \s+ (\w+)/x; 
-        }
-        close $handle;
-    }
-
-    foreach my $interface (@interfaces) { 
-        $interface->{STATUS} = "Down" unless $interface->{IPADDRESS};
-        $interface->{IPDHCP} = "No";
-
-        $interface->{IPSUBNET} = getSubnetAddress(
-            $interface->{IPADDRESS},
-            $interface->{IPMASK},
-        );
-    }
-
-    return @interfaces;
-}
-
-sub _parseLscfg {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @interfaces;
-    my $interface;
-    while (my $line = <$handle>) {
-        if ($line =~ /^\s+ ent(\d+) \s+ \S+ \s+ (.+)/x) {
-            push @interfaces, $interface if $interface;
-            undef $interface;
-            $interface->{TYPE} = $2;
-            $interface->{DESCRIPTION} = "en$1";
-        }
-        if ($line =~ /Network Address\.+($alt_mac_address_pattern)/) {
-            $interface->{MACADDR} = alt2canonical($1);
-        }
-    }
-    close $handle;
-    push @interfaces, $interface if $interface;
-
-    return @interfaces;
-}
-
-1;

@@ -1,62 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Slots;
-
-use strict;
-use warnings;
-
-use List::Util qw(first);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::AIX;
-
-sub isEnabled {
-    return canRun('lsdev');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # index VPD infos by AX field
-    my %infos =
-        map  { $_->{AX} => $_ }
-        grep { $_->{AX} }
-        getLsvpdInfos(logger => $logger);  
-
-    foreach my $slot (_getSlots(
-        command => 'lsdev -Cc bus -F "name:description"',
-        logger  => $logger
-    )) {
-
-        $slot->{DESCRIPTION} = $infos{$slot->{NAME}}->{YL}
-            if $infos{$slot->{NAME}};
-
-        $inventory->addEntry(
-            section => 'SLOTS',
-            entry   => $slot
-        );
-    }
-}
-
-sub _getSlots {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-
-    my @slots;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^(.+):(.+)/;
-
-        push @slots, {
-            NAME        => $1,
-            DESIGNATION => $2,
-            STATUS      => 'available'
-        };
-    }
-    close $handle;
-
-    return @slots;
-}
-
-1;

@@ -1,63 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Softwares;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return
-        !$params{no_category} &&
-        canRun('lslpp');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $softwares = _getSoftwaresList(
-        command => 'lslpp -c -l',
-        logger  => $logger
-    );
-    return unless $softwares;
-
-    foreach my $software (@$softwares) {
-        $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => $software
-        );
-    }
-
-}
-
-sub _getSoftwaresList {
-    my $handle = getFileHandle(@_);
-    next unless $handle;
-
-    # skip headers
-    my $line = <$handle>;
-
-    my @softwares;
-    while (my $line = <$handle>) {
-        my @entry = split(/:/, $line);
-        next if $entry[1] =~ /^device/;
-
-        $entry[6] =~ s/\s+$//;
-
-        push @softwares, {
-            COMMENTS => $entry[6],
-            FOLDER   => $entry[0],
-            NAME     => $entry[1],
-            VERSION  => $entry[2],
-        };
-    }
-    close $handle;
-
-    return \@softwares;
-}
-
-1;

@@ -1,45 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Sounds;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::AIX;
-
-sub isEnabled {
-    return canRun('lsdev');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $sound (_getSounds(
-        logger  => $logger
-    )) {
-        $inventory->addEntry(
-            section => 'SOUNDS',
-            entry   => $sound
-        );
-    }
-
-}
-
-sub _getSounds {
-    my @adapters = getAdaptersFromLsdev(@_);
-
-    my @sounds;
-    foreach my $adapter (@adapters) {
-        next unless $adapter->{DESCRIPTION} =~ /audio/i;
-        push @sounds, {
-            NAME        => $adapter->{NAME},
-            DESCRIPTION => $adapter->{DESCRIPTION}
-        };
-    }
-
-    return @sounds;
-}
-
-1;

@@ -1,232 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Storages;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::AIX;
-
-sub isEnabled {
-    return
-        canRun('lsdev') &&
-        canRun('lsattr');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{inventory};
-
-    # index VPD infos by AX field
-    my $infos = _getIndexedLsvpdInfos(logger => $logger);
-
-    foreach my $disk (_getDisks(logger => $logger, subclass => 'scsi', infos => $infos)) {
-        $disk->{DISKSIZE} = _getCapacity($disk->{NAME}, $params{logger});
-        $disk->{SERIAL}   = getFirstMatch(
-            command => "lscfg -p -v -s -l $disk->{NAME}",
-            logger  => $params{logger},
-            pattern => qr/Serial Number\.*(.*)/
-        );
-        $inventory->addEntry(section => 'STORAGES', entry => $disk);
-    }
-
-    foreach my $disk (_getDisks(logger => $logger, subclass => 'fcp', infos => $infos)) {
-        $inventory->addEntry(section => 'STORAGES', entry => $disk);
-    }
-
-    foreach my $disk (_getDisks(logger => $logger, subclass => 'fdar', infos => $infos)) {
-        $inventory->addEntry(section => 'STORAGES', entry => $disk);
-    }
-
-    foreach my $disk (_getDisks(logger => $logger, subclass => 'sas', infos => $infos)) {
-        $inventory->addEntry(section => 'STORAGES', entry => $disk);
-    }
-
-    foreach my $disk (_getDisks(logger => $logger, subclass => 'vscsi', infos => $infos)) {
-        $disk->{DISKSIZE}     = _getVirtualCapacity($disk->{NAME}, $params{logger});
-        $disk->{MANUFACTURER} = "VIO Disk";
-        $disk->{MODEL}        = "Virtual Disk";
-        $inventory->addEntry(section => 'STORAGES', entry => $disk);
-    }
-
-    foreach my $cdrom (_getCdroms(logger => $logger, infos => $infos)) {
-        $inventory->addEntry(section => 'STORAGES', entry => $cdrom);
-    }
-
-    foreach my $tape (_getTapes(logger => $logger, infos => $infos)) {
-        $inventory->addEntry(section => 'STORAGES', entry => $tape);
-    }
-
-    foreach my $floppy (_getFloppies(logger => $logger, infos => $infos)) {
-        $inventory->addEntry(section => 'STORAGES', entry => $floppy);
-    }
-}
-
-sub _getIndexedLsvpdInfos {
-    my %infos = 
-        map  { $_->{AX} => $_ }
-        grep { $_->{AX} }
-        getLsvpdInfos(@_);
-
-    return \%infos;
-}
-
-sub _getDisks {
-    my (%params) = @_;
-
-    my $command = $params{subclass} ?
-        "lsdev -Cc disk -s $params{subclass} -F 'name:description'" : undef;
-
-    my @disks = _parseLsdev(
-        command => $command,
-        pattern => qr/^(.+):(.+)/,
-        @_
-    );
-
-    foreach my $disk (@disks) {
-        $disk->{TYPE} = 'disk';
-
-        my $info = $params{infos}->{$disk->{NAME}};
-        next unless $info;
-        $disk->{MANUFACTURER} = _getManufacturer($info);
-        $disk->{MODEL}        = _getModel($info);
-    }
-
-    return @disks;
-}
-
-sub _getCdroms {
-    my (%params) = @_;
-
-    my @cdroms = _parseLsdev(
-        command => "lsdev -Cc cdrom -s scsi -F 'name:description:status'",
-        pattern => qr/^(.+):(.+):.+Available.+/,
-        @_
-    );
-
-    foreach my $cdrom (@cdroms) {
-        $cdrom->{TYPE} = 'cd';
-        $cdrom->{DISKSIZE} = _getCapacity($cdrom->{NAME}, $params{logger});
-
-        my $info = $params{infos}->{$cdrom->{NAME}};
-        next unless $info;
-        $cdrom->{MANUFACTURER} = _getManufacturer($info);
-        $cdrom->{MODEL}        = _getModel($info);
-    }
-
-    return @cdroms;
-}
-
-sub _getTapes {
-    my (%params) = @_;
-
-    my @tapes = _parseLsdev(
-        command => "lsdev -Cc tape -s scsi -F 'name:description:status'",
-        pattern => qr/^(.+):(.+):.+Available.+/,
-        @_
-    );
-
-    foreach my $tape (@tapes) {
-        $tape->{TYPE} = 'tape';
-        $tape->{DISKSIZE} = _getCapacity($tape->{NAME}, $params{logger});
-
-        my $info = $params{infos}->{$tape->{NAME}};
-        next unless $info;
-        $tape->{MANUFACTURER} = _getManufacturer($info);
-        $tape->{MODEL}        = _getModel($info);
-    }
-
-    return @tapes;
-}
-
-sub _getFloppies {
-    my (%params) = @_;
-
-    my @floppies = _parseLsdev(
-        command => "lsdev -Cc diskette -F 'name:description:status'",
-        pattern => qr/^(.+):(.+):.+Available.+/,
-        @_
-    );
-
-    foreach my $floppy (@floppies) {
-        $floppy->{TYPE} = 'floppy';
-    }
-
-    return @floppies;
-}
-
-sub _parseLsdev {
-    my (%params) = @_;
-
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @devices;
-
-    while (my $line = <$handle>) {
-        chomp $line;
-        next unless $line =~ $params{pattern};
-
-        push @devices, {
-            NAME        => $1,
-            DESCRIPTION => $2
-        };
-    }
-    close $handle;
-
-    return @devices;
-}
-
-sub _getCapacity {
-    my ($device, $logger) = @_;
-
-    return getLastLine(
-        command => "lsattr -EOl $device -a 'size_in_mb'",
-        logger  => $logger
-    );
-}
-
-sub _getVirtualCapacity {
-    my ($device, $logger) = @_;
-
-    my ($model, $capacity);
-
-    my @lines = getAllLines(
-        command => "lspv $device",
-        logger  => $logger
-    );
-
-    foreach my $line (@lines) {
-        if ($line !~ /^0516-320.*/) {
-            if ($line =~ /TOTAL PPs:/ ) {
-                ($capacity, $model) = split(/\(/, $line);
-                ($capacity, $model) = split(/ /, $model);
-            }
-        } else {
-            $capacity = 0;
-        }
-    }
-
-    return $capacity;
-}
-
-sub _getManufacturer {
-    my ($device) = @_;
-
-    return unless $device;
-
-    return $device->{FN} ?
-        "$device->{MF},FRU number :$device->{FN}" :
-        "$device->{MF}"                           ;
-}
-
-sub _getModel {
-    my ($device) = @_;
-
-    return unless $device;
-
-    return $device->{TM};
-}
-
-1;

@@ -1,43 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX::Videos;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::AIX;
-
-sub isEnabled {
-    return canRun('lsdev');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $video (_getVideos(
-        logger  => $logger
-    )) {
-        $inventory->addEntry(
-            section => 'VIDEOS',
-            entry   => $video
-        );
-    }
-}
-
-sub _getVideos {
-    my @adapters = getAdaptersFromLsdev(@_);
-
-    my @videos;
-    foreach my $adapter (@adapters) {
-        next unless $adapter->{DESCRIPTION} =~ /graphics|vga|video/i;
-        push @videos, {
-            NAME => $adapter->{NAME},
-        };
-    }
-
-    return @videos;
-}
-
-1;

@@ -1,44 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AIX;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-our $runAfter = ["FusionInventory::Agent::Task::Inventory::Input::Generic"];
-
-sub isEnabled {
-    return $OSNAME eq 'aix';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    # Operating system informations
-    my $OSName = getFirstLine(command => 'uname -s');
-
-    my $OSVersion = getFirstLine(command => 'oslevel');
-    $OSVersion =~ s/(.0)*$//;
-
-    my $OSLevel = getFirstLine(command => 'oslevel -r');
-    my @tabOS = split(/-/,$OSLevel);
-    my $OSComment = "Maintenance Level : $tabOS[1]";
-
-    $inventory->setHardware({
-        OSNAME     => "$OSName $OSVersion",
-        OSVERSION  => $OSLevel,
-        OSCOMMENTS => $OSComment,
-    });
-
-    $inventory->setOperatingSystem({
-        NAME                 => "AIX",
-        VERSION              => $OSVersion,
-        FULL_NAME            => "$OSName $OSVersion"
-    });
-}
-
-1;

@@ -1,24 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::AccessLog;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $date = getFormatedLocalTime(time());
-
-    $inventory->setAccessLog ({
-        LOGDATE => $date
-    });
-}
-
-1;

@@ -1,59 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Archs::Alpha;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return $Config{archname} =~ /^alpha/;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $bios = {
-        SMANUFACTURER => 'DEC',
-    };
-
-    # sysctl infos
-
-    # example on *BSD: AlphaStation 255 4/232
-    $bios->{SMODEL} = getFirstLine(command => 'sysctl -n hw.model');
-
-    my $count = getFirstLine(command => 'sysctl -n hw.ncpu');
-
-    # dmesg infos
-
-    # NetBSD:
-    # AlphaStation 255 4/232, 232MHz, s/n
-    # cpu0 at mainbus0: ID 0 (primary), 21064A-2
-    # OpenBSD:
-    # AlphaStation 255 4/232, 232MHz
-    # cpu0 at mainbus0: ID 0 (primary), 21064A-2 (pass 1.1)
-    # FreeBSD:
-    # AlphaStation 255 4/232, 232MHz
-    # CPU: EV45 (21064A) major=6 minor=2
-
-    my $cpu;
-    foreach my $line (getAllLines(command => 'dmesg')) {
-        if ($line =~ /$bios->{SMODEL},\s*(\S+)\s*MHz/) { $cpu->{SPEED} = $1; }
-        if ($line =~ /^cpu[^:]*:\s*(.*)$/i)            { $cpu->{NAME} = $1;  }
-    }
-
-    $inventory->setBios($bios);
-
-    while ($count--) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-
-}
-
-1;

@@ -1,65 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Archs::MIPS;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return $Config{archname} =~ /^IP\d+/;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    
-    my $bios = {
-        SMANUFACTURER => 'SGI',
-    };
-
-    # sysctl infos
-
-    # example on NetBSD: SGI-IP22
-    # example on OpenBSD: SGI-O2 (IP32)
-    $bios->{SMODEL} = getFirstLine(command => 'sysctl -n hw.model');
-
-    my $count = getFirstLine(command => 'sysctl -n hw.ncpu');
-
-    # dmesg infos
-    
-    # I) Indy
-    # NetBSD:
-    # mainbus0 (root): SGI-IP22 [SGI, 6906e152], 1 processor
-    # cpu0 at mainbus0: MIPS R4400 CPU (0x450) Rev. 5.0 with MIPS R4010 FPC Rev. 0.0
-    # int0 at mainbus0 addr 0x1fbd9880: bus 75MHz, CPU 150MHz
-    #
-    # II) O2
-    # NetBSD:
-    # mainbus0 (root): SGI-IP32 [SGI, 8], 1 processor
-    # cpu0 at mainbus0: MIPS R5000 CPU (0x2321) Rev. 2.1 with built-in FPU Rev. 1.0
-    # OpenBSD:
-    # mainbus0 (root)
-    # cpu0 at mainbus0: MIPS R5000 CPU rev 2.1 180 MHz with R5000 based FPC rev 1.0
-    # cpu0: cache L1-I 32KB D 32KB 2 way, L2 512KB direct
-
-    my $cpu;
-    foreach my $line (getAllLines(command => 'dmesg')) {
-        if ($line =~ /$bios->{SMODEL}\s*\[\S*\s*(\S*)\]/) { $bios->{SSN} = $1; }
-        if ($line =~ /cpu0 at mainbus0:\s*(.*)$/)         { $cpu->{NAME} = $1; }
-        if ($line =~ /CPU\s*.*\D(\d+)\s*MHz/)             { $cpu->{SPEED} = $1;  }
-    }
-
-    $inventory->setBios($bios);
-
-    while ($count--) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-}
-
-1;

@@ -1,89 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Archs::SPARC;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return $Config{archname} =~ /^sun4/;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $bios = {
-        SMANUFACTURER => 'SUN',
-    };
-
-    # sysctl infos
-
-    # it gives only the CPU on OpenBSD/sparc64
-    $bios->{SMODEL} = getFirstLine(command => 'sysctl -n hw.model');
-
-    # example on NetBSD: 0x807b65c
-    # example on OpenBSD: 2155570635
-    $bios->{SSN} = getFirstLine(command => 'sysctl -n kern.hostid');
-    # force hexadecimal, but remove 0x to make it appear as in the firmware
-    $bios->{SSN} = dec2hex($bios->{SSN});
-    $bios->{SSN} =~ s/^0x//;
-
-    my $count = getFirstLine(command => 'sysctl -n hw.ncpu');
-
-    # dmesg infos
-
-    # I) SPARC
-    # NetBSD:
-    # mainbus0 (root): SUNW,SPARCstation-20: hostid 72362bb1
-    # cpu0 at mainbus0: TMS390Z50 v0 or TMS390Z55 @ 50 MHz, on-chip FPU
-    # OpenBSD:
-    # mainbus0 (root): SUNW,SPARCstation-20
-    # cpu0 at mainbus0: TMS390Z50 v0 or TMS390Z55 @ 50 MHz, on-chip FPU
-    #
-    # II) SPARC64
-    # NetBSD:
-    # mainbus0 (root): SUNW,Ultra-1: hostid 807b65cb
-    # cpu0 at mainbus0: SUNW,UltraSPARC @ 166.999 MHz, version 0 FPU
-    # OpenBSD:
-    # mainbus0 (root): Sun Ultra 1 SBus (UltraSPARC 167MHz)
-    # cpu0 at mainbus0: SUNW,UltraSPARC @ 166.999 MHz, version 0 FPU
-    # FreeBSD:
-    # cpu0: Sun Microsystems UltraSparc-I Processor (167.00 MHz CPU)
-
-    my $cpu;
-    foreach my $line (getAllLines(command => 'dmesg')) {
-        if ($line=~ /^mainbus0 \(root\):\s*(.*)$/) { $bios->{SMODEL} = $1; }
-        if ($line =~ /^cpu[^:]*:\s*(.*)$/i)        { $cpu->{NAME}    = $1; }
-    }
-
-    $bios->{SMODEL} =~ s/SUNW,//;
-    $bios->{SMODEL} =~ s/[:\(].*$//;
-    $bios->{SMODEL} =~ s/^\s*//;
-    $bios->{SMODEL} =~ s/\s*$//;
-
-    $cpu->{NAME} =~ s/SUNW,//;
-    $cpu->{NAME} =~ s/^\s*//;
-    $cpu->{NAME} =~ s/\s*$//;
-
-    # XXX quick and dirty _attempt_ to get proc speed
-    if ($cpu->{NAME} =~ /(\d+)(\.\d+|)\s*mhz/i ) { # possible decimal point
-        $cpu->{SPEED} = sprintf("%.0f", "$1$2"); # round number
-    }
-
-    $inventory->setBios($bios);
-
-    while ($count--) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-
-}
-
-
-1;

@@ -1,51 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Archs::i386;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-
-# Only run this module if dmidecode has not been found
-our $runMeIfTheseChecksFailed =
-    ["FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode"];
-
-sub isEnabled{
-    return 
-        $Config{archname} eq 'i386' || 
-        $Config{archname} eq 'x86_64';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # sysctl infos
-    my $bios = {
-        SMODEL => getFirstLine(command => 'sysctl -n hw.model')
-    };
-    my $cpu = {
-        NAME  => getFirstLine(command => 'sysctl -n hw.machine'),
-        SPEED => (getCanonicalSpeed(split(/\s+/, $bios->{SMODEL})))[-1]
-    };
-    my $count = getFirstLine(command => 'sysctl -n hw.ncpu');
-
-    $inventory->setBios($bios);
-
-    # don't deal with CPUs if information can be computed from dmidecode
-    my $infos = getInfosFromDmidecode(logger => $logger);
-    return if $infos->{4};
-
-    while ($count--) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-
-}
-
-1;

@@ -1,34 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::CPU;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return canRun('dmidecode');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $speed;
-    my $hwModel = getFirstLine(command => 'sysctl -n hw.model');
-    if ($hwModel =~ /([\.\d]+)GHz/) {
-        $speed = $1 * 1000;
-    }
-
-    foreach my $cpu (getCpusFromDmidecode()) {
-        $cpu->{SPEED} = $speed;
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-
-}
-
-1;

@@ -1,43 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Drives;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return canRun('df');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # get filesystem types
-    my @types = 
-        grep { ! /^(?:fdesc|devfs|procfs|linprocfs|linsysfs|tmpfs|fdescfs)$/ }
-        getFilesystemsTypesFromMount(logger => $logger);
-
-    # get filesystem for each type
-    my @filesystems;
-    foreach my $type (@types) {
-        push @filesystems, getFilesystemsFromDf(
-            logger  => $logger,
-            command => "df -P -k -t $type",
-            type    => $type
-        );
-    }
-
-    # add filesystems to the inventory
-    foreach my $filesystem (@filesystems) {
-        $inventory->addEntry(
-            section => 'DRIVES',
-            entry   => $filesystem
-        );
-    }
-}
-
-1;

@@ -1,36 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Memory;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled { 	
-    return
-        canRun('sysctl') &&
-        canRun('swapctl');
-};
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    # Swap
-    my $swapSize;
-    my @bsd_swapctl = `swapctl -sk`;
-    foreach (@bsd_swapctl) {
-        $swapSize = $1 if /total:\s*(\d+)/i;
-    }
-
-    # RAM
-    my $memorySize = getFirstLine(command => 'sysctl -n hw.physmem');
-    $memorySize = $memorySize / 1024;
-
-    $inventory->setHardware({
-        MEMORY => int($memorySize / 1024),
-        SWAP   => int($swapSize / 1024),
-    });
-}
-
-1;

@@ -1,144 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Networks;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Network;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return canRun('ifconfig');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # set list of network interfaces
-    my $routes     = getRoutingTable(logger => $logger);
-    my @interfaces = _getInterfaces(logger => $logger);
-
-    foreach my $interface (@interfaces) {
-        $interface->{IPGATEWAY} = $params{routes}->{$interface->{IPSUBNET}}
-            if $interface->{IPSUBNET};
-
-        $inventory->addEntry(
-            section => 'NETWORKS',
-            entry   => $interface
-        );
-    }
-
-    $inventory->setHardware({
-        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
-    });
-}
-
-sub _getInterfaces {
-    my (%params) = @_;
-
-    my @interfaces = _parseIfconfig(
-        command => '/sbin/ifconfig -a',
-        logger  =>  $params{logger}
-    );
-
-    foreach my $interface (@interfaces) {
-        $interface->{IPSUBNET} = getSubnetAddress(
-            $interface->{IPADDRESS},
-            $interface->{IPMASK}
-        );
-
-        $interface->{VIRTUALDEV} =
-            $interface->{DESCRIPTION} =~ /^(lo|vboxnet|vmnet|sit|tun|pflog|pfsync|enc|strip|plip|sl|ppp|faith)\d+$/;
-
-        $interface->{IPDHCP} = getIpDhcp(
-            $params{logger}, $interface->{DESCRIPTION}
-        );
-    }
-
-    return @interfaces;
-}
-
-sub _parseIfconfig {
-
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @interfaces; # global list of interfaces
-    my @addresses;  # per-interface list of addresses
-    my $interface;  # current interface
-
-    while (my $line = <$handle>) {
-        if ($line =~ /^(\S+): flags=\d+<([^>]+)> metric \d+ mtu (\d+)/) {
-
-            if (@addresses) {
-                push @interfaces, @addresses;
-                undef @addresses;
-            } else {
-                push @interfaces, $interface if $interface;
-            }
-
-            $interface = {
-                DESCRIPTION => $1,
-                MTU         => $3
-            };
-            my $flags = $2;
-
-            foreach my $flag (split(/,/, $flags)) {
-                next unless $flag eq 'UP' || $flag eq 'DOWN';
-                $interface->{STATUS} = ucfirst(lc($flag));
-            }
-        } elsif ($line =~ /(?:address:|ether|lladdr) ($mac_address_pattern)/) {
-            $interface->{MACADDR} = $1;
-
-        } elsif ($line =~ /inet ($ip_address_pattern) (?:--> $ip_address_pattern )?netmask 0x($hex_ip_address_pattern)/) {
-            my $address = $1;
-            my $mask    = hex2canonical($2);
-            my $subnet  = getSubnetAddress($address, $mask);
-
-            push @addresses, {
-                IPADDRESS   => $address,
-                IPMASK      => $mask,
-                IPSUBNET    => $subnet,
-                STATUS      => $interface->{STATUS},
-                DESCRIPTION => $interface->{DESCRIPTION},
-                MACADDR     => $interface->{MACADDR},
-                MTU         => $interface->{MTU}
-            };
-        } elsif ($line =~ /inet6 ([\w:]+)\S* prefixlen (\d+)/) {
-            my $address = $1;
-            my $mask    = getNetworkMaskIPv6($2);
-            my $subnet  = getSubnetAddressIPv6($address, $mask);
-
-            push @addresses, {
-                IPADDRESS6  => $address,
-                IPMASK6     => $mask,
-                IPSUBNET6   => $subnet,
-                STATUS      => $interface->{STATUS},
-                DESCRIPTION => $interface->{DESCRIPTION},
-                MACADDR     => $interface->{MACADDR},
-                MTU         => $interface->{MTU}
-            };
-
-        }
-
-        if ($line =~ /media: (\S+)/) {
-            $interface->{TYPE} = $1;
-            $_->{TYPE} = $1 foreach @addresses;
-        }
-    }
-    close $handle;
-
-    # last interface
-    if (@addresses) {
-        push @interfaces, @addresses;
-    } else {
-        push @interfaces, $interface if $interface;
-    }
-
-    return @interfaces;
-}
-
-1;

@@ -1,53 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Softwares;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return
-        !$params{no_category}->{software} &&
-        canRun('pkg_info');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $command = 'pkg_info';
-    my $packages = _getPackagesListFromPkgInfo(
-        logger => $logger, command => $command
-    );
-
-    foreach my $package (@$packages) {
-        $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => $package
-        );
-    }
-}
-
-sub _getPackagesListFromPkgInfo {
-    my $handle = getFileHandle(@_);
-
-    my @packages;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^(\S+) - (\S+) \s+ (.*)/x;
-        push @packages, {
-            NAME     => $1,
-            VERSION  => $2,
-            COMMENTS => $3
-        };
-    }
-
-    close $handle;
-
-    return \@packages;
-}
-
-1;

@@ -1,74 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Storages;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return -r '/etc/fstab';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # get a list of devices from /etc/fstab
-    my @devices = _getDevicesFromFstab(logger => $logger);
-
-    # parse dmesg
-    my @lines = getAllLines(
-        command => 'dmesg'
-    );
-
-    foreach my $device (@devices) {
-
-        foreach my $line (@lines) {
-            if ($line =~ /^$device->{DESCRIPTION}.*<(.*)>/) {
-                $device->{MODEL} = $1;
-            }
-            if ($line =~ /^$device->{DESCRIPTION}.*\s+(\d+)\s*MB/) {
-                $device->{CAPACITY} = $1;
-            }
-        }
-
-        if ($device->{MODEL}) {
-            if ($device->{MODEL} =~ s/^(SGI|SONY|WDC|ASUS|LG|TEAC|SAMSUNG|PHILIPS|PIONEER|MAXTOR|PLEXTOR|SEAGATE|IBM|SUN|SGI|DEC|FUJITSU|TOSHIBA|YAMAHA|HITACHI|VERITAS)\s*//i) {
-                $device->{MANUFACTURER} = $1;
-            }
-
-            # clean up the model
-            $device->{MODEL} =~ s/^(\s|,)*//;
-            $device->{MODEL} =~ s/(\s|,)*$//;
-        }
-
-        $inventory->addEntry(
-            section => 'STORAGES',
-            entry   => $device
-        );
-    }
-}
-
-sub _getDevicesFromFstab {
-    my (%params) = (
-        file => '/etc/fstab',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my (@devices, %seen);
-    while (my $line = <$handle>) {
-        next unless $line =~ m{^/dev/(\S+)};
-        next if $seen{$1}++;
-        push @devices, { DESCRIPTION => $1 };
-    }
-    close $handle;
-
-    return @devices;
-}
-
-1;

@@ -1,38 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD::Uptime;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('sysctl');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $arch = getFirstLine(command => 'uname -m');
-    my $uptime = _getUptime(command => 'sysctl -n kern.boottime');
-    $inventory->setHardware({
-        DESCRIPTION => "$arch/$uptime"
-    });
-}
-
-sub _getUptime {
-    my $line = getFirstLine(@_);
-
-    # the output of 'sysctl -n kern.boottime' differs between BSD flavours
-    my $boottime = 
-        $line =~ /^(\d+)/      ? $1 : # OpenBSD format
-        $line =~ /sec = (\d+)/ ? $1 : # FreeBSD format
-        undef;
-    return unless $boottime;
-
-    my $uptime = $boottime - time();
-    return getFormatedGmTime($uptime);
-}
-
-1;

@@ -1,65 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::BSD;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-our $runAfter = ["FusionInventory::Agent::Task::Inventory::Input::Generic"];
-
-sub isEnabled {
-    return $OSNAME =~ /freebsd|openbsd|netbsd|gnukfreebsd|gnuknetbsd|dragonfly/;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    # Basic operating system informations
-    my $OSVersion = getFirstLine(command => 'uname -r');
-    my $OSComment = getFirstLine(command => 'uname -v');
-
-    # Get more information from the kernel configuration file
-    my $date;
-    my $handle = getFileHandle(command => "sysctl -n kern.version");
-    while (my $line = <$handle>) {
-        if ($line =~ /^\S.*\#\d+:\s*(.*)/) {
-            $date = $1;
-            next;
-        }
-
-        if ($line =~ /^\s+(.+):(.+)$/) {
-            my $origin = $1;
-            my $kernconf = $2;
-            $kernconf =~ s/\/.*\///; # remove the path
-            $OSComment = $kernconf . " (" . $date . ")\n" . $origin;
-        }
-    }
-    close $handle;
-
-    my $OSName = $OSNAME;
-    if (canRun('lsb_release')) {
-        $OSName = getFirstMatch(
-            command => 'lsb_release -d',
-            pattern => qr/Description:\s+(.+)/
-        );
-    }
-
-    $inventory->setHardware({
-        OSNAME     => $OSName,
-        OSVERSION  => $OSVersion,
-        OSCOMMENTS => $OSComment,
-    });
-
-    $inventory->setOperatingSystem({
-        NAME                 => $OSName,
-        VERSION              => $OSVersion,
-        KERNEL_VERSION       => $OSVersion,
-        FULL_NAME            => $OSNAME
-    });
-}
-
-1;

@@ -1,79 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Battery;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $battery = _getBattery(logger => $logger);
-
-    return unless $battery;
-
-    $inventory->addEntry(
-        section => 'BATTERIES',
-        entry   => $battery
-    );
-}
-
-sub _getBattery {
-    my $infos = getDmidecodeInfos(@_);
-
-    return unless $infos->{22};
-
-    my $info    = $infos->{22}->[0];
-
-    my $battery = {
-        NAME         => $info->{'Name'},
-        MANUFACTURER => $info->{'Manufacturer'},
-        SERIAL       => $info->{'Serial Number'},
-        CHEMISTRY    => $info->{'Chemistry'},
-    };
-
-    if ($info->{'Manufacture Date'}) {
-        $battery->{DATE} = _parseDate($info->{'Manufacture Date'});
-    }
-
-    if ($info->{'Design Capacity'} &&
-        $info->{'Design Capacity'} =~ /(\d+) \s m(W|A)h$/x) {
-        $battery->{CAPACITY} = $1;
-    }
-
-    if ($info->{'Design Voltage'} &&
-        $info->{'Design Voltage'} =~ /(\d+) \s mV$/x) {
-        $battery->{VOLTAGE} = $1;
-    }
-
-    return $battery;
-}
-
-sub _parseDate {
-    my ($string) = @_;
-
-    my ($day, $month, $year);
-    if ($string =~ /(\d{1,2}) [\/-] (\d{1,2}) [\/-] (\d{2})/x) {
-        $day   = $1;
-        $month = $2;
-        $year  = ($3 > 90 ? "19" : "20" ) . $3;
-        return "$day/$month/$year";
-    } elsif ($string =~ /(\d{4}) [\/-] (\d{1,2}) [\/-] (\d{1,2})/x) {
-        $year  = $1;
-        $day   = $2;
-        $month = $3;
-        return "$day/$month/$year";
-    }
-
-    return;
-}
-
-1;

@@ -1,88 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Bios;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my ($bios, $hardware) = _getBiosHardware(logger => $logger);
-
-    $inventory->setBios($bios) if $bios;
-    $inventory->setHardware($hardware) if $hardware;
-}
-
-sub _getBiosHardware {
-    my $infos = getDmidecodeInfos(@_);
-
-    my $bios_info    = $infos->{0}->[0];
-    my $system_info  = $infos->{1}->[0];
-    my $base_info    = $infos->{2}->[0];
-    my $chassis_info = $infos->{3}->[0];
-
-    my $bios = {
-        BMANUFACTURER => $bios_info->{'Vendor'},
-        BDATE         => $bios_info->{'Release Date'},
-        BVERSION      => $bios_info->{'Version'},
-        ASSETTAG      => $chassis_info->{'Asset Tag'}
-    };
-
-    $bios->{SMODEL} =
-        $system_info->{'Product'}      ||
-        $system_info->{'Product Name'};
-    $bios->{MMODEL} = $base_info->{'Product Name'};
-    $bios->{SKUNUMBER} = $system_info->{'SKU Number'};
-
-    $bios->{SMANUFACTURER} =
-        $system_info->{'Manufacturer'} ||
-        $system_info->{'Vendor'};
-    $bios->{MMANUFACTURER} = $base_info->{'Manufacturer'};
-
-    $bios->{SSN} = $system_info->{'Serial Number'};
-    $bios->{MSN} = $base_info->{'Serial Number'};
-
-    my $hardware = {
-        UUID => $system_info->{'UUID'},
-        CHASSIS_TYPE  => $chassis_info->{'Type'}
-    };
-
-    my $vmsystem;
-    if ($bios->{SMANUFACTURER} &&
-        $bios->{SMANUFACTURER} =~ /^Microsoft Corporation$/ &&
-        $bios->{SMODEL} &&
-        $bios->{SMODEL} =~ /Virtual Machine/) {
-        $vmsystem = 'Hyper-V';
-    } elsif ($bios->{BMANUFACTURER}) {
-        $vmsystem =
-            $bios->{BMANUFACTURER} =~ /(QEMU|Bochs)/         ? 'QEMU'       :
-            $bios->{BMANUFACTURER} =~ /(VirtualBox|innotek)/ ? 'VirtualBox' :
-            $bios->{BMANUFACTURER} =~ /^Xen/                 ? 'Xen'        :
-                                                               undef        ;
-    } elsif ($bios->{SMODEL}) {
-        $vmsystem =
-            $bios->{SMODEL} =~ /VMware/          ? 'VMWare'          :
-            $bios->{SMODEL} =~ /Virtual Machine/ ? 'Virtual Machine' :
-                                                    undef            ;
-    } elsif ($bios->{BVERSION}) {
-        $vmsystem =
-            $bios->{BVERSION} =~ /VirtualBox/ ? 'VirtualBox' : undef;
-    }
-    $hardware->{VMSYSTEM} = $vmsystem if $vmsystem;
-
-    
-
-
-    return $bios, $hardware;
-}
-
-1;

@@ -1,88 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Memory;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $memories = _getMemories(logger => $logger);
-
-    return unless $memories;
-
-    foreach my $memory (@$memories) {
-        $inventory->addEntry(
-            section => 'MEMORIES',
-            entry   => $memory
-        );
-    }
-}
-
-sub _getMemories {
-    my $infos = getDmidecodeInfos(@_);
-
-    my ($memories, $slot);
-
-    my $memoryCorrection;
-    if ($infos->{16}) {
-        $memoryCorrection = $infos->{16}[0]{'Error Correction Type'};
-    }
-    if ($infos->{17}) {
-
-        foreach my $info (@{$infos->{17}}) {
-            $slot++;
-
-            # Flash is 'in general' an unrelated internal BIOS storage, See bug: #1334
-            next if $info->{'Type'} =~ /Flash/i;
-
-            my $description = $info->{'Form Factor'};
-            $description .= " ($memoryCorrection)" if $memoryCorrection;
-
-            my $memory = {
-                NUMSLOTS     => $slot,
-                DESCRIPTION  => $description,
-                CAPTION      => $info->{'Locator'},
-                SPEED        => $info->{'Speed'},
-                TYPE         => $info->{'Type'},
-                SERIALNUMBER => $info->{'Serial Number'},
-                MEMORYCORRECTION => $memoryCorrection
-            };
-
-            if ($info->{'Size'} && $info->{'Size'} =~ /^(\d+) \s MB$/x) {
-                $memory->{CAPACITY} = $1;
-            }
-
-            push @$memories, $memory;
-        }
-    } elsif ($infos->{6}) {
-
-        foreach my $info (@{$infos->{6}}) {
-            $slot++;
-
-            my $memory = {
-                NUMSLOTS => $slot,
-                TYPE     => $info->{'Type'},
-            };
-
-            if ($info->{'Installed Size'} && $info->{'Installed Size'} =~ /^(\d+)\s*(MB|Mbyte)/x) {
-                $memory->{CAPACITY} = $1;
-            }
-
-            push @$memories, $memory;
-        }
-    }
-
-    return $memories;
-}
-
-1;

@@ -1,51 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Ports;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $ports = _getPorts(logger => $logger);
-
-    return unless $ports;
-
-    foreach my $port (@$ports) {
-        $inventory->addEntry(
-            section => 'PORTS',
-            entry   => $port
-        );
-    }
-}
-
-sub _getPorts {
-    my $infos = getDmidecodeInfos(@_);
-
-    return unless $infos->{8};
-
-    my $ports;
-    foreach my $info (@{$infos->{8}}) {
-        my $port = {
-            CAPTION     => $info->{'External Connector Type'},
-            DESCRIPTION => $info->{'Internal Connector Type'},
-            NAME        => $info->{'Internal Reference Designator'},
-            TYPE        => $info->{'Port Type'},
-        };
-
-        push @$ports, $port;
-    }
-
-    return $ports;
-}
-
-1;

@@ -1,51 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Slots;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $slots = _getSlots(logger => $logger);
-
-    return unless $slots;
-
-    foreach my $slot (@$slots) {
-        $inventory->addEntry(
-            section => 'SLOTS',
-            entry   => $slot
-        );
-    }
-}
-
-sub _getSlots {
-    my $infos = getDmidecodeInfos(@_);
-
-    return unless $infos->{9};
-
-    my $slots;
-    foreach my $info (@{$infos->{9}}) {
-        my $slot = {
-            DESCRIPTION => $info->{'Type'},
-            DESIGNATION => $info->{'ID'},
-            NAME        => $info->{'Designation'},
-            STATUS      => $info->{'Current Usage'},
-        };
-
-        push @$slots, $slot;
-    }
-
-    return $slots;
-}
-
-1;

@@ -1,19 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use UNIVERSAL::require;
-
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-
-    return unless getDmidecodeInfos();
-
-}
-
-sub doInventory {}
-
-1;

@@ -1,60 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Domains;
-
-use strict;
-use warnings;
-
-use Sys::Hostname;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return -f "/etc/resolv.conf";
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # first, parse /etc/resolv.conf for the DNS servers,
-    # and the domain search list
-    my %dns_list;
-    my %search_list;
-    my $handle = getFileHandle(
-        file => '/etc/resolv.conf',
-        logger => $logger
-    );
-    if ($handle) {
-        while (my $line = <$handle>) {
-            if ($line =~ /^nameserver\s+(\S+)/) {
-                $dns_list{$1} = 1;
-            } elsif ($line =~ /^(domain|search)\s+(\S+)/) {
-                $search_list{$2} = 1;
-            }
-        }
-        close $handle;
-    }
-
-    my $dns = join('/', keys %dns_list);
-
-    # attempt to deduce the actual domain from the host name
-    # and fallback on the domain search list
-    my $domain;
-    my $hostname = hostname();
-    my $pos = index $hostname, '.';
-
-    if ($pos >= 0) {
-        $domain = substr($hostname, $pos + 1);
-    } else {
-        $domain = join('/', keys %search_list);
-    }
-
-    $inventory->setHardware({
-        WORKGROUP => $domain,
-        DNS       => $dns
-    });
-
-}
-
-1;

@@ -1,35 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Environment;
-
-use English qw(-no_match_vars);
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return
-        # We use WMI for Windows because of charset issue
-        $OSNAME ne 'MSWin32' &&
-        !$params{no_category}->{environment};
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $key (keys %ENV) {
-        $inventory->addEntry(
-            section => 'ENVS',
-            entry   => {
-                KEY => $key,
-                VAL => $ENV{$key}
-            }
-        );
-    }
-}
-
-1;

@@ -1,28 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Hostname;
-
-use English qw(-no_match_vars);
-
-use strict;
-use warnings;
-
-use Sys::Hostname;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    # We use WMI for Windows because of charset issue
-    return $OSNAME ne 'MSWin32';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $hostname = hostname();
-    $hostname =~ s/\..*//; # keep just the hostname
-
-    $inventory->setHardware({NAME => $hostname});
-}
-
-1;

@@ -1,88 +0,0 @@
-#
-# OcsInventory agent - IPMI lan channel report
-#
-# Copyright (c) 2008 Jean Parpaillon <jean.parpaillon@kerlabs.com>
-#
-# The Intelligent Platform Management Interface (IPMI) specification
-# defines a set of common interfaces to a computer system which system
-# administrators can use to monitor system health and manage the
-# system. The IPMI consists of a main controller called the Baseboard
-# Management Controller (BMC) and other satellite controllers.
-# 
-# The BMC can be fetched through client like OpenIPMI drivers or
-# through the network. Though, the BMC hold a proper MAC address.
-#
-# This module reports the MAC address and, if any, the IP
-# configuration of the BMC. This is reported as a standard NIC.
-#
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Ipmi;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Network;
-
-sub isEnabled {
-    return unless canRun('ipmitool');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(
-        logger => $logger,
-        command => "ipmitool lan print",
-    );
-
-    return unless $handle;
-
-    my $ipaddress;
-    my $ipgateway;
-    my $ipmask;
-    my $macaddr;
-
-    while (my $line = <$handle>) {
-        if ($line =~ /^IP Address\s+:\s+($ip_address_pattern)/) {
-            $ipaddress = $1;
-        }
-        if ($line =~ /^Default Gateway IP\s+:\s+($ip_address_pattern)/) {
-            $ipgateway = $1;
-        }
-        if ($line =~ /^Subnet Mask\s+:\s+($ip_address_pattern)/) {
-            $ipmask = $1;
-        }
-        if ($line =~ /^MAC Address\s+:\s+($mac_address_pattern)/) {
-            $macaddr = $1;
-        }
-    }
-    close $handle;
-
-    return unless $ipaddress && $ipmask;
-
-    my $ipsubnet = getSubnetAddress($ipaddress, $ipmask);
-
-    my $status = "Down";
-    if ($ipaddress && ($ipaddress ne '0.0.0.0')) {
-        $status = "Up";
-    }
-
-    $inventory->addEntry(
-        section => 'NETWORKS',
-        entry   => {
-            DESCRIPTION => 'bmc',
-            IPADDRESS   => $ipaddress,
-            IPGATEWAY   => $ipgateway,
-            IPMASK      => $ipmask,
-            IPSUBNET    => $ipsubnet,
-            MACADDR     => $macaddr,
-            STATUS      => $status,
-            TYPE        => 'Ethernet'
-        }
-    );
-}
-
-1;

@@ -1,131 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Lspci::Controllers;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-my $vendors;
-my $classes;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-    my $datadir   = $params{datadir};
-
-    _loadPciIds(logger => $logger, datadir => $datadir);
-
-    foreach my $controller (_getControllers(logger => $logger)) {
-        $inventory->addEntry(
-            section => 'CONTROLLERS',
-            entry   => $controller
-        );
-    }
-}
-
-sub _getControllers {
-    my @controllers;
-
-    foreach my $device (getPCIDevices(@_)) {
-
-        next unless $device->{PCIID};
-
-        # duplicate entry to avoid modifying it directly
-        my $controller = {
-            PCICLASS     => $device->{PCICLASS},
-            NAME         => $device->{NAME},
-            MANUFACTURER => $device->{MANUFACTURER},
-            REV          => $device->{REV},
-            PCIID        => $device->{PCIID},
-            PCISLOT      => $device->{PCISLOT},
-        };
-        $controller->{DRIVER} = $device->{DRIVER}
-            if $device->{DRIVER};
-        $controller->{PCISUBSYSTEMID} = $device->{PCISUBSYSTEMID}
-            if $device->{PCISUBSYSTEMID};
-
-        my ($vendor_id, $device_id) = split (/:/, $device->{PCIID});
-        my $subdevice_id = $device->{PCISUBSYSTEMID};
-
-        if ($vendors->{$vendor_id}) {
-            my $vendor = $vendors->{$vendor_id};
-            $controller->{MANUFACTURER} = $vendor->{name};
-
-            if ($vendor->{devices}->{$device_id}) {
-                my $entry = $vendor->{devices}->{$device_id};
-                $controller->{CAPTION} = $entry->{name};
-
-                $controller->{NAME} =
-                    $subdevice_id && $entry->{subdevices}->{$subdevice_id} ?
-
-                    $entry->{subdevices}->{$subdevice_id}->{name} :
-                    $entry->{name};
-            }
-        }
-
-        next unless $device->{PCICLASS};
-
-        $device->{PCICLASS} =~ /^(\S\S)(\S\S)$/x;
-        my $class_id = $1;
-        my $subclass_id = $2;
-
-        if ($classes->{$class_id}) {
-            my $class = $classes->{$class_id};
-
-            $controller->{TYPE} = 
-                $subclass_id && $class->{subclasses}->{$subclass_id} ?
-                    $class->{subclasses}->{$subclass_id}->{name} :
-                    $class->{name};
-        }
-
-        push @controllers, $controller;
-    }
-
-    return @controllers;
-}
-
-sub _loadPciIds {
-    my (%params) = @_;
-
-    my $handle = getFileHandle(
-        file   => "$params{datadir}/pci.ids",
-        logger => $params{logger}
-    );
-    return unless $handle;
-
-    my ($vendor_id, $device_id, $class_id);
-    while (my $line = <$handle>) {
-
-        if ($line =~ /^\t (\S{4}) \s+ (.*)/x) {
-            # Device ID
-            $device_id = $1;
-            $vendors->{$vendor_id}->{devices}->{$device_id}->{name} = $2;
-        } elsif ($line =~ /^\t\t (\S{4}) \s+ (\S{4}) \s+ (.*)/x) {
-            # Subdevice ID
-            my $subdevice_id = "$1:$2";
-            $vendors->{$vendor_id}->{devices}->{$device_id}->{subdevices}->{$subdevice_id}->{name} = $3;
-        } elsif ($line =~ /^(\S{4}) \s+ (.*)/x) {
-            # Vendor ID
-            $vendor_id = $1;
-            $vendors->{$vendor_id}->{name} = $2;
-        } elsif ($line =~ /^C \s+ (\S{2}) \s+ (.*)/x) {
-            # Class ID
-            $class_id = $1;
-            $classes->{$class_id}->{name} = $2;
-        } elsif ($line =~ /^\t (\S{2}) \s+ (.*)/x) {
-            # SubClass ID
-            my $subclass_id = $1;
-            $classes->{$class_id}->{subclasses}->{$subclass_id}->{name} = $2;
-        } 
-    }
-    close $handle;
-}
-
-1;

@@ -1,41 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Lspci::Modems;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $modem (_getModems(logger => $logger)) {
-        $inventory->addEntry(
-            section => 'MODEMS',
-            entry   => $modem
-        );
-    }
-}
-
-sub _getModems {
-    my @modems;
-
-    foreach my $device (getPCIDevices(@_)) {
-        next unless $device->{NAME} =~ /modem/i;
-        push @modems, {
-            DESCRIPTION => $device->{NAME},
-            NAME        => $device->{MANUFACTURER},
-        };
-    }
-
-    return @modems;
-}
-
-1;

@@ -1,42 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Lspci::Sounds;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $sound (_getSounds(logger => $logger)) {
-        $inventory->addEntry(
-            section => 'SOUNDS',
-            entry   => $sound
-        );
-    }
-}
-
-sub _getSounds {
-    my @sounds;
-
-    foreach my $device (getPCIDevices(@_)) {
-        next unless $device->{NAME} =~ /audio/i;
-        push @sounds, {
-            NAME         => $device->{NAME},
-            MANUFACTURER => $device->{MANUFACTURER},
-            DESCRIPTION  => $device->{REV} && "rev $device->{REV}",
-        };
-    }
-
-    return @sounds;
-}
-
-1;

@@ -1,45 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Lspci::Videos;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    # both windows and linux have dedicated modules
-    return 
-        $OSNAME ne 'MSWin32' &&
-        $OSNAME ne 'linux';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $video (_getVideos(logger => $logger)) {
-        $inventory->addEntry(
-            section => 'VIDEOS',
-            entry   => $video
-        );
-    }
-}
-
-sub _getVideos {
-    my @videos;
-
-    foreach my $device (getPCIDevices(@_)) {
-        next unless $device->{NAME} =~ /graphics|vga|video|display/i;
-        push @videos, {
-            CHIPSET => $device->{NAME},
-            NAME    => $device->{MANUFACTURER},
-        };
-    }
-
-    return @videos;
-}
-
-1;

@@ -1,14 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Lspci;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('lspci');
-}
-
-sub doInventory {}
-
-1;

@@ -1,49 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Printers;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return 
-        # we use system profiler on MacOS
-        $OSNAME ne 'darwin' &&
-        !$params{no_category}->{printer} &&
-        canLoad("Net::CUPS") &&
-        $Net::CUPS::VERSION >= 0.60;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $cups = Net::CUPS->new();
-    my @printers = $cups->getDestinations();
-
-    foreach my $printer (@printers) {
-        my $uri = $printer->getUri();
-        my $name = $uri;
-        $name =~ s/^.*\/\/([^\.]*).*$/$1/eg ;
-        $name =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
-        $inventory->addEntry(
-            section => 'PRINTERS',
-            entry   => {
-                NAME        => $name,
-                PORT        => $uri,
-                DESCRIPTION => $printer->getDescription(),
-                DRIVER      => $printer->getOptionValue(
-                                   "printer-make-and-model"
-                               ),
-            }
-        );
-    }
-
-}
-
-1;

@@ -1,38 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Processes;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return 
-        $OSNAME ne 'MSWin32' &&
-        !$params{no_category}->{process} &&
-        canRun('ps');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-    my $command   = $OSNAME eq 'solaris' ?
-        'ps -A -o user,pid,pcpu,pmem,vsz,rss,tty,s,stime,time,comm' : 'ps aux';
-
-    foreach my $process (getProcessesFromPs(
-        logger => $logger, command => $command
-    )) {
-        $inventory->addEntry(
-            section => 'PROCESSES',
-            entry   => $process
-        );
-    }
-}
-
-1;

@@ -1,189 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Screen;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use MIME::Base64;
-use UNIVERSAL::require;
-
-use File::Find;
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Screen;
-
-# list of models with unsuited constant ASCII serial numbers
-my %blacklist = (
-    ACRad49 => 1
-);
-
-sub isEnabled {
-
-    return
-        $OSNAME eq 'MSWin32'                 ||
-        -d '/sys'                            ||
-        canRun('monitor-get-edid-using-vbe') ||
-        canRun('monitor-get-edid')           ||
-        canRun('get-edid');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $screen (_getScreens($logger)) {
-
-        if ($screen->{edid}) {
-            my $info = _getEdidInfo($screen->{edid}, $logger);
-            $screen->{CAPTION}      = $info->{CAPTION};
-            $screen->{DESCRIPTION}  = $info->{DESCRIPTION};
-            $screen->{MANUFACTURER} = $info->{MANUFACTURER};
-            $screen->{SERIAL}       = $info->{SERIAL};
-
-            $screen->{BASE64} = encode_base64($screen->{edid});
-            delete $screen->{edid};
-        }
-
-        $inventory->addEntry(
-            section => 'MONITORS',
-            entry   => $screen
-        );
-    }
-}
-
-sub _getEdidInfo {
-    my ($raw_edid, $logger) = @_;
-
-    my $edid = parseEdid($raw_edid);
-    if (my $error = checkParsedEdid($edid)) {
-        $logger->debug("bad edid: $error");
-        return;
-    }
-
-    my $info = {
-        CAPTION      => $edid->{monitor_name},
-        DESCRIPTION  => $edid->{week} . "/" . $edid->{year},
-        MANUFACTURER => getManufacturerFromCode($edid->{manufacturer_name}) ||
-                        $edid->{manufacturer_name}
-    };
-
-    # they are two different serial numbers in EDID
-    # - a mandatory 4 bytes numeric value
-    # - an optional 13 bytes ASCII value
-    # we use the ASCII value if present, and if the model is not part of an
-    # exception, otherwise we use the numerical one, as an 8-length hex string
-    # References:
-    # http://forge.fusioninventory.org/issues/1607
-    # http://forge.fusioninventory.org/issues/1614
-    $info->{SERIAL} =
-        $edid->{serial_number2} && !$blacklist{$edid->{EISA_ID}} ?
-            $edid->{serial_number2}->[0]           :
-            sprintf("%08x", $edid->{serial_number});
-
-    return $info;
-}
-
-sub _getScreensFromWindows {
-    my ($logger) = @_;
-
-    FusionInventory::Agent::Tools::Win32->use();
-    if ($EVAL_ERROR) {
-        print
-            "Failed to load FusionInventory::Agent::Tools::Win32: $EVAL_ERROR";
-        return;
-    }
-
-    my @screens;
-
-    # Vista and upper, able to get the second screen
-    foreach my $object (getWmiObjects(
-        moniker    => 'winmgmts:{impersonationLevel=impersonate,authenticationLevel=Pkt}!//./root/wmi',
-        class      => 'WMIMonitorID',
-        properties => [ qw/InstanceName/ ]
-    )) {
-        next unless $object->{InstanceName};
-
-        $object->{InstanceName} =~ s/_\d+//;
-        push @screens, {
-            id => $object->{InstanceName}
-        };
-    }
-
-    # The generic Win32_DesktopMonitor class, the second screen will be missing
-    foreach my $object (getWmiObjects(
-        class => 'Win32_DesktopMonitor',
-        properties => [ qw/
-            Caption MonitorManufacturer MonitorType PNPDeviceID Availability
-        / ]
-    )) {
-        next unless $object->{Availability};
-        next unless $object->{PNPDeviceID};
-        next unless $object->{Availability} == 3;
-
-        push @screens, {
-            id           => $object->{PNPDeviceID},
-            NAME         => $object->{Caption},
-            TYPE         => $object->{MonitorType},
-            MANUFACTURER => $object->{MonitorManufacturer},
-            CAPTION      => $object->{Caption}
-        };
-    }
-
-    foreach my $screen (@screens) {
-        next unless $screen->{id};
-        $screen->{edid} = getRegistryValue(
-            path => "HKEY_LOCAL_MACHINE/SYSTEM/CurrentControlSet/Enum/$screen->{id}/Device Parameters/EDID",
-            logger => $logger
-        ) || '';
-        $screen->{edid} =~ s/^\s+$//;
-        delete $screen->{id};
-    }
-
-    return @screens;
-}
-
-sub _getScreensFromUnix {
-
-    my @screens;
-
-    if (-d '/sys/devices') {
-        my $wanted = sub {
-            return unless $_ eq 'edid';
-            return unless -s $File::Find::name;
-            my $edid = getAllLines(file => $File::Find::name);
-            push @screens, { edid => $edid } if $edid;
-        };
-
-        no warnings 'File::Find';
-        File::Find::find($wanted, '/sys/devices');
-
-        return @screens if @screens;
-    }
-
-    my $edid =
-        getAllLines(command => 'monitor-get-edid-using-vbe') ||
-        getAllLines(command => 'monitor-get-edid');
-    push @screens, { edid => $edid };
-
-    return @screens if @screens;
-
-    foreach (1..5) { # Sometime get-edid return an empty string...
-        $edid = getFirstLine(command => 'get-edid');
-        if ($edid) {
-            push @screens, { edid => $edid };
-            last;
-        }
-    }
-
-    return @screens;
-}
-
-sub _getScreens {
-    my ($logger) = @_;
-
-    return $OSNAME eq 'MSWin32' ?
-        _getScreensFromWindows($logger) : _getScreensFromUnix($logger);
-}
-
-1;

@@ -1,64 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Softwares::Deb;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('dpkg-query');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $command =
-        'dpkg-query --show --showformat=\'' .
-        '${Package}\t' .
-        '${Architecture}\t' .
-        '${Version}\t'.
-        '${Installed-Size}\t' .
-        '${Description}\n' .
-        '\'';
-
-    my $packages = _getPackagesList(
-        logger => $logger, command => $command
-    );
-    return unless $packages;
-
-    foreach my $package (@$packages) {
-        $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => $package
-        );
-    }
-}
-
-sub _getPackagesList {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @packages;
-    while (my $line = <$handle>) {
-        # skip descriptions
-        next if $line =~ /^ /;
-        chomp $line;
-        my @infos = split("\t", $line);
-        push @packages, {
-            NAME        => $infos[0],
-            ARCH        => $infos[1],
-            VERSION     => $infos[2],
-            FILESIZE    => $infos[3],
-            COMMENTS    => $infos[4],
-            FROM        => 'deb'
-        };
-    }
-    close $handle;
-
-    return \@packages;
-}
-
-1;

@@ -1,64 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Softwares::Gentoo;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('equery');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $command = _equeryNeedsWildcard() ?
-        "equery list -i '*'" : "equery list -i";
-
-    my $packages = _getPackagesList(
-        logger => $logger, command => $command
-    );
-
-    foreach my $package (@$packages) {
-        $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => $package
-        );
-    }
-}
-
-sub _getPackagesList {
-    my $handle = getFileHandle(@_);
-
-    my @packages;
-    while (my $line = <$handle>) {
-        chomp $line;
-        next unless $line =~ /^(.*)-([0-9]+.*)/;
-        push @packages, {
-            NAME    => $1,
-            VERSION => $2,
-        };
-    }
-    close $handle;
-
-    return \@packages;
-}
-
-# http://forge.fusioninventory.org/issues/852
-sub _equeryNeedsWildcard {
-    my ($major, $minor) = getFirstMatch(
-        command => 'equery -V',
-        pattern => qr/^equery ?\((\d+)\.(\d+)\.\d+\)/,
-        @_
-    );
-
-    # true starting from version 0.3
-    return compareVersion($major, $minor, 0, 3);
-}
-
-1;

@@ -1,40 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Softwares::Pacman;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('pacman');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(
-        logger  => $logger,
-        command => 'pacman -Q'
-    );
-    return unless $handle;
-
-    while (my $line = <$handle>) {
-        next unless $line =~ /^(\S+)\s+(\S+)/;
-        my $name = $1;
-        my $version = $2;
-
-       $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => {
-                NAME    => $name,
-                VERSION => $version
-            }
-        );
-    }
-    close $handle;
-}
-
-1;

@@ -1,67 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Softwares::RPM;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('rpm');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $command =
-        'rpm -qa --queryformat \'' .
-        '%{NAME}\t' .
-        '%{ARCH}\t' .
-        '%{VERSION}-%{RELEASE}\t' .
-        '%{INSTALLTIME:date}\t' .
-        '%{SIZE}\t' .
-        '%{VENDOR}\t' .
-        '%{SUMMARY}\n' . 
-        '\'';
-
-    my $packages = _getPackagesList(
-        logger => $logger, command => $command
-    );
-    return unless $packages;
-
-    foreach my $package (@$packages) {
-        $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => $package
-        );
-    }
-}
-
-sub _getPackagesList {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @packages;
-    while (my $line = <$handle>) {
-        chomp $line;
-        my @infos = split("\t", $line);
-        push @packages, {
-            NAME        => $infos[0],
-            ARCH        => $infos[1],
-            VERSION     => $infos[2],
-            INSTALLDATE => $infos[3],
-            FILESIZE    => $infos[4],
-            PUBLISHER   => $infos[5],
-            COMMENTS    => $infos[6],
-            FROM        => 'rpm'
-        };
-    }
-
-    close $handle;
-
-    return \@packages;
-}
-
-1;

@@ -1,39 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Softwares::Slackware;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('pkgtool');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getDirectoryHandle(
-        directory => '/var/log/packages', logger => $logger
-    );
-    return unless $handle;
-
-    while (my $file = readdir($handle)) {
-        next unless $file =~ /^(.+)([^-]+-[^-]+-[^-]+)$/;
-        my $name = $1;
-        my $version = $2;
-
-        $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => {
-                NAME    => $name,
-                VERSION => $version
-            }
-        );
-    }
-    closedir $handle;
-}
-
-1;

@@ -1,14 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Softwares;
-
-use strict;
-use warnings;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return !$params{no_category}->{software};
-}
-
-sub doInventory {}
-
-1;

@@ -1,157 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Storages::HP;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use UNIVERSAL::require;
-
-use FusionInventory::Agent::Tools;
-# Tested on 2.6.* kernels
-#
-# Cards tested :
-#
-# Smart Array E200
-#
-# HP Array Configuration Utility CLI 7.85-18.0
-
-sub _getHpacuacliFromWinRegistry {
-
-    my $Registry;
-    Win32::TieRegistry->require();
-    Win32::TieRegistry->import(
-        Delimiter   => '/',
-        ArrayValues => 0,
-        TiedRef     => \$Registry,
-    );
-
-    my $machKey = $Registry->Open('LMachine', {
-        Access => Win32::TieRegistry::KEY_READ(),
-    }) or die "Can't open HKEY_LOCAL_MACHINE key: $EXTENDED_OS_ERROR";
-
-    my $uninstallValues =
-        $machKey->{'SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall/HP ACUCLI'};
-    return unless $uninstallValues;
-
-    my $uninstallString = $uninstallValues->{'/UninstallString'};
-    return unless $uninstallString;
-
-    return unless $uninstallString =~ /(.*\\)hpuninst\.exe/;
-    my $hpacuacliPath = $1 . 'bin\\hpacucli.exe';
-    return unless -f $hpacuacliPath;
-
-    return $hpacuacliPath;
-}
-
-sub isEnabled {
-    return
-        canRun('hpacucli') ||
-        ($OSNAME eq 'MSWin32' && _getHpacuacliFromWinRegistry());
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my ($serialnumber, $model, $capacity, $firmware, $description, $media, $manufacturer);
-
-    my $hpacuacliPath = canRun('hpacucli') ?
-        "hpacucli":
-        _getHpacuacliFromWinRegistry($logger);
-
-    my $handle1 = getFileHandle(
-        logger => $logger,
-        command => "$hpacuacliPath ctrl all show"
-    );
-
-    return unless $handle1;
-
-# Example output :
-#    
-# Smart Array E200 in Slot 2    (sn: PA6C90K9SUH1ZA)
-    while (my $line1 = <$handle1>) {
-        next unless $line1 =~ /Slot\s(\d*)/;
-
-        my $slot = $1;
-        my $handle2 = getFileHandle(
-            logger => $logger,
-            command => "$hpacuacliPath ctrl slot=$slot pd all show"
-        );
-        next unless $handle2;
-
-# Example output :
-#
-# Smart Array E200 in Slot 2
-#
-#   array A
-#
-#      physicaldrive 2I:1:1 (port 2I:box 1:bay 1, SATA, 74.3 GB, OK)
-#      physicaldrive 2I:1:2 (port 2I:box 1:bay 2, SATA, 74.3 GB, OK)
-        while (my $line2 = <$handle2>) {
-            next unless $line2 =~ /physicaldrive\s(\S*)/;
-
-            my $pd = $1;
-            my $handle3 = getFileHandle(
-                logger => $logger,
-                command => "$hpacuacliPath ctrl slot=$slot pd $pd show"
-            );
-            next unless $handle3;
-
-# Example output :
-#  
-# Smart Array E200 in Slot 2
-#
-#   array A
-#
-#      physicaldrive 1:1
-#         Port: 2I
-#         Box: 1
-#         Bay: 1
-#         Status: OK
-#         Drive Type: Data Drive
-#         Interface Type: SATA
-#         Size: 74.3 GB
-#         Firmware Revision: 21.07QR4
-#         Serial Number:      WD-WMANS1732855
-#         Model: ATA     WDC WD740ADFD-00
-#         SATA NCQ Capable: False
-#         PHY Count: 1        
-            while (my $line3 = <$handle3>) {
-                $model = $1 if $line3 =~ /Model:\s(.*)/;
-                $description = $1 if $line3 =~ /Interface Type:\s(.*)/;
-                $media = $1 if $line3 =~ /Drive Type:\s(.*)/;
-                $capacity = 1000*$1 if $line3 =~ /Size:\s(\S*)/;
-                $serialnumber = $1 if $line3 =~ /Serial Number:\s(.*)/;
-                $firmware = $1 if $line3 =~ /Firmware Revision:\s(.*)/;
-            }
-            close $handle3;
-            $serialnumber =~ s/^\s+//;
-            $model =~ s/^ATA\s+//; # ex: ATA     WDC WD740ADFD-00
-            $model =~ s/\s+/ /;
-            $manufacturer = getCanonicalManufacturer($model);
-            if ($media eq 'Data Drive') {
-                $media = 'disk';
-            }
-
-            $inventory->addEntry(
-                section => 'STORAGES',
-                entry   => {
-                    NAME         => $model,
-                    MANUFACTURER => $manufacturer,
-                    MODEL        => $model,
-                    DESCRIPTION  => $description,
-                    TYPE         => $media,
-                    DISKSIZE     => $capacity,
-                    SERIALNUMBER => $serialnumber,
-                    FIRMWARE     => $firmware
-                }
-            ); 
-        }
-        close $handle2;
-    }
-    close $handle1;
-}
-
-1;

@@ -1,12 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Storages;
-
-use strict;
-use warnings;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {}
-
-1;

@@ -1,71 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::USB;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('lsusb');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $device (_getDevices(logger => $logger)) {
-        next unless $device->{PRODUCTID};
-        next unless $device->{VENDORID};
-
-        # ignore the USB Hub
-        next if
-            $device->{PRODUCTID} eq "0001" ||
-            $device->{PRODUCTID} eq "0002" ;
-
-        if (defined($device->{SERIAL}) && length($device->{SERIAL}) < 5) {
-            $device->{SERIAL} = undef;
-        }
-
-        $inventory->addEntry(
-            section => 'USBDEVICES',
-            entry   => $device,
-        );
-    }
-}
-
-sub _getDevices {
-    my $handle = getFileHandle(
-        @_,
-        command => 'lsusb -v',
-    );
-
-    return unless $handle;
-
-    my @devices;
-    my $device;
-
-    while (my $line = <$handle>) {
-        if ($line =~ /^$/) {
-            push @devices, $device if $device;
-            undef $device;
-        } elsif ($line =~ /^\s*idVendor\s*0x(\w+)/i) {
-            $device->{VENDORID} = $1;
-        } elsif ($line =~ /^\s*idProduct\s*0x(\w+)/i) {
-            $device->{PRODUCTID} = $1;
-        } elsif ($line =~ /^\s*iSerial\s*\d+\s(\w+)/i) {
-            $device->{SERIAL} = $1;
-        } elsif ($line =~ /^\s*bInterfaceClass\s*(\d+)/i) {
-            $device->{CLASS} = $1;
-        } elsif ($line =~ /^\s*bInterfaceSubClass\s*(\d+)/i) {
-            $device->{SUBCLASS} = $1;
-        }
-    }
-    close $handle;
-    push @devices, $device if $device;
-
-    return @devices;
-}
-
-1;

@@ -1,59 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic::Users;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-my $seen;
-
-sub isEnabled {
-    return 
-        canRun('who') ||
-        canRun('last');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(
-        logger  => $logger,
-        command => 'who'
-    );
-
-    if ($handle) {
-        while (my $line = <$handle>) {
-            next unless $line =~ /^(\S+)/;
-            my $user = { LOGIN => $1 };
-
-            # avoid duplicates
-            next if $seen->{$user->{LOGIN}}++;
-
-            $inventory->addEntry(
-                section => 'USERS',
-                entry   => $user
-            );
-        }
-        close $handle;
-    }
-
-    my ($lastUser, $lastDate);
-    my $last = getFirstLine(command => 'last');
-    if ($last &&
-        $last =~ /^(\S+) \s+ \S+ \s+ \S+ \s+ (\S+ \s+ \S+ \s+ \S+ \s+ \S+)/x
-    ) {
-        $lastUser = $1;
-        $lastDate = $2;
-    }
-
-    $inventory->setHardware({
-        LASTLOGGEDUSER     => $lastUser,
-        DATELASTLOGGEDUSER => $lastDate
-    });
-
-}
-
-1;

@@ -1,22 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Generic;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    $inventory->setOperatingSystem({
-        KERNEL_NAME => $OSNAME
-    });
-}
-
-1;

@@ -1,57 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Bios;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::HPUX;
-
-sub isEnabled {
-    return canRun('model');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $model = getFirstLine(command => 'model');
-
-    my ($version, $serial, $uuid);
-    if (canRun('/usr/contrib/bin/machinfo')) {
-        my $info = getInfoFromMachinfo(logger => $logger);
-        $version = $info->{'Firmware info'}->{'firmware revision'};
-        $serial  = $info->{'Platform info'}->{'machine serial number'};
-        $uuid    = uc($info->{'Platform info'}->{'machine id number'});
-    } else {
-        my $handle = getFileHandle(
-            command => "echo 'sc product cpu;il' | /usr/sbin/cstm",
-            logger  => $logger
-        );
-        while (my $line = <$handle>) {
-            next unless $line =~ /PDC Firmware/;
-            next unless $line =~ /Revision:\s+(\S+)/;
-            $version = "PDC $1";
-        }
-        close $handle;
-
-        $serial = getFirstMatch(
-            command => "echo 'sc product system;il' | /usr/sbin/cstm",
-            pattern => qr/^System Serial Number:\s+: (\S+)/
-        );
-    }
-
-    $inventory->setBios({
-        BVERSION      => $version,
-        BMANUFACTURER => "HP",
-        SMANUFACTURER => "HP",
-        SMODEL        => $model,
-        SSN           => $serial,
-    });
-    $inventory->setHardware({
-        UUID => $uuid
-    });
-}
-
-1;

@@ -1,210 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::CPU;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::HPUX;
-
-sub isEnabled  { 
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # http://forge.fusioninventory.org/issues/755
-    if (canRun('/opt/propplus/bin/cprop') && !isHPVMGuest()) {
-        foreach my $cpu (_parseCprop(
-            command => '/opt/propplus/bin/cprop -summary -c Processors',
-            logger  => $logger
-        )) {
-            $inventory->addEntry(
-                section => 'CPUS',
-                entry   => $cpu
-            );
-        }
-        return;
-    }
-
-    my $CPUinfo;
-    if (canRun('/usr/contrib/bin/machinfo')) {
-        $CPUinfo = _parseMachinInfo(
-            command => '/usr/contrib/bin/machinfo',
-            logger  => $logger
-        );
-    } else {
-        # old HpUX without machinfo
-        my %cpuInfos = (
-            "D200" => { TYPE => "7100LC", SPEED => 75  },
-            "D210" => { TYPE => "7100LC", SPEED => 100 },
-            "D220" => { TYPE => "7300LC", SPEED => 132 },
-            "D230" => { TYPE => "7300LC", SPEED => 160 },
-            "D250" => { TYPE => "7200",   SPEED => 100 },
-            "D260" => { TYPE => "7200",   SPEED => 120 },
-            "D270" => { TYPE => "8000",   SPEED => 160 },
-            "D280" => { TYPE => "8000",   SPEED => 180 },
-            "D310" => { TYPE => "7100LC", SPEED => 100 },
-            "D320" => { TYPE => "7300LC", SPEED => 132 },
-            "D330" => { TYPE => "7300LC", SPEED => 160 },
-            "D350" => { TYPE => "7200",   SPEED => 100 },
-            "D360" => { TYPE => "7200",   SPEED => 120 },
-            "D370" => { TYPE => "8000",   SPEED => 160 },
-            "D380" => { TYPE => "8000",   SPEED => 180 },
-            "D390" => { TYPE => "8200",   SPEED => 240 },
-            "K360" => { TYPE => "8000",   SPEED => 180 },
-            "K370" => { TYPE => "8200",   SPEED => 200 },
-            "K380" => { TYPE => "8200",   SPEED => 240 },
-            "K400" => { TYPE => "7200",   SPEED => 140 },
-            "K410" => { TYPE => "7200",   SPEED => 120 },
-            "K420" => { TYPE => "7200",   SPEED => 120 },
-            "K460" => { TYPE => "8000",   SPEED => 180 },
-            "K570" => { TYPE => "8200",   SPEED => 200 },
-            "K580" => { TYPE => "8200",   SPEED => 240 },
-            "L1000-36" => { TYPE => "8500", SPEED => 360 },
-            "L1500-7x" => { TYPE => "8700", SPEED => 750 },
-            "L3000-7x" => { TYPE => "8700", SPEED => 750 },
-            "N4000-44" => { TYPE => "8500", SPEED => 440 },
-            "ia64 hp server rx1620" => { TYPE => "itanium", SPEED => 1600 }
-        );
-
-        my $device = getFirstLine(command => 'model |cut -f 3- -d/');
-        if ($cpuInfos{$device}) {
-            $CPUinfo = $cpuInfos{$device};
-        } else {
-            $CPUinfo->{TYPE} = getFirstMatch(
-                command => "echo 'sc product cpu;il' | /usr/sbin/cstm",
-                logger  => $logger,
-                pattern => qr/(\S+)\s+CPU\s+Module/,
-            );
-            $CPUinfo->{SPEED} = getFirstMatch(
-                command => "echo 'itick_per_usec/D' | adb -k /stand/vmunix /dev/kmem",
-                logger  => $logger,
-                pattern => qr/tick_per_usec:\s+(\d+)/
-            );
-        }
-        # NBR CPU
-        $CPUinfo->{CPUcount} = getLinesCount(
-            command => 'ioscan -Fk -C processor'
-        );
-    }
-
-    my $serie = getFirstLine(command => 'uname -m');
-    if ( $CPUinfo->{TYPE} eq 'unknow' and $serie =~ /ia64/) {
-        $CPUinfo->{TYPE} = "Itanium"
-    }
-    if ( $serie =~ /9000/) {
-        $CPUinfo->{TYPE} = "PA" . $CPUinfo->{TYPE};
-    }
-
-    foreach ( 1..$CPUinfo->{CPUcount} ) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $CPUinfo
-        );
-    }
-}
-
-sub _parseMachinInfo {
-    my $info = getInfoFromMachinfo(@_);
-    return unless $info;
-
-    my $result;
-    my $cpu_info = $info->{'CPU info'};
-    if (ref $cpu_info eq 'HASH') {
-        # HPUX 11.23
-        $result->{CPUcount} = $cpu_info->{'number of cpus'};
-
-        if ($cpu_info->{'clock speed'} =~ /(\d+) MHz/) {
-            $result->{SPEED} = $1;
-        }
-
-        if ($cpu_info->{'processor model'} =~ /Intel/) {
-            $result->{MANUFACTURER} = 'Intel';
-        }
-
-        if ($cpu_info->{'processor model'} =~ /Itanium/) {
-            $result->{NAME} = 'Itanium';
-        }
-    } else {
-        # HPUX 11.31
-        if ($cpu_info =~ /^(\d+) /) {
-            $result->{CPUcount} = $1;
-        }
-        if ($cpu_info =~ /([\d.]+) GHz/) {
-            $result->{SPEED} = $1 * 1000;
-        }
-        if ($cpu_info =~ /Intel/) {
-            $result->{MANUFACTURER} = 'Intel';
-        }
-        if ($cpu_info =~ /Itanium/) {
-            $result->{NAME} = 'Itanium';
-        }
-        if ($cpu_info =~ /(\d+) logical processors/ ) {
-            $result->{CORE} = $1 / $result->{CPUcount};
-        }
-    }
-
-    return $result;
-}
-
-sub _parseCprop {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @cpus;
-    my $instance;
-
-    while (my $line = <$handle>) {
-        if ($line =~ /^\[Instance\]: \d+/) {
-            # new block
-            $instance = {};
-            next;
-        }
-
-        if ($line =~ /^ \s+ \[ ([^\]]+) \]: \s (.+)/x) {
-            $instance->{$1} = $2;
-            next;
-        }
-
-        if ($line =~ /^\*+/) {
-            next unless keys %$instance;
-
-            my $name = $instance->{'Processor Type'} =~ /Itanium/ ?
-                'Itanium' : undef;
-            my $manufacturer = $instance->{'Processor Type'} =~ /Intel/ ?
-                'Intel' : undef;
-            my $cpu = {
-                SPEED        => $instance->{'Processor Speed'},
-                ID           => $instance->{'Tag'},
-                NAME         => $name,
-                MANUFACTURER => $manufacturer
-            };
-
-            if ($instance->{'Location'} =~ /Cell Slot Number (\d+)\b/i) {
-                # this is a single core from a multi-core cpu
-                my $slotId = $1;
-                if ($cpus[$slotId]) {
-                    $cpus[$slotId]->{CORE}++;
-                } else {
-                    $cpus[$slotId] = $cpu;
-                    $cpus[$slotId]->{CORE}=1;
-                }
-            } else {
-                push @cpus, $cpu;
-            }
-        }
-    }
-    close $handle;
-
-    # filter missing cpus
-    @cpus = grep { $_ } @cpus;
-
-    return @cpus;
-}
-1;

@@ -1,47 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Controllers;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('ioscan');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $type (qw/ext_bus fc psi/) {
-        foreach my $controller (_getControllers(
-            command => "ioscan -kFC $type",
-            logger  => $logger
-        )) {
-            $inventory->addEntry(
-                section => 'CONTROLLERS',
-                entry   => $controller
-            );
-        }
-    }
-}
-
-sub _getControllers {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @controllers;
-    while (my $line = <$handle>) {
-        my @info = split(/:/, $line);
-        push @controllers, {
-            TYPE => $info[17]
-        };
-    }
-    close $handle;
-
-    return @controllers;
-}
-
-1;

@@ -1,138 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Drives;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use POSIX qw(strftime);
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled  {
-    return
-        canRun('fstyp') &&
-        canRun('bdf');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # get filesystem types
-    my @types = getAllLines(
-        command => 'fstyp -l',
-        logger  => $logger
-    );
-
-    # get filesystems for each type
-    foreach my $type (@types) {
-        foreach my $drive (_getDrives(type => $type, logger => $logger)) {
-            $inventory->addEntry(section => 'DRIVES', entry => $drive);
-        }
-    }
-}
-
-sub _getDrives {
-    my (%params) = @_;
-
-    my @drives = _parseBdf(
-        command => "bdf -t $params{type}", logger => $params{logger}
-    );
-
-    foreach my $drive (@drives) {
-        $drive->{FILESYSTEM} = $params{type};
-        $drive->{CREATEDATE} =  _getVxFSctime($drive->{VOLUMN}, $params{logger})
-            if $params{type} eq 'vxfs';
-    }
-
-    return @drives;
-}
-
-sub _parseBdf {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @drives;
-
-    # skip header
-    my $line = <$handle>;
-
-    my $device;
-    while (my $line = <$handle>) {
-        if ($line =~ /^(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+%)\s+(\S+)/) {
-            push @drives, {
-                VOLUMN     => $1,
-                TOTAL      => $2,
-                FREE       => $3,
-                TYPE       => $6,
-            };
-            next;
-        }
-
-        if ($line =~ /^(\S+)\s/) {
-            $device = $1;
-            next;
-        }
-        
-        if ($line =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+%)\s+(\S+)/) {
-            push @drives, {
-                VOLUMN     => $device,
-                TOTAL      => $1,
-                FREE       => $3,
-                TYPE       => $5,
-            };
-            next;
-        }
-    }
-    close $handle;
-
-    return @drives;
-}
-
-# get filesystem creation time by reading binary value directly on the device
-sub _getVxFSctime {
-    my ($device, $logger) = @_;
-
-    # compute version-dependant read offset
-
-    # Output of 'fstyp' should be something like the following:
-    # $ fstyp -v /dev/vg00/lvol3
-    #   vxfs
-    #   version: 5
-    #   .
-    #   .
-    my $version = getFirstMatch(
-        command => "fstyp -v $device",
-        logger  => $logger,
-        pattern => qr/^version:\s+(\d+)$/
-    );
-
-    my $offset =
-        $version == 5 ? 8200 :
-        $version == 6 ? 8208 :
-        $version == 7 ? 8208 :
-                        undef;
-
-    if (!$offset) {
-      $logger->error("unable to compute offset from fstyp output ($device)");
-      return;
-    }
-
-    # read value
-    open (my $handle, "<:raw:bytes", $device)
-        or die "Can't open $device in raw mode: $ERRNO";
-    seek($handle, $offset, 0) 
-        or die "Can't seek offset $offset on device $device: $ERRNO";
-    my $raw;
-    read($handle, $raw, 4)
-        or die "Can't read 4 bytes on device $device: $ERRNO";
-    close($handle);
-
-    # Convert the 4-byte raw data to long integer and
-    # return a string representation of this time stamp
-    return strftime("%Y/%m/%d %T", localtime(unpack('L', $raw)));
-}
-
-1;

@@ -1,54 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::MP;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Network;
-
-#TODO driver pcislot virtualdev
-
-sub isEnabled {
-    return
-        canRun('/opt/hpsmh/data/htdocs/comppage/getMPInfo.cgi') ||
-        canRun('/opt/sfm/bin/CIMUtil');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $ipaddress = canRun('/opt/hpsmh/data/htdocs/comppage/getMPInfo.cgi') ?
-        _parseGetMPInfo(logger => $logger) : _parseCIMUtil(logger => $logger);
-
-    $inventory->addEntry(
-        section => 'NETWORKS',
-        entry => {
-            DESCRIPTION => 'Management Interface - HP MP',
-            TYPE        => 'Ethernet',
-            MANAGEMENT  => 'MP',
-            IPADDRESS   => $ipaddress,
-        }
-    );
-
-}
-
-sub _parseGetMPInfo {
-    return getFirstMatch(
-        command => '/opt/hpsmh/data/htdocs/comppage/getMPInfo.cgi',
-        pattern => qr{RIBLink = "https?://($ip_address_pattern)";},
-        @_
-    );
-}
-
-sub _parseCIMUtil {
-    return getFirstMatch(
-        command => '/opt/sfm/bin/CIMUtil -e root/cimv2 HP_ManagementProcessor',
-        pattern => qr{^IPAddress\s+:\s+($ip_address_pattern)},
-        @_
-    );
-}
-
-1;

@@ -1,208 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Memory;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::HPUX;
-use English qw(-no_match_vars);
-
-sub isEnabled { 
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @memories;
-
-    # http://forge.fusioninventory.org/issues/754
-    if (canRun('/opt/propplus/bin/cprop') && !isHPVMGuest()) {
-        @memories = _parseCprop(
-            command => '/opt/propplus/bin/cprop -summary -c Memory',
-            logger  => $logger
-        );
-    } else {
-        my $arch = getFirstLine(command => 'uname -m');
-
-        if ($arch =~ /ia64/ ) {
-            # enable infolog
-            system("echo 'sc product  IPF_MEMORY;info' | /usr/sbin/cstm");
-            @memories = _parseCstm64(
-                command => "echo 'sc product IPF_MEMORY;il' | /usr/sbin/cstm",
-                logger  => $logger
-            );
-        } else {
-            @memories = _parseCstm(
-                command => "echo 'sc product mem;il'| /usr/sbin/cstm",
-                logger  => $logger
-            );
-        }
-    }
-
-    my $memorySize;
-    my $swapSize = getFirstMatch(
-        command => 'swapinfo -dt',
-        logger  => $logger,
-        pattern => qr/^total\s+(\d+)/
-    );
-
-    foreach my $memory (@memories) {
-        $inventory->addEntry(
-            section => 'MEMORIES',
-            entry   => $memory
-        );
-        $memorySize += $memory->{CAPACITY};
-    }
-
-    $inventory->setHardware({
-        SWAP   => int($swapSize / 1024),
-        MEMORY => $memorySize
-    });
-}
-
-sub _parseCprop {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @memories;
-    my $instance;
-
-    while (my $line = <$handle>) {
-        if ($line =~ /\[Instance\]: \d+/) {
-            # new block
-            $instance = {};
-            next;
-        }
-
-        if ($line =~ /^ \s+ \[ ([^\]]+) \]: \s (\S+.*)/x) {
-            $instance->{$1} = $2;
-            next;
-        }
-
-        if ($line =~ /^\*+/) {
-            next unless keys %$instance;
-            next unless $instance->{Size};
-            push @memories, {
-                CAPACITY     => getCanonicalSize($instance->{Size}),
-                DESCRIPTION  => $instance->{'Part Number'},
-                SERIALNUMBER => $instance->{'Serial Number'},
-                TYPE         => $instance->{'Module Type'},
-            };
-        }
-    }
-    close $handle;
-
-    return @memories;
-}
-
-sub _parseCstm {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @memories;
-
-    my %capacities;
-    my $capacity = 0;
-    my $description;
-    my $numslot = 1;
-    my $subnumslot;
-    my $serialnumber = 'No Serial Number available!';
-    my $type;
-    my $ok = 0;
-
-    while (my $line = <$handle>) {
-
-        if ($line =~ /FRU\sSource\s+=\s+\S+\s+\(memory/ ) {
-            $ok = 0;
-        }
-        if ($line =~ /Source\s+Detail\s+=\s4/ ) {
-            $ok = 1;
-        }
-        if ($line =~ /\s+(\d+)\s+(\d+)/ ) {
-            $capacities{$1} = $2;
-        }
-        if ($line =~ /Extender\s+Location\s+=\s+(\S+)/ ) {
-            $subnumslot = $1;
-        };
-        if ($line =~ /DIMMS\s+Rank\s+=\s+(\S+)/ ) {
-            $numslot = sprintf("%02x",$1);
-        }
-
-        if ($line =~ /FRU\s+Name\.*:\s+(\S+)/ ) {
-            if ($line =~ /(\S+)_(\S+)/ ) {
-                $type = $1;
-                $capacity = $2;
-            } elsif ($line =~ /(\wIMM)(\S+)/ ) {
-                $ok = 1;
-                $type = $1;
-                $numslot = $2;
-            }
-        }
-        if ($line =~ /Part\s+Number\.*:\s*(\S+)\s+/ ) {
-            $description = $1;
-        }
-        if ($line =~ /Serial\s+Number\.*:\s*(\S+)\s+/ ) {
-            $serialnumber = $1;
-            if ( $ok eq 1 ) {
-                if ( $capacity eq 0 ) {
-                    $capacity = $capacities{$numslot};
-                }
-                push @memories, {
-                    CAPACITY     => $capacity,
-                    DESCRIPTION  => "Part Number $description",
-                    CAPTION      => "Ext $subnumslot Slot $numslot",
-                    TYPE         => $type,
-                    NUMSLOTS     => '1',
-                    SERIALNUMBER => $serialnumber,
-                };
-                $ok = 0;
-                $capacity = 0;
-            } # $ok eq 1
-        } # /Serial\s+Number\.*:\s*(\S+)\s+/ 
-
-    }
-    close $handle;
-
-    return @memories;
-}
-
-sub _parseCstm64 {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @memories;
-
-    while (my $line = <$handle>) {
-
-        # this pattern assumes memory slots are correctly
-        # balanced (slot A and slot B are occuped)
-        next unless $line =~ /
-            (\w+IMM)\s+(\w+)\s+(\d+) # first column
-            \s+
-            (\w+IMM)\s+(\w+)\s+(\d+) # second column
-        /x;
-
-        push @memories, {
-            CAPACITY     => $3,
-            DESCRIPTION  => $1,
-            CAPTION      => $1 . ' ' . $2,
-            TYPE         => $1,
-            NUMSLOTS     => $2,
-        }, {
-            CAPACITY     => $6,
-            DESCRIPTION  => $4,
-            CAPTION      => $4 . ' ' . $5,
-            TYPE         => $4,
-            NUMSLOTS     => $5,
-        };
-    }
-    close $handle;
-
-    return @memories;
-}
-
-1;

@@ -1,249 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Networks;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-use FusionInventory::Agent::Tools::Network;
-
-#TODO Get pcislot virtualdev
-
-sub isEnabled {
-    return canRun('lanscan');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # set list of network interfaces
-    my $routes = getRoutingTable(command => 'netstat -nr', logger => $logger);
-    my @interfaces = _getInterfaces(logger => $logger);
-
-    foreach my $interface (@interfaces) {
-        $interface->{IPGATEWAY} = $params{routes}->{$interface->{IPSUBNET}}
-            if $interface->{IPSUBNET};
-
-        $inventory->addEntry(
-            section => 'NETWORKS',
-            entry   => $interface
-        );
-    }
-
-    $inventory->setHardware({
-        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
-    });
-}
-
-sub _getInterfaces {
-    my (%params) = @_;
-
-    my @prototypes = _parseLanscan(
-        command => 'lanscan -iap',
-        logger  => $params{logger}
-    );
-
-    my %ifStatNrv = _parseNetstatNrv();
-
-    my @interfaces;
-    foreach my $prototype (@prototypes) {
-
-        my $lanadminInfo = _getLanadminInfo(
-            command => "lanadmin -g $prototype->{lan_id}",
-            logger  => $params{logger}
-        );
-        $prototype->{TYPE}  = $lanadminInfo->{'Type (value)'};
-        $prototype->{SPEED} = $lanadminInfo->{Speed} > 1000000 ?
-            $lanadminInfo->{Speed} / 1000000 : $lanadminInfo->{Speed};
-
-        if ($ifStatNrv{$prototype->{DESCRIPTION}}) {
-            # if this interface name has been found in netstat output, let's
-            # use the list of interfaces found there, using the prototype
-            # to provide additional informations
-            foreach my $interface (@{$ifStatNrv{$prototype->{DESCRIPTION}}}) {
-                foreach my $key (qw/MACADDR STATUS TYPE SPEED/) {
-                    next unless $prototype->{$key};
-                    $interface->{$key} = $prototype->{$key};
-                }
-                push @interfaces, $interface;
-            }
-        } else {
-            # otherwise, we promote this prototype to an interface, using
-            # ifconfig to provide additional informations
-            my $ifconfigInfo = _getIfconfigInfo(
-                command => "ifconfig $prototype->{DESCRIPTION}",
-                logger  => $params{logger}
-            );
-            $prototype->{STATUS}    = $ifconfigInfo->{status};
-            $prototype->{IPADDRESS} = $ifconfigInfo->{address};
-            $prototype->{IPMASK}    = $ifconfigInfo->{netmask};
-            delete $prototype->{lan_id};
-            push @interfaces, $prototype;
-        }
-    }
-
-    foreach my $interface (@interfaces) {
-        if ($interface->{IPADDRESS} && $interface->{IPADDRESS} eq '0.0.0.0') {
-            $interface->{IPADDRESS} = undef;
-            $interface->{IPMASK}    = undef;
-        } else {
-            $interface->{IPSUBNET} = getSubnetAddress(
-                $interface->{IPADDRESS},
-                $interface->{IPMASK}
-            );
-        }
-    }
-
-    return @interfaces;
-}
-
-sub _parseLanscan {
-    my (%params) = @_;
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my @interfaces;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^
-            0x($alt_mac_address_pattern)
-            \s
-            (\S+)
-            \s
-            \S+
-            \s+
-            (\S+)
-            /x;
-
-        my $interface = {
-            MACADDR     => alt2canonical($1),
-            STATUS      => 'Down',
-            DESCRIPTION => $2,
-            lan_id      => $3,
-        };
-
-        push @interfaces, $interface;
-    }
-    close $handle;
-
-    return @interfaces;
-}
-
-sub _getLanadminInfo {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my $info;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^(\S.+\S) \s+ = \s (.+)$/x;
-        $info->{$1} = $2;
-    }
-    close $handle;
-
-    return $info;
-}
-
-sub _getIfconfigInfo {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my $info;
-    while (my $line = <$handle>) {
-        if ($line =~ /<UP/) {
-            $info->{status} = 'Up';
-        }
-        if ($line =~ /inet ($ip_address_pattern)/) {
-            $info->{address} = $1;
-        }
-        if ($line =~ /netmask ($hex_ip_address_pattern)/) {
-            $info->{netmask} = hex2canonical($1);
-        }
-    }
-    close $handle;
-
-    return $info;
-}
-
-# will be need to get the bonding configuration
-sub _getNwmgrInfo {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my $info;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^
-            (\w+)
-            \s+
-            (\w+)
-            \s+
-            0x($alt_mac_address_pattern)
-            \s+
-            (\w+)
-            \s+
-            (\w*)
-            /x;
-        my $interface = $1;
-
-        $info->{$interface} = {
-            status     => $2,
-            mac        => alt2canonical($3),
-            driver     => $4,
-            media      => $5,
-            related_if => undef
-        }
-    }
-    close $handle;
-
-    return $info;
-}
-
-sub _parseNetstatNrv {
-    my (%params) = (
-        command => 'netstat -nrv',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my %interfaces;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^
-            ($ip_address_pattern) # address
-            \/
-            ($ip_address_pattern) # mask
-            \s+
-            ($ip_address_pattern) # gateway
-            \s+
-            [A-Z]* H [A-Z]*       # host flag
-            \s+
-            \d
-            \s+
-            (\w+) (?: :\d+)?      # interface name, with optional alias
-            \s+
-            (\d+)                 # MTU
-            $/x;
-
-        my $address   = $1;
-        my $mask      = $2;
-        my $gateway   = $3 if $3 ne $1;
-        my $interface = $4;
-        my $mtu       = $5;
-
-        push @{$interfaces{$interface}}, {
-            IPADDRESS   => $address,
-            IPMASK      => $mask,
-            IPGATEWAY   => $gateway,
-            DESCRIPTION => $interface,
-            MTU         => $mtu
-        }
-    }
-    close $handle;
-
-    return %interfaces;
-}
-
-1;

@@ -1,48 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Slots;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('ioscan');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $type (qw/ioa ba/) {
-        foreach my $slot (_getSlots(
-            command => "ioscan -kFC $type",
-            logger  => $logger
-        )) {
-            $inventory->addEntry(
-                section => 'SLOTS',
-                entry   => $slot
-            );
-        }
-    }
-}
-
-sub _getSlots {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @slots;
-    while (my $line = <$handle>) {
-        my @info = split(/:/, $line);
-        push @slots, {
-            DESIGNATION => $info[17],
-            STATUS      => "OK",
-        };
-    }
-    close $handle;
-
-    return @slots;
-}
-
-1;

@@ -1,66 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Softwares;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled  {
-    my (%params) = @_;
-
-    return
-        !$params{no_category}->{software} &&
-        canRun('swlist');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $list = _getSoftwaresList(
-        command => 'swlist',
-        logger => $logger
-    );
-
-    return unless $list;
-
-    foreach my $software (@$list) {
-        $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => $software
-        );
-    }
-}
-
-sub _getSoftwaresList {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @softwares;
-    while (my $line = <$handle>) {
-        chomp $line;
-        next unless $line =~ /^
-            \s\s     # two spaces
-            (\S+)    # name
-            \s+
-            (\S+)    # version
-            \s+
-            (\S.*\S) # comment
-        /x;
-        next if $1 =~ /^PH/;
-        push @softwares, {
-            NAME      => $1,
-            VERSION   => $2,
-            COMMENTS  => $3,
-            PUBLISHER => 'HP'
-        };
-    }
-
-    close $handle;
-
-    return \@softwares;
-}
-
-1;

@@ -1,98 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Storages;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled  {
-    return
-        canRun('ioscan');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $disk (_getDisks($logger)) {
-        $inventory->addEntry(section => 'STORAGES', entry => $disk);
-    }
-
-    foreach my $tape (_getTapes($logger)) {
-        $inventory->addEntry(section => 'STORAGES', entry => $tape);
-    }
-}
-
-sub _getDisks {
-    my ($logger) = @_;
-
-    my @disks;
-    foreach my $device (
-        _parseIoscan(command => 'ioscan -kFnC disk', logger => $logger)
-    ) {
-        # skip alternate links
-        next if getFirstMatch(
-            command => "pvdisplay $device->{NAME}",
-            pattern => qr/$device->{NAME}\.+lternate/
-        );
-
-        foreach ( `diskinfo -v $device->{NAME} 2>/dev/null`) {
-            if ( /^\s+size:\s+(\S+)/ ) {
-                $device->{DISKSIZE} = int( $1/1024 );
-            }
-            if ( /^\s+rev level:\s+(\S+)/ ) {
-                $device->{FIRMWARE} = $1;
-            }
-        }
-
-        $device->{TYPE} = 'disk';
-        push @disks, $device;
-    }
-
-    return @disks;
-}
-
-sub _getTapes {
-    my ($logger) = @_;
-
-    my @tapes;
-    foreach my $device (
-        _parseIoscan(command => 'ioscan -kFnC tape', logger => $logger)
-    ) {
-        $device->{TYPE} = 'tape';
-        push @tapes, $device;
-    }
-
-    return @tapes;
-}
-
-sub _parseIoscan {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @devices;
-    my ($description, $model, $manufacturer);
-    while (my $line = <$handle>) {
-        if ($line =~ /^\s+(\S+)/ ) {
-            my $device = $1;
-
-            push @devices, {
-                MANUFACTURER => $manufacturer,
-                MODEL        => $model,
-                NAME         => $device,
-                DESCRIPTION  => $description,
-            };
-        } else {
-            my @infos = split(/:/, $line);
-            $description = $infos[0];
-            ($manufacturer, $model) = $infos[17] =~ /^(\S+) \s+ (\S.*\S)$/x;
-        }
-    }
-    close $handle;
-
-    return @devices;
-}
-
-1;

@@ -1,40 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX::Uptime;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return
-        canRun('uptime') &&
-        canRun('uname');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $arch = getFirstLine(command => 'uname -m');
-    my $uptime = _getUptime(command => 'uptime');
-    $inventory->setHardware({
-        DESCRIPTION => "$arch/$uptime"
-    });
-}
-
-sub _getUptime {
-    my ($days, $hours, $minutes) = getFirstMatch(
-        pattern => qr/up \s (?:(\d+)\sdays\D+)? (\d{1,2}) : (\d{1,2})/x,
-        @_
-    );
-
-    my $uptime = 0;
-    $uptime += $days * 24 * 3600 if $days;
-    $uptime += $hours * 3600;
-    $uptime += $minutes * 60;
-
-    return getFormatedGmTime($uptime);
-}
-
-1;

@@ -1,40 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::HPUX;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-our $runAfter = ["FusionInventory::Agent::Task::Inventory::Input::Generic"];
-
-sub isEnabled  {
-    return $OSNAME eq 'hpux';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    # Operating system informations
-    my $OSVersion = getFirstLine(command => 'uname -v');
-    my $OSRelease = getFirstLine(command => 'uname -r');
-    my $OSLicense = getFirstLine(command => 'uname -l');
-
-    $inventory->setHardware({
-        OSNAME     => 'HP-UX',
-        OSVERSION  => $OSVersion . ' ' . $OSLicense,
-        OSCOMMENTS => $OSRelease,
-    });
-
-    $inventory->setOperatingSystem({
-        NAME                 => "HP-UX",
-        VERSION              => $OSRelease,
-        KERNEL_VERSION       => $OSRelease,
-#        FULL_NAME            => TODO 
-    });
-}
-
-1;

@@ -1,45 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Archs::ARM;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled { 
-    return $Config{archname} =~ /^arm/ &&
-           -r '/proc/cpuinfo';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $cpu (_getCPUsFromProc(
-        logger => $logger, file => '/proc/cpuinfo')
-    ) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-}
-
-sub _getCPUsFromProc {
-    my @cpus;
-
-    foreach my $cpu (getCPUsFromProc(@_)) {
-        push @cpus, {
-            ARCH  => 'ARM',
-            TYPE  => $cpu->{processor}
-        };
-    }
-
-    return @cpus;
-}
-
-1;

@@ -1,55 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Archs::Alpha;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled { 
-    return $Config{archname} =~ /^alpha/ &&
-           -r '/proc/cpuinfo';
-};
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $cpu (_getCPUsFromProc(
-        logger => $logger, file => '/proc/cpuinfo')
-    ) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-}
-
-sub _getCPUsFromProc {
-    my @cpus;
-    foreach my $cpu (getCPUsFromProc(@_)) {
-
-        my $speed;
-        if (
-            $cpu->{'cycle frequency [hz]'} &&
-            $cpu->{'cycle frequency [hz]'} =~ /(\d+)000000/
-        ) {
-            $speed = $1;
-        }
-
-        push @cpus, {
-            ARCH   => 'Alpha',
-            TYPE   => $cpu->{processor},
-            SERIAL => $cpu->{'cpu serial number'},
-            SPEED  => $speed
-        };
-    }
-
-    return @cpus;
-}
-
-1;

@@ -1,47 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Archs::MIPS;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled { 
-    return
-        $Config{archname} =~ /^mips/ &&
-        -r '/proc/cpuinfo';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $cpu (_getCPUsFromProc(
-        logger => $logger, file => '/proc/cpuinfo'
-    )) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-}
-
-sub _getCPUsFromProc {
-    my @cpus;
-    foreach my $cpu (getCPUsFromProc(@_)) {
-
-       push @cpus, {
-            ARCH => 'MIPS',
-            NAME => $cpu->{'cpu model'},
-        };
-    }
-
-    return @cpus;
-}
-
-
-1;

@@ -1,102 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Archs::PowerPC;
-
-use strict;
-use warnings;
-
-use Config;
-
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-#processor       : 0
-#cpu             : POWER4+ (gq)
-#clock           : 1452.000000MHz
-#revision        : 2.1
-#
-#processor       : 1
-#cpu             : POWER4+ (gq)
-#clock           : 1452.000000MHz
-#revision        : 2.1
-#
-#timebase        : 181495202
-#machine         : CHRP IBM,7029-6C3
-#
-#
-
-sub isEnabled {
-    return
-        $Config{archname} =~ /^(ppc|powerpc)/;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $cpu (_getCPUsFromProc(
-        logger => $logger, file => '/proc/cpuinfo'
-    )) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-
-    my $bios;
-
-    $bios->{SSN} = getFirstLine(file => '/proc/device-tree/serial-number');
-    $bios->{SSN} =~ s/[^\,^\.^\w^\ ]//g; # I remove some unprintable char
-
-    $bios->{SMODEL} = getFirstLine(file => '/proc/device-tree/model');
-    $bios->{SMODEL} =~ s/[^\,^\.^\w^\ ]//g;
-
-    my $colorCode = getFirstLine(file => '/proc/device-tree/color-code');
-    my ($color) = unpack "h7" , $colorCode;
-    $bios->{SMODEL} .= " color: $color" if $color;
-
-    $bios->{BVERSION} =
-        getFirstLine(file => '/proc/device-tree/openprom/model');
-    $bios->{BVERSION} =~ s/[^\,^\.^\w^\ ]//g;
-
-    my $copyright = getFirstLine(file => '/proc/device-tree/copyright');
-    if ($copyright && $copyright =~ /Apple/) {
-        # What about the Apple clone?
-        $bios->{BMANUFACTURER} = "Apple Computer, Inc.";
-        $bios->{SMANUFACTURER} = "Apple Computer, Inc." 
-    }
-
-    $inventory->setBios($bios);
-}
-
-sub _getCPUsFromProc {
-    my @cpus;
-    foreach my $cpu (getCPUsFromProc(@_)) {
-
-        my $speed;
-        if (
-            $cpu->{clock} &&
-            $cpu->{clock} =~ /(\d+)/
-        ) {
-            $speed = $1;
-        }
-
-        my $manufacturer;
-        if ($cpu->{machine} &&
-            $cpu->{machine} =~ /IBM/
-        ) {
-            $manufacturer = 'IBM';
-        }
-
-        push @cpus, {
-            NAME         => $cpu->{cpu},
-            MANUFACTURER => $manufacturer,
-            SPEED        => $speed
-        };
-    }
-
-    return @cpus;
-}
-
-1;

@@ -1,52 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Archs::SPARC;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled {
-    return
-        $Config{archname} =~ /^sparc/ &&
-        -r '/proc/cpuinfo';
-};
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $cpu (_getCPUsFromProc(
-        logger => $logger, file => '/proc/cpuinfo'
-    )) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-
-}
-
-sub _getCPUsFromProc {
-    my $cpu = (getCPUsFromProc(@_))[0];
-
-    return unless $cpu && $cpu->{'ncpus probed'};
-
-    my @cpus;
-    foreach (1 .. $cpu->{'ncpus probed'}) {
-        push @cpus, {
-            ARCH => 'SPARC',
-            TYPE => $cpu->{cpu},
-        };
-    }
-
-    return @cpus;
-}
-
-
-
-1;

@@ -1,114 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Archs::i386;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled { 
-    return
-        $Config{archname} =~ /^(i\d86|x86_64)/ &&
-        (
-            -r '/proc/cpuinfo'
-        );
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @cpusFromDmidecode = getCpusFromDmidecode();
-
-    my ($proc_cpu, $procList) = _getCPUsFromProc(
-        logger => $logger, file => '/proc/cpuinfo'
-    );
-    my $cpt = 0;
-    my @baseCpuList = @cpusFromDmidecode?@cpusFromDmidecode:@$procList;
-    foreach my $cpu (@baseCpuList) {
-
-        if ($proc_cpu->{vendor_id}) {
-            $proc_cpu->{vendor_id} =~ s/Genuine//;
-            $proc_cpu->{vendor_id} =~ s/(TMx86|TransmetaCPU)/Transmeta/;
-            $proc_cpu->{vendor_id} =~ s/CyrixInstead/Cyrix/;
-            $proc_cpu->{vendor_id} =~ s/CentaurHauls/VIA/;
-            $proc_cpu->{vendor_id} =~ s/AuthenticAMD/AMD/;
-
-            $cpu->{MANUFACTURER} = $proc_cpu->{vendor_id};
-        }
-
-        if ($proc_cpu->{'model name'}) {
-            $cpu->{NAME} = $proc_cpu->{'model name'};
-        }
-
-        if (!$cpu->{CORE}) {
-            $cpu->{CORE} = $procList->[$cpt]{CORE};
-        }
-        if (!$cpu->{THREAD}) {
-            $cpu->{THREAD} = $procList->[$cpt]{THREAD};
-        }
-
-        # Get directly informations from cpuinfo if not already processed in dmidecode
-        $cpu->{STEPPING} = $procList->[$cpt]{STEPPING} unless    $cpu->{STEPPING} ;
-        $cpu->{FAMILYNUMBER} = $procList->[$cpt]{FAMILYNUMBER} unless    $cpu->{FAMILYNUMBER};
-        $cpu->{MODEL} = $procList->[$cpt]{MODEL} unless    $cpu->{MODEL};
-
-        if ($cpu->{NAME} =~ /([\d\.]+)s*(GHZ)/i) {
-            $cpu->{SPEED} = {
-               ghz => 1000,
-               mhz => 1,
-            }->{lc($2)} * $1;
-        }
-
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-        $cpt++;
-    }
-}
-
-sub _getCPUsFromProc {
-    my @cpus = getCPUsFromProc(@_);
-
-    my ($procs, $cpuNbr);
-
-    my @cpuList;
-
-    my %cpus;
-    my $hasPhysicalId;
-    foreach my $cpu (@cpus) {
-        $procs = $cpu;
-        my $id = $cpu->{'physical id'};
-        $hasPhysicalId = 0;
-        if (defined $id) {
-            $cpus{$id}{STEPPING} = $cpu->{'stepping'};
-            $cpus{$id}{FAMILYNUMBER} = $cpu->{'cpu family'};
-            $cpus{$id}{MODEL} = $cpu->{'model'};
-            $cpus{$id}{CORE} = $cpu->{'cpu cores'};
-            $cpus{$id}{THREAD} = $cpu->{'siblings'} / ($cpu->{'cpu cores'} || 1);
-            $hasPhysicalId = 1;
-        }
-
-        push @cpuList, {STEPPING => $cpu->{'stepping'},FAMILYNUMBER => $cpu->{'cpu family'},
-                        MODEL => $cpu->{'model'},   CORE => 1, THREAD => 1 } unless $hasPhysicalId;
-    }
-    if (!$cpuNbr) {
-        $cpuNbr = keys %cpus;
-    }
-
-    # physical id may not start at 0!
-    if ($hasPhysicalId) {
-        foreach (keys %cpus) {
-            push @cpuList, $cpus{$_};
-        }
-    }
-    return $procs, \@cpuList;
-}
-
-1;

@@ -1,47 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Archs::m68k;
-
-use strict;
-use warnings;
-
-use Config;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled { 
-    return
-        $Config{archname} =~ /^m68k/ &&
-        -r '/proc/cpuinfo';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $cpu (_getCPUsFromProc(
-        logger => $logger, file => '/proc/cpuinfo'
-    )) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-}
-
-sub _getCPUsFromProc {
-    my @cpus;
-    foreach my $cpu (getCPUsFromProc(@_)) {
-
-        push @cpus, {
-            ARCH  => 'm68k',
-            TYPE  => $cpu->{'cpu'},
-            SPEED => $cpu->{'clocking'}
-        };
-    }
-
-    return @cpus;
-}
-
-1;

@@ -1,12 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Archs;
-
-use strict;
-use warnings;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {}
-
-1;

@@ -1,46 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Distro::LSB;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('lsb_release');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(
-        logger  => $logger,
-        command => 'lsb_release -a',
-    );
-
-    my ($name, $version, $description);
-    while (my $line = <$handle>) {
-        $name        = $1 if $line =~ /^Distributor ID:\s+(.+)/;
-        $version     = $1 if $line =~ /^Release:\s+(.+)/;
-        $description = $1 if $line =~ /^Description:\s+(.+)/;
-    }
-    close $handle;
-
-    # See: #1262
-    $description =~ s/^Enterprise Linux Enterprise Linux/Oracle Linux/;
-
-    $inventory->setHardware({
-        OSNAME => $description,
-    });
-
-    $inventory->setOperatingSystem({
-        NAME      => $name,
-        VERSION   => $version,
-        FULL_NAME => $description
-    });
-
-}
-
-1;

@@ -1,119 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Distro::NonLSB;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use List::Util qw(first);
-
-# This array contains four items for each distribution:
-# - release file
-# - distribution name,
-# - regex to get the version
-# - template to get the full name
-my @distributions = (
-    # vmware-release contains something like "VMware ESX Server 3" or "VMware ESX 4.0 (Kandinsky)"
-    [ '/etc/vmware-release',    'VMWare',                     '([\d.]+)',         '%s' ],
-
-    [ '/etc/arch-release',      'ArchLinux',                  '(.*)',             'ArchLinux' ],
-
-    [ '/etc/debian_version',    'Debian',                     '(.*)',             'Debian GNU/Linux %s'],
-
-    # fedora-release contains something like "Fedora release 9 (Sulphur)"
-    [ '/etc/fedora-release',    'Fedora',                     'release ([\d.]+)', '%s' ],
-
-    [ '/etc/gentoo-release',    'Gentoo',                     '(.*)',             'Gentoo Linux %s' ],
-
-    # knoppix_version contains something like "3.2 2003-04-15".
-    # Note: several 3.2 releases can be made, with different dates, so we need to keep the date suffix
-    [ '/etc/knoppix_version',   'Knoppix',                    '(.*)',             'Knoppix GNU/Linux %s' ],
-
-    # mandriva-release contains something like "Mandriva Linux release 2010.1 (Official) for x86_64"
-    [ '/etc/mandriva-release',  'Mandriva',                   'release ([\d.]+)', '%s'],
-
-    # mandrake-release contains something like "Mandrakelinux release 10.1 (Community) for i586"
-    [ '/etc/mandrake-release',  'Mandrake',                   'release ([\d.]+)', '%s'],
-
-    # centos-release contains something like "CentOS Linux release 6.0 (Final)
-    [ '/etc/centos-release',    'CentOS',                     'release ([\d.]+)', '%s' ],
-
-    # redhat-release contains something like "Red Hat Enterprise Linux Server release 5 (Tikanga)"
-    [ '/etc/redhat-release',    'RedHat',                     'release ([\d.]+)', '%s' ],
-
-    [ '/etc/slackware-version', 'Slackware',                  'Slackware (.*)',   '%s' ],
-
-    # SuSE-release contains something like "SUSE Linux Enterprise Server 11 (x86_64)"
-    # Note: it may contain several extra lines
-    [ '/etc/SuSE-release',      'SuSE',                       '([\d.]+)',         '%s' ],
-
-    # trustix-release contains something like "Trustix Secure Linux release 2.0 (Cloud)"
-    [ '/etc/trustix-release',   'Trustix',                    'release ([\d.]+)', '%s' ],
-
-    # Fallback
-    [ '/etc/issue',             'Unknown Linux distribution', '([\d.]+)'        , '%s' ],
-
-    # Note: Ubuntu is not listed here as it does not have a
-    # ubuntu-{release,version} file, but it should always have the lsb_release
-    # command so it will be handled by the Linux::Distro::LSB module
-);
-
-our $runMeIfTheseChecksFailed =
-    ["FusionInventory::Agent::Task::Inventory::Input::Linux::Distro::LSB"];
-
-sub isEnabled {
-    return !canRun('lsb_release');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $distribution = first { -f $_->[0] } @distributions;
-    return unless $distribution;
-
-    my $data = _getDistroData($distribution);
-
-    $inventory->setHardware({
-        OSNAME => $data->{FULL_NAME }
-    });
-
-    $inventory->setOperatingSystem($data);
-}
-
-sub _getDistroData {
-    my ($distribution) = @_;
-
-    my $name     = $distribution->[1];
-    my $regexp   = $distribution->[2];
-    my $template = $distribution->[3];
-
-    my $line       = getFirstLine(file => $distribution->[0]);
-    # Arch Linux has an empty release file
-    my ($release, $version);
-    if ($line) {
-        $release   = sprintf $template, $line;
-        ($version) = $line =~ /$regexp/;
-    } else {
-        $release = $template;
-    }
-
-    my $data = {
-        NAME      => $name,
-        VERSION   => $version,
-        FULL_NAME => $release
-    };
-
-    if ($name eq 'SuSE') {
-        $data->{SERVICE_PACK} = getFirstMatch(
-            file    => '/etc/SuSE-release',
-            pattern => qr/^PATCHLEVEL = ([0-9]+)/
-        );
-    }
-
-    return $data;
-}
-
-1;

@@ -1,12 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Distro;
-
-use strict;
-use warnings;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {}
-
-1;

@@ -1,183 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Drives;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return 
-        canRun('df') ||
-        canRun('lshal');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $filesystem (_getFilesystems($logger)) {
-        $inventory->addEntry(
-            section => 'DRIVES',
-            entry   => $filesystem
-        );
-    }
-}
-
-sub _getFilesystems {
-    my ($logger) = @_;
-
-    # get filesystems list
-    my @filesystems =
-        # exclude virtual file systems
-        grep { $_->{FILESYSTEM} !~ /^(tmpfs|usbfs|proc|devpts|devshm|udev)$/ }
-        # get all file systems
-        getFilesystemsFromDf(logger => $logger, command => 'df -P -T -k');
-
-    # get additional informations
-    if (canRun('blkid')) {
-        # use blkid if available, as it is filesystem-independant
-        foreach my $filesystem (@filesystems) {
-            $filesystem->{SERIAL} = getFirstMatch(
-                logger  => $logger,
-                command => "blkid $filesystem->{VOLUMN}",
-                pattern => qr/\sUUID="(\S*)"\s/
-            );
-        }
-    } else {
-        # otherwise fallback to filesystem-dependant utilities
-        my $has_dumpe2fs   = canRun('dumpe2fs');
-        my $has_xfs_db     = canRun('xfs_db');
-        my $has_dosfslabel = canRun('dosfslabel');
-        my %months = (
-            Jan => 1,
-            Feb => 2,
-            Mar => 3,
-            Apr => 4,
-            May => 5,
-            Jun => 6,
-            Jul => 7,
-            Aug => 8,
-            Sep => 9,
-            Oct => 10,
-            Nov => 11,
-            Dec => 12,
-        );
-
-        foreach my $filesystem (@filesystems) {
-            if ($filesystem->{FILESYSTEM} =~ /^ext(2|3|4|4dev)/ && $has_dumpe2fs) {
-                my $handle = getFileHandle(
-                    logger => $logger,
-                    command => "dumpe2fs -h $filesystem->{VOLUMN}"
-                );
-                next unless $handle;
-                while (my $line = <$handle>) {
-                    if ($line =~ /Filesystem UUID:\s+(\S+)/) {
-                        $filesystem->{SERIAL} = $1;
-                    } elsif ($line =~ /Filesystem created:\s+\w+\s+(\w+)\s+(\d+)\s+([\d:]+)\s+(\d{4})$/) {
-                        $filesystem->{CREATEDATE} = "$4/$months{$1}/$2 $3";
-                    } elsif ($line =~ /Filesystem volume name:\s*(\S.*)/) {
-                        $filesystem->{LABEL} = $1 unless $1 eq '<none>';
-                    }
-                }
-                close $handle;
-                next;
-            }
-
-            if ($filesystem->{FILESYSTEM} eq 'xfs' && $has_xfs_db) {
-                $filesystem->{SERIAL} = getFirstMatch(
-                    logger  => $logger,
-                    command => "xfs_db -r -c uuid $filesystem->{VOLUMN}",
-                    pattern => qr/^UUID =\s+(\S+)/
-                );
-                $filesystem->{LABEL} = getFirstMatch(
-                    logger  => $logger,
-                    command => "xfs_db -r -c label $filesystem->{VOLUMN}",
-                    pattern => qr/^label =\s+"(\S+)"/
-                );
-                next;
-            }
-
-            if ($filesystem->{FILESYSTEM} eq 'vfat' && $has_dosfslabel) {
-                $filesystem->{LABEL} = getFirstLine(
-                    logger  => $logger,
-                    command => "dosfslabel $filesystem->{VOLUMN}"
-                );
-                next;
-            }
-        }
-    }
-
-    # complete with hal if available
-    if (canRun('lshal')) {
-        my @hal_filesystems = _getFilesystemsFromHal();
-        my %hal_filesystems = map { $_->{VOLUMN} => $_ } @hal_filesystems;
-
-        foreach my $filesystem (@filesystems) {
-            # retrieve hal informations for this drive
-            my $hal_filesystem = $hal_filesystems{$filesystem->{VOLUMN}};
-            next unless $hal_filesystem;
-
-            # take hal information if it doesn't exist already
-            foreach my $key (keys %$hal_filesystem) {
-                $filesystem->{$key} = $hal_filesystem->{$key}
-                    if !$filesystem->{$key};
-            }
-        }
-    }
-
-    return @filesystems;
-}
-
-sub _getFilesystemsFromHal {
-    my $devices = _parseLshal(command => 'lshal');
-    return @$devices;
-}
-
-sub _parseLshal {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my $devices = [];
-    my $device = {};
-
-    while (my $line = <$handle>) {
-        chomp $line;
-        if ($line =~ m{^udi = '/org/freedesktop/Hal/devices/(volume|block).*}) {
-            $device = {};
-            next;
-        }
-
-        next unless defined $device;
-
-        if ($line =~ /^$/) {
-            if ($device->{ISVOLUME}) {
-                delete($device->{ISVOLUME});
-                push(@$devices, $device);
-            }
-            undef $device;
-        } elsif ($line =~ /^\s+ block.device \s = \s '([^']+)'/x) {
-            $device->{VOLUMN} = $1;
-        } elsif ($line =~ /^\s+ volume.fstype \s = \s '([^']+)'/x) {
-            $device->{FILESYSTEM} = $1;
-        } elsif ($line =~ /^\s+ volume.label \s = \s '([^']+)'/x) {
-            $device->{LABEL} = $1;
-        } elsif ($line =~ /^\s+ volume.uuid \s = \s '([^']+)'/x) {
-            $device->{SERIAL} = $1;
-        } elsif ($line =~ /^\s+ storage.model \s = \s '([^']+)'/x) {
-            $device->{TYPE} = $1;
-         } elsif ($line =~ /^\s+ volume.size \s = \s (\S+)/x) {
-            my $value = $1;
-            $device->{TOTAL} = int($value/(1024*1024) + 0.5);
-        } elsif ($line =~ /block.is_volume\s*=\s*true/i) {
-            $device->{ISVOLUME} = 1;
-        }
-    }
-    close $handle;
-
-    return $devices;
-}
-
-1;

@@ -1,74 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Inputs;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(
-        file => '/proc/bus/input/devices',
-        logger => $logger
-    );
-    return unless $handle;
-
-    my @inputs;
-    my $device;
-    my $in;
-
-    while (my $line = <$handle>) {
-        if ($line =~ /^I: Bus=.*Vendor=(.*) Prod/) {
-            $in = 1;
-            $device->{vendor}=$1;
-        } elsif ($line =~ /^$/) {
-            $in = 0;
-            if ($device->{phys} && $device->{phys} =~ "input") {
-                push @inputs, {
-                    DESCRIPTION => $device->{name},
-                    CAPTION     => $device->{name},
-                    TYPE        => $device->{type},
-                };
-            }
-    
-            $device = {};
-        } elsif ($in) {
-            if ($line =~ /^P: Phys=.*(button).*/i) {
-                $device->{phys}="nodev";
-            } elsif ($line =~ /^P: Phys=.*(input).*/i) {
-                $device->{phys}="input";
-            }
-            if ($line =~ /^N: Name=\"(.*)\"/i) {
-                $device->{name}=$1;
-            }
-            if ($line =~ /^H: Handlers=(\w+)/i) {
-                if ($1 =~ ".*kbd.*") {
-                    $device->{type}="Keyboard";
-                } elsif ($1 =~ ".*mouse.*") {
-                    $device->{type}="Pointing";
-                } else {
-                    # Keyboard ou Pointing
-                    $device->{type}=$1;
-                }
-            }
-        }
-    }
-    close $handle;
-
-    foreach my $input (@inputs) {
-        $inventory->addEntry(
-            section => 'INPUTS',
-            entry   => $input
-        );
-    }
-}
-
-1;

@@ -1,125 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::LVM;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    canRun('lvs');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{inventory};
-
-    foreach my $volume (_getLogicalVolumes(logger => $logger)) {
-        $inventory->addEntry(section => 'LOGICAL_VOLUMES', entry => $volume);
-    }
-
-    foreach my $volume (_getPhysicalVolumes(logger => $logger)) {
-        $inventory->addEntry(section => 'PHYSICAL_VOLUMES', entry => $volume);
-    }
-
-    foreach my $group (_getVolumeGroups(logger => $logger)) {
-        $inventory->addEntry(section => 'VOLUME_GROUPS', entry => $group);
-    }
-}
-
-sub _getLogicalVolumes {
-    my (%params) = (
-        command => 'lvs -a --noheading --nosuffix --units M -o lv_name,vg_uuid,lv_attr,lv_size,lv_uuid,seg_count',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my @volumes;
-    while (my $line = <$handle>) {
-        my @infos = split(/\s+/, $line);
-
-        push @volumes, {
-            LV_NAME   => $infos[1],
-            VG_UUID   => $infos[2],
-            ATTR      => $infos[3],
-            SIZE      => int($infos[4]||0),
-            LV_UUID   => $infos[5],
-            SEG_COUNT => $infos[6],
-        }
-
-    }
-    close $handle;
-
-    return @volumes;
-}
-
-sub _getPhysicalVolumes {
-    my (%params) = (
-        command => 'pvs --noheading --nosuffix --units M -o pv_name,pv_fmt,pv_attr,pv_size,pv_free,pv_uuid,pv_pe_count,vg_uuid',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my @volumes;
-    while (my $line = <$handle>) {
-        my @infos = split(/\s+/, $line);
-
-        my $pe_size;
-        if ($infos[7] && $infos[7]>0) {
-            $pe_size = int($infos[4] / $infos[7]);
-        }
-
-        push @volumes, {
-            DEVICE      => $infos[1],
-            FORMAT      => $infos[2],
-            ATTR        => $infos[3],
-            SIZE        => int($infos[4]||0),
-            FREE        => int($infos[5]||0),
-            PV_UUID     => $infos[6],
-            PV_PE_COUNT => $infos[7],
-            PE_SIZE     => $pe_size,
-            VG_UUID     => $infos[8]
-        };
-    }
-    close $handle;
-
-    return @volumes;
-}
-
-sub _getVolumeGroups {
-    my (%params) = (
-        command => 'vgs --noheading --nosuffix --units M -o vg_name,pv_count,lv_count,vg_attr,vg_size,vg_free,vg_uuid,vg_extent_size',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my @groups;
-    while (my $line = <$handle>) {
-        my @infos = split(/\s+/, $line);
-
-        push @groups, {
-            VG_NAME        => $infos[1],
-            PV_COUNT       => $infos[2],
-            LV_COUNT       => $infos[3],
-            ATTR           => $infos[4],
-            SIZE           => int($infos[5]||0),
-            FREE           => int($infos[6]||0),
-            VG_UUID        => $infos[7],
-            VG_EXTENT_SIZE => $infos[8],
-        };
-    }
-    close $handle;
-
-    return @groups;
-}
-
-1;

@@ -1,36 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Memory;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled { 
-    return -r '/proc/meminfo';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(file => '/proc/meminfo', logger => $logger);
-    return unless $handle;
-
-    my $memorySize;
-    my $swapSize;
-
-    while (my $line = <$handle>) {
-        $memorySize = $1 if $line =~ /^MemTotal:\s*(\S+)/;
-        $swapSize = $1 if $line =~ /^SwapTotal:\s*(\S+)/;
-    }
-    close $handle;
-
-    $inventory->setHardware({
-        MEMORY => int($memorySize/ 1024),
-        SWAP   => int($swapSize / 1024),
-    });
-}
-
-1;

@@ -1,151 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Networks;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Network;
-use FusionInventory::Agent::Tools::Unix;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled {
-    return 
-        canRun('ifconfig') ||
-        canRun('ip');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # get the list of network interfaces
-    my $routes = getRoutingTable(command => 'netstat -nr', logger => $logger);
-    my @interfaces = _getInterfaces(logger => $logger);
-
-    foreach my $interface (@interfaces) {
-        $interface->{IPGATEWAY} = $params{routes}->{$interface->{IPSUBNET}}
-            if $interface->{IPSUBNET};
-
-        $inventory->addEntry(
-            section => 'NETWORKS',
-            entry   => $interface
-        );
-    }
-
-    $inventory->setHardware({
-        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
-    });
-}
-
-sub _getInterfaces {
-    my (%params) = @_;
-
-    my $logger = $params{logger};
-
-    my @interfaces = canRun('/sbin/ip') ?
-        getInterfacesFromIp(logger => $logger):
-        getInterfacesFromIfconfig(logger => $logger);
-
-    foreach my $interface (@interfaces) {
-        if (_isWifi($logger, $interface->{DESCRIPTION})) {
-            $interface->{TYPE} = "Wifi";
-        }
-
-        $interface->{IPSUBNET} = getSubnetAddress(
-            $interface->{IPADDRESS},
-            $interface->{IPMASK}
-        );
-
-        my ($driver, $pcislot) = _getUevent(
-            $interface->{DESCRIPTION}
-        );
-        $interface->{DRIVER} = $driver if $driver;
-        $interface->{PCISLOT} = $pcislot if $pcislot;
-
-        $interface->{VIRTUALDEV} = _isVirtual(
-            logger => $logger,
-            name   => $interface->{DESCRIPTION},
-            slot   => $interface->{PCISLOT}
-        );
-
-        $interface->{IPDHCP} = getIpDhcp($logger, $interface->{DESCRIPTION});
-        $interface->{SLAVES} = _getSlaves($interface->{DESCRIPTION});
-    }
-
-    return @interfaces;
-}
-
-# Handle slave devices (bonding)
-sub _getSlaves {
-    my ($name) = @_;
-
-    my @slaves = ();
-    while (my $slave = glob("/sys/class/net/$name/slave_*")) {
-        if ($slave =~ /\/slave_(\w+)/) {
-            push(@slaves, $1);
-        }
-    }
-
-    return join (",", @slaves);
-}
-
-# Handle virtual devices (bridge)
-sub _isVirtual {
-    my (%params) = @_;
-
-    return 0 if $params{slot};
-
-    if (-d "/sys/devices/virtual/net/") {
-        return -d "/sys/devices/virtual/net/$params{name}";
-    }
-
-    if (canRun('brctl')) {
-        # Let's guess
-        my %bridge;
-        my $handle = getFileHandle(
-            logger => $params{logger},
-            command => 'brctl show'
-        );
-        my $line = <$handle>;
-        while (my $line = <$handle>) {
-            next unless $line =~ /^(\w+)\s/;
-            $bridge{$1} = 1;
-        }
-        close $handle;
-
-        return defined $bridge{$params{name}};
-    }
-
-    return 0;
-}
-
-sub _isWifi {
-    my ($logger, $name) = @_;
-
-    my $count = getLinesCount(
-        logger  => $logger,
-        command => "/sbin/iwconfig $name"
-    );
-    return $count > 2;
-}
-
-sub _getUevent {
-    my ($name) = @_;
-
-    my $file = "/sys/class/net/$name/device/uevent";
-    my $handle = getFileHandle(file => $file);
-    return unless $handle;
-
-    my ($driver, $pcislot);
-    while (my $line = <$handle>) {
-        $driver = $1 if $line =~ /^DRIVER=(\S+)/;
-        $pcislot = $1 if $line =~ /^PCI_SLOT_NAME=(\S+)/;
-    }
-    close $handle;
-
-    return ($driver, $pcislot);
-}
-
-1;

@@ -1,171 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Storages::3ware;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-# Tested on 2.6.* kernels
-#
-# Cards tested :
-#
-# 8006-2LP
-# 9500S-4LP
-# 9550SXU-4LP
-# 9550SXU-8LP
-# 9650SE-2LP
-# 9650SE-4LPML
-# 9650SE-8LPML
-#
-# AMCC/3ware CLI (version 2.00.0X.XXX)
-
-sub isEnabled {
-    return canRun('tw_cli');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @devices = getDevicesFromUdev(logger => $logger);
-
-    foreach my $card (_getCards()) {
-        foreach my $unit (_getUnits($card)) {
-
-            # Try do get unit's serial in order to compare it to what was found
-            # in udev db.
-            # Works only on newer cards.
-            # Allow us to associate a node to a drive : sda -> WD-WMANS1648590
-            my $sn = getFirstMatch(
-                logger => $logger,
-                command => "tw_cli info $card->{id} $unit->{id} serial",
-                pattern => qr/serial number\s=\s(\w+)/
-            );
-
-            foreach my $port (_getPorts($card, $unit)) {
-                # Finally, getting drives' values.
-                my $storage = _getStorage($card, $port);
-
-                foreach my $device (@devices) {
-                    # How does this work with multiple older cards
-                    # where serial for units is not implemented ?
-                    # Need to be tested on a system with multiple
-                    # 3ware cards.
-                    if (
-                        $device->{SERIALNUMBER} eq 'AMCC_' . $sn ||
-                        $device->{MODEL} eq 'Logical_Disk_' . $unit->{index}
-                    ) {
-                        $storage->{NAME} = $device->{NAME};
-                    }
-                }
-
-                $inventory->addEntry(section => 'STORAGES', entry => $storage);
-            }
-        }
-    }
-}
-
-
-sub _getCards {
-    my ($file) = @_;
-
-    my $handle = getFileHandle(
-        file => $file,
-        command => "tw_cli info"
-    );
-    return unless $handle;
-
-    my @cards;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^(c\d+)\s+([\w-]+)/;
-        push @cards, { id => $1, model => $2 };
-    }
-    close $handle;
-
-    return @cards;
-}
-
-sub _getUnits {
-    my ($card, $file) = @_;
-
-    my $handle = getFileHandle(
-        file => $file,
-        command => "tw_cli info $card->{id}"
-    );
-    return unless $handle;
-
-    my @units;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^(u(\d+))/;
-        push @units, { id => $1, index => $2 };
-    }
-    close $handle;
-
-    return @units;
-}
-
-sub _getPorts {
-    my ($card, $unit, $file) = @_;
-
-    my $handle = getFileHandle(
-        file => $file,
-        command => "tw_cli info $card->{id} $unit->{id}"
-    );
-    return unless $handle;
-
-    my @ports;
-    while (my $line = <$handle>) {
-        next unless $line =~ /(p\d+)/;
-        push @ports, { id => $1 };
-    }
-    close $handle;
-
-    return @ports;
-}
-
-sub _getStorage {
-    my ($card, $port, $file) = @_;
-
-    my $handle = getFileHandle(
-        file => $file,
-        command =>
-            "tw_cli info $card->{id} $port->{id} model serial capacity firmware"
-    );
-    return unless $handle;
-
-    my $storage;
-    while (my $line = <$handle>) {
-        if ($line =~ /Model\s=\s(.*)/) {
-            $storage->{MODEL} = $1;
-        } elsif ($line =~ /Serial\s=\s(.*)/) {
-            $storage->{SERIALNUMBER} = $1;
-        } elsif ($line =~ /Capacity\s=\s(\S+)\sGB.*/) {
-            $storage->{DISKSIZE} = 1024 * $1;
-        } elsif ($line =~ /Firmware Version\s=\s(.*)/) {
-            $storage->{FIRMWARE} = $1
-        }
-    }
-    close $handle;
-
-    $storage->{MANUFACTURER} = getCanonicalManufacturer(
-        $storage->{MODEL}
-    );
-    $storage->{TYPE} = 'disk';
-
-    # Getting description from card model, very basic
-    # and unreliable
-    # Assuming only IDE drives can be plugged in
-    # 5xxx/6xxx cards and
-    # SATA drives only to 7xxx/8xxx/9xxxx cards
-    $storage->{DESCRIPTION} = 
-        $card->{model} =~ /^[56]/  ? 'IDE'  :
-        $card->{model} =~ /^[789]/ ? 'SATA' :
-        undef;
-
-    return $storage;
-}
-
-1;

@@ -1,95 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Storages::Adaptec;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled {
-    return -r '/proc/scsi/scsi';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @devices = getDevicesFromUdev(logger => $logger);
-
-    foreach my $device (@devices) {
-        next unless $device->{MANUFACTURER};
-        next unless
-            $device->{MANUFACTURER} eq 'Adaptec' ||
-            $device->{MANUFACTURER} eq 'ServeRA';
-
-        foreach my $disk (_getDisksFromProc(
-                controller => 'scsi' . $device->{SCSI_COID},
-                name       => $device->{NAME},
-                logger     => $logger
-        )) {
-            # merge with smartctl info
-            my $info = getInfoFromSmartctl(device => $disk->{device});
-            foreach my $key (qw/SERIALNUMBER DESCRIPTION TYPE/) {
-                $disk->{$key} = $info->{$key};
-            }
-            delete $disk->{device};
-            $inventory->addEntry(section => 'STORAGES', entry => $disk);
-        }
-    }
-}
-
-sub _getDisksFromProc {
-    my (%params) = (
-        file => '/proc/scsi/scsi',
-        @_
-    );
-
-    return unless $params{controller};
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my @disks;
-    my $disk;
-
-    my $count = -1;
-    while (my $line = <$handle>) {
-        if ($line =~ /^Host: (\w+)/) {
-            $count++;
-            if ($1 eq $params{controller}) {
-                # that's the controller we're looking for
-                $disk = {
-                    NAME        => $params{name},
-                };
-            } else {
-                # that's another controller
-                undef $disk;
-            }
-        }
-
-        if ($line =~ /Model: \s (\S.+\S) \s+ Rev: \s (\S+)/x) {
-            next unless $disk;
-            $disk->{MODEL}    = $1;
-            $disk->{FIRMWARE} = $2;
-
-            # that's the controller itself, not a disk
-            next if $disk->{MODEL} =~ 'raid';
-
-            $disk->{MANUFACTURER} = getCanonicalManufacturer(
-                $disk->{MODEL}
-            );
-            $disk->{device} = "/dev/sg$count";
-
-            push @disks, $disk;
-        }
-    }
-    close $handle;
-
-    return @disks;
-}
-
-1;

@@ -1,72 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Storages::Lsilogic;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled {
-    return canRun('mpt-status');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @devices = getDevicesFromUdev(logger => $logger);
-
-    foreach my $device (@devices) {
-        foreach my $disk (_getDiskFromMptStatus(
-            name    => $device->{NAME},
-            logger  => $logger,
-            command => "mpt-status -n -i $device->{SCSI_UNID}"
-        )) {
-            # merge with smartctl info
-            my $info = getInfoFromSmartctl(device => $disk->{device});
-            foreach my $key (qw/SERIALNUMBER DESCRIPTION TYPE/) {
-                $disk->{$key} = $info->{$key};
-            }
-            delete $disk->{device};
-            $inventory->addEntry(section => 'STORAGES', entry => $disk);
-        }
-    }
-
-}
-
-sub _getDiskFromMptStatus {
-    my (%params) = @_;
-
-    my $handle = getFileHandle(%params);
-    next unless $handle;
-
-    my @disks;
-    while (my $line = <$handle>) {
-        next unless $line =~ /
-            phys_id:(\d+) \s
-            scsi_id:\d+ \s
-            vendor:\S+ \s+
-            product_id:(\S.+\S) \s+
-            revision:(\S+) \s+
-            size\(GB\):(\d+)
-        /x;
-
-        my $disk = {
-            NAME         => $params{name},
-            device       => "/dev/sg$1",
-            MODEL        => $2,
-            MANUFACTURER => getCanonicalManufacturer($2),
-            FIRMWARE     => $3,
-            SIZE         => $4 * 1024
-        };
-
-        push @disks, $disk;
-    }
-    close $handle;
-
-    return @disks;
-}
-
-1;

@@ -1,92 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Storages::ServeRaid;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Task::Inventory::Input::Linux::Storages;
-
-# Tested on 2.6.* kernels
-#
-# Cards tested :
-#
-# IBM ServeRAID-6M 
-# IBM ServeRAID-6i
-
-sub isEnabled {
-    return canRun('ipssend');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle1 = getFileHandle(
-        logger => $logger,
-        command => 'ipssend GETVERSION'
-    );
-    return unless $handle1;
-
-    while (my $line1 = <$handle1>) {
-
-# Example Output :
-# Found 1 IBM ServeRAID controller(s).
-#----------------------------------------------------------------------
-#ServeRAID Controller(s) Version Information
-#----------------------------------------------------------------------
-#   Controlling BIOS version       : 7.00.14
-        #
-#ServeRAID Controller Number 1
-#   Controller type                : ServeRAID-6M
-#   Controller slot information    : 2
-#   Actual BIOS version            : 7.00.14
-#   Firmware version               : 7.00.14
-#   Device driver version          : 7.10.18
-        next unless /ServeRAID Controller Number\s(\d*)/;
-        my $slot = $1;
-
-        my $storage;
-        my $handle2 = getFileHandle(
-            logger => $logger,
-            command => "ipssend GETCONFIG $slot PD"
-        );
-        next unless $handle2;
-
-        while (my $line2 =~ <$handle2>) {
-# Example Output :
-#   Channel #1:
-#      Target on SCSI ID 0
-#         Device is a Hard disk
-#         SCSI ID                  : 0
-#         PFA (Yes/No)             : No
-#         State                    : Online (ONL)
-#         Size (in MB)/(in sectors): 34715/71096368
-#         Device ID                : IBM-ESXSCBR036C3DFQDB2Q6CDKM
-#         FRU part number          : 32P0729
-
-            if ($line2 =~ /Size.*:\s(\d*)\/(\d*)/) {
-                $storage->{DISKSIZE} = $1;
-            } elsif ($line2 =~ /Device ID.*:\s(.*)/) {
-                $storage->{SERIALNUMBER} = $1;
-            } elsif ($line2 =~ /FRU part number.*:\s(.*)/) {
-                $storage->{MODEL} = $1;
-                $storage->{MANUFACTURER} = getCanonicalManufacturer(
-                    $storage->{SERIALNUMBER}
-                );
-                $storage->{NAME} = $storage->{MANUFACTURER} . ' ' . $storage->{MODEL};
-                $storage->{DESCRIPTION} = 'SCSI';
-                $storage->{TYPE} = 'disk';
-
-                $inventory->addEntry(section => 'STORAGES', entry => $storage);
-                undef $storage;
-            }
-        }
-        close $handle2;
-    }
-    close $handle1;
-}
-
-1;
-

@@ -1,145 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Storages;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Linux;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @devices;
-
-    # get informations from hal first, if available
-    if (canRun('lshal')) {
-        @devices = getDevicesFromHal(logger => $logger);
-    }
-
-    # index devices by name for comparaison
-    my %devices = map { $_->{NAME} => $_ } @devices;
-
-    # complete with udev for missing bits
-    foreach my $device (getDevicesFromUdev(logger => $logger)) {
-        my $name = $device->{NAME};
-        foreach my $key (keys %$device) {
-            $devices{$name}->{$key} = $device->{$key}
-                if !$devices{$name}->{$key};
-        }
-    }
-
-    # fallback on sysfs if /dev/.udev is not available. That's the
-    # case on any up to date Linux system
-    if (!@devices) {
-        @devices = getDevicesFromProc(logger => $logger);
-    }
-
-    # get serial & firmware numbers from hdparm, if available
-    if (_correctHdparmAvailable()) {
-        foreach my $device (@devices) {
-            if (!$device->{SERIALNUMBER} || !$device->{FIRMWARE}) {
-                my $handle = getFileHandle(
-                    command => "hdparm -I /dev/$device->{NAME}",
-                    logger  => $logger
-                );
-                next unless $handle;
-                while (my $line = <$handle>) {
-                    if ($line =~ /^\s+Serial Number\s*:\s*(.+)/i) {
-                        my $value = $1;
-                        $value =~ s/\s+$//;
-                        $device->{SERIALNUMBER} = $value
-                            if !$device->{SERIALNUMBER};
-                        next;
-                    } elsif ($line =~ /^\s+Firmware Revision\s*:\s*(.+)/i) {
-                        my $value = $1;
-                        $value =~ s/\s+$//;
-                        $device->{FIRMWARE} = $value
-                            if !$device->{FIRMWARE};
-                        next;
-                    } elsif ($line =~ /^\s*Transport:.*(SCSI|SATA|USB)/) {
-                        $device->{DESCRIPTION} = $1;
-                    } elsif ($line =~ /^\s*Model Number:\s*(.*?)\s*$/) {
-                        $device->{MODEL} = $1;
-                    } elsif ($line =~ /Logical Unit WWN Device Identifier:\s*(.*?)\s*$/) {
-			$device->{WWN} = $1;
-		    }
-                }
-                close $handle;
-            }
-        }
-    }
-
-    foreach my $device (@devices) {
-        if (!$device->{DESCRIPTION}) {
-            $device->{DESCRIPTION} = _getDescription(
-                $device->{NAME},
-                $device->{MANUFACTURER},
-                $device->{DESCRIPTION},
-                $device->{SERIALNUMBER}
-            );
-        }
-
-        if (!$device->{MANUFACTURER} or $device->{MANUFACTURER} eq 'ATA') {
-            $device->{MANUFACTURER} = getCanonicalManufacturer(
-                $device->{MODEL}
-            );
-        }
-
-        if ($device->{DISKSIZE} && $device->{TYPE} =~ /^cd/) {
-            $device->{DISKSIZE} = getDeviceCapacity(device => '/dev/' . $device->{NAME});
-        }
-
-        $inventory->addEntry(section => 'STORAGES', entry => $device);
-    }
-}
-
-sub _getDescription {
-    my ($name, $manufacturer, $description, $serialnumber) = @_;
-
-    # detected as USB by udev
-    # TODO maybe we should trust udev detection by default?
-    return "USB" if ($description && $description =~ /usb/i);
-
-    if ($name =~ /^s/) { # /dev/sd* are SCSI _OR_ SATA
-        if (
-            ($manufacturer && $manufacturer =~ /ATA/) ||
-            ($serialnumber && $serialnumber =~ /ATA/) ||
-            ($description && $description =~ /ATA/)
-        ) {
-            return  "SATA";
-        } else {
-            return "SCSI";
-        }
-    } elsif ($name =~ /^vd/) {
-            return "Virtual";
-    } else {
-        return "IDE";
-    }
-}
-
-# some hdparm release generated kernel error if they are
-# run on CDROM device
-# http://forums.ocsinventory-ng.org/viewtopic.php?pid=20810
-sub _correctHdparmAvailable {
-    return unless canRun('hdparm');
-
-    my ($major, $minor) = getFirstMatch(
-        command => 'hdparm -V',
-        pattern => qr/^hdparm v(\d+)\.(\d+)/
-    );
-
-    # we need at least version 9.15
-    return compareVersion($major, $minor, 9, 15);
-
-}
-
-1;

@@ -1,36 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Uptime;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return -r '/proc/uptime';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $arch = getFirstLine(command => 'uname -m');
-    my $uptime = _getUptime(file => '/proc/uptime');
-    $inventory->setHardware({
-        DESCRIPTION => "$arch/$uptime"
-    });
-}
-
-sub _getUptime {
-    my $uptime = getFirstMatch(
-        pattern => qr/^(\S+)/,
-        @_
-    );
-    return unless $uptime;
-
-    return getFormatedGmTime($uptime);
-}
-
-1;

@@ -1,131 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::Videos;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $ddcprobeData = _getDdcprobeData(
-        command => 'ddcprobe',
-        logger  => $logger
-    );
-    my $xorgData;
-
-    my $xorgPid;
-    foreach my $process (getProcessesFromPs(
-        command => 'ps aux',
-        logger  => $logger
-    )) {
-        next unless $process->{CMD} =~ m{
-            ^
-            (?:
-                /usr/bin
-                |
-                /usr/X11R6/bin
-                |
-                /etc/X11
-            )
-            /X
-        }x;
-        $xorgPid = $process->{PID};
-        last;
-    }
-
-    if ($xorgPid) {
-        my $link = "/proc/$xorgPid/fd/0";
-        $xorgData = _parseXorgFd(file => $link) if -r $link;
-    }
-
-    return unless $xorgData || $ddcprobeData;
-
-    my $video = {
-        CHIPSET    => $xorgData->{product}    || $ddcprobeData->{product},
-        MEMORY     => $xorgData->{memory}     || $ddcprobeData->{memory},
-        NAME       => $xorgData->{name}       || $ddcprobeData->{oem},
-        RESOLUTION => $xorgData->{resolution} || $ddcprobeData->{dtiming},
-        PCISLOT    => $xorgData->{pcislot},
-    };
-
-    if ($video->{MEMORY} && $video->{MEMORY} =~ s/kb$//i) {
-        $video->{MEMORY} = int($video->{MEMORY} / 1024);
-    }
-    if ($video->{RESOLUTION}) {
-        $video->{RESOLUTION} =~ s/@.*//;
-    }
-
-    $inventory->addEntry(
-        section => 'VIDEOS',
-        entry   => $video
-    );
-}
-
-sub _getDdcprobeData {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my $data;
-    while (my $line = <$handle>) {
-        $line =~ s/[[:cntrl:]]//g;
-        $line =~ s/[^[:ascii:]]//g;
-        $data->{$1} = $2 if $line =~ /^(\S+):\s+(.*)/;
-    }
-    close $handle;
-
-    return $data;
-}
-
-sub _parseXorgFd {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my $data;
-    while (my $line = <$handle>) {
-        if ($line =~ /Modeline\s"(\S+?)"/) {
-            $data->{resolution} = $1 if !$data->{resolution};
-        } elsif ($line =~ /Integrated Graphics Chipset:\s+(.*)/) {
-            # Intel
-            $data->{name} = $1;
-        } elsif ($line =~ /Virtual screen size determined to be (\d+)\s*x\s*(\d+)/) {
-            # Nvidia
-            $data->{resolution} = "$1x$2";
-        } elsif ($line =~ /NVIDIA GPU\s*(.*?)\s*at/) {
-            $data->{name} = $1;
-        } elsif ($line =~ /VESA VBE OEM:\s*(.*)/) {
-            $data->{name} = $1;
-        } elsif ($line =~ /VESA VBE OEM Product:\s*(.*)/) {
-            $data->{product} = $1;
-        } elsif ($line =~ /VESA VBE Total Mem: (\d+)\s*(\w+)/i) {
-            $data->{memory} = $1 . $2;
-        } elsif ($line =~ /RADEON\(0\): Chipset: "(.*?)"/i) {
-            # ATI /Radeon
-            $data->{name} = $1;
-        } elsif ($line =~ /Virtual size is (\S+)/i) {
-            # VESA / XFree86
-            $data->{resolution} = $1;
-        } elsif ($line =~ /Primary Device is: PCI (.+)/i) {
-            $data->{pcislot} = $1;
-            # mimic lspci pci slot format
-            $data->{pcislot} =~ s/^00@//;
-            $data->{pcislot} =~ s/(\d{2}):(\d{2}):(\d)$/$1:$2.$3/;
-        } elsif ($line =~ /NOUVEAU\(0\): Chipset: "(.*)"/) {
-            # Nouveau
-            $data->{product} = $1;
-        }
-    }
-    close $handle;
-
-    return $data;
-}
-
-1;

@@ -1,74 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux::iLO;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Network;
-
-sub isEnabled {
-    return unless canRun('hponcfg');
-}
-
-sub _parseHponcfg {
-    my (%params) = @_;
-
-    my $handle = getFileHandle(%params);
-
-    return unless $handle;
-
-    my $interface = {
-        DESCRIPTION => 'Management Interface - HP iLO',
-        TYPE        => 'Ethernet',
-        MANAGEMENT  => 'iLO',
-        STATUS      => 'Down',
-    };
-
-    while (my $line = <$handle>) {
-        if ($line =~ /<IP_ADDRESS VALUE="($ip_address_pattern)"\/>/) {
-            $interface->{IPADDRESS} = $1 unless $1 eq '0.0.0.0';
-        }
-        if ($line =~ /<SUBNET_MASK VALUE="($ip_address_pattern)"\/>/) {
-            $interface->{IPMASK} = $1;
-        }
-        if ($line =~ /<GATEWAY_IP_ADDRESS VALUE="($ip_address_pattern)"\/>/) {
-            $interface->{IPGATEWAY} = $1;
-        }
-        if ($line =~ /<NIC_SPEED VALUE="([0-9]+)"\/>/) {
-            $interface->{SPEED} = $1;
-        } 
-        if ($line =~ /<ENABLE_NIC VALUE="Y"\/>/) {
-            $interface->{STATUS} = 'Up';
-        }
-        if ($line =~ /not found/) {
-            chomp $line;
-            $params{logger}->error("error in hponcfg output: $line")
-                if $params{logger};
-        }
-    }
-    close $handle;
-    $interface->{IPSUBNET} = getSubnetAddress(
-        $interface->{IPADDRESS}, $interface->{IPMASK}
-    );
-
-    return $interface;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $entry = _parseHponcfg(
-        logger => $logger,
-        command => 'hponcfg -aw -'
-    );
-
-    $inventory->addEntry(
-        section => 'NETWORKS',
-        entry   => $entry
-    );
-}
-
-1;

@@ -1,54 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Linux;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use XML::TreePP;
-
-
-use FusionInventory::Agent::Tools;
-
-our $runAfter = ["FusionInventory::Agent::Task::Inventory::Input::Generic"];
-
-sub isEnabled {
-    return $OSNAME eq 'linux';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $osversion = getFirstLine(command => 'uname -r');
-    my $oscomment = getFirstLine(command => 'uname -v');
-    my $systemId  = _getRHNSystemId('/etc/sysconfig/rhn/systemid');
-
-    $inventory->setHardware({
-        OSVERSION  => $osversion,
-        OSCOMMENTS => $oscomment,
-        WINPRODID =>  $systemId,
-    });
-
-    $inventory->setOperatingSystem({
-        KERNEL_VERSION => $osversion
-    });
-
-}
-
-# Get RedHat Network SystemId
-sub _getRHNSystemId {
-    my ($file) = @_;
-
-    return unless -f $file;
-    my $tpp = XML::TreePP->new();
-    my $h = $tpp->parsefile($file);
-    eval {
-        foreach (@{$h->{params}{param}{value}{struct}{member}}) {
-            next unless $_->{name} eq 'system_id';
-            return $_->{value}{string};
-        }
-    }
-}
-
-1;

@@ -1,49 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Bios;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::MacOS;
-
-sub isEnabled {
-    return 
-        -r '/usr/sbin/system_profiler' &&
-        canLoad("Mac::SysProfile");
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $prof = Mac::SysProfile->new();
-    my $info = $prof->gettype('SPHardwareDataType');
-    return unless ref $info eq 'HASH';
-
-    $info = $info->{'Hardware Overview'};
-
-    my ($device) = getIODevices(
-        class => 'IOPlatformExpertDevice',
-        logger => $logger
-    );
-
-    # set the bios informaiton from the apple system profiler
-    $inventory->setBios({
-        SMANUFACTURER => $device->{'manufacturer'} || 'Apple Inc', # duh
-        SMODEL        => $info->{'Model Identifier'} || $info->{'Machine Model'},
-        #       SSN             => $h->{'Serial Number'}
-        # New method to get the SSN, because of MacOS 10.5.7 update
-        # system_profiler gives 'Serial Number (system): XXXXX' where 10.5.6
-        # and lower give 'Serial Number: XXXXX'
-        SSN           => $info->{'Serial Number'} || $info->{'Serial Number (system)'} || $device->{'serial-number'},
-        BVERSION      => $info->{'Boot ROM Version'},
-    });
-
-    $inventory->setHardware({
-        UUID => $info->{'Hardware UUID'} || $device->{'IOPlatformUUID'}
-    });
-}
-
-1;

@@ -1,131 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::CPU;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::MacOS;
-
-sub isEnabled {
-    return 
-        -r '/usr/sbin/system_profiler';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger = $params{logger};
-
-    my $sysprofile = getSystemProfilerInfos(@_);
-
-
-
-    foreach my $cpu (_getCpus(logger => $logger)) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-
-
-    ### mem convert it to meg's if it comes back in gig's
-    my $mem = $sysprofile->{'Hardware'}{'Hardware Overview'}{'Memory'};
-    if ($mem =~ /GB$/){
-        $mem =~ s/\sGB$//;
-        $mem = ($mem * 1024);
-    } elsif ($mem =~ /MB$/){
-        $mem =~ s/\sMB$//;
-    }
-
-    $inventory->setHardware({
-        MEMORY => $mem,
-    });
-}
-
-sub _getCpus{
-
-    my (%params) = @_;
-    my $logger = $params{logger};
-    my $sysctlfile  = $params{sysctl};
-
-   # Get more informations from sysctl
-    my $sysctl = getFileHandle (
-        logger  => $logger,
-        command => 'sysctl -a machdep.cpu',
-        file    => $sysctlfile
-    );
-
-    # System profiler informations
-    my $sysprofile = getSystemProfilerInfos(@_);
-
-
-    #add sysctl informations into profiler informations
-    my $info = $sysprofile->{'Hardware'}->{'Hardware Overview'};
-
-    while (my $line = <$sysctl>) {
-        chomp $line;
-        if ($line =~ /(.+) : \s (.+)/x) {
-            $info->{$1} = $2;
-        }
-    }
-
-    my $type  = $info->{'Processor Name'} ||
-                $info->{'CPU Type'};
-    my $procs = $info->{'Number Of Processors'} ||
-                $info->{'Number Of CPUs'}       ||
-                1;
-    my $speed = $info->{'Processor Speed'} ||
-                $info->{'CPU Speed'};
-
-    my $stepping = $info->{'machdep.cpu.stepping'};
-
-    my $family = $info->{'machdep.cpu.family'};
-
-    my $model =  $info->{'machdep.cpu.model'};
-
-    # French Mac returns 2,60 Ghz instead of 2.60 Ghz :D
-    $speed =~ s/,/./;
-    if ($speed =~ /GHz$/i) {
-        $speed =~ s/GHz//i;
-        $speed = $speed * 1000;
-    } elsif ($speed =~ /MHz$/i){
-        $speed =~ s/MHz//i;
-    }
-    $speed =~ s/\s//g;
-
-    my $cores =
-        $info->{'Total Number Of Cores'} ? $info->{'Total Number Of Cores'} / $procs :
-                                           $info->{'machdep.cpu.core_count'};
-
-    my $threads = $info->{'machdep.cpu.thread_count'};
-
-
-    my $manufacturer =
-        $type =~ /Intel/i ? "Intel" :
-        $type =~ /AMD/i   ? "AMD"   :
-                            undef   ;
-
-    my @cpus;
-    my $cpu={
-        CORE         => $cores,
-	MANUFACTURER => $manufacturer,
-        NAME         => $type,
-        THREAD       => $threads,
-        FAMILYNUMBER => $family,
-        MODEL        => $model,
-        STEPPING     => $stepping,
-        SPEED        => $speed
-    };
-
-    for (my $i=0;$i<$procs;$i++) {
-        push @cpus, $cpu;
-    }
-
-    return @cpus;
-
-}
-
-
-
-1;

@@ -1,74 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Drives;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # get filesystem types
-    my @types = 
-        grep { ! /^(?:fdesc|devfs|procfs|linprocfs|linsysfs|tmpfs|fdescfs)$/ }
-        getFilesystemsTypesFromMount(logger => $logger);
-
-    # get filesystems for each type
-    my @filesystems;
-    foreach my $type (@types) {
-        push @filesystems, getFilesystemsFromDf(
-            logger  => $logger,
-            command => "df -P -k -t $type",
-            type    => $type,
-        );
-    }
-
-    my %filesystems = map { $_->{VOLUMN} => $_ } @filesystems;
-
-    # get additional informations
-    foreach (`diskutil list`) {
-        # partition identifiers look like disk0s1
-        next unless /(disk \d+ s \d+)$/x;
-        my $id = $1;
-        my $name = "/dev/$1";
-
-        my $filesystem = $filesystems{$name};
-        next unless $filesystem;
-
-        my $device;
-        foreach (`diskutil info $id`) {
-            next unless /(\S[^:]+) : \s+ (\S.*\S)/x;
-            $device->{$1} = $2;
-        }
-
-        my $size;
-        if ($device->{'Total Size'} =~ /^([.\d]+ \s \S+)/x) {
-            $size = getCanonicalSize($1);
-        }
-
-        $filesystem->{TOTAL}      = $size;
-        $filesystem->{SERIAL}     = $device->{'Volume UUID'} ||
-                                    $device->{'UUID'};
-        $filesystem->{FILESYSTEM} = $device->{'File System'} ||
-                                    $device->{'Partition Type'};
-        $filesystem->{LABEL}      = $device->{'Volume Name'};
-    }
-
-    # add filesystems to the inventory
-    foreach my $key (keys %filesystems) {
-        $inventory->addEntry(
-            section => 'DRIVES',
-            entry   => $filesystems{$key}
-        );
-    }
-}
-
-1;

@@ -1,30 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Hostname;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return 
-        -r '/usr/sbin/system_profiler' &&
-        canLoad("Mac::SysProfile");
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $prof = Mac::SysProfile->new();
-    my $info = $prof->gettype('SPSoftwareDataType');
-    return unless ref $info eq 'HASH';
-
-    my $hostname = $info->{'System Software Overview'}->{'Computer Name'};
-
-    $inventory->setHardware({
-        NAME => $hostname
-    }) if $hostname;
-}
-
-1;

@@ -1,69 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Memory;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::MacOS;
-
-sub isEnabled {
-    return 
-        -r '/usr/sbin/system_profiler';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $memory (_getMemories(logger => $logger)) {
-        $inventory->addEntry(
-            section => 'MEMORIES',
-            entry   => $memory
-        );
-    }
-}
-
-sub _getMemories {
-    my $infos = getSystemProfilerInfos(@_);
-
-    return unless $infos->{Memory};
-
-    # the memory slot informations may appears directly under
-    # 'Memory' top-level node, or under Memory/Memory Slots
-    my $parent_node = $infos->{Memory}->{'Memory Slots'} ?
-        $infos->{Memory}->{'Memory Slots'} :
-        $infos->{Memory};
-
-    my @memories;
-    foreach my $key (sort keys %$parent_node) {
-        next unless $key =~ /DIMM(\d)/; 
-        my $slot = $1;
-
-        my $info = $parent_node->{$key};
-        my $description = $info->{'Part Number'};
-
-        # convert hexa to ascii
-        if ($description && $description =~ /^0x/) {
-            $description = pack 'H*', substr($description, 2);
-            $description =~ s/\s*$//;
-        }
-
-        my $memory = {
-            NUMSLOTS     => $slot,
-            DESCRIPTION  => $description,
-            CAPTION      => "Status: $info->{'Status'}",
-            TYPE         => $info->{'Type'},
-            SERIALNUMBER => $info->{'Serial Number'},
-            SPEED        => getCanonicalSpeed($info->{'Speed'}),
-            CAPACITY     => getCanonicalSize($info->{'Size'})
-        };
-
-        push @memories, $memory;
-    }
-
-    return @memories;
-}
-
-1;

@@ -1,115 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Networks;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Network;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return canRun('ifconfig');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # set list of network interfaces
-    my $routes = getRoutingTable(logger => $logger);
-    my @interfaces = _getInterfaces(logger => $logger);
-
-    foreach my $interface (@interfaces) {
-        $interface->{IPGATEWAY} = $params{routes}->{$interface->{IPSUBNET}}
-            if $interface->{IPSUBNET};
-
-        $inventory->addEntry(
-            section => 'NETWORKS',
-            entry   => $interface
-        );
-    }
-
-    $inventory->setHardware({
-        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
-    });
-}
-
-sub _getInterfaces {
-    my (%params) = @_;
-
-    my @interfaces = _parseIfconfig(
-        command => '/sbin/ifconfig -a',
-        logger  =>  $params{logger}
-    );
-
-    foreach my $interface (@interfaces) {
-        $interface->{IPSUBNET} = getSubnetAddress(
-            $interface->{IPADDRESS},
-            $interface->{IPMASK}
-        );
-    }
-
-    return @interfaces;
-}
-
-sub _parseIfconfig {
-
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @interfaces;
-    my $interface;
-
-    while (my $line = <$handle>) {
-        if ($line =~ /^(\S+):/) {
-            # new interface
-            push @interfaces, $interface if $interface;
-            $interface = {
-                STATUS      => 'Down',
-                DESCRIPTION => $1,
-                VIRTUALDEV  => 1
-            };
-        }
-
-        if ($line =~ /inet ($ip_address_pattern)/) {
-            $interface->{IPADDRESS} = $1;
-        }
-        if ($line =~ /inet6 (\S+)/) {
-            $interface->{IPADDRESS6} = $1;
-            # Drop the interface from the address. e.g:
-            # fe80::1%lo0
-            # fe80::214:51ff:fe1a:c8e2%fw0
-            $interface->{IPADDRESS6} =~ s/%.*$//;
-        }
-        if ($line =~ /netmask 0x($hex_ip_address_pattern)/) {
-            $interface->{IPMASK} = hex2canonical($1);
-        }
-        if ($line =~ /(?:address:|ether|lladdr) ($mac_address_pattern)/) {
-            $interface->{MACADDR} = $1;
-        }
-        if ($line =~ /mtu (\S+)/) {
-            $interface->{MTU} = $1;
-        }
-        if ($line =~ /media (\S+)/) {
-            $interface->{TYPE} = $1;
-        }
-        if ($line =~ /status:\s+active/i) {
-            $interface->{STATUS} = 'Up';
-        }
-        if ($line =~ /supported\smedia:/) {
-            $interface->{VIRTUALDEV} = 0;
-        }
-    }
-    close $handle;
-    
-    # last interface
-    push @interfaces, $interface if $interface;
-
-    return @interfaces;
-}
-
-1;

@@ -1,51 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Printers;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return 
-        !$params{no_category}->{printer} &&
-        -r '/usr/sbin/system_profiler' &&
-        canLoad("Mac::SysProfile");
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $prof = Mac::SysProfile->new();
-    my $info = $prof->gettype('SPPrintersDataType');
-    return unless ref $info eq 'HASH';
-
-    foreach my $printer (keys %$info) {
-        if ($printer && (
-            $printer =~ /list is empty/
-            ||
-            $printer =~ /^Status/
-            ||
-            $printer =~ /^CUPS Version/
-            )            ) {
-#http://forge.fusioninventory.org/issues/169
-#https://bugs.launchpad.net/bugs/901570
-                next;
-        }
-
-        $inventory->addEntry(
-            section => 'PRINTERS',
-            entry   => {
-                NAME    => $printer,
-                DRIVER  => $info->{$printer}->{'PPD'},
-                PORT    => $info->{$printer}->{'URI'},
-            }
-        );
-    }
-
-}
-
-1;

@@ -1,60 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Softwares;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return
-        !$params{no_category}->{software} &&
-        -r '/usr/sbin/system_profiler' &&
-        canLoad("Mac::SysProfile");
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $prof = Mac::SysProfile->new();
-    my $info = $prof->gettype('SPApplicationsDataType');
-    return unless ref $info eq 'HASH';
-
-    my $softwares = _getSoftwaresList($info);
-    return unless $softwares;
-
-    foreach my $software (@$softwares) {
-        $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => $software
-        );
-    }
-}
-
-sub _getSoftwaresList {
-    my ($info) = @_;
-
-    my @softwares;
-    foreach my $name (keys %$info) {
-        my $app = $info->{$name};
-
-        # Windows application found by Parallels (issue #716)
-        next if
-            $app->{'Get Info String'} &&
-            $app->{'Get Info String'} =~ /^\S+, [A-Z]:\\/;
-
-        push @softwares, {
-            NAME      => $name,
-            VERSION   => $app->{'Version'},
-            COMMENTS  => $app->{'Kind'} ? '[' . $app->{'Kind'} . ']' : undef,
-            PUBLISHER => $app->{'Get Info String'},
-        };
-    }
-
-    return \@softwares;
-}
-
-1;

@@ -1,36 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Sound;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return 
-        -r '/usr/sbin/system_profiler' &&
-        canLoad("Mac::SysProfile");
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $prof = Mac::SysProfile->new();
-    my $info = $prof->gettype('SPAudioDataType');
-    return unless ref $info eq 'HASH';
-
-    # add sound cards
-    foreach my $x (keys %$info){
-        $inventory->addEntry(
-            section => 'SOUNDS',
-            entry   => {
-                NAME         => $x,
-                MANUFACTURER => $x,
-                DESCRIPTION  => $x,
-            }
-        );
-    }
-}
-
-1;

@@ -1,115 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Storages;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::MacOS;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $storage (_getStorages(logger => $logger)) {
-        $inventory->addEntry(
-            section => 'STORAGES',
-            entry   => $storage
-        );
-    }
-}
-
-sub _getStorages {
-    my $infos = getSystemProfilerInfos(@_);
-
-    # system profiler data structure:
-    # bus
-    # └── controller
-    #     ├── device
-    #     │   ├── subdevice
-    #     │   │   └── key:value
-    #     │   └── key:value
-    #     └── key:value
-
-    my @storages;
-    my @busNames = ('ATA', 'SERIAL-ATA', 'USB', 'FireWire', 'Fibre Channel');
-    foreach my $busName (@busNames) {
-        my $bus = $infos->{$busName};
-        next unless $bus;
-        foreach my $controllerName (keys %{$bus}) {
-            my $controller = $bus->{$controllerName};
-            foreach my $deviceName (keys %{$controller}) {
-                my $device = $controller->{$deviceName};
-                next unless ref $device eq 'HASH';
-                if (_isStorage($device)) {
-                    push @storages,
-                        _getStorage($device, $deviceName, $busName);
-                } else {
-                    foreach my $subdeviceName (keys %{$device}) {
-                        my $subdevice = $device->{$subdeviceName};
-                        next unless ref $subdevice eq 'HASH';
-                        push @storages,
-                            _getStorage($subdevice, $subdeviceName, $busName)
-                            if _isStorage($subdevice);
-                    }
-                }
-
-            }
-        }
-    }
-
-    return @storages;
-}
-
-sub _isStorage {
-    my ($device) = @_;
-
-    return 
-        ($device->{'BSD Name'} && $device->{'BSD Name'} =~ /^disk\d+$/) || 
-        ($device->{'Protocol'} && $device->{'Socket Type'});
-}
-
-sub _getStorage {
-    my ($device, $device_name, $bus_name) = @_;
-
-    my $storage = {
-        NAME         => $device_name,
-        MANUFACTURER => getCanonicalManufacturer($device_name),
-        TYPE         => $bus_name eq 'FireWire' ? '1394' : $bus_name,
-        SERIAL       => $device->{'Serial Number'},
-        FIRMWARE     => $device->{'Revision'},
-        MODEL        => $device->{'Model'},
-        DISKSIZE     => $device->{'Capacity'}
-    };
-
-    if (!$device->{'Protocol'}) {
-        $storage->{DESCRIPTION} = 'Disk drive';
-    } elsif ($device->{'Protocol'} eq 'ATAPI' || $device->{'Drive Type'}) {
-        $storage->{DESCRIPTION} = 'CD-ROM Drive';
-    }
-
-    if ($storage->{DISKSIZE}) {
-        #e.g: Capacity: 320,07 GB (320 072 933 376 bytes)
-        $storage->{DISKSIZE} =~ s/\s*\(.*//;
-        $storage->{DISKSIZE} =~ s/,/./;
-
-        if ($storage->{DISKSIZE} =~ s/\s*TB//) {
-            $storage->{DISKSIZE} = int($storage->{DISKSIZE} * 1000 * 1000);
-        } elsif ($storage->{DISKSIZE} =~ s/\s+GB$//) {
-            $storage->{DISKSIZE} = int($storage->{DISKSIZE} * 1000 * 1000);
-        }
-    }
-
-    if ($storage->{MODEL}) {
-        $storage->{MODEL} =~ s/\s*$storage->{MANUFACTURER}\s*//i;
-    }
-
-    return $storage;
-}
-
-1;

@@ -1,47 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::USB;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::MacOS;
-
-my $seen;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $device (_getDevices(logger => $logger)) {
-        # avoid duplicates
-        next if $device->{SERIAL} && $seen->{$device->{SERIAL}}++;
-        $inventory->addEntry(
-            section => 'USBDEVICES',
-            entry   => $device,
-        );
-    }
-}
-
-sub _getDevices {
-
-    return 
-        map {
-            {
-                VENDORID  => dec2hex($_->{'idVendor'}),
-                PRODUCTID => dec2hex($_->{'idProduct'}),
-                SERIAL    => $_->{'USB Serial Number'},
-                NAME      => $_->{'USB Product Name'},
-                CLASS     => $_->{'bDeviceClass'},
-                SUBCLASS  => $_->{'bDeviceSubClass'}
-            }
-        }
-        getIODevices(class => 'IOUSBDevice', @_);
-}
-
-1;

@@ -1,41 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Uptime;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return getFirstLine(command => 'sysctl -n kern.boottime');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $arch = getFirstLine(command => 'uname -m');
-    my $uptime = _getUptime(command => 'sysctl -n kern.boottime');
-    $inventory->setHardware({
-        DESCRIPTION => "$arch/$uptime"
-    });
-}
-
-sub _getBootTime {
-    my $boottime = getFirstMatch(
-        pattern => qr/(\d+)$/,
-        @_,
-    );
-
-    return $boottime;
-}
-
-sub _getUptime {
-    my $boottime = _getBootTime(@_);
-    return unless $boottime;
-
-    my $uptime = time() - $boottime;
-    return getFormatedGmTime($uptime);
-}
-
-1;

@@ -1,80 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS::Videos;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::MacOS;
-
-sub isEnabled {
-    return
-        -r '/usr/sbin/system_profiler'
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my %displays = _getDisplays();
-
-    foreach my $monitor (@{$displays{MONITORS}}) {
-        $inventory->addEntry(
-            section => 'MONITORS',
-            entry   => $monitor,
-        );
-    }
-
-    foreach my $video (@{$displays{VIDEOS}}) {
-        $inventory->addEntry(
-            section => 'VIDEOS',
-            entry   => $video,
-        );
-    }
-}
-
-sub _getDisplays {
-    my $infos = getSystemProfilerInfos(@_);
-
-    my @monitors;
-    my @videos;
-
-    foreach my $videoName (keys %{$infos->{'Graphics/Displays'}}) {
-        my $videoCardInfo = $infos->{'Graphics/Displays'}->{$videoName};
-        foreach my $displayName (keys %{$videoCardInfo->{Displays}}) {
-            next if $displayName eq 'Display Connector';
-            next if $displayName eq 'Display';
-            my $displayInfo = $videoCardInfo->{Displays}->{$displayName};
-
-            my $resolution = $displayInfo->{Resolution};
-            if ($resolution) {
-                $resolution =~ s/\ //g;
-                $resolution =~ s/\@.*//g;
-            }
-
-            my $memory = $videoCardInfo->{'VRAM (Total)'};
-            $memory =~ s/\ .*//g if $memory;
-
-            push @videos, {
-                CHIPSET    => $videoCardInfo->{'Chipset Model'},
-                MEMORY     => $memory,
-                NAME       => $videoName,
-                RESOLUTION => $resolution,
-                PCISLOT    => $videoCardInfo->{Slot}
-            };
-
-            push @monitors, {
-                CAPTION     => $displayName,
-                DESCRIPTION => $displayName,
-            }
-        }
-    }
-
-    return (
-        MONITORS => \@monitors,
-        VIDEOS   => \@videos
-    );
-
-}
-
-1;

@@ -1,63 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::MacOS;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return $OSNAME eq 'darwin';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my ($OSName, $OSVersion);
-
-    if (canLoad("Mac::SysProfile")) {
-        # use system profiler if available
-        my $prof = Mac::SysProfile->new();
-        my $info = $prof->gettype('SPSoftwareDataType');
-        return unless ref $info eq 'HASH';
-
-        $info = $info->{'System Software Overview'};
-
-        my $SystemVersion = $info->{'System Version'};
-        if ($SystemVersion =~ /^(.*?)\s+(\d+.*)/) {
-            $OSName = $1;
-            $OSVersion = $2;
-        } else {
-            # Default values
-            $OSName = "Mac OS X";
-        }
-
-    } else {
-        # fallback on basic BSD type information otherwise
-        $OSName = getFirstLine(command => 'uname -s');
-        $OSVersion = getFirstLine(command => 'uname -r');
-    }
-
-    # add the uname -v as the comment, not really needed, but extra info
-    # never hurt
-    my $OSComment = getFirstLine(command => 'uname -v');
-    my $KernelVersion = getFirstLine(command => 'uname -r');
-
-    $inventory->setHardware({
-        OSNAME     => $OSName,
-        OSCOMMENTS => $OSComment,
-        OSVERSION  => $OSVersion,
-    });
-
-    $inventory->setOperatingSystem({
-        NAME                 => "MacOSX",
-        VERSION              => $OSVersion,
-        KERNEL_VERSION       => $KernelVersion,
-        FULL_NAME            => $OSName
-    });
-}
-
-1;

@@ -1,150 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::Bios;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Solaris;
-
-sub isEnabled {
-    return
-        canRun('showrev') ||
-        canRun('/usr/sbin/smbios');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my ($bios, $hardware);
-
-    if (getZone() eq 'global') {
-        my $arch;
-        if (canRun('showrev')) {
-            my $infos = _parseShowRev(logger => $logger);
-            $bios->{SMODEL}        = $infos->{'Application architecture'};
-            $bios->{SMANUFACTURER} = $infos->{'Hardware provider'};
-            $arch               = $infos->{'Application architecture'};
-        } else {
-            $arch =
-                getFirstLine(command => 'arch') eq 'i86pc' ? 'i386' : 'unknown';
-        }
-
-        if ($arch eq "i386") {
-            my $infos = _parseSmbios(logger => $logger);
-
-            my $biosInfos = $infos->{SMB_TYPE_BIOS};
-            $bios->{BMANUFACTURER} = $biosInfos->{'Vendor'};
-            $bios->{BVERSION}      = $biosInfos->{'Version String'};
-            $bios->{BDATE}         = $biosInfos->{'Release Date'};
-
-            my $systemInfos = $infos->{SMB_TYPE_SYSTEM};
-            $bios->{SMANUFACTURER} = $systemInfos->{'Manufacturer'};
-            $bios->{SMODEL}        = $systemInfos->{'Product'};
-            $bios->{SKUNUMBER}     = $systemInfos->{'SKU Number'};
-            $hardware->{UUID}      = $systemInfos->{'UUID'};
-
-            my $motherboardInfos = $infos->{SMB_TYPE_BASEBOARD};
-            $bios->{MMODEL}        = $motherboardInfos->{'Product'};
-            $bios->{MSN}           = $motherboardInfos->{'Serial Number'};
-            $bios->{MMANUFACTURER} = $motherboardInfos->{'Manufacturer'};
-        } elsif ($arch =~ /sparc/i) {
-            my $infos = _parsePrtconf(logger => $logger);
-            $bios->{SMODEL} = $infos->{'banner-name'};
-            $bios->{SMODEL} .= " ($infos->{name})" if $infos->{name};
-
-            # looks like : "OBP 4.16.4 2004/12/18 05:18"
-            #    with further informations sometime
-            if ($infos->{version} =~ m{OBP\s+([\d|\.]+)\s+(\d+)/(\d+)/(\d+)}) {
-                $bios->{BVERSION} = "OBP $1";
-                $bios->{BDATE}    = "$2/$3/$4";
-            } else {
-                $bios->{BVERSION} = $infos->{version};
-            }
-
-            my $command = -x '/opt/SUNWsneep/bin/sneep' ?
-                '/opt/SUNWsneep/bin/sneep' : 'sneep';
-
-            $bios->{SSN} = getFirstLine(
-                command => $command,
-                logger  => $logger
-            );
-        }
-    } else {
-        my $infos = _parseShowRev(logger => $logger);
-        $bios->{SMANUFACTURER} = $infos->{'Hardware provider'};
-        $bios->{SMODEL}        = "Solaris Containers";
-    }
-
-    $inventory->setBios($bios);
-    $inventory->setHardware($hardware);
-}
-
-sub _parseShowRev {
-    my (%params) = (
-        command => 'showrev',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my $infos;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^ ([^:]+) : \s+ (\S+)/x;
-        $infos->{$1} = $2;
-    }
-    close $handle;
-
-    return $infos;
-}
-
-sub _parseSmbios {
-    my (%params) = (
-        command => '/usr/sbin/smbios',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my ($infos, $current);
-    while (my $line = <$handle>) {
-        if ($line =~ /^ \d+ \s+ \d+ \s+ (\S+)/x) {
-            $current = $1;
-            next;
-        }
-
-        if ($line =~ /^ \s* ([^:]+) : \s* (.+) $/x) {
-            $infos->{$current}->{$1} = $2;
-            next;
-        }
-    }
-    close $handle;
-
-    return $infos;
-}
-
-sub _parsePrtconf {
-    my (%params) = (
-        command => '/usr/sbin/prtconf -pv',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my $infos;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^ \s* ([^:]+) : \s* ' (.+) '$/x;
-        next if $infos->{$1};
-        $infos->{$1} = $2;
-    }
-    close $handle;
-
-    return $infos;
-}
-
-1;

@@ -1,210 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::CPU;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Solaris;
-
-sub isEnabled {
-    return canRun('memconf');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $class = getClass();
-
-    my ($count, $cpu) =
-        $class == SOLARIS_CONTAINER ?
-            _getCPUFromPrtcl(logger => $logger)  :
-            _getCPUFromMemconf(logger => $logger);
-
-    # fallback on generic method
-    ($count, $cpu) = _getCPUFromPrsinfo(logger => $logger) if !$count;
-
-    $cpu->{MANUFACTURER} = "SPARC";
-
-    while ($count--) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-}
-
-
-# Sun Microsystems, Inc. Sun Fire 880 (4 X UltraSPARC-III 750MHz)
-# Sun Microsystems, Inc. Sun Fire V490 (2 X dual-thread UltraSPARC-IV 1350MHz)
-# Sun Microsystems, Inc. Sun Fire V240 (UltraSPARC-IIIi 1002MHz)
-# Sun Microsystems, Inc. Sun-Fire-T200 (Sun Fire T2000) (8-core quad-thread UltraSPARC-T1 1000MHz)
-# Sun Microsystems, Inc. Sun-Fire-T200 (Sun Fire T2000) (4-core quad-thread UltraSPARC-T1 1000MHz)
-# Sun Microsystems, Inc. SPARC Enterprise T5120 (8-core 8-thread UltraSPARC-T2 1165MHz)
-# Sun Microsystems, Inc. SPARC Enterprise T5120 (4-core 8-thread UltraSPARC-T2 1165MHz)
-# Sun Microsystems, Inc. Sun SPARC Enterprise M5000 Server (6 X dual-core dual-thread SPARC64-VI 2150MHz)
-# Fujitsu SPARC Enterprise M4000 Server (4 X dual-core dual-thread SPARC64-VI 2150MHz)
-# Sun Microsystems, Inc. Sun Fire V20z (Solaris x86 machine) (2 X Dual Core AMD Opteron(tm) Processor 270 1993MHz)
-
-sub _getCPUFromMemconf {
-    my $spec = getFirstMatch(
-        command => 'memconf',
-        pattern => qr/^((?:Sun|Fujitsu|Intel) .* \d+ [GM]Hz\))/x,
-        @_
-    );
-    return _parseSpec($spec);
-}
-
-sub _parseCoreString {
-    my ($v) = @_;
-
-    return
-        $v =~ /dual/i     ? 2  :
-        $v =~ /quad/i     ? 4  :
-        $v =~ /(\d+)-\w+/ ? $1 :
-        $v;
-}
-
-sub _parseSpec {
-    my ($spec) = @_;
-
-    my $manufacturer;
-    if ($spec =~ /(AMD|Fujitsu|Intel)\s/g) {
-        $manufacturer = $1;
-    } elsif ($spec =~ /Sun/) {
-        $manufacturer = 'Sun Microsystems';
-    }
-
-    # 4 X UltraSPARC-III 750MHz
-    if ($spec =~ /(\d+) \s X \s (\S+) \s (\d+ \s* .Hz)/x) {
-        return $1, {
-            MANUFACTURER => $manufacturer,
-            NAME         => $2,
-            SPEED        => getCanonicalSpeed($3),
-            CORE         => 1,
-        };
-    }
-
-    # 2 X dual-thread UltraSPARC-IV 1350MHz
-    if ($spec =~ /(\d+) \s X \s (\S+) \s (\S+) \s (\d+) MHz/x) {
-        return $1, {
-            MANUFACTURER => $manufacturer,
-            NAME         => $3 . " (" . $2 . ")",
-            SPEED        => $4,
-            CORE         => _parseCoreString($1),
-            THREAD       => _parseCoreString($2)
-        };
-    }
-
-    # 8-core quad-thread UltraSPARC-T1 1000MHz
-    # 8-core 8-thread UltraSPARC-T2 1165MHz
-    # 16-Core 8-Thread SPARC-T3 1649MHz
-    if ($spec =~ /(\d+ -[cC]ore) \s (\S+) \s (\S+) \s (\d+) MHz/x) {
-        return 1, {
-            MANUFACTURER => $manufacturer,
-            NAME         => $3 . " (" . $1 . " " . $2 . ")",
-            SPEED        => $4,
-            CORE         => _parseCoreString($1),
-            THREAD       => _parseCoreString($2)
-        };
-    }
-
-    # 6 X dual-core dual-thread SPARC64-VI 2150MHz
-    if ($spec =~ /(\d+) \s X \s (\S+) \s (\S+) \s (\S+) \s (\d+) MHz/x) {
-        return $1, {
-            MANUFACTURER => $manufacturer,
-            NAME         => $4 . " (" . $2 . " " . $3 . ")",
-            SPEED        => $5,
-            CORE         => _parseCoreString($2),
-            THREAD       => _parseCoreString($3)
-        };
-    }
-
-    # 2 X Dual Core AMD Opteron(tm) Processor 270 1993MHz
-    if ($spec =~ /(\d+) \s X \s (\S+) \s Core \s AMD \s (Opteron\(tm\) \s Processor \s \S+) \s ([\.\d]+ \s* .Hz)/x) {
-        return $1, {
-            MANUFACTURER => $manufacturer,
-            NAME         => $3,
-            SPEED        => getCanonicalSpeed($4),
-            CORE         => _parseCoreString($2),
-        };
-    }
-
-    # 2 X Quad-Core Intel(R) Xeon(R) E7320 @ 2.13GHz
-    if ($spec =~ /(\d+) \s X \s (\S+) \s Intel\(R\) \s (Xeon\(R\) \s E\d+) \s @ \s ([\d\.]+\s*.Hz)/x) {
-        return $1, {
-            MANUFACTURER => $manufacturer,
-            NAME         => $3,
-            SPEED        => getCanonicalSpeed($4),
-            CORE         => _parseCoreString($2),
-        };
-    }
-
-    # UltraSPARC-IIi 270MHz
-    # UltraSPARC-III 750MHz
-    if ($spec =~ /([^()\s]\S+) \s (\d+ \s* .Hz)/x) {
-        return 1, {
-            MANUFACTURER => $manufacturer,
-            NAME         => $1,
-            SPEED        => getCanonicalSpeed($2),
-            CORE         => 1,
-        };
-    }
-
-}
-
-sub _getCPUFromPsrinfo {
-    my (%params) = (
-        command => 'psrinfo -v',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my $count = 0;
-    my $cpu;
-    while (my $line = <$handle>) {
-        next unless $line =~ 
-            /^\s+The\s(\w+)\sprocessor\soperates\sat\s(\d+)\sMHz,/;
-
-        $cpu->{NAME}  = $1;
-        $cpu->{SPEED} = $2;
-        $count++;
-    }
-    close $handle;
-
-    return ($count, $cpu);
-}
-
-sub _getCPUFromPrtcl {
-    my (%params) = (
-        command => "prctl -n zone.cpu-shares $PID",
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my ($count, $cpu);
-    while (my $line = <$handle>) {
-        $cpu->{NAME} = $1 if $line =~ /^zone.(\S+)$/;
-        $cpu->{NAME} .= " " . $1 if $line =~ /^\s*privileged+\s*(\d+)/;
-        #$count = 1 if /^\s*privileged+\s*(\d+)/;
-        foreach (`memconf 2>&1`) {
-            if(/\s+\((\d+).*\s+(\d+)MHz/) {
-                $count = $1;
-                $cpu->{SPEED} = $2;
-            }
-        }
-    }
-    close $handle;
-
-    return ($count, $cpu);
-}
-
-1;

@@ -1,43 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::Controllers;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('cfgadm');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(
-        command => 'cfgadm -s cols=ap_id:type:info',
-        logger  => $logger,
-    );
-
-    return unless $handle;
-
-    while (my $line = <$handle>) {
-        next if $line =~  /^Ap_Id/;
-        next unless $line =~ /^(\S+)\s+(\S+)\s+(\S+)/;
-        my $name = $1;
-        my $type = $2;
-        my $manufacturer = $3;
-        $inventory->addEntry(
-            section => 'CONTROLLERS',
-            entry => {
-                NAME         => $name,
-                MANUFACTURER => $manufacturer,
-                TYPE         => $type,
-            }
-        );
-    }
-    close $handle;
-}
-
-1;

@@ -1,65 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::Drives;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return canRun('df');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # get filesystems list
-    my $line = getFirstLine(command => "df --version");
-    # df --help is on STDERR on some system, so $line may be undef
-    my $command = $line && $line =~ /GNU/ ? "df -P -k" : "df -k";
-
-    my @filesystems =
-        # exclude solaris 10 specific devices
-        grep { $_->{VOLUMN} !~ /^\/(devices|platform)/ } 
-        # exclude cdrom mount
-        grep { $_->{TYPE} !~ /cdrom/ } 
-        # get all file systems
-        getFilesystemsFromDf(logger => $logger, command => $command);
-
-    # get indexed list of ZFS filesystems
-    my %zfs_filesystems =
-        map { $_ => 1 }
-        map { (split(/\s+/, $_))[0] }
-        getAllLines(command => 'zfs list -H');
-
-    # set filesystem type, using fstyp if needed
-    foreach my $filesystem (@filesystems) {
-
-        if ($filesystem->{VOLUMN} eq 'swap') {
-            $filesystem->{FILESYSTEM} = 'swap';
-            next;
-        }
-
-        if ($zfs_filesystems{$filesystem->{VOLUMN}}) {
-            $filesystem->{FILESYSTEM} = 'zfs';
-            next;
-        }
-
-        my $type = getFirstLine(command => "fstyp $filesystem->{VOLUMN}");
-        if ($type && $type !~ /^fstyp/) {
-            $filesystem->{FILESYSTEM} = $type;
-        }
-    }
-
-    # add filesystems to the inventory
-    foreach my $filesystem (@filesystems) {
-        $inventory->addEntry(
-            section => 'DRIVES',
-            entry   => $filesystem
-        );
-    }
-}
-1;

@@ -1,388 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::Memory;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Solaris;
-
-sub isEnabled {
-    return canRun('memconf');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $memorySize = getFirstMatch(
-        command => 'prtconf',
-        logger  => $logger,
-        pattern => qr/^Memory\ssize:\s+(\S+)/
-    );
-
-    my $swapSize = getFirstMatch(
-        command => 'swap -l',
-        logger  => $logger,
-        pattern => qr/\s+(\d+)$/
-    );
-
-    $inventory->setHardware({
-        MEMORY => $memorySize,
-        SWAP =>   $swapSize
-    });
-
-    my $class = getClass();
-
-    if (!$class) {
-        $logger->debug(
-            "Unknown model, impossible to detect memory configuration"
-        );
-        return;
-    }
-
-    my @memories =
-        $class == SOLARIS_FIRE         ? _getMemories1() :
-        $class == SOLARIS_FIRE_V       ? _getMemories2() :
-        $class == SOLARIS_FIRE_T       ? _getMemories3() :
-        $class == SOLARIS_ENTERPRISE_T ? _getMemories4() :
-        $class == SOLARIS_ENTERPRISE   ? _getMemories5() :
-        $class == SOLARIS_I86PC        ? _getMemories6() :
-        $class == SOLARIS_CONTAINER    ? _getMemories7() :
-                                         ()              ;
-
-    foreach my $memory (@memories) {
-        $inventory->addEntry(
-            section => 'MEMORIES',
-            entry   => $memory
-        );
-    }
-}
-
-sub _getMemories1 {
-    my @memories;
-
-    my $flag = 0;
-    my $flag_mt = 0;
-    my $banksize;
-
-    my $capacity;
-    my $description;
-    my $caption;
-    my $speed;
-    my $type;
-    my $numslots;
-
-    foreach(`memconf 2>&1`) {
-        if (/^empty \w+:\s(\S+)/) {
-            # the end, we unset flag
-            $flag = 0;
-        }
-
-        # caption line
-        if (/^\s+Logical  Logical  Logical/) {
-            $flag_mt = 1;
-        }
-
-        if (/^-+/) {
-            # delimiter, we set flag
-            $flag = 1;
-        }
-
-        if ($flag_mt && /^\s*\S+\s+\S+\s+\S+\s+\S+\s+(\S+)/) {
-            # grep the type of memory modules from heading
-            $flag_mt = 0;
-            $description = $1;
-        }
-
-        # only grap for information if flag is set
-        next unless $flag;
-
-        if (/^\s*(\S+)\s+(\S+)/) {
-            $caption = "Board " . $1 . " MemCtl " . $2;
-        }
-        if (/^\s*\S+\s+\S+\s+(\S+)/) {
-            $numslots = $1;
-        }
-        if (/^\s*\S+\s+\S+\s+\S+\s+(\d+)/) {
-            $banksize = $1;
-        }
-        if (/^\s*\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+(\d+)/) {
-            $capacity = $1;
-        }
-        foreach (1 .. ($banksize / $capacity)) {
-            push @memories, {
-                CAPACITY => $capacity,
-                DESCRIPTION => $description,
-                CAPTION => $caption,
-                SPEED => $speed,
-                TYPE => $type,
-                NUMSLOTS => $numslots
-            };
-        }
-    }
-
-    return @memories;
-}
-
-sub _getMemories2 {
-    my @memories;
-
-    my $flag    = 0;
-    my $flag_mt = 0;
-
-    my $capacity;
-    my $caption;
-    my $speed;
-    my $type;
-    my $numslots;
-
-    foreach(`memconf 2>&1`) {
-        if (/^empty sockets: (.+)/) {
-            # a list of empty slots, from which we extract the slot names
-            $capacity = "empty";
-            $numslots = 0;
-            foreach my $caption (split(/ /, $1)) {
-                # no empty slots -> exit loop
-                last if $caption eq "None";
-
-                push @memories, {
-                    CAPACITY => $capacity,
-#                            DESCRIPTION => $description,
-                    CAPTION => $caption,
-                    SPEED => $speed,
-                    TYPE => $type,
-                    NUMSLOTS => $numslots
-                };
-            }
-            # the end, we unset flag
-            $flag = 0;
-        }
-
-        if (/Memory Module Groups/) {
-            $flag = 0;
-            $flag_mt = 0;
-        }
-
-        if (/^-+/) {
-            # delimiter, we set flag
-            $flag = 1;
-        }
-
-        # only grap for information if flag is set
-        next unless $flag;
-
-        if (/^\s*\S+\s+\S+\s+(\S+)/) {
-            $caption = $1;
-        }
-        if (/^\s*(\S+)/) {
-            $numslots = $1;
-        }
-        if (/^\s*\S+\s+\S+\s+\S+\s+(\d+)/){
-            $capacity = $1;
-        }
-        push @memories, {
-            CAPACITY => $capacity,
-#                        DESCRIPTION => "DIMM",
-            CAPTION => "Ram slot ".$numslots,
-            SPEED => $speed,
-            TYPE => $type,
-            NUMSLOTS => $numslots
-        };
-        # this is the caption line
-#            if (/^ID       ControllerID/) { $description = $1;}
-    }
-
-    return @memories;
-}
-
-sub _getMemories3 {
-    my @memories;
-
-    foreach(`memconf 2>&1`) {
-        if (/^empty sockets: (.+)/) {
-            # a list of empty slots, from which we extract the slot names
-            foreach my $caption (split(/ /, $1)) {
-                # no empty slots -> exit loop
-                last if $caption eq "None";
-
-                my $memory = {
-                    CAPACITY    => "empty",
-                    NUMSLOTS    => 0,
-                    CAPTION     => $caption
-                };
-                push @memories, $memory;
-            }
-        }
-        if (/^socket\s+(\S+) has a (\d+)MB\s+\(\S+\)\s+(\S+)/) {
-            my $memory = {
-                CAPTION     => $1,
-                DESCRIPTION => $3,
-                CAPACITY    => $2,
-                TYPE        => $3,
-                NUMSLOTS    => 0,
-            };
-            push @memories, $memory;
-        }
-    }
-
-    return @memories;
-}
-
-sub _getMemories4 {
-    my @memories;
-
-    foreach(`memconf 2>&1`) {
-        if (/^empty sockets: (.+)/) {
-            # a list of empty slots, from which we extract the slot names
-            foreach my $caption (split(/ /, $1)) {
-                # no empty slots -> exit loop
-                last if $caption eq "None";
-                
-                my $memory = {
-                    CAPACITY    => "empty",
-                    NUMSLOTS    => 0,
-                    CAPTION     => $caption
-                };
-                push @memories, $memory;
-            }
-        }
-
-        # socket MB/CMP0/BR0/CH0/D0 has a Samsung 501-7953-01 Rev 05 2GB FB-DIMM
-        if (/^socket\s+(\S+) has a (.+)\s+(\S+)GB\s+(\S+)$/i) {
-            my $memory = {
-                CAPTION     => $1,
-                DESCRIPTION => $2,
-                CAPACITY    => $3 * 1024,
-                TYPE        => $4,
-                NUMSLOTS    => 0,
-            };
-            push @memories, $memory;
-        }
-    }
-
-    return @memories;
-}
-
-sub _getMemories5 {
-    my @memories;
-
-    my $flag = 0;
-    my $flag_mt = 0;
-
-    my $module_count = 0;
-    my $banksize;
-
-    my $capacity;
-    my $description;
-    my $caption;
-    my $speed;
-    my $type;
-    my $numslots;
-
-    foreach(`memconf 2>&1`) {
-        if (/^total memory:\s*(\S+)/) {
-            $flag = 0;
-        }
-
-        if ($flag_mt && /^\s+\S+\s+\S+\s+\S+\s+(\S+)/) {
-            $flag_mt  = 0;
-            $description = $1;
-        }
-
-        # Caption Line
-        if (/^Sun Microsystems/) {
-            $flag_mt  = 1;
-            $flag = 1;
-        }
-
-        # only grap for information if flag is set
-        next unless $flag;
-
-        if (/^\s(\S+)\s+(\S+)/) {
-            $numslots = "LSB " . $1 . " Group " . $2;
-            $caption  = "LSB " . $1 . " Group " . $2;
-        }
-        if (/^\s+\S+\s+\S\s+\S+\s+\S+\s+(\d+)/) {
-            $capacity = $1;
-        }
-        if (/^\s+\S+\s+\S\s+(\d+)/) {
-            $banksize = $1;
-        }
-        if ($capacity > 1 ) {
-            foreach (1 .. ($banksize / $capacity)) {
-                push @memories, {
-                    CAPACITY => $capacity,
-                    DESCRIPTION => $description,
-                    CAPTION => $caption,
-                    SPEED => $speed,
-                    TYPE => $type,
-                    NUMSLOTS => $module_count
-                };
-            }
-            $module_count++;
-        }
-
-    }
-
-    return @memories;
-}
-
-sub _getMemories6 {
-
-    my @memories;
-
-    foreach(`memconf 2>&1`) {
-        if (/^empty memory sockets: (.+)/) {
-            foreach my $caption (split(/, /, $1)) {
-                if ($caption eq "None") {
-                    # no empty slots -> exit loop
-                    last;
-                }
-                my $memory = {
-                    DESCRIPTION => "empty",
-                    CAPACITY    => 0,
-                    NUMSLOTS    => 0,
-                    caption     => $caption
-                };
-                push @memories, $memory;
-            }
-        }
-        if (/^socket DIMM(\d+):\s+(\d+)MB\s(\S+)/) {
-            my $memory = {
-                CAPTION     => "DIMM$1",
-                DESCRIPTION => "DIMM$1",
-                NUMSLOTS    => $1,
-                CAPACITY    => $2,
-                TYPE        => $3
-            };
-            push @memories, $memory;
-        }
-    }
-
-    return @memories;
-}
-
-sub _getMemories7 {
-
-    my @memories;
-    my $memory;
-
-    foreach (`prctl -n project.max-shm-memory $$ 2>&1`) {
-        $memory->{DESCRIPTION} = $1 if /^project.(\S+)$/;
-        $memory->{CAPACITY} = $1 if /^\s*system+\s*(\d+)/;
-        if ($memory->{DESCRIPTION} && $memory->{CAPACITY}){
-            $memory->{CAPACITY} = $memory->{CAPACITY} * 1024;
-            $memory->{NUMSLOTS} = 1 ;
-            $memory->{DESCRIPTION} = "Memory Allocated";
-            $memory->{CAPTION} = "Memory Share";
-            push @memories, $memory;
-            undef $memory;
-        }
-    }
-
-    return @memories;
-}
-
-1;

@@ -1,359 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::Networks;
-
-use strict;
-use warnings;
-
-#ce5: flags=1000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4> mtu 1500 index 3
-#        inet 55.37.101.171 netmask fffffc00 broadcast 55.37.103.255
-#        ether 0:3:ba:24:9b:bf
-
-#aggr40001:2: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 3
-#        inet 55.37.101.172 netmask ffffff00 broadcast 223.0.146.255
-#NDD=/usr/sbin/ndd
-#KSTAT=/usr/bin/kstat
-#IFC=/sbin/ifconfig
-#DLADM=/usr/sbin/dladm
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Solaris;
-use FusionInventory::Agent::Tools::Network;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    return canRun('ifconfig');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # set list of network interfaces
-    my $routes     = getRoutingTable(logger => $logger);
-    my @interfaces = _getInterfaces(logger => $logger);
-
-    foreach my $interface (@interfaces) {
-        $interface->{IPGATEWAY} = $params{routes}->{$interface->{IPSUBNET}}
-            if $interface->{IPSUBNET};
-
-        $inventory->addEntry(
-            section => 'NETWORKS',
-            entry   => $interface
-        );
-    }
-
-    $inventory->setHardware({
-        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
-    });
-}
-
-sub _getInterfaces {
-    my (%params) = @_;
-
-    my @interfaces = _parseIfconfig(
-        command => 'ifconfig -a',
-        @_
-    );
-
-    foreach my $interface (@interfaces) {
-        if ($interface->{DESCRIPTION} =~ /^(\S+)(\d+)/) {
-            my $nic = $1;
-            my $num = $2;
-
-            if ($nic =~ /bge/ ) {
-                $interface->{SPEED} = _check_bge_nic($nic, $num);
-            } elsif ($nic =~ /ce/) {
-                $interface->{SPEED} = _check_ce($nic, $num);
-            } elsif ($nic =~ /hme/) {
-                $interface->{SPEED} = _check_nic($nic, $num);
-            } elsif ($nic =~ /dmfe/) {
-                $interface->{SPEED} = _check_dmf_nic($nic, $num);
-            } elsif ($nic =~ /ipge/) {
-                $interface->{SPEED} = _check_ce($nic, $num);
-            } elsif ($nic =~ /e1000g/) {
-                $interface->{SPEED} = _check_ce($nic, $num);
-            } elsif ($nic =~ /nxge/) {
-                $interface->{SPEED} = _check_nxge_nic($nic, $num);
-            } elsif ($nic =~ /eri/) {
-                $interface->{SPEED} = _check_nic($nic, $num);
-            } elsif ($nic =~ /aggr/) {
-                $interface->{SPEED} = "";
-            } else {
-                $interface->{SPEED} = _check_nic($nic, $num);
-            }
-        }
-
-        $interface->{IPSUBNET} = getSubnetAddress(
-            $interface->{IPADDRESS},
-            $interface->{IPMASK}
-        );
-    }
-
-    my $zone = getZone();
-    my $OSLevel = getFirstLine(command => 'uname -r');
-
-    if ($zone && $OSLevel && $OSLevel =~ /5.10/) {
-        push @interfaces, _parseDladm(
-            command => '/usr/sbin/dladm show-aggr',
-            logger  => $params{logger}
-        );
-
-        push @interfaces, _parsefcinfo(
-            command => '/usr/sbin/fcinfo hba-port',
-            logger  => $params{logger}
-        );
-    }
-
-    return @interfaces;
-}
-
-
-# Function to test Quad Fast-Ethernet, Fast-Ethernet, and
-# Gigabit-Ethernet (i.e. qfe_, hme_, ge_, fjgi_)
-sub _check_nic {
-    my ($nic, $num) = @_;
-
-    my $speed = getFirstMatch(
-        command => "/usr/sbin/ndd -get /dev/$nic link_speed",
-        pattern => qr/^(\d+)/
-    );
-
-    my $duplex = getFirstMatch(
-        command => "/usr/sbin/ndd -get /dev/$nic link_mode",
-        pattern => qr/^(\d+)/
-    );
-
-    my $arg = $nic =~ /ge/ ? 'adv_1000autoneg_cap' : 'adv_autoneg_cap';
-    my $auto = getFirstMatch(
-        command => "/usr/sbin/ndd -get /dev/$nic $arg",
-        pattern => qr/^(\d+)/
-    );
-
-    return _get_link_info($speed, $duplex, $auto);
-}
-
-# Function to test eri Fast-Ethernet (eri_).
-sub _check_eri {
-    my ($nic) = @_;
-
-    my $speed = getFirstMatch(
-        command => "/usr/sbin/ndd -get /dev/$nic link_speed",
-        pattern => qr/^(\d+)/
-    );
-
-    my $duplex = getFirstMatch(
-        command => "/usr/sbin/ndd -get /dev/$nic link_mode",
-        pattern => qr/^(\d+)/
-    );
-
-    return _get_link_info($speed, $duplex, undef);
-}
-
-# Function to test a Gigabit-Ethernet (i.e. ce_).
-# Function to test a Intel 82571-based ethernet controller port (i.e. ipge_).
-sub _check_ce {
-    my ($nic, $num) = @_;
-
-    my $speed = getFirstMatch(
-        command => "/usr/bin/kstat -m $nic -i $num -s link_speed",
-        pattern => qr/^\s*link_speed+\s*(\d+)/
-    );
-
-    my $duplex = getFirstMatch(
-        command => "/usr/bin/kstat -m $nic -i $num -s link_duplex",
-        pattern => qr/^\s*link_duplex+\s*(\d+)/
-    );
-
-    my $auto = getFirstMatch(
-        command => "/usr/bin/kstat -m $nic -i $num -s cap_autoneg",
-        pattern => qr/^\s*cap_autoneg+\s*(\d+)/
-    );
-
-    return _get_link_info($speed, $duplex, $auto);
-
-}
-
-# Function to test Sun BGE interface on Sun Fire V210 and V240.
-# The BGE is a Broadcom BCM5704 chipset. There are four interfaces
-# on the V210 and V240. (i.e. bge_)
-sub _check_bge_nic {
-    my ($nic, $num) = @_;
-
-    my $speed = getFirstMatch(
-        command => "/usr/sbin/ndd -get /dev/$nic$num link_speed",
-        pattern => qr/^(\d+)/
-    );
-
-    my $duplex = getFirstMatch(
-        command => "/usr/sbin/ndd -get /dev/$nic$num link_duplex",
-        pattern => qr/^(\d+)/
-    );
-
-    my $auto = getFirstMatch(
-        command => "/usr/sbin/ndd -get /dev/$nic$num adv_autoneg_cap",
-        pattern => qr/^(\d+)/
-    );
-
-    return _get_link_info($speed, $duplex, $auto);
-}
-
-
-# Function to test Sun NXGE interface on Sun Fire Tx000.
-sub _check_nxge_nic {
-    my ($nic, $num) = @_;
-
-    my $link_info;
-    foreach (`/usr/sbin/dladm show-dev $nic$num`) {
-        #nxge0           link: up        speed: 1000  Mbps       duplex: full
-        $link_info = $5." ".$6." ".$8 if /(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/;
-    }
-    return $link_info;
-}
-
-sub _check_dmf_nic {
-}
-
-sub _get_link_info {
-    my ($speed, $duplex, $auto) = @_;
-
-    my $info;
-
-    if ($speed) {
-        $info =
-            $speed == 0    ? "10 Mb/s"  :
-            $speed == 10   ? "10 Mb/s"  :
-            $speed == 100  ? "100 Mb/s" :
-            $speed == 1000 ? "1 Gb/s"   :
-                             "ERROR"    ;
-    }
-
-    if ($duplex) {
-        $info .=
-            $duplex == 2 ? " FDX"     :
-            $duplex == 1 ? " HDX"     :
-            $duplex == 0 ? " UNKNOWN" :
-                           " ERROR"   ;
-    }
-
-    if ($auto) {
-        $info .=
-            $auto == 0 ? " AUTOSPEED ON"    :
-            $auto == 1 ? " AUTOSPEED OFF"   :
-                         " ERROR"           ;
-    }
-
-    return $info;
-}
-
-sub _parseIfconfig {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @interfaces;
-    my $interface;
-
-    while (my $line = <$handle>) {
-        if ($line =~ /^(\S+):(\S+):/) {
-            # new interface
-            push @interfaces, $interface if $interface;
-            $interface = {
-                STATUS      => 'Down',
-                DESCRIPTION => $1 . ':' . $2
-            };
-        } elsif ($line =~ /^(\S+):/) {
-            # new interface
-            push @interfaces, $interface if $interface;
-            $interface = {
-                STATUS      => 'Down',
-                DESCRIPTION => $1
-            };
-        }
-
-        if ($line =~ /inet ($ip_address_pattern)/) {
-            $interface->{IPADDRESS} = $1;
-        }
-        if ($line =~ /netmask ($hex_ip_address_pattern)/i) {
-            $interface->{IPMASK} = hex2canonical($1);
-        }
-        if ($line =~ /groupname\s+(\S+)/i) {
-            $interface->{TYPE} = $1;
-        }
-        if ($line =~ /zone\s+(\S+)/) {
-            $interface->{TYPE} = $1;
-        }
-        if ($line =~ /ether\s+(\S+)/i) {
-            # https://sourceforge.net/tracker/?func=detail&atid=487492&aid=1819948&group_id=58373
-            $interface->{MACADDR} =
-                sprintf "%02x:%02x:%02x:%02x:%02x:%02x" , map hex, split /\:/, $1;
-        }
-        if ($line =~ /<UP,/) {
-            $interface->{STATUS} = "Up";
-        }
-    }
-    close $handle;
-
-    # last interface
-    push @interfaces, $interface if $interface;
-
-    return @interfaces;
-}
-
-sub _parseDladm {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @interfaces;
-    while (my $line = <$handle>) {
-        next if $line =~ /device/;
-        next if $line =~ /key/;
-        my $interface = {
-            STATUS    => 'Down',
-            IPADDRESS => "0.0.0.0",
-        };
-        next unless
-            $line =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/;
-        $interface->{DESCRIPTION} = $1;
-        $interface->{MACADDR}     = $2;
-        $interface->{SPEED}       = $3 . " " . $4 . " " . $5;
-        $interface->{STATUS}      = 'Up' if $line =~ /UP/;
-        push @interfaces, $interface;
-    }
-    close $handle;
-
-    return @interfaces;
-}
-
-sub _parsefcinfo {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my @interfaces;
-    my $inc = 1;
-    my $interface;
-    while (my $line = <$handle>) {
-        $interface->{DESCRIPTION} = "HBA_Port_WWN_" . $inc if $line =~ /HBA Port WWN:\s+(\S+)/;
-        $interface->{DESCRIPTION} .= " " . $1 if $line =~ /OS Device Name:\s+(\S+)/;
-        $interface->{SPEED} = $1 if $line =~ /Current Speed:\s+(\S+)/;
-        $interface->{WWN} = $1 if $line =~ /Node WWN:\s+(\S+)/;
-        $interface->{DRIVER} = $1 if $line =~ /Driver Name:\s+(\S+)/i;
-        $interface->{TYPE} = "HBA";
-        $interface->{MANUFACTURER} = $1 if $line =~ /Manufacturer:\s+(.*)$/;
-        $interface->{MODEL} = $1 if $line =~ /Model:\s+(.*)$/;
-        $interface->{FIRMWARE} = $1 if $line =~ /Firmware Version:\s+(.*)$/;
-        $interface->{STATUS} = 'Up' if $line =~ /online/;
-
-        if ($interface->{DESCRIPTION} && $interface->{WWN}) {
-            $interface->{STATUS} = 'Down' if !$interface->{STATUS};
-
-            push @interfaces, $interface;
-            $interface = {};
-            $inc++;
-        }
-    }
-    close $handle;
-
-    return @interfaces;
-}
-
-1;

@@ -1,161 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::Slots;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Solaris;
-
-sub isEnabled {
-    return canRun('prtdiag');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $class = getClass();
-
-    my @slots = 
-        $class == SOLARIS_ENTERPRISE_T ? _getSlots4(logger => $logger) :
-        $class == SOLARIS_ENTERPRISE   ? _getSlots5(logger => $logger) :
-                                         _getSlotsDefault(logger => $logger) ;
-
-    foreach my $slot (@slots) {
-        $inventory->addEntry(
-            section => 'SLOTS',
-            entry   => $slot
-        );
-    }
-}
-
-sub _getSlots4 {
-    my (%params) = (
-        command => 'prtdiag',
-        @_
-    );
-
-    my $handle  = getFileHandle(%params);
-    return unless $handle;
-
-    my @slots;
-
-    while (my $line = <$handle>) {
-        next unless $line =~ /pci/;
-        my @pci = split(/ +/, $line);
-        push @slots, {
-            DESCRIPTION => $pci[0] . " (" . $pci[1] . ")",
-            DESIGNATION => $pci[3],
-            NAME        => $pci[4] . " " . $pci[5],
-        };
-    }
-    close $handle;
-
-    return @slots;
-}
-
-sub _getSlots5 {
-    my (%params) = (
-        command => 'prtdiag',
-        @_
-    );
-
-    my $handle  = getFileHandle(%params);
-    return unless $handle;
-
-    my @slots;
-    my $flag;
-    my $flag_pci;
-    my $name;
-    my $description;
-    my $designation;
-
-    while (my $line = <$handle>) {
-        last if $line =~ /^\=+/ && $flag_pci && $flag;
-
-        if ($line =~ /^=+\S+\s+IO Cards/) {
-            $flag_pci = 1;
-        }
-        if ($flag_pci && $line =~ /^-+/) {
-            $flag = 1;
-        }
-
-        next unless $flag && $flag_pci;
-
-        if ($line =~ /^\s+(\d+)/) {
-            $name = "LSB " . $1;
-        }
-        if ($line =~ /^\s+\S+\s+(\S+)/) {
-            $description = $1;
-        }
-        if ($line =~ /^\s+\S+\s+\S+\s+(\S+)/) {
-            $designation = $1;
-        }
-
-        push @slots, {
-            DESCRIPTION => $description,
-            DESIGNATION => $designation,
-            NAME        => $name,
-        }
-    }
-    close $handle;
-
-    return @slots;
-}
-
-sub _getSlotsDefault {
-    my (%params) = (
-        command => 'prtdiag',
-        @_
-    );
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my @slots;
-    my $flag;
-    my $flag_pci;
-    my $name;
-    my $description;
-    my $designation;
-    my $status;
-
-    while (my $line = <$handle>) {
-        last if $line =~ /^\=+/ && $flag_pci;
-        next if $line =~ /^\s+/ && $flag_pci;
-        if ($line =~ /^=+\s+IO Cards/) {
-            $flag_pci = 1;
-        }
-        if ($flag_pci && $line =~ /^-+/) {
-            $flag = 1;
-        }
-
-        next unless $flag && $flag_pci;
-
-        if ($line =~ /^(\S+)\s+/){
-            $name = $1;
-        }
-        if ($line =~ /(\S+)\s*$/){
-            $designation = $1;
-        }
-        if ($line =~ /^\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+(\S+)/) {
-            $description = $1;
-        }
-        if ($line =~ /^\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+(\S+)/) {
-            $status = $1;
-        }
-        push @slots, {
-            DESCRIPTION => $description,
-            DESIGNATION => $designation,
-            NAME        => $name,
-            STATUS      => $status,
-        }
-    }
-    close $handle;
-
-    return @slots;
-}
-
-1;

@@ -1,51 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::Softwares;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return 
-        !$params{no_category}->{software} &&
-        canRun('pkginfo');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(
-        command => 'pkginfo -l',
-        logger  => $logger,
-    );
-
-    return unless $handle;
-
-    my $software;
-    while (my $line = <$handle>) {
-        if ($line =~ /^\s*$/) {
-            $inventory->addEntry(
-                section => 'SOFTWARES',
-                entry   =>  $software
-            );
-            undef $software;
-        } elsif ($line =~ /PKGINST:\s+(.+)/) {
-            $software->{NAME} = $1;
-        } elsif ($line =~ /VERSION:\s+(.+)/) {
-            $software->{VERSION} = $1;
-        } elsif ($line =~ /VENDOR:\s+(.+)/) {
-            $software->{PUBLISHER} = $1;
-        } elsif ($line =~  /DESC:\s+(.+)/) {
-            $software->{COMMENTS} = $1;
-        }
-    }
-
-    close $handle;
-}
-
-1;

@@ -1,105 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris::Storages;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('iostat');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @storages = _getStorages(
-        logger => $logger, command => 'iostat -En'
-    );
-
-    foreach my $storage (@storages) {
-        if (-l "/dev/rdsk/$storage->{NAME}s2") {
-            my $rdisk_path = getFirstLine(
-                command => "ls -l /dev/rdsk/$storage->{NAME}s2"
-            );
-            $storage->{TYPE} =
-                $rdisk_path =~ /->.*scsi_vhci/ ? 'MPxIO' :
-                $rdisk_path =~ /->.*fp@/       ? 'FC'    :
-                $rdisk_path =~ /->.*scsi@/     ? 'SCSI'  :
-                                                 undef   ;
-        }
-
-        $inventory->addEntry(section => 'STORAGES', entry => $storage);
-    }
-}
-
-sub _getStorages {
-
-    my $handle = getFileHandle(@_);
-
-    return unless $handle;
-
-    my @storages;
-    my $storage;
-
-    while (my $line = <$handle>) {
-        if ($line =~ /^(\S+)\s+Soft/) {
-            $storage->{NAME} = $1;
-        }
-        if ($line =~ /^
-            Vendor:       \s (\S+)          \s+
-            Product:      \s (\S[\w\s-]*\S) \s+
-            Revision:     \s (\S+)          \s+
-            Serial \s No: \s (\S*)
-        /x) {
-            $storage->{MANUFACTURER} = $1;
-            $storage->{MODEL} = $2;
-            $storage->{FIRMWARE} = $3;
-            $storage->{SERIALNUMBER} = $4 if $4;
-        }
-        if ($line =~ /<(\d+) bytes/) {
-            $storage->{DISKSIZE} = int($1/(1000*1000));
-        }
-        if ($line =~ /^Illegal/) { # Last ligne
-
-            ## To be removed when SERIALNUMBER will be supported
-            if ($storage->{SERIALNUMBER}) {
-                $storage->{DESCRIPTION} = $storage->{DESCRIPTION} ? 
-                $storage->{DESCRIPTION} . " S/N:" . $storage->{SERIALNUMBER} :
-                                           "S/N:" . $storage->{SERIALNUMBER} ;
-
-            }
-
-            ## To be removed when FIRMWARE will be supported
-            if ($storage->{FIRMWARE}) {
-                $storage->{DESCRIPTION} = $storage->{DESCRIPTION} ?
-                $storage->{DESCRIPTION} . " FW:" . $storage->{FIRMWARE} :
-                                           "FW:" . $storage->{FIRMWARE} ;
-            }
-
-            if ($storage->{MANUFACTURER}) {
-                ## Workaround for MANUFACTURER == ATA case
-                if (
-                    $storage->{MANUFACTURER} eq 'ATA' &&
-                    $storage->{MODEL} =~ /^(Hitachi|Seagate|INTEL) (.+)/i) {
-                        $storage->{MANUFACTURER} = $1;
-                        $storage->{MODEL} = $2;
-                }
-
-                ## Drop the (R) from the manufacturer string
-                $storage->{MANUFACTURER} =~ s/\(R\)$//i;
-            }
-
-
-            push @storages, $storage;
-            undef $storage;
-        }
-    }
-    close $handle;
-
-    return @storages;
-}
-
-1;

@@ -1,56 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Solaris;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-
-our $runAfter = ["FusionInventory::Agent::Task::Inventory::Input::Generic"];
-
-sub isEnabled {
-    return $OSNAME eq 'solaris';
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # Operating system informations
-    my $OSName = getFirstLine(command => 'uname -s');
-    my $OSLevel = getFirstLine(command => 'uname -r');
-    my $OSComment = getFirstLine(command => 'uname -v');
-
-    my $OSVersion = getFirstLine(file => '/etc/release', logger => $logger);
-    $OSVersion =~ s/^\s+//;
-
-    if (!$OSVersion) {
-        $OSVersion = $OSComment;
-    }
-
-    # Hardware informations
-    my $karch = getFirstLine(command => 'arch -k');
-    my $hostid = getFirstLine(command => 'hostid');
-    my $proct = getFirstLine(command => 'uname -p');
-    my $platform = getFirstLine(command => 'uname -i');
-    my $HWDescription = "$platform($karch)/$proct HostID=$hostid";
-
-    $inventory->setHardware({
-        OSNAME      => "$OSName $OSLevel",
-        OSVERSION   => $OSVersion,
-        OSCOMMENTS  => $OSComment,
-        DESCRIPTION => $HWDescription
-    });
-
-    $inventory->setOperatingSystem({
-        NAME                 => "Solaris",
-        VERSION              => $OSLevel,
-        KERNEL_VERSION       => $OSComment,
-        FULL_NAME            => "$OSName $OSLevel"
-    });
-}
-
-1;

@@ -1,70 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Hpvm;
-
-use strict;
-use warnings;
-
-use XML::TreePP;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('hpvmstatus');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $machine (_getMachines(
-        command => 'hpvmstatus -X', logger => $logger
-    )) {
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES', entry => $machine
-        );
-    }
-}
-
-sub _getMachines {
-    my $xml = getAllLines(@_);
-    return unless $xml;
-
-    my $tpp = XML::TreePP->new();
-    my $data = $tpp->parse($xml);
-    my $mvs = $data->{pman}->{virtual_machine};
-
-    my %units = (
-        'MB' => 1,
-        'GB' => 1024,
-    );
-
-    my %status = (
-        'On' => 'running',
-        'Off' => 'off',
-        'Invalid' => 'crashed',
-    );
-
-    my @machines;
-    foreach my $name (keys %$mvs) {
-        my $info = $mvs->{$name};
-
-        my $machine = {
-            MEMORY    => $info->{memory}->{total}->{content} *
-                         $units{$info->{memory}->{total}->{unit}},
-            NAME      => $name,
-            UUID      => $info->{uuid},
-            STATUS    => $status{$info->{vm_state}},
-            SUBSYSTEM => "HPVM",
-            VMTYPE    => "HPVM",
-            VCPU      => $info->{vcpu_number},
-            VMID      => $info->{local_id}
-        };
-
-        push @machines, $machine;
-    }
-
-    return @machines;
-}
-
-1;

@@ -1,120 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Libvirt;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use XML::TreePP;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('virsh');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $machine (_getMachines(logger => $logger)) {
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES', entry => $machine
-        );
-    }
-}
-
-sub _getMachines {
-    my (%params) = @_;
-
-    my @machines = _parseList(
-        command => 'virsh list --all',
-        logger  => $params{logger}
-    );
-
-    foreach my $machine (@machines) {
-        my %infos = _parseDumpxml(
-            command => "virsh dumpxml $machine->{NAME}",
-            logger  => $params{logger}
-        );
-
-        $machine->{MEMORY}    = $infos{memory};
-        $machine->{UUID}      = $infos{uuid};
-        $machine->{SUBSYSTEM} = $infos{vmtype};
-        $machine->{VCPU}      = $infos{vcpu};
-    }
-
-    return @machines;
-}
-
-sub _parseList {
-    my (%params) = @_;
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my @machines;
-    while (my $line = <$handle>) {
-        next if $line =~ /^\s*Id/;
-        next if $line =~ /^-{5}/;
-        next unless $line =~ /^\s*(\d+|)(\-|)\s+(\S+)\s+(\S.+)/;
-
-        my $vmid = $1;
-        my $name = $3;
-
-        # ignore Xen Dom0
-        next if $name eq 'Domain-0';
-
-        my $status = $4;
-        $status =~ s/^shut off/off/;
-
-        my $machine = {
-            NAME      => $name,
-            STATUS    => $status,
-            VMTYPE    => "libvirt",
-            VMID      => $vmid,
-        };
-
-        push @machines, $machine;
-    }
-    close $handle;
-
-    return @machines;
-}
-
-sub _parseDumpxml {
-    my (%params) = @_;
-
-    my $xml = getAllLines(%params);
-    if (!$xml) {
-        $params{logger}->error("No virsh xmldump output");
-        return;
-    }
-
-    my $data;
-    eval {
-        $data = XML::TreePP->new()->parse($xml);
-    };
-    if ($EVAL_ERROR) {
-        $params{logger}->error("Failed to parse XML output");
-        return;
-    }
-
-    my $vcpu   = $data->{domain}->{vcpu};
-    my $uuid   = $data->{domain}->{uuid};
-    my $vmtype = $data->{domain}->{'-type'};
-    my $memory;
-    if ($data->{domain}{currentMemory} =~ /(\d+)\d{3}$/) {
-        $memory = $1;
-    }
-
-    return (
-        vcpu => $vcpu,
-        uuid => $uuid,
-        vmtype => $vmtype,
-        memory => $memory,
-    );
-}
-
-1;

@@ -1,129 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Lxc;
-
-# Authors: Egor Shornikov <se@wbr.su>, Egor Morozov <akrus@flygroup.st>
-# License: GPLv2+
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('lxc-ls');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{inventory};
-
-    my $vms = _getVirtualMachines( command => '/usr/bin/lxc-ls -1', logger => $logger );
-    foreach my $vm ( keys %{$vms}) {
-
-        my $state = _getVirtualMachineState( command => "/usr/bin/lxc-info -n $vm", logger => $logger );
-        my $conf = _getVirtualMachineConfig( file => "/var/lib/lxc/$vm/config", logger => $logger );
-
-        my %entry = ();
-        $entry{'NAME'} = $vm;
-        $entry{'VMTYPE'} = 'LXC';
-        $entry{'VMID'} = $state->{'VMID'};
-        $entry{'STATUS'} = $state->{'STATUS'};
-        $entry{'VCPU'} = $conf->{'VCPU'};
-        $entry{'MEMORY'} = $conf->{'MEMORY'};
-
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES', entry => \%entry
-        );
-    }
-}
-
-sub  _getVirtualMachineState {
-    my (%params) = (
-        @_
-    );
-
-    my ( %state, %info );
-
-    my $handle = getFileHandle( %params );
-    return unless $handle;
-    while( <$handle> ){
-        chomp;
-        if( $_ =~ m/^(\S+):\s*(\S+)$/ ){ $info{$1} = $2; }
-    }
-    close $handle;
-
-    $state{'VMID'} = $info{'pid'};
-    if ( $info{'state'} eq 'RUNNING' ){
-        $state{'STATUS'} = lc( $info{'state'} );
-    } elsif ( $info{'state'} eq 'FROZEN' ){
-        $state{'STATUS'} = 'paused';
-    } elsif ( $info{'state'} eq 'STOPPED' ){
-        $state{'STATUS'} = 'off';
-    } else {
-        $state{'STATUS'} = $info{'state'};
-    }
-
-    return \%state;
-}
-
-sub  _getVirtualMachineConfig {
-    my (%params) = (
-        @_
-    );
-
-    my %conf = ();
-
-    my $handle = getFileHandle( %params );
-    return unless $handle;
-    while( <$handle> ){
-        chomp;
-        s/^\s*//g;
-        s/\s*$//g;
-        s/^#.*//g;
-        if ( $_ =~ m/^(\S+)\s*=\s*(\S+)\s*$/ ){
-            my $key = $1;
-            my $val = $2;
-            if ( $key eq 'lxc.network.hwaddr' ){ $conf{'MAC'} = $val; }
-            if ( $key eq 'lxc.cgroup.memory.limit_in_bytes' ){ $conf{'MEMORY'} = $val; }
-            if ( $key eq 'lxc.cgroup.cpuset.cpus' ){
-                ###eg: lxc.cgroup.cpuset.cpus = 0,3-5,7,2,1
-                my $cpu_num = 0;
-                foreach my $cpu ( split( /,/, $val ) ){
-                    if ( $cpu =~ /(\d+)-(\d+)/ ){
-                        my @tmp = ($1..$2);
-                        $cpu_num += $#tmp + 1;
-                    } else {
-                        $cpu_num += 1;
-                    }
-                }
-                $conf{'VCPU'} = $cpu_num;
-            }
-        }
-    }
-    close $handle;
-
-    return \%conf;
-}
-
-sub  _getVirtualMachines {
-    my (%params) = (
-        @_
-    );
-
-    my %vms = ();
-
-    my $handle = getFileHandle( %params );
-    return unless $handle;
-
-    while( <$handle> ){
-        chomp;
-        unless ( m/^(\S+)$/ ){ next; }
-        $vms{$1} = 1;
-    }
-    close $handle;
-
-    return \%vms;
-}
-
-1;

@@ -1,118 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Parallels;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    # We don't want to scan user directories unless --scan-homedirs is used
-    return 
-        canRun('prlctl') &&
-        $params{scan_homedirs};
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $user ( glob("/Users/*") ) {
-        $user =~ s/.*\///; # Just keep the login
-        next if $user =~ /Shared/i;
-        next if $user =~ /^\./i; # skip hidden directory
-        next if $user =~ /\ /;   # skip directory containing space
-        next if $user =~ /'/;    # skip directory containing quote
-
-        foreach my $machine (_parsePrlctlA(
-                logger  => $logger,
-                command => "su '$user' -c 'prlctl list -a'"
-        )) {
-
-            my $uuid = $machine->{UUID};
-            # Avoid security risk. Should never appends
-            $uuid =~ s/[^A-Za-z0-9\.\s_-]//g;
-
-
-            ($machine->{MEMORY}, $machine->{VCPU}) =
-                _parsePrlctlI(
-                    logger  => $logger,
-                    command => "su '$user' -c 'prlctl list -i $uuid'"
-                );
-
-            $inventory->addEntry(
-                section => 'VIRTUALMACHINES', entry => $machine
-            );
-        }
-    }
-}
-
-sub _parsePrlctlA {
-    my $handle = getFileHandle(@_);
-
-    return unless $handle;
-
-    my %status_list = (
-        'running'   => 'running',
-        'blocked'   => 'blocked',
-        'paused'    => 'paused',
-        'suspended' => 'suspended',
-        'crashed'   => 'crashed',
-        'dying'     => 'dying',
-        'stopped'   => 'off',
-    );
-
-
-    # get headers line first
-    my $line = <$handle>;
-
-    my @machines;
-    while (my $line = <$handle>) {
-        chomp $line; 
-        my @info = split(/\s+/, $line, 4);
-        my $uuid   = $info[0];
-        my $status = $status_list{$info[1]};
-        my $name   = $info[3];
-
-
-        $uuid =~s/{(.*)}/$1/;
-
-        # Avoid security risk. Should never appends
-        next if $uuid =~ /(;\||&)/;
-
-        push @machines, {
-            NAME      => $name,
-            UUID      => $uuid,
-            STATUS    => $status,
-            SUBSYSTEM => "Parallels",
-            VMTYPE    => "Parallels",
-        };
-    }
-
-    close $handle;
-
-    return @machines;
-}
-
-sub _parsePrlctlI {
-    my $handle = getFileHandle(@_);
-
-    my ($mem, $cpus);
-    while (my $line = <$handle>) {
-        if ($line =~ m/^\s\smemory\s(.*)Mb/) {
-            $mem = $1;
-        }
-        if ($line =~ m/^\s\scpu\s(\d{1,2})/) {
-            $cpus = $1;
-        }
-    }
-
-    close $handle;
-
-    return ($mem, $cpus);
-}
-
-1;

@@ -1,71 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Qemu;
-# With Qemu 0.10.X, some option will be added to get more and easly information (UUID, memory, ...)
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Unix;
-
-sub isEnabled {
-    # Avoid duplicated entry with libvirt
-    return if canRun('virsh');
-
-    return
-        canRun('qemu') ||
-        canRun('kvm')  ||
-        canRun('qemu-kvm');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $process (getProcessesFromPs(
-        logger => $logger, command => 'ps -ef'
-    )) {
-        # match only if an qemu instance
-        next unless
-            $process->{CMD} =~ /(qemu|kvm|qemu-kvm) .* -([fhsv]d[a-z]|cdrom|drive)/x;
-
-        my $name;
-        my $mem = 0;
-        my $uuid;
-        my $vmtype = $1;
-
-        my @options = split (/-/, $process->{CMD});
-        foreach my $option (@options) {
-            if ($option =~ m/^(?:[fhsv]d[a-d]|cdrom) (\S+)/) {
-                $name = $1 if !$name;
-            } elsif ($option =~ m/^name (\S+)/) {
-                $name = $1;
-            } elsif ($option =~ m/^m (\S+)/) {
-                $mem = $1;
-            } elsif ($option =~ m/^uuid (\S+)/) {
-                $uuid = $1;
-            }
-        }
-
-        if ($mem == 0 ) {
-            # Default value
-            $mem = 128;
-        }
-
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES',
-            entry => {
-                NAME      => $name,
-                UUID      => $uuid,
-                VCPU      => 1,
-                MEMORY    => $mem,
-                STATUS    => "running",
-                SUBSYSTEM => $vmtype,
-                VMTYPE    => $vmtype,
-            }
-        );
-    }
-}
-
-1;

@@ -1,92 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::SolarisZones;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Solaris;
-
-sub isEnabled { 
-    return 
-        canRun('zoneadm') &&
-        getZone() eq 'global' &&
-        _check_solaris_valid_release('/etc/release');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @zones =
-        grep { !/global/ }
-        getAllLines(command => '/usr/sbin/zoneadm list -p', logger => $logger);
-
-    foreach my $zone (@zones) {
-        my ($zoneid, $zonename, $zonestatus, undef, $uuid) = split(/:/, $zone);
-         
-        # Memory considerations depends on rcapd or project definitions
-        # Little hack, I go directly in /etc/zones reading mcap physcap for each zone.
-        my $zonefile = "/etc/zones/$zonename.xml";
-
-        my $line = getFirstMatch(
-            file  => $zonefile,
-            pattern => qr/(.*mcap.*)/
-        );
-
-        my $memory;
-
-        if ($line) {
-            my $memcap = $line;
-            $memcap =~ s/[^\d]+//g;
-            $memory = $memcap / 1024 / 1024;
-
-        }
-
-        my $vcpu = getFirstLine(command => '/usr/sbin/psrinfo -p');
-
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES',
-            entry => {
-                MEMORY    => $memory,
-                NAME      => $zonename,
-                UUID      => $uuid,
-                STATUS    => $zonestatus,
-                SUBSYSTEM => "Solaris Zones",
-                VMTYPE    => "Solaris Zones",
-                VMID      => $zoneid,
-                VCPU      => $vcpu,
-            }
-        );
-    }
-}
-
-# check if Solaris 10 release is higher than 08/07
-sub _check_solaris_valid_release{
-    my ($releaseFile) = @_;
-
-    my $release = getFirstMatch(
-        file => $releaseFile,
-        pattern => qr/((?:Open)?Solaris .*)/
-    );
-
-    my ($version, $year);
-    if ($release =~ m/Solaris 10 (\d+)\/(\d+)/) {
-        $version = $1;
-        $year = $2;
-    } elsif ($release =~ /OpenSolaris 20(\d+)\.(\d+)\s/) {
-        $version = $1;
-        $year = $2;
-    } else {
-        return 0;
-    }
-
-    if ($year <= 7 and $version < 8) {
-        return 0;
-    }
-
-    return 1;
-}
-
-1;

@@ -1,124 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::VirtualBox;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use User::pwent;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return unless canRun('VBoxManage');
-
-    my ($major, $minor) = getFirstMatch(
-        command => 'VBoxManage --version',
-        pattern => qr/^(\d)\.(\d)/
-    );
-
-    return compareVersion($major, $minor, 2, 1);
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory    = $params{inventory};
-    my $logger       = $params{logger};
-    my $scanhomedirs = $params{scan_homedirs};
-
-    my $command = "VBoxManage -nologo list --long vms";
-
-    foreach my $machine (_parseVBoxManage(
-        logger => $logger, command => $command
-    )) {
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES', entry => $machine
-        );
-    }
-
-    return unless $scanhomedirs == 1 && $REAL_USER_ID == 0;
-
-    # assume all system users with a suitable homedir is an actual human user
-    my $pattern = $OSNAME eq 'darwin' ?
-        qr{^/Users} : qr{^/home};
-
-    my @users;
-    while (my $user = getpwent()) {
-        next unless $user->dir() =~ /$pattern/;
-        push @users, $user->name();
-    }
-
-    # abort if too many users
-    return if @users > 10;
-
-    foreach my $user (@users) {
-        my $command = "su '$user' -c 'VBoxManage -nologo list --long vms'";
-        foreach my $machine (_parseVBoxManage(
-            logger => $logger, command => $command
-        )) {
-            $machine->{OWNER} = $user;
-            $inventory->addEntry(
-                section => 'VIRTUALMACHINES', entry => $machine
-            );
-        }
-    }
-}
-
-sub _parseVBoxManage {
-    my $handle = getFileHandle(@_);
-
-    return unless $handle;
-
-    my (@machines, $machine, $index);
-
-    my %status_list = (
-        'powered off' => 'off',
-        'saved'   => 'off',
-        'teleported'   => 'off',
-        'aborted'    => 'crashed',
-        'stuck' => 'blocked',
-        'teleporting'   => 'paused',
-        'live snapshotting'     => 'running',
-        'starting'   => 'running',
-        'stopping' => 'dying',
-        'saving' => 'dying',
-        'restoring' => 'running',
-        'running' => 'running',
-        'paused' => 'paused'
-    );
-    while (my $line = <$handle>) {
-        chomp $line;
-
-        if ($line =~ m/^Name:\s+(.*)$/) {
-            # this is a little tricky, because USB devices also have a 'name'
-            # field, so let's use the 'index' field to disambiguate
-            if (defined $index) {
-                $index = undef;
-                next;
-            }
-            push @machines, $machine if $machine;
-            $machine = {
-                NAME      => $1,
-                VCPU      => 1,
-                SUBSYSTEM => 'Oracle VM VirtualBox',
-                VMTYPE    => 'VirtualBox'
-            };
-        } elsif ($line =~ m/^UUID:\s+(.+)/) {
-            $machine->{UUID} = $1;
-        } elsif ($line =~ m/^Memory size:\s+(.+)/ ) {
-            $machine->{MEMORY} = $1;
-        } elsif ($line =~ m/^State:\s+(.+) \(/) {
-            $machine->{STATUS} = $status_list{$1};
-        } elsif ($line =~ m/^Index:\s+(\d+)$/) {
-            $index = $1;
-        }
-    }
-    close $handle;
-
-    # push last remaining machine
-    push @machines, $machine if $machine;
-
-    return @machines;
-}
-
-1;

@@ -1,58 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Virtuozzo;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('vzlist');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $handle = getFileHandle(
-        command => 'vzlist --all --no-header -o hostname,ctid,cpulimit,status,ostemplate',
-        logger  => $logger
-    );
-
-    return unless $handle;
-
-    # no service containers in glpi
-    my $line = <$handle>;
-
-    while (my $line = <$handle>) {
-
-        chomp $line; 
-        my ($name, $uuid, $cpus, $status, $subsys) = split(/[ \t]+/, $line);
-
-        my $memory = getFirstMatch(
-            file    => "/etc/vz/conf/$uuid.conf",
-            pattern => qr/^SLMMEMORYLIMIT="\d+:(\d+)"$/,
-            logger  => $logger,
-        );
-        $memory = $memory / 1024 / 1024 if $memory;
- 
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES',
-            entry => {
-                NAME      => $name,
-                VCPU      => $cpus,
-                UUID      => $uuid,
-                MEMORY    => $memory,
-                STATUS    => $status,
-                SUBSYSTEM => $subsys,
-                VMTYPE    => "Virtuozzo",
-            }
-        );
-
-    }
-
-    close $handle;
-}
-
-1;

@@ -1,85 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::VmWareDesktop;
-#
-# initial version: Walid Nouh
-#
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return 
-        canRun('/Library/Application\ Support/VMware\ Fusion/vmrun') ||
-        canRun('vmrun');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-    
-    my $command = canRun('vmrun') ?
-        'vmrun list' : '/Library/Application\ Support/VMware\ Fusion/vmrun list';
-
-    foreach my $machine (_getMachines(
-        command => $command, logger => $logger
-    )) {
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES', entry => $machine
-        );
-    }
-}
-
-sub _getMachines {
-   my (%params) = @_;
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    # skip first line
-    my $line = <$handle>;
-
-    my @machines;
-    while (my $line = <$handle>) {
-        chomp $line;
-        next unless -f $line;
-
-        my %info = _getMachineInfo(file => $line, logger => $params{logger});
-
-        my $machine = {
-            NAME      => $info{'displayName'},
-            VCPU      => 1,
-            UUID      => $info{'uuid.bios'},
-            MEMORY    => $info{'memsize'},
-            STATUS    => "running",
-            SUBSYSTEM => "VmWare Fusion",
-            VMTYPE    => "VmWare",
-        };
-
-        push @machines, $machine;
-    }
-    close $handle;
-
-    return @machines;
-}
-
-sub _getMachineInfo {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my %info;
-    while (my $line = <$handle>) {
-        next unless $line =~ /^(\S+)\s*=\s*(\S+.*)/;
-        my $key = $1;
-        my $value = $2;
-        $value =~ s/(^"|"$)//g;
-        $info{$key} = $value;
-    }
-    close $handle;
-
-    return %info;
-}
-
-1;

@@ -1,83 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::VmWareESX;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled { 
-    return canRun('vmware-cmd');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $machine (_getMachines(
-        command => 'vmware-cmd -l', logger => $logger
-    )) {
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES', entry => $machine
-        );
-    }
-}
-
-sub _getMachines {
-    my (%params) = @_;
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my @machines;
-    while (my $line = <$handle>) {
-        chomp $line;
-        next unless -f $line;
-
-        my %info = _getMachineInfo(file => $line, logger => $params{logger});
-
-        my $machine = {
-            MEMORY    => $info{'memsize'},
-            NAME      => $info{'displayName'},
-            UUID      => $info{'uuid.bios'},
-            SUBSYSTEM => "VmWareESX",
-            VMTYPE    => "VmWare",
-        };
-
-        $machine->{STATUS} = getFirstMatch(
-            command => "vmware-cmd '$line' getstate",
-            logger  => $params{logger},
-            pattern => qr/= (\w+)/
-        ) || 'unknown';
-
-        # correct uuid format
-        $machine->{UUID} =~ s/\s+//g;      # delete space
-        $machine->{UUID} =~ s/^(........)(....)(....)-(....)(.+)$/$1-$2-$3-$4-$5/; # add dashs
-
-        push @machines, $machine;
-
-    }
-    close $handle;
-
-    return @machines;
-}
-
-sub _getMachineInfo {
-    my $handle = getFileHandle(@_);
-    return unless $handle;
-
-    my %info;
-    while (my $line = <$handle>) {
-        next unless $line = /^(\S+)\s*=\s*(\S+.*)/;
-        my $key = $1;
-        my $value = $2;
-        $value =~ s/(^"|"$)//g;
-        $info{$key} = $value;
-    }
-    close $handle;
-
-    return %info;
-}
-
-1;

@@ -1,222 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Vmsystem;
-
-# Contains code from imvirt:
-# URL: http://micky.ibh.net/~liske/imvirt.html
-# Authors:  Thomas Liske <liske@ibh.de>
-# Copyright: 2008 IBH IT-Service GmbH [http://www.ibh.de/]
-# License: GPLv2+
-
-
-##
-#
-# Outputs:
-#   Xen
-#   VirtualBox
-#   Virtual Machine
-#   VMware
-#   QEMU
-#   SolarisZone
-#
-# If no virtualization has been detected:
-#   Physical
-#
-##
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Solaris;
-
-my @vmware_patterns = (
-    'VMware vmxnet virtual NIC driver',
-    'Vendor: VMware\s+Model: Virtual disk',
-    'Vendor: VMware,\s+Model: VMware Virtual ',
-    ': VMware Virtual IDE CDROM Drive'
-);
-my $vmware_pattern = _assemblePatterns(@vmware_patterns);
-
-my @qemu_patterns = (
-    ' QEMUAPIC ',
-    'QEMU Virtual CPU',
-    ': QEMU HARDDISK,',
-    ': QEMU CD-ROM,'
-);
-my $qemu_pattern = _assemblePatterns(@qemu_patterns);
-
-my @virtual_machine_patterns = (
-    ': Virtual HD,',
-    ': Virtual CD,'
-);
-my $virtual_machine_pattern = _assemblePatterns(@virtual_machine_patterns);
-
-my @virtualbox_patterns = (
-    ' VBOXBIOS ',
-    ': VBOX HARDDISK,',
-    ': VBOX CD-ROM,',
-);
-my $virtualbox_pattern = _assemblePatterns(@virtualbox_patterns);
-
-my @xen_patterns = (
-    'Hypervisor signature: xen',
-    'Xen virtual console successfully installed',
-    'Xen reported:',
-    'Xen: \d+ - \d+',
-    'xen-vbd: registered block device',
-    'ACPI: [A-Z]{4} \(v\d+\s+Xen ',
-);
-my $xen_pattern = _assemblePatterns(@xen_patterns);
-
-my %module_patterns = (
-    '^vmxnet\s' => 'VMware',
-    '^xen_\w+front\s' => 'Xen',
-);
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    # return immediatly if vm type has already been found
-    return if $inventory->{content}{HARDWARE}{VMSYSTEM} ne "Physical";
-
-    my $status = _getStatus($logger);
-
-    # for consistency with HVM domU
-    if (
-        $status eq 'Xen' &&
-        !$inventory->{h}{CONTENT}{BIOS}{SMANUFACTURER}
-    ) {
-        $inventory->setBios({
-            SMANUFACTURER => 'Xen',
-            SMODEL => 'PVM domU'
-        });
-    }
-
-    $inventory->setHardware({
-        VMSYSTEM => $status,
-    });
-
-}
-
-sub _getStatus {
-    my ($logger) = @_;
-
-    # Solaris zones
-    if (canRun('/usr/sbin/zoneadm')) {
-        my $zone = getZone();
-        return 'SolarisZone' if $zone ne 'global';
-    }
-
-    # Xen PV host
-    if (
-        -d '/proc/xen' ||
-        getFirstMatch(
-            file    => '/sys/devices/system/clocksource/clocksource0/available_clocksource',
-            pattern => qr/xen/
-        )
-    ) {
-        if (getFirstMatch(
-            file    => '/proc/xen/capabilities',
-            pattern => qr/control_d/
-        )) {
-            # dom0 host
-            return 'Physical';
-        } else {
-            # domU PV host
-            return 'Xen';
-        }
-    }
-
-    my $result;
-
-    # loaded modules
-
-    if (-f '/proc/modules') {
-        my $handle = getFileHandle(
-            file => '/proc/modules',
-            logger => $logger
-        );
-        while (my $line = <$handle>) {
-            foreach my $pattern (keys %module_patterns) {
-                next unless $line =~ /$pattern/;
-                $result = $module_patterns{$pattern};
-                last;
-            }
-        }
-        close $handle;
-    }
-    return $result if $result;
-
-    # dmesg
-
-    if (-r '/var/log/dmesg') {
-        my $handle = getFileHandle(file => '/var/log/dmesg', logger => $logger);
-        $result = _matchPatterns($handle);
-        close $handle;
-    } elsif (-x '/bin/dmesg') {
-        my $handle = getFileHandle(command => '/bin/dmesg', logger => $logger);
-        $result = _matchPatterns($handle);
-        close $handle;
-    } elsif (-x '/sbin/dmesg') {
-        # On OpenBSD, dmesg is in sbin
-        # http://forge.fusioninventory.org/issues/402
-        my $handle = getFileHandle(command => '/sbin/dmesg', logger => $logger);
-        $result = _matchPatterns($handle);
-        close $handle;
-    }
-    return $result if $result;
-
-    # scsci
-
-    if (-f '/proc/scsi/scsi') {
-        my $handle = getFileHandle(
-            file => '/proc/scsi/scsi',
-            logger => $logger
-        );
-        $result = _matchPatterns($handle);
-        close $handle;
-    }
-    return $result if $result;
-
-    # OpenVZ
-    if (-f '/proc/self/status') {
-        my $handle = getFileHandle(
-            file => '/proc/self/status',
-            logger => $logger
-        );
-        while (my $line = <$handle>) {
-            my ($key, $value) = split(/:/, $line);
-            $result = "Virtuozzo" if $key eq 'envID' && $value > 0;
-        }
-    }
-    return $result if $result;
-
-    return 'Physical';
-}
-
-sub _assemblePatterns {
-    my (@patterns) = @_;
-
-    my $pattern = '(?:' . join('|', @patterns) . ')';
-    return qr/$pattern/;
-}
-
-sub _matchPatterns {
-    my ($handle) = @_;
-
-    while (my $line = <$handle>) {
-        return 'VMware'          if $line =~ $vmware_pattern;
-        return 'QEMU'            if $line =~ $qemu_pattern;
-        return 'Virtual Machine' if $line =~ $virtual_machine_pattern;
-        return 'VirtualBox'      if $line =~ $virtualbox_pattern;
-        return 'Xen'             if $line =~ $xen_pattern;
-    }
-}
-
-1;

@@ -1,69 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Vserver;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-sub isEnabled {
-    return canRun('vserver');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $machine (_getMachines(
-        command => 'vserver-info', logger => $logger
-    )) {
-        $inventory->addEntry(section => 'VIRTUALMACHINES', entry => $machine);
-    }
-}
-
-sub _getMachines {
-    my (%params) = @_;
-
-    my $handle = getFileHandle(%params);
-    return unless $handle;
-
-    my $utilVserver;
-    my $cfgDir;
-    while (my $line = <$handle>) {
-        $cfgDir = $1 if $line =~ /^\s+cfg-Directory:\s+(.*)$/;
-        $utilVserver = $1 if $line =~ /^\s+util-vserver:\s+(.*)$/;
-    }
-    close $handle;
-
-    return unless -d $cfgDir;
-
-    $handle = getDirectoryHandle(directory => $cfgDir, logger => $params{logger});
-    return unless $handle;
-
-    my @machines;
-    while (my $name = readdir($handle)) {
-        next if $name =~ /^\./;
-        next unless $name =~ /\S/;
-
-        my $line = getFirstLine(command => "vserver $name status");
-        my $status =
-            $line =~ /is stopped/ ? 'off'     :
-            $line =~ /is running/ ? 'running' :
-                                    undef     ;
-
-        my $machine = {
-            NAME      => $name,
-            STATUS    => $status,
-            SUBSYSTEM => $utilVserver,
-            VMTYPE    => "vserver",
-        };
-
-        push @machines, $machine;
-    }
-    close $handle;
-
-    return @machines;
-}
-
-1;

@@ -1,89 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization::Xen;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-
-our $runMeIfTheseChecksFailed = ["FusionInventory::Agent::Task::Inventory::Input::Virtualization::Libvirt"];
-
-sub isEnabled {
-    return canRun('xm');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{inventory};
-
-    my $command = 'xm list';
-    foreach my $machine (_getVirtualMachines(command => $command, logger => $logger)) {
-        my $uuid = _getUUID(
-            command => "xm list -l $machine->{NAME}",
-            logger  => $logger
-        );
-        $machine->{UUID} = $uuid;
-        $inventory->addEntry(
-            section => 'VIRTUALMACHINES', entry => $machine
-        );
-    }
-}
-
-sub _getUUID {
-    my (%params) = @_;
-
-    return getFirstMatch(
-        pattern => qr/\( uuid \s ([^)]+) \)/x,
-        %params
-    );
-}
-
-sub  _getVirtualMachines {
-
-    my $handle = getFileHandle(@_);
-
-    return unless $handle;
-
-    # xm status
-    my %status_list = (
-        'r' => 'running',
-        'b' => 'blocked',
-        'p' => 'paused',
-        's' => 'shutdown',
-        'c' => 'crashed',
-        'd' => 'dying',
-    );
-
-    # drop headers
-    my $line  = <$handle>;
-
-    my @machines;
-    while (my $line = <$handle>) {
-        chomp $line;
-        my ($name, $vmid, $memory, $vcpu, $status) = split(' ', $line);
-        next if $name eq 'Domain-0';
-        next if $vmid == 0;
-
-        $status =~ s/-//g;
-        $status = $status ? $status_list{$status} : 'off';
-
-        my $machine = {
-            MEMORY    => $memory,
-            NAME      => $name,
-            STATUS    => $status,
-            SUBSYSTEM => 'xm',
-            VMTYPE    => 'xen',
-            VCPU      => $vcpu,
-            VMID      => $vmid,
-        };
-
-        push @machines, $machine;
-
-    }
-    close $handle;
-
-    return @machines;
-}
-
-1;

@@ -1,13 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Virtualization;
-
-use strict;
-use warnings;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-}
-
-1;

@@ -1,64 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::AntiVirus;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-my $seen;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    # Doesn't works on Win2003 Server
-    # On Win7, we need to use SecurityCenter2
-    foreach my $instance (qw/SecurityCenter SecurityCenter2/) {
-        my $moniker = "winmgmts:{impersonationLevel=impersonate,(security)}!//./root/$instance";
-
-        foreach my $object (getWmiObjects(
-                moniker    => $moniker,
-                class      => "AntiVirusProduct",
-                properties => [ qw/
-                    companyName displayName instanceGuid onAccessScanningEnabled
-                    productUptoDate versionNumber productState
-               / ]
-        )) {
-            next unless $object;
-
-            my $antivirus = {
-                COMPANY  => $object->{companyName},
-                NAME     => $object->{displayName},
-                GUID     => $object->{instanceGuid},
-                VERSION  => $object->{versionNumber},
-                ENABLED  => $object->{onAccessScanningEnabled},
-                UPTODATE => $object->{productUptoDate}
-            };
-
-            if ($object->{productState}) {
-                my $bin = sprintf( "%b\n", $object->{productState});
-# http://blogs.msdn.com/b/alejacma/archive/2008/05/12/how-to-get-antivirus-information-with-wmi-vbscript.aspx?PageIndex=2#comments
-                if ($bin =~ /(\d)\d{5}(\d)\d{6}(\d)\d{5}$/) {
-                    $antivirus->{UPTODATE} = $1 || $2;
-                    $antivirus->{ENABLED}  = $3 ? 0 : 1;
-                }
-            }
-
-            # avoid duplicates
-            next if $seen->{$antivirus->{NAME}}->{$antivirus->{VERSION}||'_undef_'}++;
-
-            $inventory->addEntry(
-                section => 'ANTIVIRUS',
-                entry   => $antivirus
-            );
-        }
-    }
-}
-
-1;
-

@@ -1,121 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Bios;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools::Win32;
-
-# Only run this module if dmidecode has not been found
-our $runMeIfTheseChecksFailed =
-    ["FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Bios"];
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $bios = {
-        BDATE => getRegistryValue(
-            path   => "HKEY_LOCAL_MACHINE/Hardware/Description/System/BIOS/BIOSReleaseDate",
-            logger => $logger
-        )
-    };
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_Bios',
-        properties => [ qw/
-            SerialNumber Version Manufacturer SMBIOSBIOSVersion BIOSVersion
-        / ]
-    )) {
-        $bios->{BIOSSERIAL}    = $object->{SerialNumber};
-        $bios->{SSN}           = $object->{SerialNumber};
-        $bios->{BMANUFACTURER} = $object->{Manufacturer};
-        $bios->{BVERSION}      = $object->{SMBIOSBIOSVersion} || 
-                                 $object->{BIOSVersion}       || 
-                                 $object->{Version};
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_ComputerSystem',
-        properties => [ qw/
-            Manufacturer Model
-        / ]
-    )) {
-        $bios->{SMANUFACTURER} = $object->{Manufacturer};
-        $bios->{SMODEL}        = $object->{Model};
-    }
-
-    foreach my $object (getWmiObjects(
-            class      => 'Win32_SystemEnclosure',
-            properties => [ qw/
-                SerialNumber SMBIOSAssetTag
-            / ]
-    )) {
-        $bios->{ENCLOSURESERIAL} = $object->{SerialNumber} ;
-        $bios->{SSN}             = $object->{SerialNumber} unless $bios->{SSN};
-        $bios->{ASSETTAG}        = $object->{SMBIOSAssetTag};
-    }
-
-    foreach my $object (getWmiObjects(
-            class => 'Win32_BaseBoard',
-            properties => [ qw/
-                SerialNumber Product Manufacturer
-            / ]
-    )) {
-        $bios->{MSN}             = $object->{SerialNumber};
-        $bios->{MMODEL}          = $object->{Product};
-        $bios->{SSN}             = $object->{SerialNumber}
-            unless $bios->{SSN};
-        $bios->{SMANUFACTURER}   = $object->{Manufacturer}
-            unless $bios->{SMANUFACTURER};
-
-    }
-
-    foreach (keys %$bios) {
-        $bios->{$_} =~ s/\s+$// if $bios->{$_};
-    }
-
-    $inventory->setBios($bios);
-
-    SWITCH: {
-        if (
-            ($bios->{VERSION} && $bios->{VERSION} eq 'VirtualBox') ||
-            ($bios->{MMODEL}  && $bios->{MMODEL} eq 'VirtualBox')
-           ) {
-            $inventory->setHardware ({
-                VMSYSTEM => 'VirtualBox'
-            });
-            last SWITCH;
-        }
-
-        if (
-            ($bios->{BIOSSERIAL} && $bios->{BIOSSERIAL} =~ /VMware/i) ||
-            ($bios->{SMODEL}     && $bios->{SMODEL} eq 'VirtualBox')
-           ) {
-            $inventory->setHardware ({
-                VMSYSTEM => 'VMware'
-            });
-            last SWITCH;
-        }
-
-        if (
-            ($bios->{SMANUFACTURER} && $bios->{SMANUFACTURER} eq 'Xen') ||
-            ($bios->{BMANUFACTURER} && $bios->{BMANUFACTURER} eq 'Xen')
-           ) {
-            $inventory->setHardware ({
-                VMSYSTEM => 'Xen'
-            });
-            last SWITCH;
-        }
-    }
-
-}
-
-1;

@@ -1,116 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::CPU;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Win32;
-use FusionInventory::Agent::Tools::Generic;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my @cpus = _getCPUs($logger);
-
-    foreach my $cpu (@cpus) {
-        $inventory->addEntry(
-            section => 'CPUS',
-            entry   => $cpu
-        );
-    }
-
-    if (any { $_->{NAME} =~ /QEMU/i } @cpus) {
-        $inventory->setHardware ({
-            VMSYSTEM => 'QEMU'
-        });
-    }
-}
-
-sub _getCPUs {
-    my ($logger) = @_;
-
-    my @dmidecodeInfos = getCpusFromDmidecode();
-    # the CPU description in WMI is false, we use the registry instead
-    my $registryInfos = getRegistryKey(
-        path   => "HKEY_LOCAL_MACHINE/Hardware/Description/System/CentralProcessor",
-        logger => $logger
-    );
-
-    my $cpuId = 0;
-    my @cpus;
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_Processor',
-        properties => [ qw/NumberOfCores ProcessorId MaxClockSpeed/ ]
-    )) {
-
-        my $dmidecodeInfo = $dmidecodeInfos[$cpuId];
-        my $registryInfo  = $registryInfos->{"$cpuId/"};
-
-        # Split CPUID from its value inside registry
-        my @splitted_identifier = split(/ |\n/ ,$registryInfo->{'/Identifier'});
-
-        my $cpu = {
-            CORE         => $dmidecodeInfo->{CORE} || $object->{NumberOfCores},
-            THREAD       => $dmidecodeInfo->{THREAD},
-            DESCRIPTION  => $registryInfo->{'/Identifier'},
-            NAME         => $registryInfo->{'/ProcessorNameString'},
-            MANUFACTURER => $registryInfo->{'/VendorIdentifier'},
-            SERIAL       => $dmidecodeInfo->{SERIAL},
-            SPEED        => $dmidecodeInfo->{SPEED} || $object->{MaxClockSpeed},
-            FAMILYNUMBER => $splitted_identifier[2],
-            MODEL        => $splitted_identifier[4],
-            STEPPING     => $splitted_identifier[6],
-            ID           => $dmidecodeInfo->{ID} || $object->{ProcessorId}
-        };
-
-        # Some information are missing on Win2000
-        if (!$cpu->{NAME}) {
-            $cpu->{NAME} = $ENV{PROCESSOR_IDENTIFIER};
-            if ($cpu->{NAME} =~ s/,\s(\S+)$//) {
-                $cpu->{MANUFACTURER} = $1;
-            }
-        }
-
-        if ($cpu->{MANUFACTURER}) {
-            $cpu->{MANUFACTURER} =~ s/Genuine//;
-            $cpu->{MANUFACTURER} =~ s/(TMx86|TransmetaCPU)/Transmeta/;
-            $cpu->{MANUFACTURER} =~ s/CyrixInstead/Cyrix/;
-            $cpu->{MANUFACTURER} =~ s/CentaurHauls/VIA/;
-        }
-
-        if ($cpu->{SERIAL}) {
-            $cpu->{SERIAL} =~ s/\s//g;
-        }
-
-        if ($cpu->{NAME}) {
-            $cpu->{NAME} =~ s/^\s+//;
-            $cpu->{NAME} =~ s/\s+$//;
-
-
-            if ($cpu->{NAME} =~ /([\d\.]+)s*(GHZ)/i) {
-                $cpu->{SPEED} = {
-                    ghz => 1000,
-                    mhz => 1,
-                }->{lc($2)} * $1;
-            }
-        }
-
-        push @cpus, $cpu;
-
-        $cpuId++;
-    }
-
-    return @cpus;
-}
-
-1;

@@ -1,60 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Chassis;
-
-use strict;
-use warnings;
-
-use Win32::OLE qw(in);
-
-my @chassisType = (
-    'Unknown',
-    'Other',
-    'Unknown',
-    'Desktop',
-    'Low Profile Desktop',
-    'Pizza Box',
-    'Mini Tower',
-    'Tower',
-    'Portable',
-    'Laptop',
-    'Notebook',
-    'Hand Held',
-    'Docking Station',
-    'All in One',
-    'Sub Notebook',
-    'Space-Saving',
-    'Lunch Box',
-    'Main System Chassis',
-    'Expansion Chassis',
-    'SubChassis',
-    'Bus Expansion Chassis',
-    'Peripheral Chassis',
-    'Storage Chassis',
-    'Rack Mount Chassis',
-    'Sealed-Case PC'
-);
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $WMIService = Win32::OLE->GetObject(
-        'winmgmts:{impersonationLevel=impersonate}!\\\\.\\root\\cimv2'
-    ) or die "WMI connection failed: " . Win32::OLE->LastError();
-
-    my $enclosures = $WMIService->ExecQuery('SELECT * FROM Win32_SystemEnclosure');
-    my ($enclosure) = (in $enclosures);
-
-    return unless $enclosure;
-
-    my $chassisTypeId = $enclosure->ChassisTypes->[0];
-    $inventory->setBios({
-        TYPE => $chassisType[$chassisTypeId]
-    });
-}
-
-1;

@@ -1,79 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Controllers;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my %seen;
-
-    foreach my $class (qw/
-        Win32_FloppyController Win32_IDEController Win32_SCSIController
-        Win32_VideoController Win32_InfraredDevice Win32_USBController
-        Win32_1394Controller Win32_PCMCIAController CIM_LogicalDevice
-    /) {
-
-        foreach my $object (getWmiObjects(
-            class      => $class,
-            properties => [ qw/
-                Name Manufacturer Caption Description DeviceID HardwareVersion
-            /] 
-        )) {
-
-            my ($pciid, $pcisubsystemid) = _getPciIDFromDeviceID(
-                $object->{DeviceID}
-            );
-
-            # I scan CIM_LogicalDevice to identify more devices but I don't want
-            # everything. Only devices with a PCIID sounds resonable
-            if ($class eq 'CIM_LogicalDevice') {
-                next unless $pciid;
-                next if $seen{$pciid};
-            }
-
-            if ($pciid) {
-                $seen{$pciid} = 1;
-            }
-            $inventory->addEntry(
-                section => 'CONTROLLERS',
-                entry => {
-                    NAME           => $object->{Name},
-                    MANUFACTURER   => $object->{Manufacturer},
-                    CAPTION        => $object->{Caption},
-                    #DESCRIPTION    => $object->{Description},
-                    PCIID          => $pciid,
-                    PCISUBSYSTEMID => $pcisubsystemid,
-                    #VERSION        => $object->{HardwareVersion},
-                    TYPE           => $object->{Caption},
-                }
-            );
-        }
-    }
-}
-
-sub _getPciIDFromDeviceID {
-    my ($DeviceID) = @_;
-
-    my $pciid;
-    my $pcisubsystemid;
-
-    if ($DeviceID =~ /PCI\\VEN_(\S{4})&DEV_(\S{4})/) {
-        $pciid = lc($1.':'.$2);
-    }
-
-    if ($DeviceID =~ /&SUBSYS_(\S{4})(\S{4})/) {
-        $pcisubsystemid = lc($2.':'.$1);
-    }
-
-    return ($pciid, $pcisubsystemid);
-}
-
-1;

@@ -1,68 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Drives;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-my @type = (
-    'Unknown', 
-    'No Root Directory',
-    'Removable Disk',
-    'Local Disk',
-    'Network Drive',
-    'Compact Disc',
-    'RAM Disk'
-); 
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $systemDrive;
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_OperatingSystem',
-        properties => [ qw/SystemDrive/ ]
-    )) {
-        $systemDrive = lc($object->{SystemDrive});
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_LogicalDisk',
-        properties => [ qw/
-            InstallDate Description FreeSpace FileSystem VolumeName Caption
-            VolumeSerialNumber DeviceID Size DriveType VolumeName
-        / ]
-    )) {
-
-        $object->{FreeSpace} = int($object->{FreeSpace} / (1024 * 1024))
-            if $object->{FreeSpace};
-
-        $object->{Size} = int($object->{Size} / (1024 * 1024))
-            if $object->{Size};
-
-        $inventory->addEntry(
-            section => 'DRIVES',
-            entry   => {
-                CREATEDATE  => $object->{InstallDate},
-                DESCRIPTION => $object->{Description},
-                FREE        => $object->{FreeSpace},
-                FILESYSTEM  => $object->{FileSystem},
-                LABEL       => $object->{VolumeName},
-                LETTER      => $object->{DeviceID} || $object->{Caption},
-                SERIAL      => $object->{VolumeSerialNumber},
-                SYSTEMDRIVE => (lc($object->{DeviceID}) eq $systemDrive),
-                TOTAL       => $object->{Size},
-                TYPE        => $type[$object->{DriveType}],
-                VOLUMN      => $object->{VolumeName},
-            }
-        );
-    }
-}
-
-1;

@@ -1,36 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Environment;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return !$params{no_category}->{environment};
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_Environment',
-        properties => [ qw/SystemVariable Name VariableValue/ ]
-    )) {
-
-        next unless $object->{SystemVariable};
-
-        $inventory->addEntry(
-            section => 'ENVS',
-            entry   => {
-                KEY => $object->{Name},
-                VAL => $object->{VariableValue}
-            }
-        );
-    }
-}
-
-1;

@@ -1,79 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Inputs;
-
-use strict;
-use warnings;
-
-# Had never been tested.
-use FusionInventory::Agent::Tools::Win32;
-
-my $seen;
-
-my %mouseInterface = (
-    1 =>  'Other',
-    2 => 'Unknown',
-    3 => 'Serial',
-    4 => 'PS/2',
-    5 => 'Infrared',
-    6 => 'HP-HIL',
-    7 => 'Bus Mouse',
-    8 => 'ADB (Apple Desktop Bus)',
-    160 => 'Bus Mouse DB-9',
-    161 => 'Bus Mouse Micro-DIN',
-    162 => 'USB',
-);
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_Keyboard',
-        properties => [ qw/Name Caption Manufacturer Description Layout/ ]
-    )) {
-        my $input = {
-            NAME         => $object->{Name},
-            CAPTION      => $object->{Caption},
-            MANUFACTURER => $object->{Manufacturer},
-            DESCRIPTION  => $object->{Description},
-            LAYOUT       => $object->{Layout},
-        };
-
-        # avoid duplicates
-        next if $seen->{$input->{NAME}}++;
-
-        $inventory->addEntry(
-            section => 'INPUTS',
-            entry   => $input
-        );
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_PointingDevice',
-        properties => [ qw/Name Caption Manufacturer Description PointingType DeviceInterface/ ]
-    )) {
-        my $input = {
-            NAME         => $object->{Name},
-            CAPTION      => $object->{Caption},
-            MANUFACTURER => $object->{Manufacturer},
-            DESCRIPTION  => $object->{Description},
-            POINTINGTYPE => $object->{PointingType},
-            INTERFACE    => $mouseInterface{$object->{DeviceInterface}},
-        };
-
-        # avoid duplicates
-        next if $seen->{$input->{NAME}}++;
-
-        $inventory->addEntry(
-            section => 'INPUTS',
-            entry   => $input
-        );
-    }
-
-}
-
-1;

@@ -1,150 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Memory;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-our $runMeIfTheseChecksFailed =
-    ["FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode"];
-
-my @formFactorVal = qw/
-    Unknown 
-    Other
-    SIP
-    DIP
-    ZIP
-    SOJ
-    Proprietary
-    SIMM
-    DIMM
-    TSOP
-    PGA
-    RIMM
-    SODIMM
-    SRIMM
-    SMD
-    SSMP
-    QFP
-    TQFP
-    SOIC
-    LCC
-    PLCC
-    BGA
-    FPBGA
-    LGA
-/;
-
-my @memoryTypeVal = qw/
-    Unknown
-    Other
-    DRAM
-    Synchronous DRAM
-    Cache DRAM
-    EDO
-    EDRAM
-    VRAM
-    SRAM
-    RAM
-    ROM
-    Flash
-    EEPROM
-    FEPROM
-    EPROM
-    CDRAM
-    3DRAM
-    SDRAM
-    SGRAM
-    RDRAM
-    DDR
-    DDR-2
-/;
-
-my @memoryErrorProtection = ( 
-    undef,
-    'Other',
-    undef,
-    'None',
-    'Parity',
-    'Single-bit ECC',
-    'Multi-bit ECC',
-    'CRC',
-);
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $memory (_getMemories()) {
-        $inventory->addEntry(
-            section => 'MEMORIES',
-            entry   => $memory
-        );
-    }
-}
-
-sub _getMemories {
-
-    my $cpt = 0;
-    my @memories;
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_PhysicalMemory',
-        properties => [ qw/
-            Capacity Caption Description FormFactor Removable Speed MemoryType
-            SerialNumber
-        / ]
-    )) {
-        # Ignore ROM storages (BIOS ROM)
-        my $type = $memoryTypeVal[$object->{MemoryType}];
-        next if $type && $type eq 'ROM';
-        next if $type && $type eq 'Flash';
-       
-        my $capacity; 
-        $capacity = $object->{Capacity} / (1024 * 1024)
-            if $object->{Capacity};
-
-        push @memories, {
-            CAPACITY     => $capacity,
-            CAPTION      => $object->{Caption},
-            DESCRIPTION  => $object->{Description},
-            FORMFACTOR   => $formFactorVal[$object->{FormFactor}],
-            REMOVABLE    => $object->{Removable} ? 1 : 0,
-            SPEED        => $object->{Speed},
-            TYPE         => $memoryTypeVal[$object->{MemoryType}],
-            NUMSLOTS     => $cpt++,
-            SERIALNUMBER => $object->{SerialNumber}
-        }
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_PhysicalMemoryArray', 
-        properties => [ qw/
-            MemoryDevices SerialNumber PhysicalMemoryCorrection
-        / ]
-    )) {
-
-        my $memory = $memories[$object->{MemoryDevices} - 1];
-        if (!$memory->{SERIALNUMBER}) {
-            $memory->{SERIALNUMBER} = $object->{SerialNumber};
-        }
-
-        if ($object->{PhysicalMemoryCorrection}) {
-            $memory->{MEMORYCORRECTION} =
-                $memoryErrorProtection[$object->{PhysicalMemoryCorrection}];
-        }
-
-        if ($memory->{MEMORYCORRECTION}) {
-            $memory->{DESCRIPTION} .= " (".$memory->{MEMORYCORRECTION}.")";
-        }
-    }
-
-    return @memories;
-}
-
-1;

@@ -1,34 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Modems;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_POTSModem',
-        properties => [ qw/Name DeviceType Model Description/ ]
-    )) {
-
-        $inventory->addEntry(
-            section => 'MODEMS',
-            entry   => {
-                NAME        => $object->{Name},
-                TYPE        => $object->{DeviceType},
-                MODEL       => $object->{Model},
-                DESCRIPTION => $object->{Description},
-            }
-        );
-    }
-}
-
-1;

@@ -1,187 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Networks;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Network;
-use FusionInventory::Agent::Tools::Win32;
- 
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my (@gateways, @dns, @ips);
-
-    foreach my $interface (_getInterfaces()) {
-        push @gateways, $interface->{IPGATEWAY}
-            if $interface->{IPGATEWAY};
-        push @dns, $interface->{dns}
-            if $interface->{dns};
-
-        push @ips, $interface->{IPADDRESS}
-            if $interface->{IPADDRESS};
-
-        delete $interface->{dns};
-
-        $inventory->addEntry(
-            section => 'NETWORKS',
-            entry   => $interface
-        );
-    }
-
-    $inventory->setHardware({
-        DEFAULTGATEWAY => join('/', uniq @gateways),
-        DNS            => join('/', uniq @dns),
-        IPADDR         => join('/', uniq @ips),
-    });
-
-}
-
-sub _getInterfaces {
-
-    my @configurations;
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_NetworkAdapterConfiguration',
-        properties => [ qw/Index Description IPEnabled DHCPServer MACAddress
-                           MTU DefaultIPGateway DNSServerSearchOrder IPAddress
-                           IPSubnet/  ]
-    )) {
-
-        my $configuration = {
-            DESCRIPTION => $object->{Description},
-            STATUS      => $object->{IPEnabled} ? "Up" : "Down",
-            IPDHCP      => $object->{DHCPServer},
-            MACADDR     => $object->{MACAddress},
-            MTU         => $object->{MTU}
-        };
-
-        if ($object->{DefaultIPGateway}) {
-            $configuration->{IPGATEWAY} = $object->{DefaultIPGateway}->[0];
-        }
-
-        if ($object->{DNSServerSearchOrder}) {
-            $configuration->{dns} = $object->{DNSServerSearchOrder}->[0];
-        }
-
-        if ($object->{IPAddress}) {
-            foreach my $address (@{$object->{IPAddress}}) {
-                my $prefix = shift @{$object->{IPSubnet}};
-                push @{$configuration->{addresses}}, [ $address, $prefix ];
-            }
-        }
-
-        $configurations[$object->{Index}] = $configuration;
-    }
-
-    my @interfaces;
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_NetworkAdapter',
-        properties => [ qw/Index PNPDeviceID Speed PhysicalAdapter AdapterType/  ]
-    )) {
-        # http://comments.gmane.org/gmane.comp.monitoring.fusion-inventory.devel/34
-        next unless $object->{PNPDeviceID};
-
-        my $configuration = $configurations[$object->{Index}];
-
-        if ($configuration->{addresses}) {
-            foreach my $address (@{$configuration->{addresses}}) {
-
-                my $interface = {
-                    SPEED       => $object->{Speed},
-                    PNPDEVICEID => $object->{PNPDeviceID},
-                    MACADDR     => $configuration->{MACADDR},
-                    DESCRIPTION => $configuration->{DESCRIPTION},
-                    STATUS      => $configuration->{STATUS},
-                    IPDHCP      => $configuration->{IPDHCP},
-                    MTU         => $configuration->{MTU},
-                    IPGATEWAY   => $configuration->{IPGATEWAY},
-                    dns         => $configuration->{dns},
-                };
-
-                if ($address->[0] =~ /$ip_address_pattern/) {
-                    $interface->{IPADDRESS} = $address->[0];
-                    $interface->{IPMASK}    = $address->[1];
-                    $interface->{IPSUBNET}  = getSubnetAddress(
-                        $interface->{IPADDRESS},
-                        $interface->{IPMASK}
-                    );
-                } else {
-                    $interface->{IPADDRESS6} = $address->[0];
-                    $interface->{IPMASK6}    = getNetworkMaskIPv6($address->[1]);
-                    $interface->{IPSUBNET6}  = getSubnetAddressIPv6(
-                        $interface->{IPADDRESS6},
-                        $interface->{IPMASK6}
-                    );
-                }
-
-                $interface->{VIRTUALDEV} = _isVirtual($object, $configuration);
-                $interface->{TYPE}       = _getType($object);
-
-                push @interfaces, $interface;
-            }
-        } else {
-            next unless $configuration->{MACADDR};
-
-            my $interface = {
-                SPEED       => $object->{Speed},
-                PNPDEVICEID => $object->{PNPDeviceID},
-                MACADDR     => $configuration->{MACADDR},
-                DESCRIPTION => $configuration->{DESCRIPTION},
-                STATUS      => $configuration->{STATUS},
-                IPDHCP      => $configuration->{IPDHCP},
-                MTU         => $configuration->{MTU},
-                IPGATEWAY   => $configuration->{IPGATEWAY},
-                dns         => $configuration->{dns},
-            };
-
-            $interface->{VIRTUALDEV} = _isVirtual($object, $configuration);
-            $interface->{TYPE}       = _getType($object);
-
-            push @interfaces, $interface;
-        }
-
-    }
-
-    return
-        @interfaces;
-
-}
-
-sub _isVirtual {
-    my ($object, $configuration) = @_;
-
-    # PhysicalAdapter only work on OS > XP
-    if (defined $object->{PhysicalAdapter}) {
-        return $object->{PhysicalAdapter} ? 0 : 1;
-    }
-
-    # http://forge.fusioninventory.org/issues/1166 
-    if ($configuration->{DESCRIPTION} &&
-        $configuration->{DESCRIPTION} =~ /RAS/ &&
-        $configuration->{DESCRIPTION} =~ /Adapter/i
-    ) {
-          return 1;
-    }
-
-    return $object->{PNPDeviceID} =~ /^ROOT/ ? 1 : 0;
-}
-
-sub _getType {
-    my ($object) = @_;
-
-    return unless $object->{AdapterType};
-
-    my $type = $object->{AdapterType};
-    $type =~ s/Ethernet.*/Ethernet/;
-
-    return $type;
-}
-
-1;

@@ -1,177 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::OS;
-
-use strict;
-use warnings;
-use integer;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Hostname;
-use FusionInventory::Agent::Tools::Win32;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $object (getWmiObjects(
-            class      => 'Win32_OperatingSystem',
-            properties => [ qw/
-                OSLanguage Caption Version SerialNumber Organization \
-                RegisteredUser CSDVersion TotalSwapSpaceSize
-            / ]
-        )) {
-
-        my $key = _getXPkey(path => 'HKEY_LOCAL_MACHINE/Software/Microsoft/Windows NT/CurrentVersion/DigitalProductId');
-        if (!$key) { # 582
-           $key = _getXPkey(path => 'HKEY_LOCAL_MACHINE/Software/Microsoft/Windows NT/CurrentVersion/DigitalProductId4');
-        }
-        my $description = encodeFromRegistry(getRegistryValue(
-            path   => 'HKEY_LOCAL_MACHINE/SYSTEM/CurrentControlSet/Services/lanmanserver/Parameters/srvcomment',
-            logger => $logger
-        ));
-        my $installDate = getFormatedLocalTime(hex2dec(
-            encodeFromRegistry(getRegistryValue(
-                path   => 'HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows NT/CurrentVersion/InstallDate',
-                logger => $logger
-            ))
-        ));
-
-        $object->{TotalSwapSpaceSize} = int($object->{TotalSwapSpaceSize} / (1024 * 1024))
-            if $object->{TotalSwapSpaceSize};
-
-        $inventory->setHardware({
-            WINLANG       => $object->{OSLanguage},
-            OSNAME        => $object->{Caption},
-            OSVERSION     => $object->{Version},
-            WINPRODKEY    => $key,
-            WINPRODID     => $object->{SerialNumber},
-            WINCOMPANY    => $object->{Organization},
-            WINOWNER      => $object->{RegistredUser},
-            OSCOMMENTS    => $object->{CSDVersion},
-            SWAP          => $object->{TotalSwapSpaceSize},
-            DESCRIPTION   => $description,
-        });
-
-        $inventory->setOperatingSystem({
-            NAME           => "Windows",
-            INSTALL_DATE   => $installDate,
-    #        VERSION       => $OSVersion,
-            KERNEL_VERSION => $object->{Version},
-            FULL_NAME      => $object->{Caption},
-            SERVICE_PACK   => $object->{CSDVersion}
-        });
-    }
-
-    # In the rare case WMI DB is broken,
-    # We first initialize the name by kernel32
-    # call
-    my $name = FusionInventory::Agent::Tools::Hostname::getHostname();
-    $name = $ENV{COMPUTERNAME} unless $name;
-    my $domain;
-
-    if ($name  =~ s/^([^\.]+)\.(.*)/$1/) {
-        $domain = $2;
-    }
-
-    $inventory->setHardware({
-        NAME       => $name,
-        WORKGROUP  => $domain
-    });
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_ComputerSystem',
-        properties => [ qw/
-            Name Domain Workgroup UserName PrimaryOwnerName TotalPhysicalMemory
-        / ]
-    )) {
-
-        $object->{TotalPhysicalMemory} = int($object->{TotalPhysicalMemory} / (1024 * 1024))
-            if $object->{TotalPhysicalMemory};
-
-        $inventory->setHardware({
-            MEMORY     => $object->{TotalPhysicalMemory},
-            WORKGROUP  => $object->{Domain} || $object->{Workgroup},
-            WINOWNER   => $object->{PrimaryOwnerName}
-        });
-
-        if (!$name) {
-            $inventory->setHardware({
-                NAME       => $object->{Name},
-            });
-        }
-
-
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_ComputerSystemProduct',
-        properties => [ qw/UUID/ ]
-    )) {
-
-        my $uuid = $object->{UUID};
-        $uuid = '' if $uuid =~ /^[0-]+$/;
-        $inventory->setHardware({
-            UUID => $uuid,
-        });
-
-    }
-
-
-}
-
-#http://www.perlmonks.org/?node_id=497616
-# Thanks William Gannon && Charles Clarkson
-sub _getXPkey {
-    my $key = getRegistryValue(@_);
-    return unless $key;
-
-    my @encoded = ( unpack 'C*', $key )[ reverse 52 .. 66 ];
-
-    # Get indices
-    my @indices;
-    foreach ( 0 .. 24 ) {
-        my $index = 0;
-
-        # Shift off remainder
-        ( $index, $_ ) = _quotient( $index, $_ ) foreach @encoded;
-
-        # Store index.
-        unshift @indices, $index;
-    }
-
-    # translate base 24 "digits" to characters
-    my $cd_key =
-        join '',
-        qw( B C D F G H J K M P Q R T V W X Y 2 3 4 6 7 8 9 )[ @indices ];
-
-    # Add seperators
-    $cd_key =
-        join '-',
-        $cd_key =~ /(.{5})/g;
-
-    return if $cd_key =~ /^[B-]*$/;
-    return $cd_key;
-}
-
-sub _quotient {
-    my($index, $encoded) = @_;
-
-    # Same as $index * 256 + $product_key ???
-    my $dividend = $index * 256 ^ $encoded; ## no critic (ProhibitBitwise)
-
-    # return modulus and integer quotient
-    return(
-        $dividend % 24,
-        $dividend / 24,
-    );
-}
-
-
-1;

@@ -1,213 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Ports;
-
-use strict;
-use warnings;
-
-# Had never been tested.
-use FusionInventory::Agent::Tools::Win32;
-
-# cf http://msdn.microsoft.com/en-us/library/aa394486%28VS.85%29.aspx
-my @portType = (
-    'Unknown',
-    'Other',
-    'Male',
-    'Female',
-    'Shielded',
-    'Unshielded',
-    'SCSI (A) High-Density (50 pins)',
-    'SCSI (A) Low-Density (50 pins)',
-    'SCSI (P) High-Density (68 pins)',
-    'SCSI SCA-I (80 pins)',
-    'SCSI SCA-II (80 pins)',
-    'SCSI Fibre Channel (DB-9, Copper)',
-    'SCSI Fibre Channel (Fibre)',
-    'SCSI Fibre Channel SCA-II (40 pins)',
-    'SCSI Fibre Channel SCA-II (20 pins)',
-    'SCSI Fibre Channel BNC',
-    'ATA 3-1/2 Inch (40 pins)',
-    'ATA 2-1/2 Inch (44 pins)',
-    'ATA-2',
-    'ATA-3',
-    'ATA/66',
-    'DB-9',
-    'DB-15',
-    'DB-25',
-    'DB-36',
-    'RS-232C',
-    'RS-422',
-    'RS-423',
-    'RS-485',
-    'RS-449',
-    'V.35',
-    'X.21',
-    'IEEE-488',
-    'AUI',
-    'UTP Category 3',
-    'UTP Category 4',
-    'UTP Category 5',
-    'BNC',
-    'RJ11',
-    'RJ45',
-    'Fiber MIC',
-    'Apple AUI',
-    'Apple GeoPort',
-    'PCI',
-    'ISA',
-    'EISA',
-    'VESA',
-    'PCMCIA',
-    'PCMCIA Type I',
-    'PCMCIA Type II',
-    'PCMCIA Type III',
-    'ZV Port',
-    'CardBus',
-    'USB',
-    'IEEE 1394',
-    'HIPPI',
-    'HSSDC (6 pins)',
-    'GBIC',
-    'DIN',
-    'Mini-DIN',
-    'Micro-DIN',
-    'PS/2',
-    'Infrared',
-    'HP-HIL',
-    'Access.bus',
-    'NuBus',
-    'Centronics',
-    'Mini-Centronics',
-    'Mini-Centronics Type-14',
-    'Mini-Centronics Type-20',
-    'Mini-Centronics Type-26',
-    'Bus Mouse',
-    'ADB',
-    'AGP',
-    'VME Bus',
-    'VME64',
-    'Proprietary',
-    'Proprietary Processor Card Slot',
-    'Proprietary Memory Card Slot',
-    'Proprietary I/O Riser Slot',
-    'PCI-66MHZ',
-    'AGP2X',
-    'AGP4X',
-    'PC-98',
-    'PC-98-Hireso',
-    'PC-H98',
-    'PC-98Note',
-    'PC-98Full',
-    'PCI-X',
-    'SSA SCSI',
-    'Circular',
-    'On-Board IDE Connector',
-    'On-Board Floppy Connector',
-    '9 Pin Dual Inline',
-    '25 Pin Dual Inline',
-    '50 Pin Dual Inline',
-    '68 Pin Dual Inline',
-    'On-Board Sound Connector',
-    'Mini-Jack',
-    'PCI-X',
-    'Sbus IEEE 1396-1993 32 Bit',
-    'Sbus IEEE 1396-1993 64 Bit',
-    'MCA',
-    'GIO',
-    'XIO',
-    'HIO',
-    'NGIO',
-    'PMC',
-    'MTRJ',
-    'VF-45',
-    'Future I/O',
-    'SC',
-    'SG',
-    'Electrical',
-    'Optical',
-    'Ribbon',
-    'GLM',
-    '1x9',
-    'Mini SG',
-    'LC',
-    'HSSC',
-    'VHDCI Shielded (68 pins)',
-    'InfiniBand',
-    'AGP8X',
-    'PCI-E',
-);
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_SerialPort',
-        properties => [ qw/Name Caption Description/ ]
-    )) {
-        $inventory->addEntry(
-            section => 'PORTS',
-            entry   => {
-                NAME        => $object->{Name},
-                CAPTION     => $object->{Caption},
-                DESCRIPTION => $object->{Description},
-                TYPE        => 'Serial',
-            }
-        );
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_ParallelPort',
-        properties => [ qw/Name Caption Description/ ]
-    )) {
-
-        $inventory->addEntry(
-            section => 'PORTS',
-            entry   => {
-                NAME        => $object->{Name},
-                CAPTION     => $object->{Caption},
-                DESCRIPTION => $object->{Description},
-                TYPE        => 'Parallel',
-            }
-        );
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_PortConnector',
-        properties => [ qw/ConnectorType InternalReferenceDesignator/ ]
-    )) {
-
-        my $type;
-        if ($object->{ConnectorType}) {
-            $type = join(', ', map { $portType[$_] } @{$object->{ConnectorType}}); 
-        }
-        if (!$type) {
-            $type = $object->{InternalReferenceDesignator};
-            $type =~ s/\ \d.*//; # Drop the port number
-        }
-
-        if (!$type && !$object->{InternalReferenceDesignator}) {
-            next;
-        } elsif ($object->{InternalReferenceDesignator} =~ /SERIAL/) {
-            next; # Already done
-        } elsif ($object->{InternalReferenceDesignator} =~ /PARALLEL/) {
-            next; # Already done
-        }
-
-        $inventory->addEntry(
-            section => 'PORTS',
-            entry   => {
-                NAME        => $object->{InternalReferenceDesignator},
-                CAPTION     => $object->{InternalReferenceDesignator},
-                DESCRIPTION => $object->{InternalReferenceDesignator},
-                TYPE        => $type
-            }
-        );
-
-    }
-
-}
-1;

@@ -1,180 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Printers;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools::Win32;
-
-my @status = (
-    'Unknown', # 0 is not defined
-    'Other',
-    'Unknown',
-    'Idle',
-    'Printing',
-    'Warming Up',
-    'Stopped printing',
-    'Offline',
-);
-
-my @errStatus = (
-    'Unknown',
-    'Other',
-    'No Error',
-    'Low Paper',
-    'No Paper',
-    'Low Toner',
-    'No Toner',
-    'Door Open',
-    'Jammed',
-    'Service Requested',
-    'Output Bin Full',
-    'Paper Problem',
-    'Cannot Print Page',
-    'User Intervention Required',
-    'Out of Memory',
-    'Server Unknown',
-);
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return !$params{no_category}->{printer};
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_Printer',
-        properties => [ qw/
-            ExtendedDetectedErrorState HorizontalResolution VerticalResolution Name
-            Comment DescriptionDriverName DriverName PortName Network Shared 
-            PrinterStatus ServerName ShareName PrintProcessor
-        / ]
-    )) {
-
-        my $errStatus;
-        if ($object->{ExtendedDetectedErrorState}) {
-            $errStatus = $errStatus[$object->{ExtendedDetectedErrorState}];
-        }
-
-        my $resolution;
-
-        if ($object->{HorizontalResolution}) {
-            $resolution =
-                $object->{HorizontalResolution} .
-                "x"                             .
-                $object->{VerticalResolution};
-        }
-
-        $object->{Serial} = _getUSBPrinterSerial($object->{PortName}, $logger)
-            if $object->{PortName} && $object->{PortName} =~ /USB/;
-
-        $inventory->addEntry(
-            section => 'PRINTERS',
-            entry   => {
-                NAME           => $object->{Name},
-                COMMENT        => $object->{Comment},
-                DESCRIPTION    => $object->{Description},
-                DRIVER         => $object->{DriverName},
-                PORT           => $object->{PortName},
-                RESOLUTION     => $resolution,
-                NETWORK        => $object->{Network},
-                SHARED         => $object->{Shared},
-                STATUS         => $status[$object->{PrinterStatus}],
-                ERRSTATUS      => $errStatus,
-                SERVERNAME     => $object->{ServerName},
-                SHARENAME      => $object->{ShareName},
-                PRINTPROCESSOR => $object->{PrintProcessor},
-                SERIAL         => $object->{Serial}
-            }
-        );
-
-    }    
-}
-
-sub _getUSBPrinterSerial {
-    my ($portName, $logger) = @_;
-
-    # find the ParentIdPrefix value for the printer matching given portname
-    my $prefix = _getUSBPrefix(
-        getRegistryKey(
-            path => "HKEY_LOCAL_MACHINE/SYSTEM/CurrentControlSet/Enum/USBPRINT",
-            logger => $logger
-        ),
-        $portName
-    );
-    return unless $prefix;
-
-    # find the key name for the device matching given parentIdPrefix
-    my $serial = _getUSBSerial(
-        getRegistryKey(
-            path => "HKEY_LOCAL_MACHINE/SYSTEM/CurrentControlSet/Enum/USB",
-            logger => $logger
-        ),
-        $prefix
-    );
-
-    return $serial;
-}
-
-sub _getUSBPrefix {
-    my ($print, $portName) = @_;
-
-    # registry data structure:
-    # USBPRINT
-    # └── device
-    #     └── subdevice
-    #         └── Device Parameters
-    #             └── PortName:value
-
-    foreach my $device (values %$print) {
-        foreach my $subdeviceName (keys %$device) {
-            my $subdevice = $device->{$subdeviceName};
-            next unless 
-                $subdevice->{'Device Parameters/'}                &&
-                $subdevice->{'Device Parameters/'}->{'/PortName'} &&
-                $subdevice->{'Device Parameters/'}->{'/PortName'} eq $portName;
-            # got it
-            my $prefix = $subdeviceName;
-            $prefix =~ s{&$portName/$}{};
-            return $prefix;
-        };
-    }
-
-    return;
-}
-
-sub _getUSBSerial {
-    my ($usb, $prefix) = @_;
-
-    # registry data structure:
-    # USB
-    # └── device
-    #     └── subdevice
-    #         └── ParentIdPrefix:value
-
-    foreach my $device (values %$usb) {
-        foreach my $subdeviceName (keys %$device) {
-            my $subdevice = $device->{$subdeviceName};
-            next unless
-                $subdevice->{'/ParentIdPrefix'} &&
-                $subdevice->{'/ParentIdPrefix'} eq $prefix;
-            # got it
-            my $serial = $subdeviceName;
-            # pseudo serial generated by windows
-            return if $serial =~ /&/;
-            $serial =~ s{/$}{};
-            return $serial;
-        }
-    }
-
-    return;
-}
-
-1;

@@ -1,90 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Registry;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Win32;
-
-
-my @hives = qw/
-    HKEY_CLASSES_ROOT
-    HKEY_CURRENT_USER
-    HKEY_LOCAL_MACHINE
-    HKEY_USERS
-    HKEY_CURRENT_CONFIG
-    HKEY_DYN_DATA
-/; 
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return $params{registry};
-}
-
-sub _getRegistryData {
-    my (%params) = @_;
-
-    my @data;
-
-    my @registrys = ref($params{registry}->{PARAM}) eq 'ARRAY' ?
-         @{$params{registry}->{PARAM}} :
-         ($params{registry}->{PARAM});
-
-    foreach my $option (@registrys) {
-
-        my $name = $option->{NAME};
-        my $regkey = $option->{REGKEY};
-        my $regtree = $option->{REGTREE};
-        my $content = $option->{content};
-
-        # This should never append, err wait... 
-        next unless $content;
-
-        $regkey =~ s{\\}{/}g;
-        my $value = getRegistryValue(
-            path   => $hives[$regtree]."/".$regkey."/".$content,
-            logger => $params{logger}
-        );
-
-        if (ref($value) eq "HASH") {
-            foreach ( keys %$value ) {
-                my $n = encodeFromRegistry($_) || '';
-                my $v = encodeFromRegistry($value->{$_}) || '';
-                push @data, { section => 'REGISTRY', entry => {
-                        NAME => $name, 
-                        REGVALUE => "$n=$v"
-                    }
-                };
-            }
-        } else {
-            push @data, {section => 'REGISTRY', entry => {
-                    NAME => $name, 
-                    REGVALUE => encodeFromRegistry($value)
-                }
-            };
-        }
-    }
-
-
-    return @data;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    return unless $params{registry}->{NAME} eq 'REGISTRY';
-
-    foreach my $data (_getRegistryData(
-                registry => $params{registry},
-                logger => $params{logger}))
-    {
-        $params{inventory}->addEntry(%$data);
-    }
-
-
-}
-
-1;

@@ -1,36 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Slots;
-
-use strict;
-use warnings;
-
-# Had never been tested. There is no slot on my virtal machine.
-use FusionInventory::Agent::Tools::Win32;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_SystemSlot',
-        properties => [ qw/Name Description SlotDesignation Status/ ]
-    )) {
-
-        $inventory->addEntry(
-            section => 'SLOTS',
-            entry   => {
-                NAME        => $object->{Name},
-                DESCRIPTION => $object->{Description},
-                DESIGNATION => $object->{SlotDesignation},
-                STATUS      => $object->{Status},
-            }
-        );
-    }
-
-}
-
-1;

@@ -1,245 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Softwares;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-use Win32;
-use Win32::OLE('in');
-use Win32::TieRegistry (
-    Delimiter   => '/',
-    ArrayValues => 0,
-    qw/KEY_READ/
-);
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Win32;
-
-my $seen = {};
-
-sub isEnabled {
-    my (%params) = @_;
-
-    return !$params{no_category}->{software};
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-    my $logger    = $params{logger};
-
-    my $is64bit = is64bit();
-
-    my $kbList = _getKB(is64bit => $is64bit);
-
-    if ($is64bit) {
-
-        # I don't know why but on Vista 32bit, KEY_WOW64_64 is able to read
-        # 32bit entries. This is not the case on Win2003 and if I correctly
-        # understand MSDN, this sounds very odd
-
-        my $machKey64 = $Registry->Open('LMachine', {
-            Access => KEY_READ | KEY_WOW64_64 ## no critic (ProhibitBitwise)
-        }) or $logger->error("Can't open HKEY_LOCAL_MACHINE key: $EXTENDED_OS_ERROR");
-
-        my $softwares64 =
-            $machKey64->{"SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall"};
-
-        foreach my $software (_getSoftwares(
-            softwares => $softwares64,
-            is64bit   => 1,
-            kbList => $kbList
-        )) {
-            _addSoftware(inventory => $inventory, entry => $software);
-        }
-        _processMSIE(
-            machKey   => $machKey64,
-            inventory => $inventory,
-            is64bit   => 1
-        );
-
-        my $machKey32 = $Registry->Open('LMachine', {
-            Access => KEY_READ | KEY_WOW64_32 ## no critic (ProhibitBitwise)
-        }) or $logger->error("Can't open HKEY_LOCAL_MACHINE key: $EXTENDED_OS_ERROR");
-
-        my $softwares32 =
-            $machKey32->{"SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall"};
-
-        foreach my $software (_getSoftwares(
-            softwares => $softwares32,
-            is64bit   => 0,
-            logger => $logger,
-            kbList => $kbList
-        )) {
-            _addSoftware(inventory => $inventory, entry => $software);
-        }
-        _processMSIE(
-            machKey   => $machKey32,
-            inventory => $inventory,
-            is64bit   => 0
-        );
-
-
-    } else {
-        my $machKey = $Registry->Open('LMachine', {
-            Access => KEY_READ
-        }) or $logger->error("Can't open HKEY_LOCAL_MACHINE key: $EXTENDED_OS_ERROR");
-
-        my $softwares =
-            $machKey->{"SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall"};
-
-        foreach my $software (_getSoftwares(
-            softwares => $softwares,
-            is64bit   => 0,
-            kbList => $kbList
-        )) {
-            _addSoftware(inventory => $inventory, entry => $software);
-        }
-        _processMSIE(
-            machKey   => $machKey,
-            inventory => $inventory,
-            is64bit   => 0
-        );
-    }
-
-    foreach (values %$kbList) {
-        _addSoftware(inventory => $inventory, entry => $_);
-    }
-
-}
-
-sub _dateFormat {
-    my ($date) = @_;
-
-    ## no critic (ExplicitReturnUndef)
-    return undef unless $date;
-
-    if ($date =~ /^(\d{4})(\d{1})(\d{2})$/) {
-	return "$3/0$2/$1";
-    }
-
-    if ($date =~ /^(\d{4})(\d{2})(\d{2})$/) {
-	return "$3/$2/$1";
-    }
-
-    return undef;
-}
-
-sub _getSoftwares {
-    my (%params) = @_;
-
-    my $softwares = $params{softwares};
-    my $kbList = $params{kbList};
-
-    my @softwares;
-
-    return unless $softwares;
-
-    foreach my $rawGuid (keys %$softwares) {
-        # only keep subkeys
-        next unless $rawGuid =~ m{/$};
-
-        # only keep subkeys with more than 1 value
-        my $data = $softwares->{$rawGuid};
-        next unless keys %$data > 1;
-
-        my $guid = $rawGuid;
-        $guid =~ s/\/$//; # drop the tailing /
-
-        my $software = {
-            FROM             => "registry",
-            NAME             => encodeFromRegistry($data->{'/DisplayName'}) ||
-                                encodeFromRegistry($guid), # folder name
-            COMMENTS         => encodeFromRegistry($data->{'/Comments'}),
-            HELPLINK         => encodeFromRegistry($data->{'/HelpLink'}),
-            RELEASE_TYPE     => encodeFromRegistry($data->{'/ReleaseType'}),
-            VERSION          => encodeFromRegistry($data->{'/DisplayVersion'}),
-            PUBLISHER        => encodeFromRegistry($data->{'/Publisher'}),
-            URL_INFO_ABOUT   => encodeFromRegistry($data->{'/URLInfoAbout'}),
-            UNINSTALL_STRING => encodeFromRegistry($data->{'/UninstallString'}),
-            INSTALLDATE      => _dateFormat($data->{'/InstallDate'}),
-            VERSION_MINOR    => hex2dec($data->{'/MinorVersion'}),
-            VERSION_MAJOR    => hex2dec($data->{'/MajorVersion'}),
-            NO_REMOVE        => hex2dec($data->{'/NoRemove'}),
-            ARCH             => $params{is64bit} ? 'x86_64' : 'i586',
-            GUID             => $guid,
-        };
-
-        # Workaround for #415
-        $software->{VERSION} =~ s/[\000-\037].*// if $software->{VERSION};
-
-        if ($software->{NAME} =~ /KB(\d{4,10})/i) {
-            delete($kbList->{$1});
-        }
-
-        push @softwares, $software;
-    }
-
-    return @softwares;
-}
-
-sub _getKB {
-    my (%params) = @_;
-
-    my $kbList = {};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_QuickFixEngineering',
-        properties => [ qw/HotFixID Description/  ]
-    )) {
-
-        my $releaseType;
-        if ($object->{Description} && $object->{Description} =~ /^(Security Update|Hotfix|Update)/) {
-            $releaseType = $1;
-        }
-
-        next unless $object->{HotFixID} =~ /KB(\d{4,10})/i;
-        $kbList->{$1} = {
-            NAME         => $object->{HotFixID},
-            COMMENTS     => $object->{Description},
-            FROM         => "WMI",
-            RELEASE_TYPE => $releaseType,
-            ARCH         => $params{is64bit} ? 'x86_64' : 'i586'
-        };
-
-    }
-
-    return $kbList;
-}
-
-sub _addSoftware {
-    my (%params) = @_;
-
-    my $entry = $params{entry};
-
-    # avoid duplicates
-    return if $seen->{$entry->{NAME}}->{$entry->{ARCH}}{$entry->{VERSION} || '_undef_'}++;
-
-    $params{inventory}->addEntry(section => 'SOFTWARES', entry => $entry);
-}
-
-sub _processMSIE {
-    my (%params) = @_;
-
-    my $name = $params{is64bit} ?
-        "Internet Explorer (64bit)" : "Internet Explorer";
-    my $version = 
-        $params{machKey}->{"SOFTWARE/Microsoft/Internet Explorer/Version"};
-
-    return unless $version; # Not installed
-
-    _addSoftware(
-        inventory => $params{inventory},
-        entry     => {
-            FROM      => "registry",
-            ARCH      => $params{is64bit} ? 'x86_64' : 'i586',
-            NAME      => $name,
-            VERSION   => $version,
-            PUBLISHER => "Microsoft Corporation"
-        }
-    );
-
-}
-
-1;

@@ -1,36 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Sounds;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_SoundDevice',
-        properties => [ qw/
-            Name Manufacturer Caption Description
-        / ]
-    )) {
-
-        $inventory->addEntry(
-            section => 'SOUNDS',
-            entry   => {
-                NAME         => $object->{Name},
-                CAPTION      => $object->{Caption},
-                MANUFACTURER => $object->{Manufacturer},
-                DESCRIPTION  => $object->{Description},
-            }
-        );
-    }
-}
-
-1;

@@ -1,150 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Storages;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools;
-use FusionInventory::Agent::Tools::Win32;
-
-sub isEnabled {
-    return canRun('hdparm');
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_DiskDrive', 
-        properties => [ qw/
-            Name Manufacturer Model MediaType InterfaceType FirmwareRevision
-            SerialNumber Size SCSILogicialUnit SCSIPort SCSILogicalUnit SCSITargetId
-        / ]
-    )) {
-
-        my $info = {};
-
-        if ($object->{Name} =~ /(\d+)$/) {
-            $info = _getInfo("hd", $1);
-        }
-
-        $object->{Size} = int($object->{Size} / (1024 * 1024))
-            if $object->{Size};
-
-        $inventory->addEntry(
-            section => 'STORAGES',
-            entry => {
-                MANUFACTURER => $object->{Manufacturer},
-                MODEL        => $info->{model} || $object->{Model},
-                DESCRIPTION  => $object->{Description},
-                NAME         => $object->{Name},
-                TYPE         => $object->{MediaType},
-                INTERFACE    => $object->{InterfaceType},
-                FIRMWARE     => $info->{firmware} || $object->{FirmwareRevision},
-                SERIAL       => $info->{serial} || $object->{SerialNumber},
-                DISKSIZE     => $info->{size} || $object->{Size},
-                SCSI_CHID    => $object->{SCSILogicialUnit},
-                SCSI_COID    => $object->{SCSIPort},
-                SCSI_LUN     => $object->{SCSILogicalUnit},
-                SCSI_UNID    => $object->{SCSITargetId},
-            }
-        );
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_CDROMDrive',
-        properties => [ qw/
-            Manufacturer Caption Description Name MediaType InterfaceType
-            FirmwareRevision SerialNumber Size SCSILogicialUnit SCSIPort
-            SCSILogicalUnit SCSITargetId
-        / ]
-    )) {
-        my $info = {};
-
-        if ($object->{Name} =~ /(\d+)$/) {
-            $info = _getInfo("cdrom", $1);
-        }
-
-        $object->{Size} = int($object->{Size} / (1024 * 1024))
-            if $object->{Size};
-
-        $inventory->addEntry(
-            section => 'STORAGES',
-            entry => {
-                MANUFACTURER => $object->{Manufacturer},
-                MODEL        => $info->{model} || $object->{Caption},
-                DESCRIPTION  => $object->{Description},
-                NAME         => $object->{Name},
-                TYPE         => $object->{MediaType},
-                INTERFACE    => $object->{InterfaceType},
-                FIRMWARE     => $info->{firmware} || $object->{FirmwareRevision},
-                SERIAL       => $info->{serial} || $object->{SerialNumber},
-                DISKSIZE     => $info->{size} || $object->{Size},
-                SCSI_CHID    => $object->{SCSILogicialUnit},
-                SCSI_COID    => $object->{SCSIPort},
-                SCSI_LUN     => $object->{SCSILogicalUnit},
-                SCSI_UNID    => $object->{SCSITargetId},
-            }
-        );
-    }
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_TapeDrive',
-        properties => [ qw/
-            Manufacturer Caption Description Name MediaType InterfaceType
-            FirmwareRevision SerialNumber Size SCSILogicialUnit SCSIPort
-            SCSILogicalUnit SCSITargetId
-        / ]
-    )) {
-
-        $object->{Size} = int($object->{Size} / (1024 * 1024))
-            if $object->{Size};
-
-        $inventory->addEntry(
-            section => 'STORAGES',
-            entry => {
-                MANUFACTURER => $object->{Manufacturer},
-                MODEL        => $object->{Caption},
-                DESCRIPTION  => $object->{Description},
-                NAME         => $object->{Name},
-                TYPE         => $object->{MediaType},
-                INTERFACE    => $object->{InterfaceType},
-                FIRMWARE     => $object->{FirmwareRevision},
-                SERIAL       => $object->{SerialNumber},
-                DISKSIZE     => $object->{Size},
-                SCSI_CHID    => $object->{SCSILogicialUnit},
-                SCSI_COID    => $object->{SCSIPort},
-                SCSI_LUN     => $object->{SCSILogicalUnit},
-                SCSI_UNID    => $object->{SCSITargetId},
-            }
-        );
-    }
-}
-
-sub _getInfo {
-    my ($type, $nbr) = @_;
-
-
-    my $device = "/dev/";
-    $device .= $type eq 'hd'?'hd':'scd';
-    $device .= chr(ord('a')+$nbr);
-
-    my $handle = getFileHandle(
-        command => "hdparm -I $device",
-    );
-    return unless $handle;
-
-    my $info;
-    while (my $line = <$handle>) {
-        $info->{model} = $1 if $line =~ /Model Number:\s+(.*?)\s*$/;
-        $info->{firmware} = $1 if $line =~ /Firmware Revision:\s+(\S*)/;
-        $info->{serial} = $1 if $line =~ /Serial Number:\s+(\S*)/;
-        $info->{size} = $1 if $line =~ /1000:\s+(\d*)\sMBytes\s\(/;
-    }
-    close $handle;
-
-    return $info;
-}
-
-1;

@@ -1,58 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::USB;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-my $seen;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $device (_getUSBDevices()) {
-        $inventory->addEntry(
-            section => 'USBDEVICES',
-            entry   => $device
-        );
-    }
-}
-
-sub _getUSBDevices {
-
-    my @devices;
-
-    foreach my $object (getWmiObjects(
-        class      => 'CIM_LogicalDevice',
-        properties => [ qw/DeviceID Name/ ]
-    )) {
-        next unless $object->{DeviceID} =~ /^USB\\VID_(\w+)&PID_(\w+)\\(.*)/;
-
-        my $device = {
-            NAME      => $object->{Name},
-            VENDORID  => $1,
-            PRODUCTID => $2,
-            SERIAL    => $3
-        };
-
-        next if $device->{VENDORID} =~ /^0+$/;
-
-        # avoid duplicates
-        next if $seen->{$device->{SERIAL}}++;
-
-	# pseudo serial generated by windows
-	delete $device->{SERIAL} if $device->{SERIAL} =~ /&/;
-
-        push @devices, $device;
-    }
-
-    return @devices;
-}
-
-1;

@@ -1,81 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::User;
-
-use strict;
-use warnings;
-
-use constant wbemFlagReturnImmediately => 0x10;
-use constant wbemFlagForwardOnly => 0x20;
-
-use English qw(-no_match_vars);
-use Win32::OLE;
-use Win32::OLE::Variant;
-use Win32::TieRegistry (
-    Delimiter   => '/',
-    ArrayValues => 0,
-    qw/KEY_READ/
-);
-
-use FusionInventory::Agent::Tools::Win32;
-
-my $seen;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    my $WMIService = Win32::OLE->GetObject("winmgmts:\\\\.\\root\\CIMV2")
-        or die "WMI connection failed: " . Win32::OLE->LastError();
-
-    my $processes = $WMIService->ExecQuery(
-        "SELECT * FROM Win32_Process", "WQL",
-        wbemFlagReturnImmediately | wbemFlagForwardOnly ## no critic (ProhibitBitwise)
-    );
-
-    foreach my $process (in $processes) {
-        next unless
-            $process->{ExecutablePath} &&
-            $process->{ExecutablePath} =~ /\\Explorer\.exe$/i;
-
-        ## no critic (ProhibitBitwise)
-        my $name = Variant(VT_BYREF | VT_BSTR, '');
-        my $domain = Variant(VT_BYREF | VT_BSTR, '');
-
-        $process->GetOwner($name, $domain);
-
-        my $user = {
-            LOGIN => $name->Get(),
-            DOMAIN => $domain->Get()
-        };
-
-        next if $seen->{$user->{LOGIN}}++;
-
-        $inventory->addEntry(
-            section => 'USERS',
-            entry   => $user
-        );
-    }
-
-    my $machKey = $Registry->Open('LMachine', {
-        Access => KEY_READ
-    }) or die "Can't open HKEY_LOCAL_MACHINE key: $EXTENDED_OS_ERROR";
-
-    foreach my $key (
-        "SOFTWARE/Microsoft/Windows NT/CurrentVersion/Winlogon/DefaultUserName",
-        "SOFTWARE/Microsoft/Windows/CurrentVersion/Authentication/LogonUI/LastLoggedOnUser"
-    ) {
-        my $user = encodeFromRegistry($machKey->{$key});
-        next unless $user;
-        $user =~ s,.*\\,,;
-        $inventory->setHardware({
-           LASTLOGGEDUSER => $user
-        });
-    }
-
-}
-
-1;

@@ -1,53 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32::Videos;
-
-use strict;
-use warnings;
-
-use FusionInventory::Agent::Tools::Win32;
-
-my $seen;
-
-sub isEnabled {
-    return 1;
-}
-
-sub doInventory {
-    my (%params) = @_;
-
-    my $inventory = $params{inventory};
-
-    foreach my $object (getWmiObjects(
-        class      => 'Win32_VideoController',
-        properties => [ qw/
-            CurrentHorizontalResolution CurrentVerticalResolution VideoProcessor
-            AdaptaterRAM Name
-        / ]
-    )) {
-
-        my $video = {
-            CHIPSET => $object->{VideoProcessor},
-            MEMORY  => $object->{AdaptaterRAM},
-            NAME    => $object->{Name},
-        };
-
-        if ($object->{CurrentHorizontalResolution}) {
-            $video->{RESOLUTION} =
-                $object->{CurrentHorizontalResolution} .
-                "x" .
-                $object->{CurrentVerticalResolution};
-        }
-
-        $video->{MEMORY} = int($video->{MEMORY} / (1024 * 1024))
-            if $video->{MEMORY};
-
-        # avoid duplicates
-        next if $seen->{$video->{NAME}}++;
-
-        $inventory->addEntry(
-            section => 'VIDEOS',
-            entry   => $video
-        );
-    }
-}
-
-1;

@@ -1,18 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Input::Win32;
-
-use strict;
-use warnings;
-
-use English qw(-no_match_vars);
-
-our $runAfter = ["FusionInventory::Agent::Task::Inventory::Input::Generic"];
-
-sub isEnabled {
-    return $OSNAME eq 'MSWin32';
-}
-
-sub doInventory {
-
-}
-
-1;

@@ -1,1573 +0,0 @@
-package FusionInventory::Agent::Task::Inventory::Inventory;
-
-use strict;
-use warnings;
-
-use Config;
-use Data::Dumper;
-use Digest::MD5 qw(md5_base64);
-use English qw(-no_match_vars);
-use XML::TreePP;
-
-use FusionInventory::Agent::Tools;
-
-my %fields = (
-    ANTIVIRUS   => [ qw/COMPANY NAME GUID ENABLED UPTODATE VERSION/ ],
-    BATTERIES   => [ qw/CAPACITY CHEMISTRY DATE NAME SERIAL MANUFACTURER
-                        VOLTAGE/ ],
-    CONTROLLERS => [ qw/CAPTION DRIVER NAME MANUFACTURER PCICLASS PCIID
-                        PCISUBSYSTEMID PCISLOT TYPE REV/ ],
-    CPUS        => [ qw/CACHE CORE DESCRIPTION MANUFACTURER NAME THREAD SERIAL
-                        STEPPING FAMILYNAME FAMILYNUMBER MODEL SPEED ID EXTERNAL_CLOCK/ ],
-    DRIVES      => [ qw/CREATEDATE DESCRIPTION FREE FILESYSTEM LABEL LETTER 
-                        SERIAL SYSTEMDRIVE TOTAL TYPE VOLUMN/ ],
-    ENVS        => [ qw/KEY VAL/ ],
-    INPUTS      => [ qw/NAME MANUFACTURER CAPTION DESCRIPTION INTERFACE LAYOUT
-	                POINTINGTYPE TYPE/ ],
-    MEMORIES    => [qw/CAPACITY CAPTION FORMFACTOR REMOVABLE PURPOSE SPEED
-                       SERIALNUMBER TYPE DESCRIPTION NUMSLOTS MEMORYCORRECTION/ ],
-    MODEMS      => [ qw/DESCRIPTION NAME/ ],
-    MONITORS    => [ qw/BASE64 CAPTION DESCRIPTION MANUFACTURER SERIAL
-                        UUENCODE/ ],
-    NETWORKS    => [ qw/BSSID DESCRIPTION DRIVER FIRMWARE IPADDRESS IPADDRESS6 
-                        IPDHCP IPGATEWAY IPMASK IPMASK6 IPSUBNET IPSUBNET6
-                        MANAGEMENT MANUFACTURER MACADDR MODEL MTU PCISLOT 
-                        PNPDEVICEID STATUS SLAVES SPEED SSID TYPE VIRTUALDEV  
-                        WWN/ ],
-    PORTS       => [ qw/CAPTION DESCRIPTION NAME TYPE/ ],
-    PROCESSES   => [ qw/USER PID CPUUSAGE MEM VIRTUALMEMORY TTY STARTED CMD/ ],
-    REGISTRY    => [ qw/NAME REGVALUE HIVE/ ],
-    SLOTS       => [ qw/DESCRIPTION DESIGNATION NAME STATUS/ ],
-    SOFTWARES   => [ qw/COMMENTS FILESIZE FOLDER FROM HELPLINK INSTALLDATE NAME
-                        NO_REMOVE RELEASE_TYPE PUBLISHER UNINSTALL_STRING 
-                        URL_INFO_ABOUT VERSION VERSION_MINOR VERSION_MAJOR 
-                        GUID ARCH/ ],
-    SOUNDS      => [ qw/CAPTION DESCRIPTION MANUFACTURER NAME/ ],
-    STORAGES    => [ qw/DESCRIPTION DISKSIZE INTERFACE MANUFACTURER MODEL NAME
-                        TYPE SERIAL SERIALNUMBER FIRMWARE SCSI_COID SCSI_CHID
-                        SCSI_UNID SCSI_LUN WWN/ ],
-    VIDEOS      => [ qw/CHIPSET MEMORY NAME RESOLUTION PCISLOT/ ],
-    USBDEVICES  => [ qw/VENDORID PRODUCTID SERIAL CLASS SUBCLASS NAME/ ],
-    USERS       => [ qw/LOGIN DOMAIN/ ],
-    PRINTERS    => [ qw/COMMENT DESCRIPTION DRIVER NAME NETWORK PORT RESOLUTION
-                        SHARED STATUS ERRSTATUS SERVERNAME SHARENAME 
-                        PRINTPROCESSOR SERIAL/ ],
-    BIOS             => [ qw/SMODEL SMANUFACTURER SSN BDATE BVERSION 
-                             BMANUFACTURER MMANUFACTURER MSN MMODEL ASSETTAG 
-                             ENCLOSURESERIAL BIOSSERIAL 
-                             TYPE SKUNUMBER/ ],
-    HARDWARE         => [ qw/USERID OSVERSION PROCESSORN OSCOMMENTS CHECKSUM
-                             PROCESSORT NAME PROCESSORS SWAP ETIME TYPE OSNAME
-                             IPADDR WORKGROUP DESCRIPTION MEMORY UUID DNS 
-                             LASTLOGGEDUSER USERDOMAIN DATELASTLOGGEDUSER 
-                             DEFAULTGATEWAY VMSYSTEM WINOWNER WINPRODID
-                             WINPRODKEY WINCOMPANY WINLANG CHASSIS_TYPE/ ],
-    OPERATINGSYSTEM  => [ qw/KERNEL_NAME KERNEL_VERSION NAME VERSION FULL_NAME 
-                            SERVICE_PACK INSTALL_DATE/ ],
-    ACCESSLOG        => [ qw/USERID LOGDATE/ ],
-    VIRTUALMACHINES  => [ qw/MEMORY NAME UUID STATUS SUBSYSTEM VMTYPE VCPU
-                             VMID MAC COMMENT OWNER/ ],
-    LOGICAL_VOLUMES  => [ qw/LV_NAME VGN_AME ATTR SIZE LV_UUID SEG_COUNT 
-                             VG_UUID/ ],
-    PHYSICAL_VOLUMES => [ qw/DEVICE PV_PE_COUNT PV_UUID FORMAT ATTR
-                             SIZE FREE PE_SIZE VG_UUID/ ],
-    VOLUME_GROUPS    => [ qw/VG_NAME PV_COUNT LV_COUNT ATTR SIZE FREE VG_UUID 
-                             VG_EXTENT_SIZE/ ],
-);
-
-my %checks = (
-    STORAGES => {
-        INTERFACE => qr/^(SCSI|HDC|IDE|USB|1394|Serial-ATA|SAS)$/
-    },
-    VIRTUALMACHINES => {
-        STATUS => qr/^(running|idle|paused|shutdown|crashed|dying|off)$/
-    }
-);
-
-# convert fields list into fields hashes, for fast lookup
-foreach my $section (keys %fields) {
-    $fields{$section} = { map { $_ => 1 } @{$fields{$section}} };
-}
-
-sub new {
-    my ($class, %params) = @_;
-
-    my $self = {
-        logger         => $params{logger},
-        fields         => \%fields,
-        content        => {
-            HARDWARE => {
-                ARCHNAME => $Config{archname},
-                VMSYSTEM => "Physical" # Default value
-            },
-            VERSIONCLIENT => $FusionInventory::Agent::AGENT_STRING
-        }
-    };
-    bless $self, $class;
-
-    $self->setTag($params{tag});
-    $self->{last_state_file} = $params{statedir} . '/last_state'
-        if $params{statedir};
-
-    return $self;
-}
-
-sub getContent {
-    my ($self) = @_;
-
-    return $self->{content};
-}
-
-sub mergeContent {
-    my ($self, $content) = @_;
-
-    die "no content" unless $content;
-
-    foreach my $section (keys %$content) {
-        if (ref $content->{$section} eq 'ARRAY') {
-            # a list of entry
-            foreach my $entry (@{$content->{$section}}) {
-                $self->addEntry(section => $section, entry => $entry);
-            }
-        } else {
-            # single entry
-            SWITCH: {
-                if ($section eq 'HARDWARE') {
-                    $self->setHardware($content->{$section});
-                    last SWITCH;
-                }
-                if ($section eq 'BIOS') {
-                    $self->setBios($content->{$section});
-                    last SWITCH;
-                }
-                if ($section eq 'ACCESSLOG') {
-                    $self->setAccessLog($content->{$section});
-                    last SWITCH;
-                }
-                $self->addEntry(
-                    section => $section, entry => $content->{$section}
-                );
-            }
-        }
-    }
-}
-
-sub addEntry {
-    my ($self, %params) = @_;
-
-    my $entry = $params{entry};
-    die "no entry" unless $entry;
-
-    my $section = $params{section};
-    my $fields = $fields{$section};
-    my $checks = $checks{$section};
-    die "unknown section $section" unless $fields;
-
-    foreach my $field (keys %$entry) {
-        if (!$fields->{$field}) {
-            # unvalid field, log error and remove
-            $self->{logger}->debug("unknown field $field for section $section");
-            delete $entry->{$field};
-            next;
-        }
-        if (!defined $entry->{$field}) {
-            # undefined value, remove
-            delete $entry->{$field};
-            next;
-        }
-        # sanitize value
-        my $value = getSanitizedString($entry->{$field});
-        # check value if appliable
-        if ($checks->{$field}) {
-            $self->{logger}->debug(
-                "invalid value $value for field $field for section $section"
-            ) unless $value =~ $checks->{$field};
-        }
-        $entry->{$field} = $value;
-    }
-
-    # avoid duplicate entries
-    if ($params{noDuplicated}) {
-        my $md5 = md5_base64(Dumper($entry));
-        return if $self->{seen}->{$section}->{$md5};
-        $self->{seen}->{$section}->{$md5} = 1;
-    }
-
-    if ($section eq 'STORAGES') {
-        $entry->{SERIALNUMBER} = $entry->{SERIAL} if !$entry->{SERIALNUMBER}
-    }
-
-    push @{$self->{content}{$section}}, $entry;
-}
-
-sub computeLegacyValues {
-    my ($self) = @_;
-
-    # CPU-related values
-    my $cpus = $self->{content}->{CPUS};
-    if ($cpus) {
-        my $cpu = $cpus->[0];
-
-        $self->setHardware({
-            PROCESSORN => scalar @$cpus,
-            PROCESSORS => $cpu->{SPEED},
-            PROCESSORT => $cpu->{NAME},
-        });
-    }
-
-    # network related values
-    my $interfaces = $self->{content}->{NETWORKS};
-    if ($interfaces) {
-        my @ip_addresses =
-            grep { ! /^127/ }
-            grep { $_ }
-            map { $_->{IPADDRESS} }
-            @$interfaces;
-
-        $self->setHardware({
-            IPADDR => join('/', @ip_addresses),
-        });
-    }
-
-    # user-related values
-    my $users = $self->{content}->{USERS};
-    if ($users) {
-        my $user = $users->[-1];
-
-        my ($domain, $id);
-        if ($user->{LOGIN} =~ /(\S+)\\(\S+)/) {
-            # Windows fully qualified username: domain\user
-            $domain = $1;
-            $id = $2;
-        } else {
-            # simple username: user
-            $id = $user->{LOGIN};
-        }
-
-        $self->setHardware({
-            USERID     => $id,
-            USERDOMAIN => $domain,
-        });
-    }
-}
-
-sub setHardware {
-    my ($self, $args) = @_;
-
-    foreach my $field (keys %$args) {
-        if (!$fields{HARDWARE}->{$field}) {
-            $self->{logger}->debug("unknown field $field for section HARDWARE");
-            next
-        }
-        $self->{content}->{HARDWARE}->{$field} =
-            getSanitizedString($args->{$field});
-    }
-}
-
-sub setOperatingSystem {
-    my ($self, $args) = @_;
-
-    foreach my $field (keys %$args) {
-        if (!$fields{OPERATINGSYSTEM}->{$field}) {
-            $self->{logger}->debug(
-                "unknown field $field for section OPERATINGSYSTEM"
-            );
-            next
-        }
-        $self->{content}->{OPERATINGSYSTEM}->{$field} = 
-            getSanitizedString($args->{$field});
-    }
-}
-
-sub setBios {
-    my ($self, $args) = @_;
-
-    foreach my $field (keys %$args) {
-        if (!$fields{BIOS}->{$field}) {
-            $self->{logger}->debug("unknown field $field for section BIOS");
-            next
-        }
-
-        $self->{content}->{BIOS}->{$field} =
-            getSanitizedString($args->{$field});
-    }
-}
-
-sub setAccessLog {
-    my ($self, $args) = @_;
-
-    foreach my $field (keys %$args) {
-        if (!$fields{ACCESSLOG}->{$field}) {
-            $self->{logger}->debug(
-                "unknown field $field for section ACCESSLOG"
-            );
-            next
-        }
-
-        $self->{content}->{ACCESSLOG}->{$field} = 
-            getSanitizedString($args->{$field});
-    }
-}
-
-sub setTag {
-    my ($self, $tag) = @_;
-
-    return unless $tag;
-
-    $self->{content}{ACCOUNTINFO} = [{
-        KEYNAME  => "TAG",
-        KEYVALUE => $tag
-    }];
-
-}
-
-sub computeChecksum {
-    my ($self) = @_;
-
-    my $logger = $self->{logger};
-
-    # to apply to $checksum with an OR
-    my %mask = (
-        HARDWARE      => 1,
-        BIOS          => 2,
-        MEMORIES      => 4,
-        SLOTS         => 8,
-        REGISTRY      => 16,
-        CONTROLLERS   => 32,
-        MONITORS      => 64,
-        PORTS         => 128,
-        STORAGES      => 256,
-        DRIVES        => 512,
-        INPUT         => 1024,
-        MODEMS        => 2048,
-        NETWORKS      => 4096,
-        PRINTERS      => 8192,
-        SOUNDS        => 16384,
-        VIDEOS        => 32768,
-        SOFTWARES     => 65536,
-    );
-    # TODO CPUS is not in the list
-
-    if ($self->{last_state_file}) {
-        if (-f $self->{last_state_file}) {
-            eval {
-                $self->{last_state_content} = XML::TreePP->new()->parsefile(
-                    $self->{last_state_file}
-                );
-            };
-            if (ref($self->{last_state_content}) ne 'HASH') {
-                $self->{last_state_file} = {};
-            }
-        } else {
-            $logger->debug(
-                "last state file '$self->{last_state_file}' doesn't exist"
-            );
-        }
-    }
-
-    my $checksum = 0;
-    foreach my $section (keys %mask) {
-        my $hash =
-            md5_base64(Dumper($self->{content}->{$section}));
-
-        # check if the section did change since the last run
-        next if 
-            $self->{last_state_content}->{$section} &&
-            $self->{last_state_content}->{$section} eq $hash;
-
-        $logger->debug("Section $section has changed since last inventory");
-
-        # add the mask of the current section to the checksum
-        $checksum |= $mask{$section}; ## no critic (ProhibitBitwise)
-
-        # store the new value.
-        $self->{last_state_content}->{$section} = $hash;
-    }
-
-
-    $self->setHardware({CHECKSUM => $checksum});
-}
-
-sub saveLastState {
-    my ($self) = @_;
-
-    my $logger = $self->{logger};
-
-    if (!defined($self->{last_state_content})) {
-        $self->processChecksum();
-    }
-    if ($self->{last_state_file}) {
-        eval {
-            XML::TreePP->new()->writefile(
-                $self->{last_state_file}, $self->{last_state_content}
-            );
-        }
-    } else {
-        $logger->debug(
-            "last state file is not defined, last state not saved"
-        );
-    }
-
-    my $tpp = XML::TreePP->new();
-}
-
-1;
-__END__
-
-=head1 NAME
-
-FusionInventory::Agent::Task::Inventory::Inventory - Inventory data structure
-
-=head1 DESCRIPTION
-
-This is a data structure corresponding to an hardware and software inventory.
-
-=head1 METHODS
-
-=head2 new(%params)
-
-The constructor. The following parameters are allowed, as keys of the
-%params hash:
-
-=over
-
-=item I<logger>
-
-a logger object
-
-=item I<statedir>
-
-a path to a writable directory containing the last serialized inventory
-
-=item I<tag>
-
-an arbitrary label, used for server-side filtering
-
-=back
-
-=head2 getContent()
-
-Get content attribute.
-
-=head2 mergeContent($content)
-
-Merge content to the inventory.
-
-=head2 addEntry(%params)
-
-Add a new entry to the inventory. The following parameters are allowed, as keys
-of the %params hash:
-
-=over
-
-=item I<section>
-
-the entry section (mandatory)
-
-=item I<entry>
-
-the entry (mandatory)
-
-=item I<noDuplicated>
-
-ignore entry if already present
-
-=back
-
-=head2 setTag($tag)
-
-Set inventory tag, an arbitrary label used for filtering on server side.
-
-=head2 setHardware()
-
-Save global information regarding the machine.
-
-=head2 setOperatingSystem()
-
-Operating System information.
-
-=head2 setBios()
-
-Set BIOS informations.
-
-=head2 setAccessLog()
-
-What is that for? :)
-
-=head2 computeChecksum()
-
-Compute the inventory checksum. This information is used by the server to
-know which parts of the inventory have changed since the last one.
-
-=head2 computeLegacyValues()
-
-Compute the inventory global values, meaning values in hardware section such as
-CPU number, speed and model, computed from other values, but needed for OCS
-compatibility.
-
-=head2 saveLastState()
-
-At the end of the process IF the inventory was saved
-correctly, the last_state is saved.
-
-=head1 DATA MODEL
-
-This section presents the various entry types, with their attributes. The names
-correspond to the historical OCS format.
-
-=head2 BIOS
-
-=over
-
-=item SMODEL
-
-System model
-
-=item SMANUFACTURER
-
-System manufacturer
-
-=item SSN
-
-System Serial number
-
-=item BDATE
-
-BIOS release date
-
-=item BVERSION
-
-The BIOS revision
-
-=item BMANUFACTURER
-
-BIOS manufacturer
-
-=item MMANUFACTURER
-
-Motherboard Manufacturer
-
-=item MSN
-
-Motherboard Serial
-
-=item MMODEL
-
-Motherboard model
-
-=item ASSETTAG
-
-=item ENCLOSURESERIAL
-
-=item BIOSSERIAL
-
-The optional asset tag for this machine.
-
-=item TYPE
-
-depcreated, replace by HARDWARE/CHASSIS_TYPE
-
-=back
-
-=head2 CONTROLLERS
-
-=over
-
-=item CAPTION
-
-Windows CAPTION field or subsystem Name from the pci.ids table
-
-=item DRIVER
-
-=item NAME
-
-The device name, the on from the PCIIDs DB
-
-=item MANUFACTURER
-
-The manifacturer name, the on from the PCIIDs DB
-
-=item PCICLASS
-
-The PCI class ID
-
-=item PCIID
-
-The PCI ID, e.g: 8086:2a40 (only for PCI device)
-
-=item PCISUBSYSTEMID
-
-The PCI subsystem ID, e.g: 8086:2a40 (only for PCI device)
-
-=item PCISLOT
-
-The PCI slot, e.g: 00:02.1 (only for PCI device)
-
-=item TYPE
-
-The controller revision, e.g: rev 02. This field may be renamed
-in the future.
-
-=item REV
-
-Revision of the device in the XX format (e.g: 04)
-
-=back
-
-=head2 MEMORIES
-
-=over
-
-=item CAPACITY
-
-=item CAPTION
-
-E.g: Physical Memory
-
-=item DESCRIPTION
-
-=item FORMFACTOR
-
-Only available on Windows, See Win32_PhysicalMemory documentation on MSDN.
-
-=item REMOVABLE
-
-=item PURPOSE
-
-Only avalaible on Windows, See Win32_PhysicalMemory documentation on MSDN.
-
-=item SPEED
-
-In Mhz, e.g: 800
-
-=item TYPE
-
-=item NUMSLOTS
-
-Eg. 2, start at 1, not 0
-
-=item SERIALNUMBER
-
-=back
-
-=head2 CPUS
-
-=over
-
-=item CACHESIZE
-
-The total CPU cache size in KB. e.g: 3072
-
-=item CORE
-
-Number of core.
-
-=item DESCRIPTION
-
-=item MANUFACTURER
-
-AMD/Intel/Transmeta/Cyrix/VIA/Sun Microsystems//Fujitsu
-
-=item NAME
-
-The name of the CPU, e.g: Intel(R) Core(TM)2 Duo CPU     P8600  @ 2.40GHz
-
-=item THREAD
-
-Number of thread per core.
-
-=item SERIAL
-
-Serial number
-
-=item SPEED
-
-Frequency in MHz
-
-=item ID
-
-The CPU ID: http://en.wikipedia.org/wiki/CPUID
-
-=item STEPPING
-
-Stepping value (Contained in CPUID)
-
-=item MODEL
-
-Model value (Contained in CPUID)
-
-=item FAMILYNUMBER
-
-Family value (Contained in CPUID)
-
-=item FAMILYNAME
-
-Family Name
-
-=back
-
-=head2 DRIVES
-
-Drive is actually a filesystem. Virtual filesystem like /proc or /sys are ignored.
-
-=over
-
-=item CREATEDATE
-
-Date of creation of the filesystem in DD/MM/YYYY format.
-
-=item DESCRIPTION
-
-=item FREE
-
-Free space (MB)
-
-=item FILESYSTEM
-
-File system name. e.g: ext3
-
-=item LABEL
-
-Name of the partition given by the user.
-
-=item LETTER
-
-Windows driver letter. Windows only
-
-=item SERIAL
-
-Partition serial number or UUID
-
-=item SYSTEMDRIVE
-
-Boolean. Is this the system partition?
-
-=item TOTAL
-
-Total space available (MB)
-
-=item TYPE
-
-The mount point on UNIX.
-
-=item VOLUMN
-
-System name of the partition (e.g: /dev/sda1 or server:/directory for NFS)
-
-=back
-
-=head2 HARDWARE
-
-=over
-
-=item USERID
-
-The current user list, '/' is the delimiter. This field is deprecated, you
-should use the USERS section instead.
-
-=item OSVERSION
-
-Version number of the operating system. This field will be deprecated in the
-future, please use OPERATINGSYSTEM/VERSION or OPERATINGSYSTEM/KERNEL_VERSION
-instead.
-
-=item PROCESSORN
-
-=item OSCOMMENTS
-
-Service Pack on Windows, kernel build date on Linux
-
-=item CHECKSUM
-
-Deprecated, OCS only.
-
-=item PROCESSORT
-
-Deprecated, OCS only.
-
-=item NAME
-
-=item PROCESSORS
-
-The processor speed in MHz, this field is deprecated, see CPUS instead.
-
-=item SWAP
-
-The swap space in MB.
-
-=item ETIME
-
-The time needed to run the inventory on the agent side.
-
-=item TYPE
-
-=item OSNAME
-
-Full name of the operating system as reported by itself. This field will be
-deprecated in the future, please use OPERATINGSYSTEM/NAME or
-OPERATINGSYSTEM/FULL_NAME instead.
-
-=item IPADDR
-
-=item WORKGROUP
-
-=item DESCRIPTION
-
-Computer description (Windows only so far)
-
-=item MEMORY
-
-Total system memory in MB
-
-=item UUID
-
-=item DNS
-
-=item LASTLOGGEDUSER
-
-The login of the last logged user.
-
-=item USERDOMAIN
-
-This field is deprecated, you should use the USERS section instead.
-
-=item DATELASTLOGGEDUSER
-
-=item DEFAULTGATEWAY
-
-=item VMSYSTEM
-
-The virtualization technology used if the machine is a virtual machine.
-
-Can be:
-
-=over 5
-
-=item Physical: (default)
-
-=item Xen
-
-=item VirtualBox
-
-=item Virtual Machine: Generic if it's not possible to correctly identify the solution
-
-=item VMware: ESX, ESXi, server, etc
-
-=item QEMU
-
-=item SolarisZone
-
-=item VServer
-
-=item OpenVZ
-
-=item BSDJail
-
-=item Parallels
-
-=item Hyper-V
-
-=back
-
-=item WINOWNER
-
-=item WINPRODID
-
-=item WINPRODKEY
-
-=item WINCOMPANY
-
-=item WINLANG
-
-Language code of the Windows
-
-=item CHASSIS_TYPE
-
-The computer chassis format (e.g: Notebook, Laptop, Server, etc)
-
-=back
-
-=head2 OPERATINGSYSTEM
-
-=over
-
-=item KERNEL_NAME
-
-The name of the kernel used by this operating system, e.g freebsd, linux, hpux,
-win32, etc (linux for android).
-
-=item KERNEL_VERSION
-
-Version of the operating system's kernel, e.g 2.6.32 for Linux, 5.2.x.y on
-Windows Server 2003, etc.
-
-=item NAME
-
-Name of the Operating System ("Distributor ID" in LSB terms), e.g Debian,
-Ubuntu, CentOS, SUSE LINUX, Windows, MacOSX, FreeBSD, AIX, Android, etc.
-
-=item VERSION
-
-Version of the operating system distribution ("Release" in LSB terms), e.g 11.04
-on Ubuntu natty, 5.0.8 on Debian Lenny, 5.4 on CentOS 5.4, 2003 for Windows
-Server 2003, etc.
-
-=item FULL_NAME
-
-Full name of the operating system as reported by itself, e.g "Debian GNU/Linux
-unstable (sid)" or "Microsoft(R) Windows(R) Server 2003, Enterprise Edition
-x64". This is also contained in the HARDWARE/OSNAME field which will be
-deprecated in the future.
-
-=item SERVICE_PACK
-
-The Service Pack level reported by the operating system. This field is only
-present on systems which use this notion.
-
-=item INSTALL_DATE
-
-The operating system installation date.
-
-=back
-
-=head2 MONITORS
-
-=over
-
-=item BASE64
-
-The uuencoded EDID trame. Optional.
-
-=item CAPTION
-
-=item DESCRIPTION
-
-=item MANUFACTURER
-
-The manufacturer retrieved from the EDID trame.
-
-=item SERIAL
-
-The serial number retrieved from the EDID trame.
-
-=item UUENCODE
-
-The uuencoded EDID trame. Optional.
-
-=back
-
-=head2 PORTS
-
-Serial, Parallel, SATA, etc
-
-=over
-
-=item CAPTION
-
-=item DESCRIPTION
-
-=item NAME
-
-=item TYPE
-
-=back
-
-=head2 SLOTS
-
-Represents physical connection points including ports, motherboard slots and peripherals, and proprietary connection points.
-
-This information is hardly reliable.
-
-=over
-
-=item CAPACITY
-
-=item CAPTION
-
-=item FORMFACTOR
-
-=item REMOVABLE
-
-=item PURPOSE
-
-=item TYPE
-
-=item DESCRIPTION
-
-=back
-
-=head2 STORAGES
-
-=over
-
-=item DESCRIPTION
-
-The long name of the device displayed to the user.
-
-=item DISKSIZE
-
-The disk size in MB.
-
-=item INTERFACE
-
-INTERFACE can be SCSI/HDC/IDE/USB/1394/Serial-ATA/SAS or empty if unknown
-
-=item MANUFACTURER
-
-=item MODEL
-
-The commercial name of the device
-
-=item NAME
-
-The name of the device as seen by the system. E.g: hda (Linux), \\.\PHYSICALDRIVE0 (Windows)
-
-=item TYPE
-
-The kind of device. There is no standard for the format of the string in this field.
-
-=item SERIAL
-
-The harddrive serial number
-
-=item SERIALNUMBER
-
-Deprecated. The harddrive serial number, same as SERIAL.
-
-=item FIRMWARE
-
-=item SCSI_COID
-
-=item SCSI_CHID
-
-=item SCSI_UNID
-
-=item SCSI_LUN
-
-=item WWN
-
-World Wide Name http://fr.wikipedia.org/wiki/World_Wide_Name
-
-=back
-
-=head2 SOFTWARES
-
-=over
-
-=item COMMENTS
-
-=item FILESIZE
-
-=item FOLDER
-
-=item FROM
-
-Where the information about the software came from, can be:
-registry, rpm, deb, etc
-
-=item HELPLINK
-
-=item INSTALLDATE
-
-Installation day in DD/MM/YYYY format. Windows only.
-
-=item NAME
-
-=item NO_REMOVE
-
-Can the software be removed.
-
-=item RELEASE_TYPE
-
-Windows only for now, come from the registry
-
-=item PUBLISHER
-
-=item UNINSTALL_STRING
-
-Windows only, come from the registry
-
-=item URL_INFO_ABOUT
-
-=item VERSION
-
-=item VERSION_MINOR
-
-Windows only, come from the registry
-
-=item VERSION_MAJOR
-
-Windows only, come from the registry
-
-=item IS64BIT
-
-If the software is in 32 or 64bit, (1/0)
-
-=item GUID
-
-Windows software GUID
-
-=back
-
-=head2 USERS
-
-=over
-
-=item LOGIN
-
-=item DOMAIN
-
-The Windows domain of the user, if available.
-
-=back
-
-=head2 VIDEOS
-
-=over
-
-=item CHIPSET
-
-=item MEMORY
-
-Video card memory in MB
-
-=item NAME
-
-=item RESOLUTION
-
-Resolution in pixel. 1024x768.
-
-=item PCISLOT
-
-The local PCI slot ID if the video card use PCI.
-
-=back
-
-=head2 VIRTUALMACHINES
-
-=over
-
-=item MEMORY
-
-Memory size, in MB.
-
-=item NAME
-
-The name of the virtual machine.
-
-=item UUID
-
-=item STATUS
-
-The VM status: running, idle, paused, shutdown, crashed, dying, off
-
-=item SUBSYSTEM
-
-The virtualisation software.
-E.g: VmWare ESX
-
-=item VMTYPE
-
-The name of the virtualisation system family. The same type found is HARDWARE/VMSYSTEM
-
-=item VCPU
-
-Number of CPU affected to the virtual machine
-
-=item VMID
-
-The ID of virtual machine in the virtual managment system.
-
-=item MAC
-
-The list of the MAC addresses of the virtual machine. The delimiter is '/'. e.g: 00:23:18:91:db:8d/00:23:57:31:sb:8e
-
-=item COMMENT
-
-a comment
-
-=item OWNER
-
-=back
-
-=head2 SOUNDS
-
-=over
-
-=item DESCRIPTION
-
-=item MANUFACTURER
-
-=item NAME
-
-=back
-
-=head2 MODEMS
-
-=over
-
-=item DESCRIPTION
-
-=item NAME
-
-=back
-
-=head2 ENVS
-
-Environment variables
-
-=over
-
-=item KEY
-
-=item VAL
-
-=back
-
-=head2 UPDATES 
-
-Windows updates
-
-=over
-
-=item ID 
-
-Update Id
-
-=item KB
-
-List of KB, delimiter is '/'
-
-=back
-
-=head2 USBDEVICES 
-
-USB Devices
-
-=over
-
-=item VENDORID 
-
-Vendor USB ID. 4 hexa char.
-
-=item PRODUCTID 
-
-Product USB ID. 4 hexa char.
-
-=item SERIAL
-
-=item CLASS
-
-USB Class (e.g: 8 for Mass Storage)
-
-=item SUBCLASS
-
-USB Sub Class
-
-=item NAME
-
-The name of the device (optional)
-
-=back
-
-=head2 NETWORKS
-
-A network configuration.
-
-=over
-
-=item DESCRIPTION
-
-The name of the interface as seen in the OS settings, e.g: eth0 (Linux) or AMD PCNET Family Ethernet Adapter (Windows)
-
-=item DRIVER
-
-The name of the driver used by the network interface
-
-=item IPADDRESS
-
-=item IPADDRESS6
-
-=item IPDHCP
-
-The IP address of the DHCP server (optional).
-
-=item IPGATEWAY
-
-=item IPMASK
-
-=item IPSUBNET
-
-=item MACADDR
-
-=item MTU
-
-=item PCISLOT
-
-The PCI slot name.
-
-=item STATUS
-
-Up or Down
-
-=item TYPE
-
-Interface type: Ethernet, Wifi
-
-=item VIRTUALDEV
-
-If the interface exist or not (1 or empty)
-
-=item SLAVES
-
-Bonded interfaces list in the eth0/eth1/eth2 format (/ is the separator).
-
-=item MANAGEMENT
-
-Whether or not it is a HP iLO, Sun SC, HP MP or other kind of Remote Management Interface
-
-=item SPEED
-
-Interface speed in Mb/s
-
-=item BSSID
-
-Wifi only, Access point MAC Address
-
-=item SSID
-
-Wifi only, Access point name
-
-=back
-
-=head2 BATTERIES
-
-=over
-
-=item CAPACITY
-
-Battery capacity in mWh
-
-=item DATE
-
-Manufacture date in DD/MM/YYYY format
-
-=item NAME
-
-Name of the device
-
-=item SERIAL
-
-Serial number
-
-=item MANUFACTURER
-
-Battery manufacturer
-
-=item VOLTAGE
-
-Voltage in mV
-
-=back
-
-=head2 PRINTERS
-
-=over
-
-=item COMMENT
-
-=item DESCRIPTION
-
-=item DRIVER
-
-=item NAME
-
-=item NETWORK
-
-Network: True (1) if it's a network printer
-
-=item PORT
-
-=item RESOLUTION
-
-Resolution: eg. 600x600
-
-=item SHARED
-
-Shared: True if the printer is shared (Win32)
-
-=item STATUS
-
-Status: See Win32_Printer.PrinterStatus
-
-=item ERRSTATUS
-
-ErrStatus: See Win32_Printer.ExtendedDetectedErrorState
-
-=item SERVERNAME
-
-=item SHARENAME
-
-=item PRINTPROCESSOR
-
-=item SERIAL
-
-The serial number
-
-=back
-
-=head2 PROCESSES
-
-=over
-
-=item USER
-
-The process owner
-
-=item PID
-
-The process Id
-
-=item CPUUSAGE
-
-The CPU usage.
-
-=item MEM
-
-The memory.
-
-=item VIRTUALMEMORY
-
-=item TTY
-
-=item STARTED
-
-When the process has been started in YYYY/MM/DD HH:MM format
-
-=item CMD
-
-The command.
-
-=back
-
-=head2 ANTIVIRUS
-
-=over
-
-=item COMPANY
-
-Comapny name
-
-=item NAME
-
-=item GUID
-
-Unique ID
-
-=item ENABLED
-
-1 if the antivirus is enabled.
-
-=item UPTODATE
-
-1 if the antivirus is up to date.
-
-=item VERSION
-
-=back
-
-=head2 LOGICAL_VOLUMES
-
-A LVM Logical Volume
-
-=over
-
-=item LVNAME
-
-The volume name.
-
-=item VGNAME
-
-The volume group name.
-
-=item ATTR
-
-The special attribue used on this volume (e.g: a-)
-
-=item SIZE
-
-The size of the volume on MB.
-
-=item UUID
-
-The volume UUID.
-
-=back
-
-=head2 PHYSICAL_VOLUMES
-
-=over
-
-=item DEVICE
-
-The device name. Eg.: /dev/sda1 on Linux.
-
-=item PV_NAME
-
-The physical device name.
-
-=item FORMAT
-
-The format. E.g: lvm2.
-
-=item ATTR
-
-The LVM attribue in use for this phyisical device.
-
-=item SIZE
-
-The size in MB.
-
-=item PV_UUID
-
-The UUID.
-
-=item PV_PE_COUNT
-
-Item PV_PE_COUNT
-
-=item PE_SIZE
-
-Item PE_SIZE
-
-=back
-
-=head2 VOLUME_GROUPS
-
-A LVM Volume group.
-
-=over
-
-=item VGNAME
-
-The name of the volume group.
-
-=item PV_COUNT
-
-=item LV_COUNT
-
-=item ATTR
-
-The volume group LVM attribue.
-
-=item SIZE
-
-The size.
-
-=item FREE
-
-The free space.
-
-=item UUID
-
-The UUID

@@ -0,0 +1,45 @@
+package FusionInventory::Agent::Task::Inventory::Linux::ARM::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return -r '/proc/cpuinfo';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCPUsFromProc(
+        logger => $logger, file => '/proc/cpuinfo')
+    ) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+sub _getCPUsFromProc {
+    my @cpus;
+
+    # https://github.com/joyent/libuv/issues/812
+    foreach my $cpu (getCPUsFromProc(@_)) {
+        push @cpus, {
+            ARCH  => 'ARM',
+            NAME  => $cpu->{'model name'} || $cpu->{processor}
+        };
+    }
+
+    return @cpus;
+}
+
+1;

@@ -0,0 +1,15 @@
+package FusionInventory::Agent::Task::Inventory::Linux::ARM;
+
+use strict;
+use warnings;
+
+use Config;
+
+sub isEnabled {
+    return $Config{archname} =~ /^arm/;
+}
+
+sub doInventory {
+}
+
+1;

@@ -0,0 +1,54 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Alpha::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return -r '/proc/cpuinfo';
+};
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCPUsFromProc(
+        logger => $logger, file => '/proc/cpuinfo')
+    ) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+sub _getCPUsFromProc {
+    my @cpus;
+    foreach my $cpu (getCPUsFromProc(@_)) {
+
+        my $speed;
+        if (
+            $cpu->{'cycle frequency [hz]'} &&
+            $cpu->{'cycle frequency [hz]'} =~ /(\d+)000000/
+        ) {
+            $speed = $1;
+        }
+
+        push @cpus, {
+            ARCH   => 'Alpha',
+            NAME   => $cpu->{processor},
+            SERIAL => $cpu->{'cpu serial number'},
+            SPEED  => $speed
+        };
+    }
+
+    return @cpus;
+}
+
+1;

@@ -0,0 +1,15 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Alpha;
+
+use strict;
+use warnings;
+
+use Config;
+
+sub isEnabled {
+    return $Config{archname} =~ /^alpha/;
+};
+
+sub doInventory {
+}
+
+1;

@@ -0,0 +1,46 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Distro::LSB;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('lsb_release');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getFileHandle(
+        logger  => $logger,
+        command => 'lsb_release -a',
+    );
+
+    my ($name, $version, $description);
+    while (my $line = <$handle>) {
+        $name        = $1 if $line =~ /^Distributor ID:\s+(.+)/;
+        $version     = $1 if $line =~ /^Release:\s+(.+)/;
+        $description = $1 if $line =~ /^Description:\s+(.+)/;
+    }
+    close $handle;
+
+    # See: #1262
+    $description =~ s/^Enterprise Linux Enterprise Linux/Oracle Linux/;
+
+    $inventory->setHardware({
+        OSNAME => $description,
+    });
+
+    $inventory->setOperatingSystem({
+        NAME      => $name,
+        VERSION   => $version,
+        FULL_NAME => $description
+    });
+
+}
+
+1;

@@ -0,0 +1,130 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Distro::NonLSB;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use List::Util qw(first);
+
+# This array contains four items for each distribution:
+# - release file
+# - distribution name,
+# - regex to get the version
+# - template to get the full name
+my @distributions = (
+    # vmware-release contains something like "VMware ESX Server 3" or "VMware ESX 4.0 (Kandinsky)"
+    [ '/etc/vmware-release',    'VMWare',                     '([\d.]+)',         '%s' ],
+
+    [ '/etc/arch-release',      'ArchLinux',                  '(.*)',             'ArchLinux' ],
+
+    [ '/etc/debian_version',    'Debian',                     '(.*)',             'Debian GNU/Linux %s'],
+
+    # fedora-release contains something like "Fedora release 9 (Sulphur)"
+    [ '/etc/fedora-release',    'Fedora',                     'release ([\d.]+)', '%s' ],
+
+    [ '/etc/gentoo-release',    'Gentoo',                     '(.*)',             'Gentoo Linux %s' ],
+
+    # knoppix_version contains something like "3.2 2003-04-15".
+    # Note: several 3.2 releases can be made, with different dates, so we need to keep the date suffix
+    [ '/etc/knoppix_version',   'Knoppix',                    '(.*)',             'Knoppix GNU/Linux %s' ],
+
+    # mandriva-release contains something like "Mandriva Linux release 2010.1 (Official) for x86_64"
+    [ '/etc/mandriva-release',  'Mandriva',                   'release ([\d.]+)', '%s'],
+
+    # mandrake-release contains something like "Mandrakelinux release 10.1 (Community) for i586"
+    [ '/etc/mandrake-release',  'Mandrake',                   'release ([\d.]+)', '%s'],
+
+    # oracle-release contains something like "Oracle Linux Server release 6.3"
+    [ '/etc/oracle-release',    'Oracle Linux Server',        'release ([\d.]+)', '%s' ],
+
+    # centos-release contains something like "CentOS Linux release 6.0 (Final)
+    [ '/etc/centos-release',    'CentOS',                     'release ([\d.]+)', '%s' ],
+
+    # redhat-release contains something like "Red Hat Enterprise Linux Server release 5 (Tikanga)"
+    [ '/etc/redhat-release',    'RedHat',                     'release ([\d.]+)', '%s' ],
+
+    [ '/etc/slackware-version', 'Slackware',                  'Slackware (.*)',   '%s' ],
+
+    # SuSE-release contains something like "SUSE Linux Enterprise Server 11 (x86_64)"
+    # Note: it may contain several extra lines
+    [ '/etc/SuSE-release',      'SuSE',                       '([\d.]+)',         '%s' ],
+
+    # trustix-release contains something like "Trustix Secure Linux release 2.0 (Cloud)"
+    [ '/etc/trustix-release',   'Trustix',                    'release ([\d.]+)', '%s' ],
+
+    # Fallback
+    [ '/etc/issue',             'Unknown Linux distribution', '([\d.]+)'        , '%s' ],
+
+    # Note: Ubuntu is not listed here as it does not have a
+    # ubuntu-{release,version} file, but it should always have the lsb_release
+    # command so it will be handled by the Linux::Distro::LSB module
+);
+
+our $runMeIfTheseChecksFailed =
+    ["FusionInventory::Agent::Task::Inventory::Linux::Distro::LSB"];
+
+sub isEnabled {
+    return !canRun('lsb_release');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $distribution = first { -f $_->[0] } @distributions;
+    return unless $distribution;
+
+    my $data = _getDistroData($distribution);
+
+    $inventory->setHardware({
+        OSNAME => $data->{FULL_NAME}
+    });
+
+    $inventory->setOperatingSystem($data);
+}
+
+sub _getDistroData {
+    my ($distribution) = @_;
+
+    my $name     = $distribution->[1];
+    my $regexp   = $distribution->[2];
+    my $template = $distribution->[3];
+
+    my $line       = getFirstLine(file => $distribution->[0]);
+    # Arch Linux has an empty release file
+    my ($release, $version);
+    if ($line) {
+        $release   = sprintf $template, $line;
+        ($version) = $line =~ /$regexp/;
+    } else {
+        $release = $template;
+    }
+
+    # If the detected OS is RedHat, but the release contains Scientific, then it is Scientific
+    if ($name =~ /RedHat/) {
+        if ($release =~ /Scientific/) {
+            # this is really a scientific linux, we have to change the name
+            $name = "Scientific";
+        }
+    }
+
+    my $data = {
+        NAME      => $name,
+        VERSION   => $version,
+        FULL_NAME => $release
+    };
+
+    if ($name eq 'SuSE') {
+        $data->{SERVICE_PACK} = getFirstMatch(
+            file    => '/etc/SuSE-release',
+            pattern => qr/^PATCHLEVEL = ([0-9]+)/
+        );
+    }
+
+    return $data;
+}
+
+1;

@@ -0,0 +1,12 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Distro;
+
+use strict;
+use warnings;
+
+sub isEnabled {
+    return 1;
+}
+
+sub doInventory {}
+
+1;

@@ -0,0 +1,185 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Drives;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{drive};
+    return
+        canRun('df') ||
+        canRun('lshal');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $filesystem (_getFilesystems($logger)) {
+        $inventory->addEntry(
+            section => 'DRIVES',
+            entry   => $filesystem
+        );
+    }
+}
+
+sub _getFilesystems {
+    my ($logger) = @_;
+
+    # get filesystems list
+    my @filesystems =
+        # exclude virtual file systems
+        grep { $_->{FILESYSTEM} !~ /^(tmpfs|usbfs|proc|devpts|devshm|udev)$/ }
+        # get all file systems
+        getFilesystemsFromDf(logger => $logger, command => 'df -P -T -k');
+
+    # get additional informations
+    if (canRun('blkid')) {
+        # use blkid if available, as it is filesystem-independent
+        foreach my $filesystem (@filesystems) {
+            $filesystem->{SERIAL} = getFirstMatch(
+                logger  => $logger,
+                command => "blkid -w /dev/null $filesystem->{VOLUMN}",
+                pattern => qr/\sUUID="(\S*)"\s/
+            );
+        }
+    } else {
+        # otherwise fallback to filesystem-dependant utilities
+        my $has_dumpe2fs   = canRun('dumpe2fs');
+        my $has_xfs_db     = canRun('xfs_db');
+        my $has_dosfslabel = canRun('dosfslabel');
+        my %months = (
+            Jan => 1,
+            Feb => 2,
+            Mar => 3,
+            Apr => 4,
+            May => 5,
+            Jun => 6,
+            Jul => 7,
+            Aug => 8,
+            Sep => 9,
+            Oct => 10,
+            Nov => 11,
+            Dec => 12,
+        );
+
+        foreach my $filesystem (@filesystems) {
+            if ($filesystem->{FILESYSTEM} =~ /^ext(2|3|4|4dev)/ && $has_dumpe2fs) {
+                my $handle = getFileHandle(
+                    logger => $logger,
+                    command => "dumpe2fs -h $filesystem->{VOLUMN}"
+                );
+                next unless $handle;
+                while (my $line = <$handle>) {
+                    if ($line =~ /Filesystem UUID:\s+(\S+)/) {
+                        $filesystem->{SERIAL} = $1;
+                    } elsif ($line =~ /Filesystem created:\s+\w+\s+(\w+)\s+(\d+)\s+([\d:]+)\s+(\d{4})$/) {
+                        $filesystem->{CREATEDATE} = "$4/$months{$1}/$2 $3";
+                    } elsif ($line =~ /Filesystem volume name:\s*(\S.*)/) {
+                        $filesystem->{LABEL} = $1 unless $1 eq '<none>';
+                    }
+                }
+                close $handle;
+                next;
+            }
+
+            if ($filesystem->{FILESYSTEM} eq 'xfs' && $has_xfs_db) {
+                $filesystem->{SERIAL} = getFirstMatch(
+                    logger  => $logger,
+                    command => "xfs_db -r -c uuid $filesystem->{VOLUMN}",
+                    pattern => qr/^UUID =\s+(\S+)/
+                );
+                $filesystem->{LABEL} = getFirstMatch(
+                    logger  => $logger,
+                    command => "xfs_db -r -c label $filesystem->{VOLUMN}",
+                    pattern => qr/^label =\s+"(\S+)"/
+                );
+                next;
+            }
+
+            if ($filesystem->{FILESYSTEM} eq 'vfat' && $has_dosfslabel) {
+                $filesystem->{LABEL} = getFirstLine(
+                    logger  => $logger,
+                    command => "dosfslabel $filesystem->{VOLUMN}"
+                );
+                next;
+            }
+        }
+    }
+
+    # complete with hal if available
+    if (canRun('lshal')) {
+        my @hal_filesystems = _getFilesystemsFromHal();
+        my %hal_filesystems = map { $_->{VOLUMN} => $_ } @hal_filesystems;
+
+        foreach my $filesystem (@filesystems) {
+            # retrieve hal informations for this drive
+            my $hal_filesystem = $hal_filesystems{$filesystem->{VOLUMN}};
+            next unless $hal_filesystem;
+
+            # take hal information if it doesn't exist already
+            foreach my $key (keys %$hal_filesystem) {
+                $filesystem->{$key} = $hal_filesystem->{$key}
+                    if !$filesystem->{$key};
+            }
+        }
+    }
+
+    return @filesystems;
+}
+
+sub _getFilesystemsFromHal {
+    my $devices = _parseLshal(command => 'lshal');
+    return @$devices;
+}
+
+sub _parseLshal {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my $devices = [];
+    my $device = {};
+
+    while (my $line = <$handle>) {
+        chomp $line;
+        if ($line =~ m{^udi = '/org/freedesktop/Hal/devices/(volume|block).*}) {
+            $device = {};
+            next;
+        }
+
+        next unless defined $device;
+
+        if ($line =~ /^$/) {
+            if ($device->{ISVOLUME}) {
+                delete($device->{ISVOLUME});
+                push(@$devices, $device);
+            }
+            undef $device;
+        } elsif ($line =~ /^\s+ block.device \s = \s '([^']+)'/x) {
+            $device->{VOLUMN} = $1;
+        } elsif ($line =~ /^\s+ volume.fstype \s = \s '([^']+)'/x) {
+            $device->{FILESYSTEM} = $1;
+        } elsif ($line =~ /^\s+ volume.label \s = \s '([^']+)'/x) {
+            $device->{LABEL} = $1;
+        } elsif ($line =~ /^\s+ volume.uuid \s = \s '([^']+)'/x) {
+            $device->{SERIAL} = $1;
+        } elsif ($line =~ /^\s+ storage.model \s = \s '([^']+)'/x) {
+            $device->{TYPE} = $1;
+         } elsif ($line =~ /^\s+ volume.size \s = \s (\S+)/x) {
+            my $value = $1;
+            $device->{TOTAL} = int($value/(1024*1024) + 0.5);
+        } elsif ($line =~ /block.is_volume\s*=\s*true/i) {
+            $device->{ISVOLUME} = 1;
+        }
+    }
+    close $handle;
+
+    return $devices;
+}
+
+1;

@@ -0,0 +1,76 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Inputs;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{input};
+    return -r '/proc/bus/input/devices';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getFileHandle(
+        file => '/proc/bus/input/devices',
+        logger => $logger
+    );
+    return unless $handle;
+
+    my @inputs;
+    my $device;
+    my $in;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /^I: Bus=.*Vendor=(.*) Prod/) {
+            $in = 1;
+            $device->{vendor}=$1;
+        } elsif ($line =~ /^$/) {
+            $in = 0;
+            if ($device->{phys} && $device->{phys} =~ "input") {
+                push @inputs, {
+                    DESCRIPTION => $device->{name},
+                    CAPTION     => $device->{name},
+                    TYPE        => $device->{type},
+                };
+            }
+
+            $device = {};
+        } elsif ($in) {
+            if ($line =~ /^P: Phys=.*(button).*/i) {
+                $device->{phys}="nodev";
+            } elsif ($line =~ /^P: Phys=.*(input).*/i) {
+                $device->{phys}="input";
+            }
+            if ($line =~ /^N: Name=\"(.*)\"/i) {
+                $device->{name}=$1;
+            }
+            if ($line =~ /^H: Handlers=(\w+)/i) {
+                if ($1 =~ ".*kbd.*") {
+                    $device->{type}="Keyboard";
+                } elsif ($1 =~ ".*mouse.*") {
+                    $device->{type}="Pointing";
+                } else {
+                    # Keyboard ou Pointing
+                    $device->{type}=$1;
+                }
+            }
+        }
+    }
+    close $handle;
+
+    foreach my $input (@inputs) {
+        $inventory->addEntry(
+            section => 'INPUTS',
+            entry   => $input
+        );
+    }
+}
+
+1;

@@ -0,0 +1,127 @@
+package FusionInventory::Agent::Task::Inventory::Linux::LVM;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{lvm};
+    return canRun('lvs');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $volume (_getLogicalVolumes(logger => $logger)) {
+        $inventory->addEntry(section => 'LOGICAL_VOLUMES', entry => $volume);
+    }
+
+    foreach my $volume (_getPhysicalVolumes(logger => $logger)) {
+        $inventory->addEntry(section => 'PHYSICAL_VOLUMES', entry => $volume);
+    }
+
+    foreach my $group (_getVolumeGroups(logger => $logger)) {
+        $inventory->addEntry(section => 'VOLUME_GROUPS', entry => $group);
+    }
+}
+
+sub _getLogicalVolumes {
+    my (%params) = (
+        command => 'lvs -a --noheading --nosuffix --units M -o lv_name,vg_uuid,lv_attr,lv_size,lv_uuid,seg_count',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @volumes;
+    while (my $line = <$handle>) {
+        my @infos = split(/\s+/, $line);
+
+        push @volumes, {
+            LV_NAME   => $infos[1],
+            VG_UUID   => $infos[2],
+            ATTR      => $infos[3],
+            SIZE      => int($infos[4]||0),
+            LV_UUID   => $infos[5],
+            SEG_COUNT => $infos[6],
+        }
+
+    }
+    close $handle;
+
+    return @volumes;
+}
+
+sub _getPhysicalVolumes {
+    my (%params) = (
+        command => 'pvs --noheading --nosuffix --units M -o pv_name,pv_fmt,pv_attr,pv_size,pv_free,pv_uuid,pv_pe_count,vg_uuid',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @volumes;
+    while (my $line = <$handle>) {
+        my @infos = split(/\s+/, $line);
+
+        my $pe_size;
+        if ($infos[7] && $infos[7]>0) {
+            $pe_size = int($infos[4] / $infos[7]);
+        }
+
+        push @volumes, {
+            DEVICE      => $infos[1],
+            FORMAT      => $infos[2],
+            ATTR        => $infos[3],
+            SIZE        => int($infos[4]||0),
+            FREE        => int($infos[5]||0),
+            PV_UUID     => $infos[6],
+            PV_PE_COUNT => $infos[7],
+            PE_SIZE     => $pe_size,
+            VG_UUID     => $infos[8]
+        };
+    }
+    close $handle;
+
+    return @volumes;
+}
+
+sub _getVolumeGroups {
+    my (%params) = (
+        command => 'vgs --noheading --nosuffix --units M -o vg_name,pv_count,lv_count,vg_attr,vg_size,vg_free,vg_uuid,vg_extent_size',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @groups;
+    while (my $line = <$handle>) {
+        my @infos = split(/\s+/, $line);
+
+        push @groups, {
+            VG_NAME        => $infos[1],
+            PV_COUNT       => $infos[2],
+            LV_COUNT       => $infos[3],
+            ATTR           => $infos[4],
+            SIZE           => int($infos[5]||0),
+            FREE           => int($infos[6]||0),
+            VG_UUID        => $infos[7],
+            VG_EXTENT_SIZE => $infos[8],
+        };
+    }
+    close $handle;
+
+    return @groups;
+}
+
+1;

@@ -0,0 +1,44 @@
+package FusionInventory::Agent::Task::Inventory::Linux::MIPS::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return -r '/proc/cpuinfo';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCPUsFromProc(
+        logger => $logger, file => '/proc/cpuinfo'
+    )) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+sub _getCPUsFromProc {
+    my @cpus;
+    foreach my $cpu (getCPUsFromProc(@_)) {
+
+       push @cpus, {
+            ARCH => 'MIPS',
+            NAME => $cpu->{'cpu model'},
+        };
+    }
+
+    return @cpus;
+}
+
+1;

@@ -0,0 +1,15 @@
+package FusionInventory::Agent::Task::Inventory::Linux::MIPS;
+
+use strict;
+use warnings;
+
+use Config;
+
+sub isEnabled {
+    return $Config{archname} =~ /^mips/;
+}
+
+sub doInventory {
+}
+
+1;

@@ -0,0 +1,38 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Memory;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{memory};
+    return -r '/proc/meminfo';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getFileHandle(file => '/proc/meminfo', logger => $logger);
+    return unless $handle;
+
+    my $memorySize;
+    my $swapSize;
+
+    while (my $line = <$handle>) {
+        $memorySize = $1 if $line =~ /^MemTotal:\s*(\S+)/;
+        $swapSize = $1 if $line =~ /^SwapTotal:\s*(\S+)/;
+    }
+    close $handle;
+
+    $inventory->setHardware({
+        MEMORY => int($memorySize/ 1024),
+        SWAP   => int($swapSize / 1024),
+    });
+}
+
+1;

@@ -0,0 +1,63 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Networks::FibreChannel;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('systool');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @interfaces = _getInterfacesFromFcHost(logger => $logger);
+
+    foreach my $interface (@interfaces) {
+        $inventory->addEntry(
+            section => 'NETWORKS',
+            entry   => $interface
+        );
+    }
+}
+
+sub _getInterfacesFromFcHost {
+    my (%params) = (
+        command => 'systool -c fc_host -v',
+        @_
+    );
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @interfaces;
+    my $interface;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /Class Device = "(.+)"/) {
+            $interface = {
+                DESCRIPTION => $1,
+                TYPE        => 'fibrechannel'
+            };
+        } elsif ($line =~ /port_name\s+= "0x(\w+)"/) {
+            $interface->{'WWN'} = join(':', unpack '(A2)*', $1);
+        } elsif ($line =~ /port_state\s+= "(\w+)"/) {
+            if ($1 eq 'Online') {
+                $interface->{'STATUS'} = 'Up';
+            } elsif ($1 eq 'Linkdown') {
+                $interface->{'STATUS'} = 'Down';
+            }
+        } elsif ($line =~ /speed\s+= "(.+)"/) {
+            $interface->{'SPEED'} = $1 if ($1 ne 'unknown');
+
+            push @interfaces, $interface;
+        }
+    }
+
+    return @interfaces;
+}
+
+1;

@@ -0,0 +1,74 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Networks::iLO;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Network;
+
+sub isEnabled {
+    return canRun('hponcfg');
+}
+
+sub _parseHponcfg {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+
+    return unless $handle;
+
+    my $interface = {
+        DESCRIPTION => 'Management Interface - HP iLO',
+        TYPE        => 'ethernet',
+        MANAGEMENT  => 'iLO',
+        STATUS      => 'Down',
+    };
+
+    while (my $line = <$handle>) {
+        if ($line =~ /<IP_ADDRESS VALUE="($ip_address_pattern)"\/>/) {
+            $interface->{IPADDRESS} = $1 unless $1 eq '0.0.0.0';
+        }
+        if ($line =~ /<SUBNET_MASK VALUE="($ip_address_pattern)"\/>/) {
+            $interface->{IPMASK} = $1;
+        }
+        if ($line =~ /<GATEWAY_IP_ADDRESS VALUE="($ip_address_pattern)"\/>/) {
+            $interface->{IPGATEWAY} = $1;
+        }
+        if ($line =~ /<NIC_SPEED VALUE="([0-9]+)"\/>/) {
+            $interface->{SPEED} = $1;
+        }
+        if ($line =~ /<ENABLE_NIC VALUE="Y"\/>/) {
+            $interface->{STATUS} = 'Up';
+        }
+        if ($line =~ /not found/) {
+            chomp $line;
+            $params{logger}->error("error in hponcfg output: $line")
+                if $params{logger};
+        }
+    }
+    close $handle;
+    $interface->{IPSUBNET} = getSubnetAddress(
+        $interface->{IPADDRESS}, $interface->{IPMASK}
+    );
+
+    return $interface;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $entry = _parseHponcfg(
+        logger => $logger,
+        command => 'hponcfg -aw -'
+    );
+
+    $inventory->addEntry(
+        section => 'NETWORKS',
+        entry   => $entry
+    );
+}
+
+1;

@@ -0,0 +1,220 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Networks;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Network;
+use FusionInventory::Agent::Tools::Unix;
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{network};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @interfaces = _getInterfaces(logger => $logger);
+    foreach my $interface (@interfaces) {
+        $inventory->addEntry(
+            section => 'NETWORKS',
+            entry   => $interface
+        );
+    }
+
+    my $routes = getRoutingTable(command => 'netstat -nr', logger => $logger);
+    $inventory->setHardware({
+        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
+    });
+}
+
+sub _getInterfaces {
+    my (%params) = @_;
+
+    my $logger = $params{logger};
+
+    my @interfaces = _getInterfacesBase(logger => $logger);
+
+    foreach my $interface (@interfaces) {
+        $interface->{IPSUBNET} = getSubnetAddress(
+            $interface->{IPADDRESS},
+            $interface->{IPMASK}
+        );
+
+        $interface->{IPDHCP} = getIpDhcp(
+            $logger,
+            $interface->{DESCRIPTION}
+        );
+
+        # check if it is a physical interface
+        if (-d "/sys/class/net/$interface->{DESCRIPTION}/device") {
+            my $info = _getUevent($interface->{DESCRIPTION});
+            $interface->{DRIVER}  = $info->{DRIVER}
+                if $info->{DRIVER};
+            $interface->{PCISLOT} = $info->{PCI_SLOT_NAME}
+                if $info->{PCI_SLOT_NAME};
+            $interface->{PCIID} =
+                $info->{PCI_ID} . ':' . $info->{PCI_SUBSYS_ID}
+                if $info->{PCI_SUBSYS_ID} && $info->{PCI_ID};
+
+            $interface->{VIRTUALDEV} = 0;
+
+            # check if it is a wifi interface, otherwise assume ethernet
+            if (-d "/sys/class/net/$interface->{DESCRIPTION}/wireless") {
+                $interface->{TYPE} = 'wifi';
+                my $info = _parseIwconfig(name => $interface->{DESCRIPTION});
+                $interface->{WIFI_MODE}    = $info->{mode};
+                $interface->{WIFI_SSID}    = $info->{SSID};
+                $interface->{WIFI_BSSID}   = $info->{BSSID};
+                $interface->{WIFI_VERSION} = $info->{version};
+            } elsif (-f "/sys/class/net/$interface->{DESCRIPTION}/mode") {
+                $interface->{TYPE} = 'infiniband';
+            } else {
+                $interface->{TYPE} = 'ethernet';
+            }
+
+        } else {
+            $interface->{VIRTUALDEV} = 1;
+
+            if ($interface->{DESCRIPTION} eq 'lo') {
+                $interface->{TYPE} = 'loopback';
+            }
+
+            if ($interface->{DESCRIPTION} =~ m/^ppp/) {
+                $interface->{TYPE} = 'dialup';
+            }
+
+            # check if it is an alias or a tagged interface
+            if ($interface->{DESCRIPTION} =~ m/^([\w\d]+)[:.]\d+$/) {
+                $interface->{TYPE} = 'alias';
+                $interface->{BASE} = $1;
+             }
+            # check if is is a bridge
+            if (-d "/sys/class/net/$interface->{DESCRIPTION}/brif") {
+                $interface->{SLAVES} = _getSlaves($interface->{DESCRIPTION});
+                $interface->{TYPE}   = 'bridge';
+            }
+
+            # check if it is a bonding master
+            if (-d "/sys/class/net/$interface->{DESCRIPTION}/bonding") {
+                $interface->{SLAVES} = _getSlaves($interface->{DESCRIPTION});
+                $interface->{TYPE}   = 'aggregate';
+            }
+        }
+
+        # check if it is a bonding slave
+        if (-d "/sys/class/net/$interface->{DESCRIPTION}/bonding_slave") {
+            $interface->{MACADDR} = getFirstMatch(
+                command => "ethtool -P $interface->{DESCRIPTION}",
+                pattern => qr/^Permanent address: ($mac_address_pattern)$/,
+                logger  => $logger
+            );
+        }
+
+        if (-r "/sys/class/net/$interface->{DESCRIPTION}/speed") {
+            $interface->{SPEED} = getFirstLine(
+                file => "/sys/class/net/$interface->{DESCRIPTION}/speed"
+            );
+        }
+    }
+
+    return @interfaces;
+}
+
+sub _getInterfacesBase {
+    my (%params) = @_;
+
+    my $logger = $params{logger};
+    $logger->debug("retrieving interfaces list:");
+
+    if (canRun('/sbin/ip')) {
+        my @interfaces = getInterfacesFromIp(logger => $logger);
+        $logger->debug_result(
+            action => 'running /sbin/ip command',
+            data   => scalar @interfaces
+        );
+        return @interfaces if @interfaces;
+    } else {
+        $logger->debug_result(
+            action => 'running /sbin/ip command',
+            status => 'command not available'
+        );
+    }
+
+    if (canRun('/sbin/ifconfig')) {
+        my @interfaces = getInterfacesFromIfconfig(logger => $logger);
+        $logger->debug_result(
+            action => 'running /sbin/ifconfig command',
+            data   => scalar @interfaces
+        );
+        return @interfaces if @interfaces;
+    } else {
+        $logger->debug_result(
+            action => 'running /sbin/ifconfig command',
+            status => 'command not available'
+        );
+    }
+
+    return;
+}
+
+sub _getSlaves {
+    my ($name) = @_;
+
+    my @slaves =
+        map { $_ =~ /\/lower_(\w+)$/ }
+        glob("/sys/class/net/$name/lower_*");
+
+    return join (",", @slaves);
+}
+
+sub _getUevent {
+    my ($name) = @_;
+
+    my $file = "/sys/class/net/$name/device/uevent";
+    my $handle = getFileHandle(file => $file);
+    return unless $handle;
+
+    my $info;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(\w+)=(\S+)$/;
+        $info->{$1} = $2;
+    }
+    close $handle;
+
+    return $info;
+}
+
+sub _parseIwconfig {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(
+        %params,
+        command => $params{name} ? "iwconfig $params{name}" : undef
+    );
+    return unless $handle;
+
+    my $info;
+    while (my $line = <$handle>) {
+        $info->{version} = $1
+            if $line =~ /IEEE (\S+)/;
+        $info->{SSID} = $1
+            if $line =~ /ESSID:"([^"]+)"/;
+        $info->{mode} = $1
+            if $line =~ /Mode:(\S+)/;
+        $info->{BSSID} = $1
+            if $line =~ /Access Point: ($mac_address_pattern)/;
+    }
+
+    close $handle;
+
+    return $info;
+}
+
+1;

@@ -0,0 +1,43 @@
+package FusionInventory::Agent::Task::Inventory::Linux::PowerPC::Bios;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $bios;
+
+    $bios->{SSN} = getFirstLine(file => '/proc/device-tree/serial-number');
+    $bios->{SSN} =~ s/[^\,^\.^\w^\ ]//g; # I remove some unprintable char
+
+    $bios->{SMODEL} = getFirstLine(file => '/proc/device-tree/model');
+    $bios->{SMODEL} =~ s/[^\,^\.^\w^\ ]//g;
+
+    my $colorCode = getFirstLine(file => '/proc/device-tree/color-code');
+    my ($color) = unpack "h7" , $colorCode;
+    $bios->{SMODEL} .= " color: $color" if $color;
+
+    $bios->{BVERSION} =
+        getFirstLine(file => '/proc/device-tree/openprom/model');
+    $bios->{BVERSION} =~ s/[^\,^\.^\w^\ ]//g;
+
+    my $copyright = getFirstLine(file => '/proc/device-tree/copyright');
+    if ($copyright && $copyright =~ /Apple/) {
+        # What about the Apple clone?
+        $bios->{BMANUFACTURER} = "Apple Computer, Inc.";
+        $bios->{SMANUFACTURER} = "Apple Computer, Inc.";
+    }
+
+    $inventory->setBios($bios);
+}
+
+1;

@@ -0,0 +1,60 @@
+package FusionInventory::Agent::Task::Inventory::Linux::PowerPC::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return -r '/proc/cpuinfo';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCPUsFromProc(
+        logger => $logger, file => '/proc/cpuinfo'
+    )) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+sub _getCPUsFromProc {
+    my @cpus;
+    foreach my $cpu (getCPUsFromProc(@_)) {
+
+        my $speed;
+        if (
+            $cpu->{clock} &&
+            $cpu->{clock} =~ /(\d+)/
+        ) {
+            $speed = $1;
+        }
+
+        my $manufacturer;
+        if ($cpu->{machine} &&
+            $cpu->{machine} =~ /IBM/
+        ) {
+            $manufacturer = 'IBM';
+        }
+
+        push @cpus, {
+            ARCH         => 'PowerPC',
+            NAME         => $cpu->{cpu},
+            MANUFACTURER => $manufacturer,
+            SPEED        => $speed
+        };
+    }
+
+    return @cpus;
+}
+
+1;

@@ -0,0 +1,15 @@
+package FusionInventory::Agent::Task::Inventory::Linux::PowerPC;
+
+use strict;
+use warnings;
+
+use Config;
+
+sub isEnabled {
+    return $Config{archname} =~ /^(ppc|powerpc)/;
+}
+
+sub doInventory {
+}
+
+1;

@@ -0,0 +1,97 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Rudder;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return -r '/opt/rudder/etc/uuid.hive';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # get Rudder UUID
+    my $Uuid = getFirstLine(
+        logger => $logger, file => '/opt/rudder/etc/uuid.hive'
+    );
+    # get all agents running on that machine
+    my @agents = _manageAgent(
+        logger => $logger, command => 'ls /var/rudder'
+    );
+    # get machine hostname
+    my $hostname = getFirstLine(
+        logger => $logger, command => 'hostname --fqd'
+    );
+    my $rudder = {
+        HOSTNAME => $hostname,
+        UUID => $Uuid,
+        AGENT => \@agents,
+    };
+
+    $inventory->addEntry(
+        section => 'RUDDER', entry => $rudder
+    );
+}
+
+sub _manageAgent {
+    my $handle = getFileHandle(@_);
+    my %params = @_;
+    my $logger = $params{logger};
+
+    my @agents;
+
+    # each line could be a new agent
+    while(my $name = <$handle>){
+
+        chomp $name;
+        # verify agent name
+        next unless $name =~ /cfengine/;
+
+        # get policy server hostname
+        my $serverHostname = getFirstLine (
+            logger => $logger,
+            file => "/var/rudder/$name/policy_server.dat"
+        );
+        chomp $serverHostname;
+
+        # get policy server uuid
+        my $serverUuid = getFirstLine (
+            logger => $logger,
+            file => '/var/rudder/tmp/uuid.txt'
+        );
+        chomp $serverUuid;
+
+        # get CFengine public key
+        my $cfengineKey = getAllLines(
+            file => "/var/rudder/$name/ppkeys/localhost.pub"
+        );
+
+        # get owner name
+        my $owner = getFirstLine (
+            logger => $logger,
+            command => 'whoami'
+        );
+
+        # build agent from datas
+        my $agent = {
+            AGENT_NAME             => $name,
+            POLICY_SERVER_HOSTNAME => $serverHostname,
+            CFENGINE_KEY           => $cfengineKey,
+            OWNER                  => $owner,
+            POLICY_SERVER_UUID     => $serverUuid,
+        };
+
+        push @agents, $agent;
+
+    }
+
+    close $handle;
+    return @agents;
+}
+
+1;

@@ -0,0 +1,50 @@
+package FusionInventory::Agent::Task::Inventory::Linux::SPARC::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return -r '/proc/cpuinfo';
+};
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCPUsFromProc(
+        logger => $logger, file => '/proc/cpuinfo'
+    )) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+
+}
+
+sub _getCPUsFromProc {
+    my $cpu = (getCPUsFromProc(@_))[0];
+
+    return unless $cpu && $cpu->{'ncpus probed'};
+
+    my @cpus;
+    foreach (1 .. $cpu->{'ncpus probed'}) {
+        push @cpus, {
+            ARCH => 'SPARC',
+            NAME => $cpu->{cpu},
+        };
+    }
+
+    return @cpus;
+}
+
+
+
+1;

@@ -0,0 +1,15 @@
+package FusionInventory::Agent::Task::Inventory::Linux::SPARC;
+
+use strict;
+use warnings;
+
+use Config;
+
+sub isEnabled {
+    return $Config{archname} =~ /^sparc/;
+};
+
+sub doInventory {
+}
+
+1;

@@ -0,0 +1,97 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Storages::Adaptec;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    return -r '/proc/scsi/scsi';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @devices = getDevicesFromUdev(logger => $logger);
+
+    foreach my $device (@devices) {
+        next unless $device->{MANUFACTURER};
+        next unless
+            $device->{MANUFACTURER} eq 'Adaptec' ||
+            $device->{MANUFACTURER} eq 'Sun'     ||
+            $device->{MANUFACTURER} eq 'ServeRA';
+
+        foreach my $disk (_getDisksFromProc(
+                controller => 'scsi' . $device->{SCSI_COID},
+                name       => $device->{NAME},
+                logger     => $logger
+        )) {
+            # merge with smartctl info
+            my $info = getInfoFromSmartctl(device => $disk->{device});
+            next unless $info->{TYPE} =~ /disk/i;
+            foreach my $key (qw/SERIALNUMBER DESCRIPTION TYPE DISKSIZE MANUFACTURER/) {
+                $disk->{$key} = $info->{$key};
+            }
+            delete $disk->{device};
+            $inventory->addEntry(section => 'STORAGES', entry => $disk);
+        }
+    }
+}
+
+sub _getDisksFromProc {
+    my (%params) = (
+        file => '/proc/scsi/scsi',
+        @_
+    );
+
+    return unless $params{controller};
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @disks;
+    my $disk;
+
+    my $count = -1;
+    while (my $line = <$handle>) {
+        if ($line =~ /^Host: (\w+)/) {
+            $count++;
+            if ($1 eq $params{controller}) {
+                # that's the controller we're looking for
+                $disk = {
+                    NAME        => $params{name},
+                };
+            } else {
+                # that's another controller
+                undef $disk;
+            }
+        }
+
+        if ($line =~ /Model: \s (\S.+\S) \s+ Rev: \s (\S+)/x) {
+            next unless $disk;
+            $disk->{MODEL}    = $1;
+            $disk->{FIRMWARE} = $2;
+
+            # that's the controller itself, not a disk
+            next if $disk->{MODEL} =~ /raid|virtual/i;
+
+            $disk->{MANUFACTURER} = getCanonicalManufacturer(
+                $disk->{MODEL}
+            );
+            $disk->{device} = "/dev/sg$count";
+
+            push @disks, $disk;
+        }
+    }
+    close $handle;
+
+    return @disks;
+}
+
+1;

@@ -0,0 +1,72 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Storages::Lsilogic;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    return canRun('mpt-status');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @devices = getDevicesFromUdev(logger => $logger);
+
+    foreach my $device (@devices) {
+        foreach my $disk (_getDiskFromMptStatus(
+            name    => $device->{NAME},
+            logger  => $logger,
+            command => "mpt-status -n -i $device->{SCSI_UNID}"
+        )) {
+            # merge with smartctl info
+            my $info = getInfoFromSmartctl(device => $disk->{device});
+            foreach my $key (qw/SERIALNUMBER DESCRIPTION TYPE/) {
+                $disk->{$key} = $info->{$key};
+            }
+            delete $disk->{device};
+            $inventory->addEntry(section => 'STORAGES', entry => $disk);
+        }
+    }
+
+}
+
+sub _getDiskFromMptStatus {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    next unless $handle;
+
+    my @disks;
+    while (my $line = <$handle>) {
+        next unless $line =~ /
+            phys_id:(\d+) \s
+            scsi_id:\d+ \s
+            vendor:\S+ \s+
+            product_id:(\S.+\S) \s+
+            revision:(\S+) \s+
+            size\(GB\):(\d+)
+        /x;
+
+        my $disk = {
+            NAME         => $params{name},
+            device       => "/dev/sg$1",
+            MODEL        => $2,
+            MANUFACTURER => getCanonicalManufacturer($2),
+            FIRMWARE     => $3,
+            DISKSIZE     => $4 * 1024
+        };
+
+        push @disks, $disk;
+    }
+    close $handle;
+
+    return @disks;
+}
+
+1;

@@ -0,0 +1,205 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Storages::Megacli;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('megacli');
+}
+
+# The module gets a disk data from `megacli -PDlist` and `megacli -ShowSummary`.
+# `PDlist` provides s/n and model in a single 'Inquiry Data' string, and
+# `ShowSummary` helps to "separate the wheat from the chaff". (Wish there was
+# an easier way).
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $count = getFirstMatch(
+        command => "megacli -adpCount",
+        pattern => qr/Controller Count: (\d+)/
+    );
+    return unless $count;
+
+    my (%adapter, %summary, %pdlist, $storage);
+    for (my $adp = 0; $adp < $count; $adp++) {
+        $adapter{$adp} = _getAdpEnclosure( adp => $adp );
+        $summary{$adp} = _getSummary( adp => $adp );
+        $pdlist{$adp}  = _getPDlist( adp => $adp );
+    }
+
+    while (my ($adp_id, $adp) =  each %adapter) {
+        while (my ($pd_id, $pd) = each %{$pdlist{$adp_id}}) {
+            my ($firmware, $size, $model, $vendor);
+
+            # Raw Size: 232.885 GB [0x1d1c5970 Sectors]
+            ($size) = ($pd->{'Raw Size'} =~ /^(.+) \[/);
+            $size = getCanonicalSize($size);
+            $firmware = $pd->{'Device Firmware Level'};
+
+            $storage = {
+                TYPE         => 'disk',
+                FIRMWARE     => $firmware,
+                DESCRIPTION  => $pd->{'PD Type'},
+                DISKSIZE     => $size,
+            };
+
+            # Lookup the disk info in 'ShowSummary'
+            while (my ($sum_id, $sum) = each %{$summary{$adp_id}}) {
+                next unless
+                    $adp->{$sum->{encl_id}} == $pd->{'Enclosure Device ID'} &&
+                    $sum->{encl_pos}        == $pd->{'Enclosure position'} &&
+                    $sum->{slot}            == $pd->{'Slot Number'};
+
+                # 'HUC101212CSS'  <-- note it is incomplete
+                $model  = $sum->{'Product Id'};
+
+                # 'HGST    HUC101212CSS600 U5E0KZGLG2HE'
+                my $serial = $pd->{'Inquiry Data'};
+                $serial =~ s/$firmware//;        # remove firmware part
+
+                if ($sum->{'Vendor Id'} ne 'ATA') {
+                    $vendor = $sum->{'Vendor Id'};
+                    $serial =~ s/$vendor//;      # remove vendor part
+                }
+
+                $serial =~ s/$model[^ ]*//;      # remove model part
+                $serial =~ s/\s//g;              # remove remaining spaces
+                $storage->{SERIALNUMBER} = $serial;
+
+                # Restore complete model name:
+                # HUC101212CSS --> HUC101212CSS600
+                if ($pd->{'Inquiry Data'} =~ /($sum->{'Product Id'}(?:[^ ]*))/) {
+                    $model = $1;
+                    $model =~ s/^\s+//;
+                    $model =~ s/\s+$//;
+                }
+
+                last;
+            }
+
+            # When Product ID ($model) looks like 'INTEL SSDSC2CW24'
+            if ($model =~ /^(\S+)\s+(\S+)$/) {
+                $vendor = $1;        # 'INTEL'
+                $model  = $2;        # 'SSDSC2CW24'
+            }
+
+            $storage->{NAME}  = $model;
+            $storage->{MODEL} = $model;
+            $storage->{MANUFACTURER} = defined $vendor ?
+                getCanonicalManufacturer($vendor) :
+                getCanonicalManufacturer($model);
+
+            $inventory->addEntry(
+                section => 'STORAGES',
+                entry   => $storage,
+            );
+        }
+    }
+}
+
+sub _getAdpEnclosure {
+    my (%params) = @_;
+
+    my $command = $params{adp} ? "megacli -EncInfo -a$params{adp}" : undef;
+
+    my $handle = getFileHandle(
+        command => $command,
+        %params
+    );
+    return unless $handle;
+
+    my %enclosure;
+    my $encl_id;
+    while (my $line = <$handle>) {
+        chomp $line;
+
+        if ($line =~ /Enclosure (\d+):/) {
+            $encl_id = $1;
+        }
+
+        if ($line =~ /Device ID\s+:\s+(\d+)/) {
+            $enclosure{$encl_id} = $1;
+        }
+    }
+    close $handle;
+
+    return \%enclosure;
+}
+
+sub _getSummary {
+    my (%params) = @_;
+
+    my $command = $params{adp} ? "megacli -ShowSummary -a$params{adp}" : undef;
+
+    my $handle = getFileHandle(
+        command => $command,
+        %params
+    );
+    return unless $handle;
+
+    # fast forward to relevant section
+    while (my $line = <$handle>) {
+        last if $line =~ /^\s+PD\s+$/;
+    }
+
+    my %drive;
+    my $n = -1;
+    while (my $line = <$handle>) {
+        # end of relevant section
+        last if $line =~ /^Storage$/;
+        chomp $line;
+
+        $n++ if $line =~ /Connector\s*:/;
+
+        if ($line =~ /Connector\s*:\s*(\d+)(?:<Internal>)?<Encl Pos (\d+) >: Slot (\d+)/) {
+            $drive{$n} = {
+                encl_id  => $1,
+                encl_pos => $2,
+                slot     => $3,
+            };
+            $drive{$n}->{'encl_id'} += 0;  # drop leading zeroes
+        } elsif ($line =~ /^\s*(.+[^ ])\s*:\s*(.+[^ ])/) {
+            $drive{$n}->{$1} = $2;
+        }
+    }
+    close $handle;
+
+    #delete non-disks
+    foreach my $i (keys %drive) {
+        delete $drive{$i} unless defined $drive{$i}->{'slot'};
+    }
+
+    return \%drive;
+}
+
+sub _getPDlist {
+    my (%params) = @_;
+
+    my $command = $params{adp} ? "megacli -PDlist -a$params{adp}" : undef;
+
+    my $handle = getFileHandle(
+        command => $command,
+        %params
+    );
+    return unless $handle;
+
+    my %pdlist;
+    my $n = 0;
+    while (my $line = <$handle>) {
+        chomp $line;
+        next unless $line =~ /^([^:]+)\s*:\s*(.+[^ ])/;
+        my $key = $1;
+        my $val = $2;
+        $n++ if $key =~ /Enclosure Device ID/;
+        $pdlist{$n}->{$key} = $val;
+    }
+    close $handle;
+
+    return \%pdlist;
+}
+
+1;

@@ -0,0 +1,58 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Storages::Megaraid;
+
+# Authors: Egor Shornikov <se@wbr.su>, Egor Morozov <akrus@flygroup.st>
+# License: GPLv2+
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Task::Inventory::Linux::Storages;
+
+sub isEnabled {
+    return canRun('megasasctl');
+}
+
+sub _parseMegasasctl {
+    my $handle = getFileHandle(
+        command => 'megasasctl -v',
+        @_
+    );
+    return unless $handle;
+
+    my @storages;
+    while (my $line = <$handle>) {
+        unless( $line =~ /\s*([a-z]\d[a-z]\d+[a-z]\d+)\s+(\S+)\s+(\S+)\s*(\S+)\s+\S+\s+\S+\s*/ ){ next; }
+        my ( $disk_addr, $vendor, $model, $size ) = ( $1, $2, $3, $4 );
+
+        if ( $size =~ /(\d+)GiB/ ){
+            $size = $1 * 1024;
+        }
+
+        my $storage;
+        $storage->{NAME} = $disk_addr;
+        $storage->{MANUFACTURER} = $vendor;
+        $storage->{MODEL} = $model;
+        $storage->{DESCRIPTION} = 'SAS';
+        $storage->{TYPE} = 'disk';
+        $storage->{DISKSIZE} = $size;
+
+        push @storages, $storage;
+    }
+    close $handle;
+
+    return @storages;
+
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    foreach my $storage (_parseMegasasctl(@_)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $storage);
+    }
+}
+
+1;

@@ -0,0 +1,91 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Storages::ServeRaid;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Task::Inventory::Linux::Storages;
+
+# Tested on 2.6.* kernels
+#
+# Cards tested :
+#
+# IBM ServeRAID-6M
+# IBM ServeRAID-6i
+
+sub isEnabled {
+    return canRun('ipssend');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle1 = getFileHandle(
+        logger => $logger,
+        command => 'ipssend GETVERSION'
+    );
+    return unless $handle1;
+
+    while (my $line1 = <$handle1>) {
+
+# Example Output :
+# Found 1 IBM ServeRAID controller(s).
+#----------------------------------------------------------------------
+#ServeRAID Controller(s) Version Information
+#----------------------------------------------------------------------
+#   Controlling BIOS version       : 7.00.14
+        #
+#ServeRAID Controller Number 1
+#   Controller type                : ServeRAID-6M
+#   Controller slot information    : 2
+#   Actual BIOS version            : 7.00.14
+#   Firmware version               : 7.00.14
+#   Device driver version          : 7.10.18
+        next unless /ServeRAID Controller Number\s(\d*)/;
+        my $slot = $1;
+
+        my $storage;
+        my $handle2 = getFileHandle(
+            logger => $logger,
+            command => "ipssend GETCONFIG $slot PD"
+        );
+        next unless $handle2;
+
+        while (my $line2 =~ <$handle2>) {
+# Example Output :
+#   Channel #1:
+#      Target on SCSI ID 0
+#         Device is a Hard disk
+#         SCSI ID                  : 0
+#         PFA (Yes/No)             : No
+#         State                    : Online (ONL)
+#         Size (in MB)/(in sectors): 34715/71096368
+#         Device ID                : IBM-ESXSCBR036C3DFQDB2Q6CDKM
+#         FRU part number          : 32P0729
+
+            if ($line2 =~ /Size.*:\s(\d*)\/(\d*)/) {
+                $storage->{DISKSIZE} = $1;
+            } elsif ($line2 =~ /Device ID.*:\s(.*)/) {
+                $storage->{SERIALNUMBER} = $1;
+            } elsif ($line2 =~ /FRU part number.*:\s(.*)/) {
+                $storage->{MODEL} = $1;
+                $storage->{MANUFACTURER} = getCanonicalManufacturer(
+                    $storage->{SERIALNUMBER}
+                );
+                $storage->{NAME} = $storage->{MANUFACTURER} . ' ' . $storage->{MODEL};
+                $storage->{DESCRIPTION} = 'SCSI';
+                $storage->{TYPE} = 'disk';
+
+                $inventory->addEntry(section => 'STORAGES', entry => $storage);
+                undef $storage;
+            }
+        }
+        close $handle2;
+    }
+    close $handle1;
+}
+
+1;

@@ -0,0 +1,177 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Storages;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Generic;
+use FusionInventory::Agent::Tools::Linux;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{storage};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $device (_getDevices(logger => $logger)) {
+        $inventory->addEntry(section => 'STORAGES', entry => $device);
+    }
+}
+
+sub _getDevices {
+    my (%params) = @_;
+
+    my $logger    = $params{logger};
+
+    my @devices = _getDevicesBase(logger => $logger);
+
+    # complete with udev for missing bits, if available
+    if (-d '/dev/.udev/db/') {
+
+        my %udev_devices = map { $_->{NAME} => $_ }
+            getDevicesFromUdev(logger => $logger);
+
+        foreach my $device (@devices) {
+            # find corresponding udev entry
+            my $udev_device = $udev_devices{$device->{NAME}};
+            next unless $udev_device;
+
+            foreach my $key (keys %$udev_device) {
+                next if $device->{$key};
+                $device->{$key} = $udev_device->{$key};
+            }
+        }
+    }
+
+    # get serial & firmware numbers from hdparm, if available
+    if (_correctHdparmAvailable()) {
+        foreach my $device (@devices) {
+            next if $device->{SERIALNUMBER} && $device->{FIRMWARE};
+            my $info = getHdparmInfo(
+                device => "/dev/" . $device->{NAME},
+                logger  => $logger
+            );
+
+            $device->{SERIALNUMBER} = $info->{serial}
+                if $info->{serial} && !$device->{SERIALNUMBER};
+
+            $device->{FIRMWARE} = $info->{firmware}
+                if $info->{firmware} && !$device->{FIRMWARE};
+
+            $device->{DESCRIPTION} = $info->{transport} if $info->{transport};
+            $device->{MODEL}       = $info->{model} if $info->{model};
+            $device->{WWN}         = $info->{wwn} if $info->{wwn};
+        }
+    }
+
+    foreach my $device (@devices) {
+        if (!$device->{DESCRIPTION}) {
+            $device->{DESCRIPTION} = _getDescription(
+                $device->{NAME},
+                $device->{MANUFACTURER},
+                $device->{DESCRIPTION},
+                $device->{SERIALNUMBER}
+            );
+        }
+
+        if (!$device->{MANUFACTURER} or $device->{MANUFACTURER} eq 'ATA') {
+            $device->{MANUFACTURER} = getCanonicalManufacturer(
+                $device->{MODEL}
+            );
+        }
+
+        if (!$device->{DISKSIZE} && $device->{TYPE} !~ /^cd/) {
+            $device->{DISKSIZE} = getDeviceCapacity(device => '/dev/' . $device->{NAME});
+        }
+    }
+
+    return @devices;
+}
+
+sub _getDevicesBase {
+    my (%params) = @_;
+
+    my $logger = $params{logger};
+    $logger->debug("retrieving devices list:");
+
+    if (-d '/sys/block') {
+        my @devices = getDevicesFromProc(logger => $logger);
+        $logger->debug_result(
+            action => 'reading /sys/block content',
+            data   => scalar @devices
+        );
+        return @devices if @devices;
+    } else {
+        $logger->debug_result(
+            action => 'reading /sys/block content',
+            status => 'directory not available'
+        );
+    }
+
+    if (canRun('/usr/bin/lshal')) {
+        my @devices = getDevicesFromHal(logger => $logger);
+        $logger->debug_result(
+            action => 'running lshal command',
+            data   => scalar @devices
+        );
+        return @devices if @devices;
+    } else {
+        $logger->debug_result(
+            action => 'running lshal command',
+            status => 'command not available'
+        );
+    }
+
+    return;
+}
+
+sub _getDescription {
+    my ($name, $manufacturer, $description, $serialnumber) = @_;
+
+    # detected as USB by udev
+    # TODO maybe we should trust udev detection by default?
+    return "USB" if ($description && $description =~ /usb/i);
+
+    if ($name =~ /^s/) { # /dev/sd* are SCSI _OR_ SATA
+        if (
+            ($manufacturer && $manufacturer =~ /ATA/) ||
+            ($serialnumber && $serialnumber =~ /ATA/) ||
+            ($description && $description =~ /ATA/)
+        ) {
+            return "SATA";
+        } else {
+            return "SCSI";
+        }
+    } elsif ($name =~ /^vd/) {
+            return "Virtual";
+    } else {
+        return "IDE";
+    }
+}
+
+# some hdparm release generated kernel error if they are
+# run on CDROM device
+# http://forums.ocsinventory-ng.org/viewtopic.php?pid=20810
+sub _correctHdparmAvailable {
+    return unless canRun('hdparm');
+
+    my ($major, $minor) = getFirstMatch(
+        command => 'hdparm -V',
+        pattern => qr/^hdparm v(\d+)\.(\d+)/
+    );
+
+    # we need at least version 9.15
+    return compareVersion($major, $minor, 9, 15);
+
+}
+
+1;

@@ -0,0 +1,35 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Uptime;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return -r '/proc/uptime';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $uptime = _getUptime(file => '/proc/uptime');
+    $inventory->setOperatingSystem({
+        BOOT_TIME => $uptime
+    });
+}
+
+sub _getUptime {
+    my $uptime = getFirstMatch(
+        pattern => qr/^(\S+)/,
+        @_
+    );
+    return unless $uptime;
+
+    return getFormatedLocalTime(int(time - $uptime));
+}
+
+1;

@@ -0,0 +1,163 @@
+package FusionInventory::Agent::Task::Inventory::Linux::Videos;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{video};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    $logger->debug("retrieving display information:");
+
+    my $ddcprobeData;
+    if (canRun('ddcprobe')) {
+        $ddcprobeData = _getDdcprobeData(
+            command => 'ddcprobe',
+            logger  => $logger
+        );
+         $logger->debug_result(
+             action => 'running ddcprobe command',
+             data   => $ddcprobeData
+         );
+    } else {
+        $logger->debug_result(
+             action => 'running ddcprobe command',
+             status => 'command not available'
+        );
+    }
+
+    my $xorgData;
+
+    my $xorgPid;
+    foreach my $process (getProcesses(logger  => $logger)) {
+        next unless $process->{CMD} =~ m{
+            ^
+            (?:
+                /usr/bin
+                |
+                /usr/X11R6/bin
+                |
+                /etc/X11
+            )
+            /X
+        }x;
+        $xorgPid = $process->{PID};
+        last;
+    }
+
+    if ($xorgPid) {
+        my $link = "/proc/$xorgPid/fd/0";
+        if (-r $link) {
+            $xorgData = _parseXorgFd(file => $link);
+            $logger->debug_result(
+                 action => 'reading Xorg log file',
+                 data   => $xorgData
+            );
+        } else {
+            $logger->debug_result(
+                 action => 'reading Xorg log file',
+                 status => "non-readable link $link"
+            );
+        }
+    } else {
+        $logger->debug_result(
+             action => 'reading Xorg log file',
+             status => 'unable to get Xorg PID'
+        );
+    }
+
+    return unless $xorgData || $ddcprobeData;
+
+    my $video = {
+        CHIPSET    => $xorgData->{product}    || $ddcprobeData->{product},
+        MEMORY     => $xorgData->{memory}     || $ddcprobeData->{memory},
+        NAME       => $xorgData->{name}       || $ddcprobeData->{oem},
+        RESOLUTION => $xorgData->{resolution} || $ddcprobeData->{dtiming},
+        PCISLOT    => $xorgData->{pcislot},
+        PCIID      => $xorgData->{pciid},
+    };
+
+    if ($video->{MEMORY} && $video->{MEMORY} =~ s/kb$//i) {
+        $video->{MEMORY} = int($video->{MEMORY} / 1024);
+    }
+    if ($video->{RESOLUTION}) {
+        $video->{RESOLUTION} =~ s/@.*//;
+    }
+
+    $inventory->addEntry(
+        section => 'VIDEOS',
+        entry   => $video
+    );
+}
+
+sub _getDdcprobeData {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my $data;
+    while (my $line = <$handle>) {
+        $line =~ s/[[:cntrl:]]//g;
+        $line =~ s/[^[:ascii:]]//g;
+        $data->{$1} = $2 if $line =~ /^(\S+):\s+(.*)/;
+    }
+    close $handle;
+
+    return $data;
+}
+
+sub _parseXorgFd {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my $data;
+    while (my $line = <$handle>) {
+        if ($line =~ /Modeline\s"(\S+?)"/) {
+            $data->{resolution} = $1 if !$data->{resolution};
+        } elsif ($line =~ /Integrated Graphics Chipset:\s+(.*)/) {
+            # Intel
+            $data->{name} = $1;
+        } elsif ($line =~ /Virtual screen size determined to be (\d+)\s*x\s*(\d+)/) {
+            # Nvidia
+            $data->{resolution} = "$1x$2";
+        } elsif ($line =~ /NVIDIA GPU\s*(.*?)\s*at/) {
+            $data->{name} = $1;
+        } elsif ($line =~ /VESA VBE OEM:\s*(.*)/) {
+            $data->{name} = $1;
+        } elsif ($line =~ /VESA VBE OEM Product:\s*(.*)/) {
+            $data->{product} = $1;
+        } elsif ($line =~ /VESA VBE Total Mem: (\d+)\s*(\w+)/i) {
+            $data->{memory} = $1 . $2;
+        } elsif ($line =~ /RADEON\(0\): Chipset: "(.*?)"/i) {
+            # ATI /Radeon
+            $data->{name} = $1;
+        } elsif ($line =~ /Virtual size is (\S+)/i) {
+            # VESA / XFree86
+            $data->{resolution} = $1;
+        } elsif ($line =~ /
+            PCI: \* \( (?:\d+:)? (\d+) : (\d+) : (\d+) \) \s
+            (\w{4}:\w{4}:\w{4}:\w{4})?
+        /x) {
+            $data->{pcislot} = sprintf("%02d:%02d.%d", $1, $2, $3);
+            $data->{pciid}   = $4 if $4;
+        } elsif ($line =~ /NOUVEAU\(0\): Chipset: "(.*)"/) {
+            # Nouveau
+            $data->{product} = $1;
+        }
+    }
+    close $handle;
+
+    return $data;
+}
+
+1;

@@ -0,0 +1,125 @@
+package FusionInventory::Agent::Task::Inventory::Linux::i386::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+use FusionInventory::Agent::Tools::Generic;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return -r '/proc/cpuinfo';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCPUs(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+sub _getCPUs {
+    my (%params) = @_;
+
+    my @cpusFromDmidecode = $params{dmidecode} ?
+        getCpusFromDmidecode(file => $params{dmidecode}) :
+        getCpusFromDmidecode();
+    my @cpusFromProc      = $params{cpuinfo} ?
+        getCPUsFromProc(file => $params{cpuinfo}) :
+        getCPUsFromProc();
+
+    my @physicalCPUs = _getPhysicalCPUs(@cpusFromProc);
+    my @baseCPUs = @cpusFromDmidecode ?
+        @cpusFromDmidecode : @physicalCPUs;
+
+    my $info = $cpusFromProc[-1];
+
+    my $cpt = 0;
+    my @cpus;
+
+    foreach my $cpu (@baseCPUs) {
+
+        if ($info->{vendor_id}) {
+            $info->{vendor_id} =~ s/Genuine//;
+            $info->{vendor_id} =~ s/(TMx86|TransmetaCPU)/Transmeta/;
+            $info->{vendor_id} =~ s/CyrixInstead/Cyrix/;
+            $info->{vendor_id} =~ s/CentaurHauls/VIA/;
+            $info->{vendor_id} =~ s/AuthenticAMD/AMD/;
+
+            $cpu->{MANUFACTURER} = $info->{vendor_id};
+        }
+
+        if ($info->{'model name'}) {
+            $cpu->{NAME} = $info->{'model name'};
+        }
+
+        # Get directly informations from cpuinfo if not already processed
+        # in dmidecode
+        $cpu->{CORE} = $cpusFromProc[$cpt]{CORE}
+            unless $cpu->{CORE};
+        $cpu->{THREAD} = $cpusFromProc[$cpt]{THREAD}
+            unless $cpu->{THREAD};
+        $cpu->{STEPPING} = $cpusFromProc[$cpt]{STEPPING}
+            unless $cpu->{STEPPING} ;
+        $cpu->{FAMILYNUMBER} = $cpusFromProc[$cpt]{FAMILYNUMBER}
+            unless $cpu->{FAMILYNUMBER};
+        $cpu->{MODEL} = $cpusFromProc[$cpt]{MODEL}
+            unless $cpu->{MODEL};
+
+        if ($cpu->{NAME} =~ /([\d\.]+)s*(GHZ)/i) {
+            $cpu->{SPEED} = {
+               ghz => 1000,
+               mhz => 1,
+            }->{lc($2)} * $1;
+        }
+
+        $cpu->{ARCH} = 'i386';
+
+        push @cpus, $cpu;
+        $cpt++;
+    }
+
+    return @cpus;
+}
+
+sub _getPhysicalCPUs {
+    my (@cpus) = @_;
+
+    my @physical_cpus;
+    my %cpus;
+
+    foreach my $cpu (@cpus) {
+        my $id = $cpu->{'physical id'};
+        if (defined $id) {
+            $cpus{$id}{STEPPING}     = $cpu->{'stepping'};
+            $cpus{$id}{FAMILYNUMBER} = $cpu->{'cpu family'};
+            $cpus{$id}{MODEL}        = $cpu->{'model'};
+            $cpus{$id}{CORE}         = $cpu->{'cpu cores'};
+            $cpus{$id}{THREAD}       = $cpu->{'siblings'} / ($cpu->{'cpu cores'} || 1);
+        } else {
+            push @physical_cpus, {
+                STEPPING     => $cpu->{'stepping'},
+                FAMILYNUMBER => $cpu->{'cpu family'},
+                MODEL        => $cpu->{'model'},
+                CORE         => 1,
+                THREAD       => 1
+            }
+        }
+    }
+
+    # physical id may not start at 0!
+    push @physical_cpus, values %cpus if %cpus;
+
+    return @physical_cpus;
+}
+
+1;

@@ -0,0 +1,15 @@
+package FusionInventory::Agent::Task::Inventory::Linux::i386;
+
+use strict;
+use warnings;
+
+use Config;
+
+sub isEnabled {
+    return $Config{archname} =~ /^(i\d86|x86_64)/;
+}
+
+sub doInventory {
+}
+
+1;

@@ -0,0 +1,45 @@
+package FusionInventory::Agent::Task::Inventory::Linux::m68k::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Linux;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return -r '/proc/cpuinfo';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCPUsFromProc(
+        logger => $logger, file => '/proc/cpuinfo'
+    )) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+sub _getCPUsFromProc {
+    my @cpus;
+    foreach my $cpu (getCPUsFromProc(@_)) {
+
+        push @cpus, {
+            ARCH  => 'm68k',
+            NAME  => $cpu->{'cpu'},
+            SPEED => $cpu->{'clocking'}
+        };
+    }
+
+    return @cpus;
+}
+
+1;

@@ -0,0 +1,15 @@
+package FusionInventory::Agent::Task::Inventory::Linux::m68k;
+
+use strict;
+use warnings;
+
+use Config;
+
+sub isEnabled {
+    return $Config{archname} =~ /^m68k/;
+}
+
+sub doInventory {
+}
+
+1;

@@ -0,0 +1,59 @@
+package FusionInventory::Agent::Task::Inventory::Linux;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use XML::TreePP;
+
+
+use FusionInventory::Agent::Tools;
+
+our $runAfter = ["FusionInventory::Agent::Task::Inventory::Generic"];
+
+sub isEnabled {
+    return $OSNAME eq 'linux';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $kernelVersion = getFirstLine(command => 'uname -v');
+    my $kernelRelease = getFirstLine(command => 'uname -r');
+
+    my $systemId  = _getRHNSystemId('/etc/sysconfig/rhn/systemid');
+
+    my $boottime =
+        time - getFirstMatch(file => '/proc/uptime', pattern => qr/^(\d+)/);
+
+    $inventory->setHardware({
+        OSVERSION  => $kernelRelease,
+        OSCOMMENTS => $kernelVersion,
+        WINPRODID  => $systemId,
+    });
+
+    $inventory->setOperatingSystem({
+        KERNEL_VERSION => $kernelRelease,
+        BOOT_TIME      => getFormatedLocalTime($boottime)
+    });
+
+}
+
+# Get RedHat Network SystemId
+sub _getRHNSystemId {
+    my ($file) = @_;
+
+    return unless -f $file;
+    my $tpp = XML::TreePP->new();
+    my $h = $tpp->parsefile($file);
+    eval {
+        foreach (@{$h->{params}{param}{value}{struct}{member}}) {
+            next unless $_->{name} eq 'system_id';
+            return $_->{value}{string};
+        }
+    }
+}
+
+1;

@@ -0,0 +1,46 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Bios;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    return canRun('/usr/sbin/system_profiler');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $infos = getSystemProfilerInfos(logger => $logger);
+    my $info = $infos->{'Hardware'}->{'Hardware Overview'};
+
+    my ($device) = getIODevices(
+        class => 'IOPlatformExpertDevice',
+        logger => $logger
+    );
+
+    # set the bios informaiton from the apple system profiler
+    $inventory->setBios({
+        SMANUFACTURER => $device->{'manufacturer'} || 'Apple Inc', # duh
+        SMODEL        => $info->{'Model Identifier'} ||
+                         $info->{'Machine Model'},
+        # New method to get the SSN, because of MacOS 10.5.7 update
+        # system_profiler gives 'Serial Number (system): XXXXX' where 10.5.6
+        # and lower give 'Serial Number: XXXXX'
+        SSN           => $info->{'Serial Number'}          ||
+                         $info->{'Serial Number (system)'} ||
+                         $device->{'serial-number'},
+        BVERSION      => $info->{'Boot ROM Version'},
+    });
+
+    $inventory->setHardware({
+        UUID => $info->{'Hardware UUID'} || $device->{'IOPlatformUUID'}
+    });
+}
+
+1;

@@ -0,0 +1,109 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::CPU;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return canRun('/usr/sbin/system_profiler');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $cpu (_getCpus(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+}
+
+sub _getCpus {
+    my (%params) = @_;
+
+    # system profiler informations
+    my $infos = getSystemProfilerInfos(
+        logger => $params{logger},
+        file   => $params{file}
+    );
+
+    my $sysprofile_info = $infos->{'Hardware'}->{'Hardware Overview'};
+
+    # more informations from sysctl
+    my $handle = getFileHandle(
+        logger  => $params{logger},
+        command => 'sysctl -a machdep.cpu',
+        file    => $params{sysctl}
+    );
+
+    my $sysctl_info;
+    while (my $line = <$handle>) {
+        chomp $line;
+        next unless $line =~ /([^:]+) : \s (.+)/x;
+        $sysctl_info->{$1} = $2;
+    }
+    close $handle;
+
+    my $type  = $sysprofile_info->{'Processor Name'} ||
+                $sysprofile_info->{'CPU Type'};
+    my $procs = $sysprofile_info->{'Number Of Processors'} ||
+                $sysprofile_info->{'Number Of CPUs'}       ||
+                1;
+    my $speed = $sysprofile_info->{'Processor Speed'} ||
+                $sysprofile_info->{'CPU Speed'};
+
+    my $stepping = $sysctl_info->{'machdep.cpu.stepping'};
+    my $family   = $sysctl_info->{'machdep.cpu.family'};
+    my $model    = $sysctl_info->{'machdep.cpu.model'};
+    my $threads  = $sysctl_info->{'machdep.cpu.thread_count'};
+
+    # French Mac returns 2,60 Ghz instead of 2.60 Ghz :D
+    $speed =~ s/,/./;
+    if ($speed =~ /GHz$/i) {
+        $speed =~ s/GHz//i;
+        $speed = $speed * 1000;
+    } elsif ($speed =~ /MHz$/i){
+        $speed =~ s/MHz//i;
+    }
+    $speed =~ s/\s//g;
+
+    my $cores = $sysprofile_info->{'Total Number Of Cores'} ?
+        $sysprofile_info->{'Total Number Of Cores'} / $procs :
+        $sysctl_info->{'machdep.cpu.core_count'};
+
+    my $manufacturer =
+        $type =~ /Intel/i ? "Intel" :
+        $type =~ /AMD/i   ? "AMD"   :
+                            undef   ;
+
+    my @cpus;
+    my $cpu = {
+        CORE         => $cores,
+        MANUFACTURER => $manufacturer,
+        NAME         => $type,
+        THREAD       => $threads,
+        FAMILYNUMBER => $family,
+        MODEL        => $model,
+        STEPPING     => $stepping,
+        SPEED        => $speed
+    };
+
+    for (my $i=0; $i < $procs; $i++) {
+        push @cpus, $cpu;
+    }
+
+    return @cpus;
+
+}
+
+
+
+1;

@@ -0,0 +1,100 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Drives;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{drive};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # get filesystem types
+    my @types =
+        grep { ! /^(?:fdesc|devfs|procfs|linprocfs|linsysfs|tmpfs|fdescfs)$/ }
+        getFilesystemsTypesFromMount(logger => $logger);
+
+    # get filesystems for each type
+    my @filesystems;
+    foreach my $type (@types) {
+        push @filesystems, getFilesystemsFromDf(
+            logger  => $logger,
+            command => "df -P -k -t $type",
+            type    => $type,
+        );
+    }
+
+    my %filesystems = map { $_->{VOLUMN} => $_ } @filesystems;
+
+    foreach my $partition (_getPartitions()) {
+        my $device = "/dev/$partition";
+
+        my $info = _getPartitionInfo(partition => $partition);
+
+        my $filesystem = $filesystems{$device};
+        next unless $filesystem;
+
+        if ($info->{'Total Size'} =~ /^([.\d]+ \s \S+)/x) {
+            $filesystem->{TOTAL} = getCanonicalSize($1);
+        }
+        $filesystem->{SERIAL}     = $info->{'Volume UUID'} ||
+                                    $info->{'UUID'};
+        $filesystem->{FILESYSTEM} = $info->{'File System'} ||
+                                    $info->{'Partition Type'};
+        $filesystem->{LABEL}      = $info->{'Volume Name'};
+    }
+
+    # add filesystems to the inventory
+    foreach my $key (keys %filesystems) {
+        $inventory->addEntry(
+            section => 'DRIVES',
+            entry   => $filesystems{$key}
+        );
+    }
+}
+
+sub _getPartitions {
+    my (%params) = @_;
+
+    my $command = "diskutil list";
+    my $handle = getFileHandle(command => $command, %params);
+    return unless $handle;
+
+    my @devices;
+    while (my $line = <$handle>) {
+        # partition identifiers look like disk0s1
+        next unless $line =~ /(disk \d+ s \d+)$/x;
+        push @devices, $1;
+    }
+    close $handle;
+
+    return @devices;
+}
+
+sub _getPartitionInfo {
+    my (%params) = @_;
+
+    my $command = "diskutil info $params{partition}";
+    my $handle = getFileHandle(command => $command, %params);
+    return unless $handle;
+
+    my $info;
+    while (my $line = <$handle>) {
+        next unless $line =~ /(\S[^:]+) : \s+ (\S.*\S)/x;
+        $info->{$1} = $2;
+    }
+    close $handle;
+
+    return $info;
+}
+
+1;

@@ -0,0 +1,29 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Hostname;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    return canRun('/usr/sbin/system_profiler');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $infos = getSystemProfilerInfos(logger => $logger);
+
+    my $hostname =
+        $infos->{'Software'}->{'System Software Overview'}->{'Computer Name'};
+
+    $inventory->setHardware({
+        NAME => $hostname
+    }) if $hostname;
+}
+
+1;

@@ -0,0 +1,105 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::License;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::License;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{licenseinfo};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # Adobe
+    my @found = getAdobeLicenses(
+        command => 'sqlite3 -separator " <> " "/Library/Application Support/Adobe/Adobe PCD/cache/cache.db" "SELECT * FROM domain_data"'
+    );
+
+    # Transmit
+    my @transmitFiles = glob('/System/Library/User Template/*.lproj/Library/Preferences/com.panic.Transmit.plist');
+
+    if ($params{scan_homedirs}) {
+        push @transmitFiles, glob('/Users/*/Library/Preferences/com.panic.Transmit.plist');
+    } else {
+        $logger->warning(
+            "'scan-homedirs' configuration parameters disabled, " .
+            "ignoring transmit installations in user directories"
+        );
+    }
+
+    foreach my $transmitFile (@transmitFiles) {
+        my $info = _getTransmitLicenses(
+            command => "plutil -convert xml1 -o - '$transmitFile'"
+        );
+        next unless $info;
+        push @found, $info;
+        last; # One installation per machine
+    }
+
+    # VMware
+    my @vmwareFiles = glob('/Library/Application Support/VMware Fusion/license-*');
+    foreach my $vmwareFile (@vmwareFiles) {
+        my %info;
+        # e.g:
+        # LicenseType = "Site"
+        my $handle = getFileHandle(file => $vmwareFile);
+        foreach (<$handle>) {
+            next unless /^(\S+)\s=\s"(.*)"/;
+            $info{$1} = $2;
+        }
+        next unless $info{Serial};
+
+        my $date;
+        if ($info{LastModified} =~ /(^2\d{3})-(\d{1,2})-(\d{1,2}) @ (\d{1,2}):(\d{1,2})/) {
+            $date = getFormatedDate($1, $2, $3, $4, $5, 0);
+        }
+
+        push @found, {
+            NAME            => $info{ProductID},
+            FULLNAME        => $info{ProductID}." (".$info{LicenseVersion}.")",
+            KEY             => $info{Serial},
+            ACTIVATION_DATE => $date
+        }
+    }
+
+    foreach my $license (@found) {
+        $inventory->addEntry(section => 'LICENSEINFOS', entry => $license);
+    }
+}
+
+sub _getTransmitLicenses {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+
+    my %val;
+    my $in;
+    foreach my $line (<$handle>) {
+        if ($in) {
+            $val{$in} = $1 if $line =~ /<string>([\d\w\.-]+)<\/string>/;
+            $in = undef;
+        } elsif ($line =~ /<key>SerialNumber2/) {
+            $in = "KEY";
+        } elsif ($line =~ /<key>PreferencesVersion<\/key>/) {
+            $in = "VERSION";
+        }
+    }
+
+    return unless $val{KEY};
+
+    return {
+        NAME     => "Transmit",
+        FULLNAME => "Panic's Transmit",
+        KEY      => $val{KEY}
+    };
+}
+
+1;

@@ -0,0 +1,95 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Memory;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{memory};
+    return canRun('/usr/sbin/system_profiler');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $memory (_getMemories(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'MEMORIES',
+            entry   => $memory
+        );
+    }
+
+    my $memory = _getMemory(logger => $logger);
+    $inventory->setHardware({
+        MEMORY => $memory,
+    });
+
+}
+
+sub _getMemories {
+    my (%params) = @_;
+
+    my $infos = getSystemProfilerInfos(
+        logger => $params{logger},
+        file   => $params{file}
+    );
+
+    return unless $infos->{Memory};
+
+    # the memory slot informations may appears directly under
+    # 'Memory' top-level node, or under Memory/Memory Slots
+    my $parent_node = $infos->{Memory}->{'Memory Slots'} ?
+        $infos->{Memory}->{'Memory Slots'} :
+        $infos->{Memory};
+
+    my @memories;
+    foreach my $key (sort keys %$parent_node) {
+        next unless $key =~ /DIMM(\d)/;
+        my $slot = $1;
+
+        my $info = $parent_node->{$key};
+        my $description = $info->{'Part Number'};
+
+        # convert hexa to ascii
+        if ($description && $description =~ /^0x/) {
+            $description = pack 'H*', substr($description, 2);
+            $description =~ s/\s*$//;
+        }
+
+        my $memory = {
+            NUMSLOTS     => $slot,
+            DESCRIPTION  => $description,
+            CAPTION      => "Status: $info->{'Status'}",
+            TYPE         => $info->{'Type'},
+            SERIALNUMBER => $info->{'Serial Number'},
+            SPEED        => getCanonicalSpeed($info->{'Speed'}),
+            CAPACITY     => getCanonicalSize($info->{'Size'})
+        };
+
+        push @memories, $memory;
+    }
+
+    return @memories;
+}
+
+sub _getMemory {
+    my (%params) = @_;
+
+    my $infos = getSystemProfilerInfos(
+        logger => $params{logger},
+        file   => $params{file}
+    );
+
+    return getCanonicalSize(
+        $infos->{'Hardware'}{'Hardware Overview'}{'Memory'},
+        1024
+    );
+}
+
+1;

@@ -0,0 +1,112 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Networks;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Network;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{network};
+    return canRun('ifconfig');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @interfaces = _getInterfaces(logger => $logger);
+    foreach my $interface (@interfaces) {
+        $inventory->addEntry(
+            section => 'NETWORKS',
+            entry   => $interface
+        );
+    }
+
+    my $routes = getRoutingTable(logger => $logger);
+    $inventory->setHardware({
+        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
+    });
+}
+
+sub _getInterfaces {
+    my (%params) = @_;
+
+    my @interfaces = _parseIfconfig(
+        command => '/sbin/ifconfig -a',
+        logger  =>  $params{logger}
+    );
+
+    foreach my $interface (@interfaces) {
+        $interface->{IPSUBNET} = getSubnetAddress(
+            $interface->{IPADDRESS},
+            $interface->{IPMASK}
+        );
+    }
+
+    return @interfaces;
+}
+
+sub _parseIfconfig {
+
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @interfaces;
+    my $interface;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /^(\S+):/) {
+            # new interface
+            push @interfaces, $interface if $interface;
+            $interface = {
+                STATUS      => 'Down',
+                DESCRIPTION => $1,
+                VIRTUALDEV  => 1
+            };
+        }
+
+        if ($line =~ /inet ($ip_address_pattern)/) {
+            $interface->{IPADDRESS} = $1;
+        }
+        if ($line =~ /inet6 (\S+)/) {
+            $interface->{IPADDRESS6} = $1;
+            # Drop the interface from the address. e.g:
+            # fe80::1%lo0
+            # fe80::214:51ff:fe1a:c8e2%fw0
+            $interface->{IPADDRESS6} =~ s/%.*$//;
+        }
+        if ($line =~ /netmask 0x($hex_ip_address_pattern)/) {
+            $interface->{IPMASK} = hex2canonical($1);
+        }
+        if ($line =~ /(?:address:|ether|lladdr) ($mac_address_pattern)/) {
+            $interface->{MACADDR} = $1;
+        }
+        if ($line =~ /mtu (\S+)/) {
+            $interface->{MTU} = $1;
+        }
+        if ($line =~ /media (\S+)/) {
+            $interface->{TYPE} = $1;
+        }
+        if ($line =~ /status:\s+active/i) {
+            $interface->{STATUS} = 'Up';
+        }
+        if ($line =~ /supported\smedia:/) {
+            $interface->{VIRTUALDEV} = 0;
+        }
+    }
+    close $handle;
+
+    # last interface
+    push @interfaces, $interface if $interface;
+
+    return @interfaces;
+}
+
+1;

@@ -0,0 +1,41 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Printers;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return
+        !$params{no_category}->{printer} &&
+        canRun('/usr/sbin/system_profiler');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $infos = getSystemProfilerInfos(logger => $logger);
+    my $info = $infos->{Printers};
+
+    foreach my $printer (keys %$info) {
+        next unless ref($info->{printer}) eq 'HASH';
+
+        $inventory->addEntry(
+            section => 'PRINTERS',
+            entry   => {
+                NAME    => $printer,
+                DRIVER  => $info->{$printer}->{PPD},
+                PORT    => $info->{$printer}->{URI},
+            }
+        );
+    }
+
+}
+
+1;

@@ -0,0 +1,60 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Softwares;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return
+        !$params{no_category}->{software} &&
+        canRun('/usr/sbin/system_profiler');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $softwares = _getSoftwaresList(logger => $params{logger});
+    return unless $softwares;
+
+    foreach my $software (@$softwares) {
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => $software
+        );
+    }
+}
+
+sub _getSoftwaresList {
+    my $infos = getSystemProfilerInfos(
+        type => 'SPApplicationsDataType',
+        @_
+    );
+    my $info = $infos->{Applications};
+
+    my @softwares;
+    foreach my $name (keys %$info) {
+        my $app = $info->{$name};
+
+        # Windows application found by Parallels (issue #716)
+        next if
+            $app->{'Get Info String'} &&
+            $app->{'Get Info String'} =~ /^\S+, [A-Z]:\\/;
+
+        push @softwares, {
+            NAME      => $name,
+            VERSION   => $app->{'Version'},
+            COMMENTS  => $app->{'Kind'} ? '[' . $app->{'Kind'} . ']' : undef,
+            PUBLISHER => $app->{'Get Info String'},
+        };
+    }
+
+    return \@softwares;
+}
+
+1;

@@ -0,0 +1,36 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Sound;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{sound};
+    return canRun('/usr/sbin/system_profiler');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $infos = getSystemProfilerInfos(logger => $logger);
+    my $info = $infos->{'Audio (Built In)'};
+
+    foreach my $sound (keys %$info){
+        $inventory->addEntry(
+            section => 'SOUNDS',
+            entry   => {
+                NAME         => $sound,
+                MANUFACTURER => $sound,
+                DESCRIPTION  => $sound,
+            }
+        );
+    }
+}
+
+1;

@@ -0,0 +1,122 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Storages;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{storage};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $storage (_getStorages(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'STORAGES',
+            entry   => $storage
+        );
+    }
+}
+
+sub _getStorages {
+    my (%params) = @_;
+
+    my $infos = getSystemProfilerInfos(
+        logger => $params{logger},
+        file   => $params{file}
+    );
+
+    # system profiler data structure:
+    # bus
+    # └── controller
+    #     ├── device
+    #     │   ├── subdevice
+    #     │   │   └── key:value
+    #     │   └── key:value
+    #     └── key:value
+
+    my @storages;
+    my @busNames = ('ATA', 'SERIAL-ATA', 'USB', 'FireWire', 'Fibre Channel');
+    foreach my $busName (@busNames) {
+        my $bus = $infos->{$busName};
+        next unless $bus;
+        foreach my $controllerName (keys %{$bus}) {
+            my $controller = $bus->{$controllerName};
+            foreach my $deviceName (keys %{$controller}) {
+                my $device = $controller->{$deviceName};
+                next unless ref $device eq 'HASH';
+                if (_isStorage($device)) {
+                    push @storages,
+                        _getStorage($device, $deviceName, $busName);
+                } else {
+                    foreach my $subdeviceName (keys %{$device}) {
+                        my $subdevice = $device->{$subdeviceName};
+                        next unless ref $subdevice eq 'HASH';
+                        push @storages,
+                            _getStorage($subdevice, $subdeviceName, $busName)
+                            if _isStorage($subdevice);
+                    }
+                }
+
+            }
+        }
+    }
+
+    return @storages;
+}
+
+sub _isStorage {
+    my ($device) = @_;
+
+    return
+        ($device->{'BSD Name'} && $device->{'BSD Name'} =~ /^disk\d+$/) ||
+        ($device->{'Protocol'} && $device->{'Socket Type'});
+}
+
+sub _getStorage {
+    my ($device, $device_name, $bus_name) = @_;
+
+    my $storage = {
+        NAME         => $device_name,
+        MANUFACTURER => getCanonicalManufacturer($device_name),
+        TYPE         => $bus_name eq 'FireWire' ? '1394' : $bus_name,
+        SERIAL       => $device->{'Serial Number'},
+        FIRMWARE     => $device->{'Revision'},
+        MODEL        => $device->{'Model'},
+        DISKSIZE     => $device->{'Capacity'}
+    };
+
+    if (!$device->{'Protocol'}) {
+        $storage->{DESCRIPTION} = 'Disk drive';
+    } elsif ($device->{'Protocol'} eq 'ATAPI' || $device->{'Drive Type'}) {
+        $storage->{DESCRIPTION} = 'CD-ROM Drive';
+    }
+
+    if ($storage->{DISKSIZE}) {
+        #e.g: Capacity: 320,07 GB (320 072 933 376 bytes)
+        $storage->{DISKSIZE} =~ s/\s*\(.*//;
+        $storage->{DISKSIZE} =~ s/,/./;
+
+        if ($storage->{DISKSIZE} =~ s/\s*TB//) {
+            $storage->{DISKSIZE} = int($storage->{DISKSIZE} * 1000 * 1000);
+        } elsif ($storage->{DISKSIZE} =~ s/\s+GB$//) {
+            $storage->{DISKSIZE} = int($storage->{DISKSIZE} * 1000 * 1000);
+        }
+    }
+
+    if ($storage->{MODEL}) {
+        $storage->{MODEL} =~ s/\s*$storage->{MANUFACTURER}\s*//i;
+    }
+
+    return $storage;
+}
+
+1;

@@ -0,0 +1,49 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::USB;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+my $seen;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{usb};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $device (_getDevices(logger => $logger)) {
+        # avoid duplicates
+        next if $device->{SERIAL} && $seen->{$device->{SERIAL}}++;
+        $inventory->addEntry(
+            section => 'USBDEVICES',
+            entry   => $device,
+        );
+    }
+}
+
+sub _getDevices {
+
+    return
+        map {
+            {
+                VENDORID  => dec2hex($_->{'idVendor'}),
+                PRODUCTID => dec2hex($_->{'idProduct'}),
+                SERIAL    => $_->{'USB Serial Number'},
+                NAME      => $_->{'USB Product Name'},
+                CLASS     => $_->{'bDeviceClass'},
+                SUBCLASS  => $_->{'bDeviceSubClass'}
+            }
+        }
+        getIODevices(class => 'IOUSBDevice', @_);
+}
+
+1;

@@ -0,0 +1,41 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Uptime;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return getFirstLine(command => 'sysctl -n kern.boottime');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    my $arch = getFirstLine(command => 'uname -m');
+    my $uptime = _getUptime(command => 'sysctl -n kern.boottime');
+    $inventory->setHardware({
+        DESCRIPTION => "$arch/$uptime"
+    });
+}
+
+sub _getBootTime {
+    my $boottime = getFirstMatch(
+        pattern => qr/(\d+)$/,
+        @_,
+    );
+
+    return $boottime;
+}
+
+sub _getUptime {
+    my $boottime = _getBootTime(@_);
+    return unless $boottime;
+
+    my $uptime = time() - $boottime;
+    return getFormatedGMTTime($uptime);
+}
+
+1;

@@ -0,0 +1,87 @@
+package FusionInventory::Agent::Task::Inventory::MacOS::Videos;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{video};
+    return canRun('/usr/sbin/system_profiler');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my %displays = _getDisplays(logger => $logger);
+
+    foreach my $monitor (@{$displays{MONITORS}}) {
+        $inventory->addEntry(
+            section => 'MONITORS',
+            entry   => $monitor,
+        );
+    }
+
+    foreach my $video (@{$displays{VIDEOS}}) {
+        $inventory->addEntry(
+            section => 'VIDEOS',
+            entry   => $video,
+        );
+    }
+}
+
+sub _getDisplays {
+    my (%params) = @_;
+
+    my $infos = getSystemProfilerInfos(
+        logger => $params{logger},
+        file   => $params{file}
+    );
+
+    my @monitors;
+    my @videos;
+
+    foreach my $videoName (keys %{$infos->{'Graphics/Displays'}}) {
+        my $videoCardInfo = $infos->{'Graphics/Displays'}->{$videoName};
+        foreach my $displayName (keys %{$videoCardInfo->{Displays}}) {
+            next if $displayName eq 'Display Connector';
+            next if $displayName eq 'Display';
+            my $displayInfo = $videoCardInfo->{Displays}->{$displayName};
+
+            my $resolution = $displayInfo->{Resolution};
+            if ($resolution) {
+                $resolution =~ s/\ //g;
+                $resolution =~ s/\@.*//g;
+            }
+
+            my $memory = $videoCardInfo->{'VRAM (Total)'};
+            $memory =~ s/\ .*//g if $memory;
+
+            push @videos, {
+                CHIPSET    => $videoCardInfo->{'Chipset Model'},
+                MEMORY     => $memory,
+                NAME       => $videoName,
+                RESOLUTION => $resolution,
+                PCISLOT    => $videoCardInfo->{Slot}
+            };
+
+            push @monitors, {
+                CAPTION     => $displayName,
+                DESCRIPTION => $displayName,
+            }
+        }
+    }
+
+    return (
+        MONITORS => \@monitors,
+        VIDEOS   => \@videos
+    );
+
+}
+
+1;

@@ -0,0 +1,56 @@
+package FusionInventory::Agent::Task::Inventory::MacOS;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::MacOS;
+
+sub isEnabled {
+    return $OSNAME eq 'darwin';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # basic operating system informations
+    my $kernelVersion = getFirstLine(command => 'uname -v');
+    my $kernelRelease = getFirstLine(command => 'uname -r');
+
+    my ($name, $version);
+    my $infos = getSystemProfilerInfos(logger => $logger);
+    my $SystemVersion =
+        $infos->{'Software'}->{'System Software Overview'}->{'System Version'};
+    if ($SystemVersion =~ /^(.*?)\s+(\d+.*)/) {
+        $name = $1;
+        $version = $2;
+    } else {
+        $name = "Mac OS X";
+    }
+
+    my $boottime = getFirstMatch(
+        command => "sysctl -n kern.boottime",
+        pattern => qr/sec = (\d+)/
+    );
+
+    $inventory->setHardware({
+        OSNAME     => $name,
+        OSVERSION  => $version,
+        OSCOMMENTS => $kernelVersion,
+    });
+
+    $inventory->setOperatingSystem({
+        NAME           => "MacOSX",
+        FULL_NAME      => $name,
+        VERSION        => $version,
+        KERNEL_VERSION => $kernelRelease,
+        BOOT_TIME      => getFormatedLocalTime($boottime)
+    });
+}
+
+1;

@@ -0,0 +1,155 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::Bios;
+
+use strict;
+use warnings;
+
+use Config;
+use List::Util qw(first);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Solaris;
+
+sub isEnabled {
+    return
+        canRun('showrev') ||
+        canRun('/usr/sbin/smbios');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $arch = $Config{archname} =~ /^i86pc/ ? 'i386' : 'sparc';
+
+    my ($bios, $hardware);
+
+    if (getZone() eq 'global') {
+        if (canRun('showrev')) {
+            my $infos = _parseShowRev(logger => $logger);
+            $bios->{SMODEL}        = $infos->{'Application architecture'};
+            $bios->{SMANUFACTURER} = $infos->{'Hardware provider'};
+        }
+
+        if ($arch eq "i386") {
+            my $infos = _parseSmbios(logger => $logger);
+
+            my $biosInfos = $infos->{SMB_TYPE_BIOS};
+            $bios->{BMANUFACTURER} = $biosInfos->{'Vendor'};
+            $bios->{BVERSION}      = $biosInfos->{'Version String'};
+            $bios->{BDATE}         = $biosInfos->{'Release Date'};
+
+            my $systemInfos = $infos->{SMB_TYPE_SYSTEM};
+            $bios->{SMANUFACTURER} = $systemInfos->{'Manufacturer'};
+            $bios->{SMODEL}        = $systemInfos->{'Product'};
+            $bios->{SKUNUMBER}     = $systemInfos->{'SKU Number'};
+            $hardware->{UUID}      = $systemInfos->{'UUID'};
+
+            my $motherboardInfos = $infos->{SMB_TYPE_BASEBOARD};
+            $bios->{MMODEL}        = $motherboardInfos->{'Product'};
+            $bios->{MSN}           = $motherboardInfos->{'Serial Number'};
+            $bios->{MMANUFACTURER} = $motherboardInfos->{'Manufacturer'};
+        } else {
+            my $info = getPrtconfInfos(logger => $logger);
+            if ($info) {
+                my $root = first { ref $_ eq 'HASH' } values %$info;
+                $bios->{SMODEL} = $root->{'banner-name'};
+                if ($root->{openprom}->{version} =~
+                    m{OBP \s+ ([\d.]+) \s+ (\d{4})/(\d{2})/(\d{2})}x) {
+                    $bios->{BVERSION} = $1;
+                    $bios->{BDATE}    = join('/', $4, $3, $2);
+                }
+            }
+
+            my $command = -x '/opt/SUNWsneep/bin/sneep' ?
+                '/opt/SUNWsneep/bin/sneep' : 'sneep';
+
+            $bios->{SSN} = getFirstLine(
+                command => $command,
+                logger  => $logger
+            );
+
+            $hardware->{UUID} = _getUUID(
+                command => '/usr/sbin/zoneadm -z global list -p',
+                logger  => $logger
+            );
+        }
+    } else {
+        my $infos = _parseShowRev(logger => $logger);
+        $bios->{SMANUFACTURER} = $infos->{'Hardware provider'};
+        $bios->{SMODEL}        = "Solaris Containers";
+
+        if ($arch eq 'sparc') {
+            $hardware->{UUID} = _getUUID(
+                command => '/usr/sbin/zoneadm list -p',
+                logger  => $logger
+            )
+        }
+    }
+
+    $inventory->setBios($bios);
+    $inventory->setHardware($hardware);
+}
+
+sub _parseShowRev {
+    my (%params) = (
+        command => 'showrev',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my $infos;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^ ([^:]+) : \s+ (\S+)/x;
+        $infos->{$1} = $2;
+    }
+    close $handle;
+
+    return $infos;
+}
+
+sub _parseSmbios {
+    my (%params) = (
+        command => '/usr/sbin/smbios',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my ($infos, $current);
+    while (my $line = <$handle>) {
+        if ($line =~ /^ \d+ \s+ \d+ \s+ (\S+)/x) {
+            $current = $1;
+            next;
+        }
+
+        if ($line =~ /^ \s* ([^:]+) : \s* (.+) $/x) {
+            $infos->{$current}->{$1} = $2;
+            next;
+        }
+    }
+    close $handle;
+
+    return $infos;
+}
+
+sub _getUUID {
+    my (%params) = (
+        command => '/usr/sbin/zoneadm list -p',
+        @_
+    );
+
+    my $line = getFirstLine(%params);
+    return unless $line;
+
+    my @info = split(/:/, $line);
+    my $uuid = $info[4];
+
+    return $uuid;
+}
+
+1;

@@ -0,0 +1,195 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::CPU;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Solaris;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{cpu};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    foreach my $cpu (_getCPUs()) {
+        $inventory->addEntry(
+            section => 'CPUS',
+            entry   => $cpu
+        );
+    }
+
+}
+
+sub _getCPUs {
+    my (%params) = @_;
+
+    # get virtual CPUs from psrinfo -v
+    my @all_virtual_cpus = _getVirtualCPUs(logger => $params{logger});
+
+    # get physical CPUs from psrinfo -vp
+    my @all_physical_cpus = _getPhysicalCPUs(logger => $params{logger});
+
+    # count the different speed values
+    # undef is temporarily mapped to 0, to avoid warnings
+    my @physical_speeds =
+        map { $_ ? $_ : undef }
+        sort { $a <=> $b }
+        uniq
+        map { $_->{speed} || 0 }
+        @all_physical_cpus;
+
+    my @virtual_speeds =
+        map { $_ ? $_ : undef }
+        sort { $a <=> $b }
+        uniq
+        map { $_->{speed} || 0 }
+        @all_virtual_cpus;
+
+    my @cpus;
+
+    # process CPUs by groups, according to their speed
+    while (@physical_speeds) {
+        my $physical_speed = shift @physical_speeds;
+        my $virtual_speed  = shift @virtual_speeds;
+
+        my @physical_cpus = $physical_speed ?
+            grep { $_->{speed} eq $physical_speed } @all_physical_cpus:
+            grep { ! defined $_->{speed}          } @all_physical_cpus;
+        my @virtual_cpus  = $virtual_speed ?
+            grep { $_->{speed} eq $virtual_speed } @all_virtual_cpus:
+            grep { ! defined $_->{speed}         } @all_virtual_cpus;
+
+        my $speed = $physical_cpus[0]->{speed} || $virtual_cpus[0]->{speed};
+        my $type  = $physical_cpus[0]->{type}  || $virtual_cpus[0]->{type};
+        my $manufacturer =
+            $type =~ /SPARC/ ? 'SPARC' :
+            $type =~ /Xeon/  ? 'Intel' :
+                               undef   ;
+        my $cpus  = scalar @physical_cpus;
+
+        my ($cores, $threads) =
+            $type eq 'UltraSPARC-IV'  ? (2,     1) : # US-IV & US-IV+
+            $type eq 'UltraSPARC-T1'  ? (undef, 4) : # Niagara
+            $type eq 'UltraSPARC-T2'  ? (undef, 8) : # Niagara-II
+            $type eq 'UltraSPARC-T2+' ? (undef, 8) : # Victoria Falls
+            $type eq 'SPARC-T3'       ? (undef, 8) : # Rainbow Falls
+            $type eq 'SPARC64-VI'     ? (2,     2) : # Olympus-C SPARC64-VI
+            $type eq 'SPARC64-VII'    ? (4,     2) : # Jupiter SPARC64-VII
+            $type eq 'SPARC64-VII+'   ? (4,     2) : # Jupiter+ SPARC64-VII+
+            $type eq 'SPARC64-VII++'  ? (4,     2) : # Jupiter++ SPARC64-VII++
+            $type eq 'SPARC64-VIII'   ? (8,     2) : # Venus SPARC64-VIII
+                                        (1,     1) ;
+
+        if ($type =~ /MB86907/) {
+            $type = "TurboSPARC-II $type";
+        } elsif ($type =~ /MB86904|390S10/) {
+            $type = ($speed > 70) ? "microSPARC-II $type" : "microSPARC $type";
+        } elsif ($type =~ /,RT62[56]/) {
+            $type = "hyperSPARC $type";
+        }
+
+        # deduce core numbers from number of virtual cpus if needed
+        if (!$cores) {
+            # cores may be < 1 in case of virtualisation
+            $cores = (scalar @virtual_cpus) / $threads / $cpus;
+        }
+
+        for my $i (1 .. $cpus) {
+            push @cpus,
+                {
+                    MANUFACTURER => $manufacturer,
+                    NAME         => $type,
+                    SPEED        => $speed,
+                    CORE         => $cores,
+                    THREAD       => $threads
+                };
+        }
+    }
+
+    return @cpus;
+}
+
+sub _getVirtualCPUs {
+    my %params = (
+        command => '/usr/sbin/psrinfo -v',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @cpus;
+    while (my $line = <$handle>) {
+        if ($line =~ /The (\S+) processor operates at (\d+) MHz/) {
+            push @cpus, {
+                type  => $1,
+                speed => $2,
+            };
+            next;
+        }
+    }
+    close $handle;
+
+    return @cpus;
+}
+
+sub _getPhysicalCPUs {
+    my %params = (
+        command => '/usr/sbin/psrinfo -vp',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @cpus;
+    while (my $line = <$handle>) {
+
+        if ($line =~ /^The physical processor has (\d+) virtual/) {
+            push @cpus, {
+                count => $1
+            };
+            next;
+        }
+
+        if ($line =~ /^The physical processor has (\d+) cores and (\d+) virtual/) {
+            push @cpus, {
+                count => $2
+            };
+            next;
+        }
+
+        if ($line =~ /^The (\S+) physical processor has (\d+) virtual/) {
+            push @cpus, {
+                type  => $1,
+                count => $2
+            };
+            next;
+        }
+
+        if ($line =~ /(\S+) \(.* clock (\d+) MHz\)/) {
+            my $cpu = $cpus[-1];
+            $cpu->{type} = $1;
+            $cpu->{speed} = $2;
+            next;
+        }
+
+        if ($line =~ /Intel\(r\) Xeon\(r\) CPU +(\S+)/) {
+            my $cpu = $cpus[-1];
+            $cpu->{type} = "Xeon $1";
+        }
+    }
+    close $handle;
+
+    return @cpus;
+}
+
+1;

@@ -0,0 +1,45 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::Controllers;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return if $params{no_category}->{controller};
+    return canRun('cfgadm');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getFileHandle(
+        command => 'cfgadm -s cols=ap_id:type:info',
+        logger  => $logger,
+    );
+
+    return unless $handle;
+
+    while (my $line = <$handle>) {
+        next if $line =~  /^Ap_Id/;
+        next unless $line =~ /^(\S+)\s+(\S+)\s+(\S+)/;
+        my $name = $1;
+        my $type = $2;
+        my $manufacturer = $3;
+        $inventory->addEntry(
+            section => 'CONTROLLERS',
+            entry => {
+                NAME         => $name,
+                MANUFACTURER => $manufacturer,
+                TYPE         => $type,
+            }
+        );
+    }
+    close $handle;
+}
+
+1;

@@ -0,0 +1,57 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::Drives;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{drive};
+    return canRun('df');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # get filesystems list
+    my $line = getFirstLine(logger => $logger, command => "df --version");
+    # df --help is on STDERR on some system, so $line may be undef
+    my $command = $line && $line =~ /GNU/ ? "df -P -k" : "df -k";
+
+    my @filesystems =
+        # exclude solaris 10 specific devices
+        grep { $_->{VOLUMN} !~ /^\/(devices|platform)/ }
+        # exclude cdrom mount
+        grep { $_->{TYPE} !~ /cdrom/ }
+        # get all file systems
+        getFilesystemsFromDf(logger => $logger, command => $command);
+
+    # get indexed list of filesystems types
+    my %filesystems_types =
+        map { /^(\S+) on \S+ type (\w+)/; $1 => $2 }
+        getAllLines(logger => $logger, command => '/usr/sbin/mount -v');
+
+    # set filesystem type based on that information
+    foreach my $filesystem (@filesystems) {
+        if ($filesystem->{VOLUMN} eq 'swap') {
+            $filesystem->{FILESYSTEM} = 'swap';
+            next;
+        }
+
+        $filesystem->{FILESYSTEM} = $filesystems_types{$filesystem->{VOLUMN}};
+    }
+
+    # add filesystems to the inventory
+    foreach my $filesystem (@filesystems) {
+        $inventory->addEntry(
+            section => 'DRIVES',
+            entry   => $filesystem
+        );
+    }
+}
+1;

@@ -0,0 +1,87 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::Memory;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Solaris;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{memory};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $memorySize = getFirstMatch(
+        command => '/usr/sbin/prtconf',
+        logger  => $logger,
+        pattern => qr/^Memory\ssize:\s+(\S+)/
+    );
+
+    my $swapSize = getFirstMatch(
+        command => '/usr/sbin/swap -l',
+        logger  => $logger,
+        pattern => qr/\s+(\d+)$/
+    );
+
+    $inventory->setHardware({
+        MEMORY => $memorySize,
+        SWAP =>   $swapSize
+    });
+
+    my $zone = getZone();
+
+    my @memories = $zone eq 'global' ?
+        _getMemoriesPrtdiag() :
+        _getMemoriesPrctl()   ;
+
+    foreach my $memory (@memories) {
+        $inventory->addEntry(
+            section => 'MEMORIES',
+            entry   => $memory
+        );
+    }
+}
+
+sub _getMemoriesPrtdiag {
+    my $info = getPrtdiagInfos(@_);
+
+    return $info->{memories} ? @{$info->{memories}} : ();
+}
+
+sub _getMemoriesPrctl {
+    my $handle = getFileHandle(
+        command => "prctl -n project.max-shm-memory $PID",
+        @_
+    );
+
+    my @memories;
+    my $memory;
+
+    while (my $line = <$handle>) {
+        $memory->{DESCRIPTION} = $1 if $line =~ /^project.(\S+)$/;
+        $memory->{CAPACITY} = $1 if $line =~ /^\s*system+\s*(\d+)/;
+
+        if ($memory->{DESCRIPTION} && $memory->{CAPACITY}){
+            $memory->{CAPACITY} = $memory->{CAPACITY} * 1024;
+            $memory->{NUMSLOTS} = 1 ;
+            $memory->{DESCRIPTION} = "Memory Allocated";
+            $memory->{CAPTION} = "Memory Share";
+            push @memories, $memory;
+            undef $memory;
+        }
+    }
+    close $handle;
+
+    return @memories;
+}
+
+1;

@@ -0,0 +1,335 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::Networks;
+
+use strict;
+use warnings;
+
+#ce5: flags=1000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4> mtu 1500 index 3
+#        inet 55.37.101.171 netmask fffffc00 broadcast 55.37.103.255
+#        ether 0:3:ba:24:9b:bf
+
+#aggr40001:2: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 3
+#        inet 55.37.101.172 netmask ffffff00 broadcast 223.0.146.255
+#NDD=/usr/sbin/ndd
+#KSTAT=/usr/bin/kstat
+#IFC=/sbin/ifconfig
+#DLADM=/usr/sbin/dladm
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Solaris;
+use FusionInventory::Agent::Tools::Network;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{network};
+    return canRun('ifconfig');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @interfaces = _getInterfaces(logger => $logger);
+    foreach my $interface (@interfaces) {
+        $inventory->addEntry(
+            section => 'NETWORKS',
+            entry   => $interface
+        );
+    }
+
+    my $routes = getRoutingTable(logger => $logger);
+    $inventory->setHardware({
+        DEFAULTGATEWAY => $routes->{'0.0.0.0'}
+    });
+}
+
+sub _getInterfaces {
+    my (%params) = @_;
+
+    my @interfaces = _parseIfconfig(
+        command => 'ifconfig -a',
+        @_
+    );
+
+    foreach my $interface (@interfaces) {
+        $interface->{IPSUBNET} = getSubnetAddress(
+            $interface->{IPADDRESS},
+            $interface->{IPMASK}
+        );
+
+        if ($interface->{DESCRIPTION} =~ /^(\S+)(\d+)/) {
+            my $nic = $1;
+            my $num = $2;
+
+            $interface->{SPEED} =
+                $nic =~ /aggr/   ? undef                       :
+                $nic =~ /dmfe/   ? undef                       :
+                $nic =~ /bge/    ? _check_bge_nic($nic, $num)  :
+                $nic =~ /nxge/   ? _check_nxge_nic($nic, $num) :
+                $nic =~ /ce/     ? _check_ce_nic($nic, $num)   :
+                $nic =~ /ipge/   ? _check_ce_nic($nic, $num)   :
+                $nic =~ /e1000g/ ? _check_ce_nic($nic, $num)   :
+                                   _check_nic($nic, $num);
+        }
+    }
+
+    my $zone = getZone();
+    my $OSLevel = getFirstLine(command => 'uname -r');
+
+    if ($zone && $OSLevel && $OSLevel =~ /5.10/) {
+        push @interfaces, _parseDladm(
+            command => '/usr/sbin/dladm show-aggr',
+            logger  => $params{logger}
+        );
+
+        push @interfaces, _parsefcinfo(
+            command => '/usr/sbin/fcinfo hba-port',
+            logger  => $params{logger}
+        );
+    }
+
+    return @interfaces;
+}
+
+
+# Function to test Quad Fast-Ethernet, Fast-Ethernet, and
+# Gigabit-Ethernet (i.e. qfe_, hme_, ge_, fjgi_)
+sub _check_nic {
+    my ($nic, $num) = @_;
+
+    my $speed = getFirstMatch(
+        command => "/usr/sbin/ndd -get /dev/$nic link_speed",
+        pattern => qr/^(\d+)/
+    );
+
+    my $duplex = getFirstMatch(
+        command => "/usr/sbin/ndd -get /dev/$nic link_mode",
+        pattern => qr/^(\d+)/
+    );
+
+    my $arg = $nic =~ /ge/ ? 'adv_1000autoneg_cap' : 'adv_autoneg_cap';
+    my $auto = getFirstMatch(
+        command => "/usr/sbin/ndd -get /dev/$nic $arg",
+        pattern => qr/^(\d+)/
+    );
+
+    return _get_link_info($speed, $duplex, $auto);
+}
+
+# Function to test a Gigabit-Ethernet (i.e. ce_).
+# Function to test a Intel 82571-based ethernet controller port (i.e. ipge_).
+sub _check_ce_nic {
+    my ($nic, $num) = @_;
+
+    my $speed = getFirstMatch(
+        command => "/usr/bin/kstat -m $nic -i $num -s link_speed",
+        pattern => qr/^\s*link_speed+\s*(\d+)/
+    );
+
+    my $duplex = getFirstMatch(
+        command => "/usr/bin/kstat -m $nic -i $num -s link_duplex",
+        pattern => qr/^\s*link_duplex+\s*(\d+)/
+    );
+
+    my $auto = getFirstMatch(
+        command => "/usr/bin/kstat -m $nic -i $num -s cap_autoneg",
+        pattern => qr/^\s*cap_autoneg+\s*(\d+)/
+    );
+
+    return _get_link_info($speed, $duplex, $auto);
+
+}
+
+# Function to test Sun BGE interface on Sun Fire V210 and V240.
+# The BGE is a Broadcom BCM5704 chipset. There are four interfaces
+# on the V210 and V240. (i.e. bge_)
+sub _check_bge_nic {
+    my ($nic, $num) = @_;
+
+    my $speed = getFirstMatch(
+        command => "/usr/sbin/ndd -get /dev/$nic$num link_speed",
+        pattern => qr/^(\d+)/
+    );
+
+    my $duplex = getFirstMatch(
+        command => "/usr/sbin/ndd -get /dev/$nic$num link_duplex",
+        pattern => qr/^(\d+)/
+    );
+
+    my $auto = getFirstMatch(
+        command => "/usr/sbin/ndd -get /dev/$nic$num adv_autoneg_cap",
+        pattern => qr/^(\d+)/
+    );
+
+    return _get_link_info($speed, $duplex, $auto);
+}
+
+
+# Function to test Sun NXGE interface on Sun Fire Tx000.
+sub _check_nxge_nic {
+    my ($nic, $num) = @_;
+
+    #nxge0           link: up        speed: 1000  Mbps       duplex: full
+    my ($speed, $unit, $duplex) = getFirstMatch(
+        command => "/usr/sbin/dladm show-dev $nic$num",
+        pattern => qr/
+            $nic$num \s+
+            link:   \s \S+   \s+
+            speed:  \s (\d+) \s+ (\S+) \s+
+            duplex: \s (\S+)
+        /x
+    );
+    return $speed . ' ' . $unit . ' ' . $duplex;
+}
+
+sub _get_link_info {
+    my ($speed, $duplex, $auto) = @_;
+
+    my $info;
+
+    if ($speed) {
+        $info =
+            $speed == 0    ? "10 Mb/s"  :
+            $speed == 10   ? "10 Mb/s"  :
+            $speed == 100  ? "100 Mb/s" :
+            $speed == 1000 ? "1 Gb/s"   :
+                             "ERROR"    ;
+    }
+
+    if ($duplex) {
+        $info .=
+            $duplex == 2 ? " FDX"     :
+            $duplex == 1 ? " HDX"     :
+            $duplex == 0 ? " UNKNOWN" :
+                           " ERROR"   ;
+    }
+
+    if ($auto) {
+        $info .=
+            $auto == 0 ? " AUTOSPEED ON"    :
+            $auto == 1 ? " AUTOSPEED OFF"   :
+                         " ERROR"           ;
+    }
+
+    return $info;
+}
+
+sub _parseIfconfig {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @interfaces;
+    my $interface;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /^(\S+):(\S+):/) {
+            # new interface
+            push @interfaces, $interface if $interface;
+            # quick assertion: nothing else as ethernet interface
+            $interface = {
+                STATUS      => 'Down',
+                DESCRIPTION => $1 . ':' . $2,
+                TYPE        => 'ethernet'
+            };
+        } elsif ($line =~ /^(\S+):/) {
+            # new interface
+            push @interfaces, $interface if $interface;
+            # quick assertion: nothing else as ethernet interface
+            $interface = {
+                STATUS      => 'Down',
+                DESCRIPTION => $1,
+                TYPE        => 'ethernet'
+            };
+        }
+
+        if ($line =~ /inet ($ip_address_pattern)/) {
+            $interface->{IPADDRESS} = $1;
+        }
+        if ($line =~ /netmask ($hex_ip_address_pattern)/i) {
+            $interface->{IPMASK} = hex2canonical($1);
+        }
+        if ($line =~ /ether\s+(\S+)/i) {
+            # https://sourceforge.net/tracker/?func=detail&atid=487492&aid=1819948&group_id=58373
+            $interface->{MACADDR} =
+                sprintf "%02x:%02x:%02x:%02x:%02x:%02x" , map hex, split /\:/, $1;
+        }
+        if ($line =~ /<UP,/) {
+            $interface->{STATUS} = "Up";
+        }
+    }
+    close $handle;
+
+    # last interface
+    push @interfaces, $interface if $interface;
+
+    return @interfaces;
+}
+
+sub _parseDladm {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @interfaces;
+    while (my $line = <$handle>) {
+        next if $line =~ /device/;
+        next if $line =~ /key/;
+        my $interface = {
+            STATUS    => 'Down',
+            IPADDRESS => "0.0.0.0",
+        };
+        next unless
+            $line =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/;
+        $interface->{DESCRIPTION} = $1;
+        $interface->{MACADDR}     = $2;
+        $interface->{SPEED}       = $3 . " " . $4 . " " . $5;
+        $interface->{STATUS}      = 'Up' if $line =~ /UP/;
+        push @interfaces, $interface;
+    }
+    close $handle;
+
+    return @interfaces;
+}
+
+sub _parsefcinfo {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my @interfaces;
+    my $inc = 1;
+    my $interface;
+    while (my $line = <$handle>) {
+        $interface->{DESCRIPTION} = "HBA_Port_WWN_" . $inc
+            if $line =~ /HBA Port WWN:\s+(\S+)/;
+        $interface->{DESCRIPTION} .= " " . $1
+            if $line =~ /OS Device Name:\s+(\S+)/;
+        $interface->{SPEED} = $1
+            if $line =~ /Current Speed:\s+(\S+)/;
+        $interface->{WWN} = $1
+            if $line =~ /Node WWN:\s+(\S+)/;
+        $interface->{DRIVER} = $1
+            if $line =~ /Driver Name:\s+(\S+)/i;
+        $interface->{MANUFACTURER} = $1
+            if $line =~ /Manufacturer:\s+(.*)$/;
+        $interface->{MODEL} = $1
+            if $line =~ /Model:\s+(.*)$/;
+        $interface->{FIRMWARE} = $1
+            if $line =~ /Firmware Version:\s+(.*)$/;
+        $interface->{STATUS} = 'Up'
+            if $line =~ /online/;
+
+        if ($interface->{DESCRIPTION} && $interface->{WWN}) {
+            $interface->{STATUS} = 'Down' if !$interface->{STATUS};
+
+            push @interfaces, $interface;
+            $interface = {};
+            $inc++;
+        }
+    }
+    close $handle;
+
+    return @interfaces;
+}
+
+1;

@@ -0,0 +1,35 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::Slots;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Solaris;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{slot};
+    return canRun('prtdiag');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $slot (_getSlots(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'SLOTS',
+            entry   => $slot
+        );
+    }
+}
+
+sub _getSlots {
+    my $info = getPrtdiagInfos(@_);
+
+    return $info->{slots} ? @{$info->{slots}} : ();
+}
+
+1;

@@ -0,0 +1,51 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::Softwares;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return
+        !$params{no_category}->{software} &&
+        canRun('pkginfo');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getFileHandle(
+        command => 'pkginfo -l',
+        logger  => $logger,
+    );
+
+    return unless $handle;
+
+    my $software;
+    while (my $line = <$handle>) {
+        if ($line =~ /^\s*$/) {
+            $inventory->addEntry(
+                section => 'SOFTWARES',
+                entry   =>  $software
+            );
+            undef $software;
+        } elsif ($line =~ /PKGINST:\s+(.+)/) {
+            $software->{NAME} = $1;
+        } elsif ($line =~ /VERSION:\s+(.+)/) {
+            $software->{VERSION} = $1;
+        } elsif ($line =~ /VENDOR:\s+(.+)/) {
+            $software->{PUBLISHER} = $1;
+        } elsif ($line =~  /DESC:\s+(.+)/) {
+            $software->{COMMENTS} = $1;
+        }
+    }
+
+    close $handle;
+}
+
+1;

@@ -0,0 +1,107 @@
+package FusionInventory::Agent::Task::Inventory::Solaris::Storages;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{storage};
+    return canRun('iostat');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @storages = _getStorages(
+        logger => $logger, command => 'iostat -En'
+    );
+
+    foreach my $storage (@storages) {
+        if (-l "/dev/rdsk/$storage->{NAME}s2") {
+            my $rdisk_path = getFirstLine(
+                command => "ls -l /dev/rdsk/$storage->{NAME}s2"
+            );
+            $storage->{TYPE} =
+                $rdisk_path =~ /->.*scsi_vhci/ ? 'MPxIO' :
+                $rdisk_path =~ /->.*fp@/       ? 'FC'    :
+                $rdisk_path =~ /->.*scsi@/     ? 'SCSI'  :
+                                                 undef   ;
+        }
+
+        $inventory->addEntry(section => 'STORAGES', entry => $storage);
+    }
+}
+
+sub _getStorages {
+
+    my $handle = getFileHandle(@_);
+
+    return unless $handle;
+
+    my @storages;
+    my $storage;
+
+    while (my $line = <$handle>) {
+        if ($line =~ /^(\S+)\s+Soft/) {
+            $storage->{NAME} = $1;
+        }
+        if ($line =~ /^
+            Vendor:       \s (\S+)          \s+
+            Product:      \s (\S.*?\S)      \s+
+            Revision:     \s (\S+)          \s+
+            Serial \s No: \s (\S*)
+        /x) {
+            $storage->{MANUFACTURER} = $1;
+            $storage->{MODEL} = $2;
+            $storage->{FIRMWARE} = $3;
+            $storage->{SERIALNUMBER} = $4 if $4;
+        }
+        if ($line =~ /<(\d+) bytes/) {
+            $storage->{DISKSIZE} = int($1/(1000*1000));
+        }
+        if ($line =~ /^Illegal/) { # Last ligne
+
+            ## To be removed when SERIALNUMBER will be supported
+            if ($storage->{SERIALNUMBER}) {
+                $storage->{DESCRIPTION} = $storage->{DESCRIPTION} ?
+                $storage->{DESCRIPTION} . " S/N:" . $storage->{SERIALNUMBER} :
+                                           "S/N:" . $storage->{SERIALNUMBER} ;
+
+            }
+
+            ## To be removed when FIRMWARE will be supported
+            if ($storage->{FIRMWARE}) {
+                $storage->{DESCRIPTION} = $storage->{DESCRIPTION} ?
+                $storage->{DESCRIPTION} . " FW:" . $storage->{FIRMWARE} :
+                                           "FW:" . $storage->{FIRMWARE} ;
+            }
+
+            if ($storage->{MANUFACTURER}) {
+                ## Workaround for MANUFACTURER == ATA case
+                if (
+                    $storage->{MANUFACTURER} eq 'ATA' &&
+                    $storage->{MODEL} =~ /^(Hitachi|Seagate|INTEL) (.+)/i) {
+                        $storage->{MANUFACTURER} = $1;
+                        $storage->{MODEL} = $2;
+                }
+
+                ## Drop the (R) from the manufacturer string
+                $storage->{MANUFACTURER} =~ s/\(R\)$//i;
+            }
+
+
+            push @storages, $storage;
+            undef $storage;
+        }
+    }
+    close $handle;
+
+    return @storages;
+}
+
+1;

@@ -0,0 +1,47 @@
+package FusionInventory::Agent::Task::Inventory::Solaris;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Solaris;
+
+our $runAfter = ["FusionInventory::Agent::Task::Inventory::Generic"];
+
+sub isEnabled {
+    return $OSNAME eq 'solaris';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    # Operating system informations
+    my $info          = getReleaseInfo();
+    my $kernelArch    = getFirstLine(command => 'arch -k');
+    my $kernelVersion = getFirstLine(command => 'uname -v');
+    my $proct         = getFirstLine(command => 'uname -p');
+    my $platform      = getFirstLine(command => 'uname -i');
+    my $hostid        = getFirstLine(command => 'hostid');
+    my $description   = "$platform($kernelArch)/$proct HostID=$hostid";
+
+    $inventory->setHardware({
+        OSNAME      => "Solaris",
+        OSVERSION   => $info->{version},
+        OSCOMMENTS  => $info->{subversion},
+        DESCRIPTION => $description
+    });
+
+    $inventory->setOperatingSystem({
+        NAME           => "Solaris",
+        FULL_NAME      => $info->{fullname},
+        VERSION        => $info->{version},
+        SERVICE_PACK   => $info->{subversion},
+        KERNEL_VERSION => $kernelVersion
+    });
+}
+
+1;

@@ -0,0 +1,70 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Hpvm;
+
+use strict;
+use warnings;
+
+use XML::TreePP;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('hpvmstatus');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $machine (_getMachines(
+        command => 'hpvmstatus -X', logger => $logger
+    )) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+}
+
+sub _getMachines {
+    my $xml = getAllLines(@_);
+    return unless $xml;
+
+    my $tpp = XML::TreePP->new();
+    my $data = $tpp->parse($xml);
+    my $mvs = $data->{pman}->{virtual_machine};
+
+    my %units = (
+        'MB' => 1,
+        'GB' => 1024,
+    );
+
+    my %status = (
+        'On' => 'running',
+        'Off' => 'off',
+        'Invalid' => 'crashed',
+    );
+
+    my @machines;
+    foreach my $name (keys %$mvs) {
+        my $info = $mvs->{$name};
+
+        my $machine = {
+            MEMORY    => $info->{memory}->{total}->{content} *
+                         $units{$info->{memory}->{total}->{unit}},
+            NAME      => $name,
+            UUID      => $info->{uuid},
+            STATUS    => $status{$info->{vm_state}},
+            SUBSYSTEM => "HPVM",
+            VMTYPE    => "HPVM",
+            VCPU      => $info->{vcpu_number},
+            VMID      => $info->{local_id}
+        };
+
+        push @machines, $machine;
+    }
+
+    return @machines;
+}
+
+1;

@@ -0,0 +1,89 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::HyperV;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use UNIVERSAL::require;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Hostname;
+
+sub isEnabled {
+    return $OSNAME eq 'MSWin32';
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{inventory};
+
+    foreach my $machine (_getVirtualMachines(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+}
+
+sub _getVirtualMachines {
+    FusionInventory::Agent::Tools::Win32->require();
+
+    my $hostname = getHostname(short => 1);
+
+    my @machines;
+
+    # index memory and cpu information
+    my %memory;
+    foreach my $object (FusionInventory::Agent::Tools::Win32::getWMIObjects(
+        moniker    => 'winmgmts://./root/virtualization',
+        class      => 'MSVM_MemorySettingData',
+        properties => [ qw/InstanceID VirtualQuantity/ ]
+    )) {
+        my $id = $object->{InstanceID};
+        next unless $id =~ /^Microsoft:([^\\]+)/;
+        $memory{$1} = $object->{VirtualQuantity};
+    }
+
+    my %vcpu;
+    foreach my $object (FusionInventory::Agent::Tools::Win32::getWMIObjects(
+        moniker    => 'winmgmts://./root/virtualization',
+        class      => 'MSVM_ProcessorSettingData',
+        properties => [ qw/InstanceID VirtualQuantity/ ]
+    )) {
+        my $id = $object->{InstanceID};
+        next unless $id =~ /^Microsoft:([^\\]+)/;
+        $vcpu{$1} = $object->{VirtualQuantity};
+    }
+
+    foreach my $object (FusionInventory::Agent::Tools::Win32::getWMIObjects(
+        moniker    => 'winmgmts://./root/virtualization',
+        class      => 'MSVM_ComputerSystem',
+        properties => [ qw/ElementName EnabledState Name/ ]
+    )) {
+        # skip host
+        next if lc($object->{Name}) eq lc($hostname);
+
+        my $status =
+            $object->{EnabledState} == 2     ? 'running'  :
+            $object->{EnabledState} == 3     ? 'shutdown' :
+            $object->{EnabledState} == 32768 ? 'paused'   :
+                                               'unknown'  ;
+        my $machine = {
+            SUBSYSTEM => 'MS HyperV',
+            VMTYPE    => 'HyperV',
+            STATUS    => $status,
+            NAME      => $object->{ElementName},
+            UUID      => $object->{Name},
+            MEMORY    => $memory{$object->{Name}},
+            VCPU      => $vcpu{$object->{Name}},
+        };
+
+        push @machines, $machine;
+
+    }
+
+    return @machines;
+}
+
+1;

@@ -0,0 +1,58 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Jails;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('jls');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $machine (_getVirtualMachines(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+}
+
+sub  _getVirtualMachines {
+    my (%params) = (
+        command => 'jls -n',
+        @_
+    );
+
+    my $handle = getFileHandle(%params);
+
+    return unless $handle;
+
+    my @machines;
+    while (my $line = <$handle>) {
+        my $info;
+        foreach my $item (split(' ', $line)) {
+            next unless $item =~ /(\S+)=(\S+)/;
+            $info->{$1} = $2;
+        }
+
+        my $machine = {
+            VMTYPE    => 'jail',
+            NAME      => $info->{'host.hostname'},
+            VMID      => $info->{'jid'},
+            STATUS    => 'running'
+        };
+
+        push @machines, $machine;
+
+    }
+    close $handle;
+
+    return @machines;
+}
+
+1;

@@ -0,0 +1,141 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Libvirt;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use XML::TreePP;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('virsh');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $machine (_getMachines(logger => $logger)) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+
+    foreach my $machine (_getMachines(logger => $logger, uri => 'lxc:///')) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+
+}
+
+sub _getMachines {
+    my (%params) = @_;
+
+
+    my $uri_param = $params{'uri'} ? "-c ".$params{'uri'} : "";
+
+    my @machines = _parseList(
+        command => "virsh $uri_param list --all",
+        logger  => $params{logger}
+    );
+
+    foreach my $machine (@machines) {
+        my %infos = _parseDumpxml(
+            command => "virsh $uri_param dumpxml $machine->{NAME}",
+            logger  => $params{logger}
+        );
+
+        $machine->{MEMORY}    = $infos{memory};
+        $machine->{UUID}      = $infos{uuid};
+        $machine->{SUBSYSTEM} = $infos{vmtype};
+        $machine->{VCPU}      = $infos{vcpu};
+    }
+
+    return @machines;
+}
+
+sub _parseList {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @machines;
+    while (my $line = <$handle>) {
+        next if $line =~ /^\s*Id/;
+        next if $line =~ /^-{5}/;
+        next unless $line =~ /^\s*(\d+|)(\-|)\s+(\S+)\s+(\S.+)/;
+
+        my $vmid = $1;
+        my $name = $3;
+
+        # ignore Xen Dom0
+        next if $name eq 'Domain-0';
+
+        my $status = $4;
+        $status =~ s/^shut off/off/;
+
+        my $machine = {
+            NAME      => $name,
+            STATUS    => $status,
+            VMTYPE    => "libvirt",
+            VMID      => $vmid,
+        };
+
+        push @machines, $machine;
+    }
+    close $handle;
+
+    return @machines;
+}
+
+sub _getKeyText {
+    my ($key) = @_;
+
+    if (ref($key) eq 'HASH') {
+        return $key->{'#text'};
+    } else {
+        return $key;
+    }
+}
+
+sub _parseDumpxml {
+    my (%params) = @_;
+
+    my $xml = getAllLines(%params);
+    if (!$xml) {
+        $params{logger}->error("No virsh xmldump output");
+        return;
+    }
+
+    my $data;
+    eval {
+        $data = XML::TreePP->new()->parse($xml);
+    };
+    if ($EVAL_ERROR) {
+        $params{logger}->error("Failed to parse XML output");
+        return;
+    }
+
+    my $vcpu   = _getKeyText($data->{domain}{vcpu});
+    my $uuid   = _getKeyText($data->{domain}{uuid});
+    my $vmtype = $data->{domain}{'-type'};
+    my $memory;
+    my $currentMemory = _getKeyText($data->{domain}{currentMemory});
+    if ($currentMemory =~ /(\d+)\d{3}$/) {
+        $memory = $1;
+    }
+
+    return (
+        vcpu => $vcpu,
+        uuid => $uuid,
+        vmtype => $vmtype,
+        memory => $memory,
+    );
+}
+
+1;

@@ -0,0 +1,138 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Lxc;
+
+# Authors: Egor Shornikov <se@wbr.su>, Egor Morozov <akrus@flygroup.st>
+# License: GPLv2+
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('lxc-ls');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @machines = _getVirtualMachines(
+        command => '/usr/bin/lxc-ls -1',
+        logger => $logger
+    );
+
+    foreach my $machine (@machines) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+}
+
+sub  _getVirtualMachineState {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my %info;
+    while (my $line = <$handle>){
+        chomp $line;
+        next unless $line =~ m/^(\S+):\s*(\S+)$/;
+        $info{lc($1)} = $2;
+    }
+    close $handle;
+
+    my $state;
+    $state->{VMID} = $info{pid};
+    $state->{STATUS} =
+        $info{state} eq 'RUNNING' ? 'running' :
+        $info{state} eq 'FROZEN'  ? 'paused'  :
+        $info{state} eq 'STOPPED' ? 'off'     :
+        $info{state};
+
+    return $state;
+}
+
+sub  _getVirtualMachineConfig {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my $config = {
+        VCPU => 0
+    };
+
+    while (my $line = <$handle>) {
+        chomp $line;
+        next if $line =~ /^#.*/;
+        next unless $line =~ m/^\s*(\S+)\s*=\s*(\S+)\s*$/;
+
+        my $key = $1;
+        my $val = $2;
+        if ($key eq 'lxc.network.hwaddr') {
+            $config->{MAC} = $val;
+        }
+
+        if ($key eq 'lxc.cgroup.memory.limit_in_bytes') {
+            $config->{MEMORY} = $val;
+        }
+
+        if ($key eq 'lxc.cgroup.cpuset.cpus') {
+            ###eg: lxc.cgroup.cpuset.cpus = 0,3-5,7,2,1
+            foreach my $cpu ( split( /,/, $val ) ){
+                if ( $cpu =~ /(\d+)-(\d+)/ ){
+                    my @tmp = ($1..$2);
+                    $config->{VCPU} += $#tmp + 1;
+                } else {
+                    $config->{VCPU} += 1;
+                }
+            }
+        }
+    }
+    close $handle;
+
+    return $config;
+}
+
+sub  _getVirtualMachines {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @machines;
+
+    while(my $line = <$handle>) {
+        chomp $line;
+        next unless $line =~ m/^(\S+)$/;
+
+        my $name = $1;
+
+        my $state = _getVirtualMachineState(
+            command => "/usr/bin/lxc-info -n $name",
+            logger => $params{logger}
+        );
+
+        my $config = _getVirtualMachineConfig(
+            file => "/var/lib/lxc/$name/config",
+            logger => $params{logger}
+        );
+
+        push @machines, {
+            NAME   => $name,
+            VMTYPE => 'LXC',
+            VMID   => $state->{VMID},
+            STATUS => $state->{STATUS},
+            VCPU   => $config->{VCPU},
+            MEMORY => $config->{MEMORY},
+        };
+    }
+    close $handle;
+
+    return @machines;
+}
+
+1;

@@ -0,0 +1,123 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Parallels;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return canRun('prlctl');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    if (!$params{scan_homedirs}) {
+        $logger->warning(
+            "'scan-homedirs' configuration parameter disabled, " .
+            "ignoring parallels virtual machines in user directories"
+        );
+        return;
+    }
+
+    foreach my $user ( glob("/Users/*") ) {
+        $user =~ s/.*\///; # Just keep the login
+        next if $user =~ /Shared/i;
+        next if $user =~ /^\./i; # skip hidden directory
+        next if $user =~ /\ /;   # skip directory containing space
+        next if $user =~ /'/;    # skip directory containing quote
+
+        foreach my $machine (_parsePrlctlA(
+                logger  => $logger,
+                command => "su '$user' -c 'prlctl list -a'"
+        )) {
+
+            my $uuid = $machine->{UUID};
+            # Avoid security risk. Should never appends
+            $uuid =~ s/[^A-Za-z0-9\.\s_-]//g;
+
+
+            ($machine->{MEMORY}, $machine->{VCPU}) =
+                _parsePrlctlI(
+                    logger  => $logger,
+                    command => "su '$user' -c 'prlctl list -i $uuid'"
+                );
+
+            $inventory->addEntry(
+                section => 'VIRTUALMACHINES', entry => $machine
+            );
+        }
+    }
+}
+
+sub _parsePrlctlA {
+    my $handle = getFileHandle(@_);
+
+    return unless $handle;
+
+    my %status_list = (
+        'running'   => 'running',
+        'blocked'   => 'blocked',
+        'paused'    => 'paused',
+        'suspended' => 'suspended',
+        'crashed'   => 'crashed',
+        'dying'     => 'dying',
+        'stopped'   => 'off',
+    );
+
+
+    # get headers line first
+    my $line = <$handle>;
+
+    my @machines;
+    while (my $line = <$handle>) {
+        chomp $line;
+        my @info = split(/\s+/, $line, 4);
+        my $uuid   = $info[0];
+        my $status = $status_list{$info[1]};
+        my $name   = $info[3];
+
+
+        $uuid =~s/{(.*)}/$1/;
+
+        # Avoid security risk. Should never appends
+        next if $uuid =~ /(;\||&)/;
+
+        push @machines, {
+            NAME      => $name,
+            UUID      => $uuid,
+            STATUS    => $status,
+            SUBSYSTEM => "Parallels",
+            VMTYPE    => "Parallels",
+        };
+    }
+
+    close $handle;
+
+    return @machines;
+}
+
+sub _parsePrlctlI {
+    my $handle = getFileHandle(@_);
+
+    my ($mem, $cpus);
+    while (my $line = <$handle>) {
+        if ($line =~ m/^\s\smemory\s(.*)Mb/) {
+            $mem = $1;
+        }
+        if ($line =~ m/^\s\scpu\s(\d{1,2})/) {
+            $cpus = $1;
+        }
+    }
+
+    close $handle;
+
+    return ($mem, $cpus);
+}
+
+1;

@@ -0,0 +1,87 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Qemu;
+# With Qemu 0.10.X, some option will be added to get more and easly information (UUID, memory, ...)
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Unix;
+
+sub isEnabled {
+    # Avoid duplicated entry with libvirt
+    return if canRun('virsh');
+
+    return
+        canRun('qemu') ||
+        canRun('kvm')  ||
+        canRun('qemu-kvm');
+}
+
+sub _parseProcessList {
+    my ($process) = @_;
+
+
+    my $values = {};
+
+    my @options = split (/ -/, $process->{CMD});
+
+    foreach my $option (@options) {
+        if ($option =~ m/^(?:[fhsv]d[a-d]|cdrom) (\S+)/) {
+            $values->{name} = $1 if !$values->{name};
+        } elsif ($option =~ m/^name (\S+)/) {
+            $values->{name} = $1;
+        } elsif ($option =~ m/^m (\S+)/) {
+            $values->{mem} = $1;
+        } elsif ($option =~ m/^uuid (\S+)/) {
+            $values->{uuid} = $1;
+        }
+
+        if ($option =~ /smbios/) {
+            if ($option =~ m/smbios.*uuid=([a-zA-Z0-9-]+)/) {
+                $values->{uuid} = $1;
+            }
+            if ($option =~ m/smbios.*serial=([a-zA-Z0-9-]+)/) {
+                $values->{serial} = $1;
+            }
+        }
+    }
+
+    if ($values->{mem} == 0 ) {
+        # Default value
+        $values->{mem} = 128;
+    }
+
+    return $values;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $process (getProcesses(logger => $logger)) {
+        # match only if an qemu instance
+        next if $process->{CMD} =~ /^\[/;
+        next if $process->{CMD} !~ /(qemu|kvm|qemu-kvm|qemu-system\S+) .*\S/x;
+
+        my $values = _parseProcessList($process);
+        next unless $values;
+
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES',
+            entry => {
+                NAME      => $values->{name},
+                UUID      => $values->{uuid},
+                VCPU      => 1,
+                MEMORY    => $values->{mem},
+                STATUS    => "running",
+                SUBSYSTEM => $values->{vmtype},
+                VMTYPE    => $values->{vmtype},
+                SERIAL    => $values->{serial},
+            }
+        );
+    }
+}
+
+1;

@@ -0,0 +1,77 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::SolarisZones;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Solaris;
+
+sub isEnabled {
+    return
+        canRun('zoneadm') &&
+        getZone() eq 'global' &&
+        _check_solaris_valid_release();
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my @zones =
+        getAllLines(command => '/usr/sbin/zoneadm list -p', logger => $logger);
+
+    foreach my $zone (@zones) {
+        my ($zoneid, $zonename, $zonestatus, undef, $uuid) = split(/:/, $zone);
+        next if $zonename eq 'global';
+
+        # Memory considerations depends on rcapd or project definitions
+        # Little hack, I go directly in /etc/zones reading mcap physcap for each zone.
+        my $zonefile = "/etc/zones/$zonename.xml";
+
+        my $line = getFirstMatch(
+            file  => $zonefile,
+            pattern => qr/(.*mcap.*)/
+        );
+
+        my $memory;
+
+        if ($line) {
+            my $memcap = $line;
+            $memcap =~ s/[^\d]+//g;
+            $memory = $memcap / 1024 / 1024;
+
+        }
+
+        my $vcpu = getFirstLine(command => '/usr/sbin/psrinfo -p');
+
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES',
+            entry => {
+                MEMORY    => $memory,
+                NAME      => $zonename,
+                UUID      => $uuid,
+                STATUS    => $zonestatus,
+                SUBSYSTEM => "Solaris Zones",
+                VMTYPE    => "Solaris Zones",
+                VMID      => $zoneid,
+                VCPU      => $vcpu,
+            }
+        );
+    }
+}
+
+# check if Solaris 10 release is higher than 08/07
+sub _check_solaris_valid_release{
+
+    my $info = getReleaseInfo();
+    return
+        $info->{version} > 10
+        ||
+        $info->{version} == 10 &&
+        $info->{subversion}    &&
+        substr($info->{subversion}, 1) >= 4;
+}
+
+1;

@@ -0,0 +1,131 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::VirtualBox;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+use User::pwent;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    my (%params) = @_;
+
+    return unless canRun('VBoxManage');
+
+    my ($major, $minor) = getFirstMatch(
+        command => 'VBoxManage --version',
+        pattern => qr/^(\d)\.(\d)/
+    );
+
+    return compareVersion($major, $minor, 2, 1);
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory    = $params{inventory};
+    my $logger       = $params{logger};
+
+    my $command = "VBoxManage -nologo list --long vms";
+
+    foreach my $machine (_parseVBoxManage(
+        logger => $logger, command => $command
+    )) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+
+    if (!$params{scan_homedirs}) {
+        $logger->warning(
+            "'scan-homedirs' configuration parameters disabled, " .
+            "ignoring virtualbox virtual machines in user directories"
+        );
+        return;
+    }
+
+    # assume all system users with a suitable homedir is an actual human user
+    my $pattern = $OSNAME eq 'darwin' ?
+        qr{^/Users} : qr{^/home};
+
+    my @users;
+    while (my $user = getpwent()) {
+        next unless $user->dir() =~ /$pattern/;
+        push @users, $user->name();
+    }
+
+    # abort if too many users
+    return if @users > 10;
+
+    foreach my $user (@users) {
+        my $command = "su '$user' -c 'VBoxManage -nologo list --long vms'";
+        foreach my $machine (_parseVBoxManage(
+            logger => $logger, command => $command
+        )) {
+            $machine->{OWNER} = $user;
+            $inventory->addEntry(
+                section => 'VIRTUALMACHINES', entry => $machine
+            );
+        }
+    }
+}
+
+sub _parseVBoxManage {
+    my $handle = getFileHandle(@_);
+
+    return unless $handle;
+
+    my (@machines, $machine, $index);
+
+    my %status_list = (
+        'powered off'       => 'off',
+        'saved'             => 'off',
+        'teleported'        => 'off',
+        'aborted'           => 'crashed',
+        'stuck'             => 'blocked',
+        'teleporting'       => 'paused',
+        'live snapshotting' => 'running',
+        'starting'          => 'running',
+        'stopping'          => 'dying',
+        'saving'            => 'dying',
+        'restoring'         => 'running',
+        'running'           => 'running',
+        'paused'            => 'paused'
+    );
+    while (my $line = <$handle>) {
+        chomp $line;
+
+        if ($line =~ m/^Name:\s+(.*)$/) {
+            # this is a little tricky, because USB devices also have a 'name'
+            # field, so let's use the 'index' field to disambiguate
+            if (defined $index) {
+                $index = undef;
+                next;
+            }
+            push @machines, $machine if $machine;
+            $machine = {
+                NAME      => $1,
+                VCPU      => 1,
+                SUBSYSTEM => 'Oracle VM VirtualBox',
+                VMTYPE    => 'VirtualBox'
+            };
+        } elsif ($line =~ m/^UUID:\s+(.+)/) {
+            $machine->{UUID} = $1;
+        } elsif ($line =~ m/^Memory size:\s+(.+)/ ) {
+            $machine->{MEMORY} = $1;
+        } elsif ($line =~ m/^State:\s+(.+) \(/) {
+            $machine->{STATUS} = $status_list{$1};
+        } elsif ($line =~ m/^Index:\s+(\d+)$/) {
+            $index = $1;
+        }
+    }
+    close $handle;
+
+    # push last remaining machine
+    push @machines, $machine if $machine;
+
+    return @machines;
+}
+
+1;

@@ -0,0 +1,109 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Virtuozzo;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Network;
+
+sub isEnabled {
+    # Avoid duplicated entry with libvirt
+    return if canRun('virsh');
+
+    return canRun('vzlist');
+}
+
+sub getMACs {
+    my ($ctid, $logger) = @_;
+
+    my @ipLines = getAllLines(
+            command => "vzctl exec '$ctid' 'ip -0 a'",
+            logger  => $logger
+            );
+
+    my @macs;
+    foreach my $line (@ipLines) {
+        next unless $line =~ /^\s+link\/ether ($mac_address_pattern)\s/;
+        push @macs, $1;
+    }
+
+    return join('/', @macs);
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $handle = getFileHandle(
+        command => 'vzlist --all --no-header -o hostname,ctid,cpulimit,status,ostemplate',
+        logger  => $logger
+    );
+
+    return unless $handle;
+
+    # no service containers in glpi
+    my $line = <$handle>;
+
+    while (my $line = <$handle>) {
+
+        chomp $line;
+        my ($name, $ctid, $cpus, $status, $subsys) = split(/[ \t]+/, $line);
+
+        my $memory = getFirstMatch(
+            file    => "/etc/vz/conf/$ctid.conf",
+            pattern => qr/^SLMMEMORYLIMIT="\d+:(\d+)"$/,
+            logger  => $logger,
+            );
+        if ($memory) {
+            $memory = $memory / 1024 / 1024;
+        } else {
+            $memory = getFirstMatch(
+                file    => "/etc/vz/conf/$ctid.conf",
+                pattern => qr/^PRIVVMPAGES="\d+:(\d+)"$/,
+                logger  => $logger,
+                );
+            if ($memory) {
+                $memory = $memory * 4 / 1024;
+            } else {
+                $memory = getFirstMatch(
+                    file    => "/etc/vz/conf/$ctid.conf",
+                    pattern => qr/^PHYSPAGES="\d+:(\d+\w{0,1})"$/,
+                    logger  => $logger,
+                    );
+                if ($memory) {
+                    $memory =~ /:(\d+)(\w{0,1})/;
+                    if ($2 eq "M") {
+                        $memory=$1;
+                    } elsif ($2 eq "G") {
+                        $memory=$1*1024;
+                    } elsif ($2 eq "K") {
+                        $memory=$1/1024;
+                    } else {
+                        $memory=$1/1024/1024;
+                    }
+                }
+            }
+        }
+
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES',
+            entry => {
+                NAME      => $name,
+                VCPU      => $cpus,
+                UUID      => $ctid,
+                MEMORY    => $memory,
+                STATUS    => $status,
+                SUBSYSTEM => $subsys,
+                VMTYPE    => "Virtuozzo",
+                MAC       => getMACs($ctid, $logger)
+            }
+        );
+
+    }
+
+    close $handle;
+}
+
+1;

@@ -0,0 +1,85 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::VmWareDesktop;
+#
+# initial version: Walid Nouh
+#
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return
+        canRun('/Library/Application Support/VMware Fusion/vmrun') ||
+        canRun('vmrun');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $command = canRun('vmrun') ?
+        'vmrun list' : "'/Library/Application Support/VMware Fusion/vmrun' list";
+
+    foreach my $machine (_getMachines(
+        command => $command, logger => $logger
+    )) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+}
+
+sub _getMachines {
+   my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    # skip first line
+    my $line = <$handle>;
+
+    my @machines;
+    while (my $line = <$handle>) {
+        chomp $line;
+        next unless -f $line;
+
+        my %info = _getMachineInfo(file => $line, logger => $params{logger});
+
+        my $machine = {
+            NAME      => $info{'displayName'},
+            VCPU      => 1,
+            UUID      => $info{'uuid.bios'},
+            MEMORY    => $info{'memsize'},
+            STATUS    => "running",
+            SUBSYSTEM => "VmWare Fusion",
+            VMTYPE    => "VmWare",
+        };
+
+        push @machines, $machine;
+    }
+    close $handle;
+
+    return @machines;
+}
+
+sub _getMachineInfo {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my %info;
+    while (my $line = <$handle>) {
+        next unless $line =~ /^(\S+)\s*=\s*(\S+.*)/;
+        my $key = $1;
+        my $value = $2;
+        $value =~ s/(^"|"$)//g;
+        $info{$key} = $value;
+    }
+    close $handle;
+
+    return %info;
+}
+
+1;

@@ -0,0 +1,83 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::VmWareESX;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('vmware-cmd');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $machine (_getMachines(
+        command => 'vmware-cmd -l', logger => $logger
+    )) {
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+}
+
+sub _getMachines {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my @machines;
+    while (my $line = <$handle>) {
+        chomp $line;
+        next unless -f $line;
+
+        my %info = _getMachineInfo(file => $line, logger => $params{logger});
+
+        my $machine = {
+            MEMORY    => $info{'memsize'},
+            NAME      => $info{'displayName'},
+            UUID      => $info{'uuid.bios'},
+            SUBSYSTEM => "VmWareESX",
+            VMTYPE    => "VmWare",
+        };
+
+        $machine->{STATUS} = getFirstMatch(
+            command => "vmware-cmd '$line' getstate",
+            logger  => $params{logger},
+            pattern => qr/= (\w+)/
+        ) || 'unknown';
+
+        # correct uuid format
+        $machine->{UUID} =~ s/\s+//g;      # delete space
+        $machine->{UUID} =~ s/^(........)(....)(....)-(....)(.+)$/$1-$2-$3-$4-$5/; # add dashs
+
+        push @machines, $machine;
+
+    }
+    close $handle;
+
+    return @machines;
+}
+
+sub _getMachineInfo {
+    my $handle = getFileHandle(@_);
+    return unless $handle;
+
+    my %info;
+    while (my $line = <$handle>) {
+        next unless $line = /^(\S+)\s*=\s*(\S+.*)/;
+        my $key = $1;
+        my $value = $2;
+        $value =~ s/(^"|"$)//g;
+        $info{$key} = $value;
+    }
+    close $handle;
+
+    return %info;
+}
+
+1;

@@ -0,0 +1,262 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Vmsystem;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+use FusionInventory::Agent::Tools::Solaris;
+
+my @vmware_patterns = (
+    'VMware vmxnet virtual NIC driver',
+    'Vendor: VMware\s+Model: Virtual disk',
+    'Vendor: VMware,\s+Model: VMware Virtual ',
+    ': VMware Virtual IDE CDROM Drive'
+);
+my $vmware_pattern = _assemblePatterns(@vmware_patterns);
+
+my @qemu_patterns = (
+    ' QEMUAPIC ',
+    'QEMU Virtual CPU',
+    ': QEMU HARDDISK,',
+    ': QEMU CD-ROM,'
+);
+my $qemu_pattern = _assemblePatterns(@qemu_patterns);
+
+my @virtual_machine_patterns = (
+    ': Virtual HD,',
+    ': Virtual CD,'
+);
+my $virtual_machine_pattern = _assemblePatterns(@virtual_machine_patterns);
+
+my @virtualbox_patterns = (
+    ' VBOXBIOS ',
+    ': VBOX HARDDISK,',
+    ': VBOX CD-ROM,',
+);
+my $virtualbox_pattern = _assemblePatterns(@virtualbox_patterns);
+
+my @xen_patterns = (
+    'Hypervisor signature: xen',
+    'Xen virtual console successfully installed',
+    'Xen reported:',
+    'Xen: \d+ - \d+',
+    'xen-vbd: registered block device',
+    'ACPI: [A-Z]{4} \(v\d+\s+Xen ',
+);
+my $xen_pattern = _assemblePatterns(@xen_patterns);
+
+my %module_patterns = (
+    '^vmxnet\s' => 'VMware',
+    '^xen_\w+front\s' => 'Xen',
+);
+
+sub isEnabled {
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    # return immediatly if vm type has already been found
+    return if $inventory->{content}{HARDWARE}{VMSYSTEM} ne "Physical";
+
+    my $type = _getType($logger);
+
+    # for consistency with HVM domU
+    if (
+        $type eq 'Xen' &&
+        !$inventory->{h}{CONTENT}{BIOS}{SMANUFACTURER}
+    ) {
+        $inventory->setBios({
+            SMANUFACTURER => 'Xen',
+            SMODEL => 'PVM domU'
+        });
+    }
+
+    my $vmid = $type eq 'Virtuozzo' ?
+        _getOpenVZVmID(logger => $logger) : undef;
+
+    my $uuid = $type eq 'Xen' ? _getXenUUID(logger => $logger) :
+               $type eq 'LXC' ? _getLibvirtLXC_UUID(logger => $logger) :
+               undef;
+
+    $inventory->setHardware({
+        VMSYSTEM => $type,
+        UUID     => $uuid,
+        VMID     => $vmid
+    });
+}
+
+sub _getType {
+    my ($logger) = @_;
+
+    if (-f '/.dockerinit') {
+        return 'Docker';
+    }
+
+    # Solaris zones
+    if (canRun('/usr/sbin/zoneadm')) {
+        my $zone = getZone();
+        return 'SolarisZone' if $zone ne 'global';
+    }
+
+    # Xen PV host
+    if (
+        -d '/proc/xen' ||
+        getFirstMatch(
+            file    => '/sys/devices/system/clocksource/clocksource0/available_clocksource',
+            pattern => qr/xen/
+        )
+    ) {
+        if (getFirstMatch(
+            file    => '/proc/xen/capabilities',
+            pattern => qr/control_d/
+        )) {
+            # dom0 host
+            return 'Physical';
+        } else {
+            # domU PV host
+            return 'Xen';
+        }
+    }
+
+    my $result;
+
+    if (canRun('/sbin/sysctl')) {
+        my $handle = getFileHandle(
+            command => '/sbin/sysctl -n security.jail.jailed',
+            logger => $logger
+        );
+        my $line = <$handle>;
+        close $handle;
+        return 'BSDJail' if $line && $line == 1;
+    }
+
+    # loaded modules
+
+    if (-f '/proc/modules') {
+        my $handle = getFileHandle(
+            file => '/proc/modules',
+            logger => $logger
+        );
+        while (my $line = <$handle>) {
+            foreach my $pattern (keys %module_patterns) {
+                next unless $line =~ /$pattern/;
+                $result = $module_patterns{$pattern};
+                last;
+            }
+        }
+        close $handle;
+    }
+    return $result if $result;
+
+    # dmesg
+
+    my $handle;
+    if (-r '/var/log/dmesg') {
+        $handle = getFileHandle(file => '/var/log/dmesg', logger => $logger);
+    } elsif (-x '/bin/dmesg') {
+        $handle = getFileHandle(command => '/bin/dmesg', logger => $logger);
+    } elsif (-x '/sbin/dmesg') {
+        # On OpenBSD, dmesg is in sbin
+        # http://forge.fusioninventory.org/issues/402
+        $handle = getFileHandle(command => '/sbin/dmesg', logger => $logger);
+    }
+
+    if ($handle) {
+        $result = _matchPatterns($handle);
+        close $handle;
+        return $result if $result;
+    }
+
+    # scsi
+
+    if (-f '/proc/scsi/scsi') {
+        my $handle = getFileHandle(
+            file => '/proc/scsi/scsi',
+            logger => $logger
+        );
+        $result = _matchPatterns($handle);
+        close $handle;
+    }
+    return $result if $result;
+
+    if (getFirstMatch(
+        file    => '/proc/1/environ',
+        pattern => qr/container=lxc/
+    )) {
+        return 'lxc';
+    }
+
+    # OpenVZ
+    if (-f '/proc/self/status') {
+        my $handle = getFileHandle(
+            file => '/proc/self/status',
+            logger => $logger
+        );
+        while (my $line = <$handle>) {
+            my ($key, $value) = split(/:/, $line);
+            $result = "Virtuozzo" if $key eq 'envID' && $value > 0;
+        }
+    }
+    return $result if $result;
+
+    return 'Physical';
+}
+
+sub _assemblePatterns {
+    my (@patterns) = @_;
+
+    my $pattern = '(?:' . join('|', @patterns) . ')';
+    return qr/$pattern/;
+}
+
+sub _matchPatterns {
+    my ($handle) = @_;
+
+    while (my $line = <$handle>) {
+        return 'VMware'          if $line =~ $vmware_pattern;
+        return 'QEMU'            if $line =~ $qemu_pattern;
+        return 'Virtual Machine' if $line =~ $virtual_machine_pattern;
+        return 'VirtualBox'      if $line =~ $virtualbox_pattern;
+        return 'Xen'             if $line =~ $xen_pattern;
+    }
+}
+
+sub _getOpenVZVmID {
+    return getFirstMatch(
+        file    => '/proc/self/status',
+        pattern => qr/^envID:\s*(\d+)/,
+        @_
+    );
+}
+
+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;

@@ -0,0 +1,69 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Vserver;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+sub isEnabled {
+    return canRun('vserver');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    foreach my $machine (_getMachines(
+        command => 'vserver-info', logger => $logger
+    )) {
+        $inventory->addEntry(section => 'VIRTUALMACHINES', entry => $machine);
+    }
+}
+
+sub _getMachines {
+    my (%params) = @_;
+
+    my $handle = getFileHandle(%params);
+    return unless $handle;
+
+    my $utilVserver;
+    my $cfgDir;
+    while (my $line = <$handle>) {
+        $cfgDir = $1 if $line =~ /^\s+cfg-Directory:\s+(.*)$/;
+        $utilVserver = $1 if $line =~ /^\s+util-vserver:\s+(.*)$/;
+    }
+    close $handle;
+
+    return unless -d $cfgDir;
+
+    $handle = getDirectoryHandle(directory => $cfgDir, logger => $params{logger});
+    return unless $handle;
+
+    my @machines;
+    while (my $name = readdir($handle)) {
+        next if $name =~ /^\./;
+        next unless $name =~ /\S/;
+
+        my $line = getFirstLine(command => "vserver $name status");
+        my $status =
+            $line =~ /is stopped/ ? 'off'     :
+            $line =~ /is running/ ? 'running' :
+                                    undef     ;
+
+        my $machine = {
+            NAME      => $name,
+            STATUS    => $status,
+            SUBSYSTEM => $utilVserver,
+            VMTYPE    => "vserver",
+        };
+
+        push @machines, $machine;
+    }
+    close $handle;
+
+    return @machines;
+}
+
+1;

@@ -0,0 +1,89 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::Xen;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+our $runMeIfTheseChecksFailed = ["FusionInventory::Agent::Task::Inventory::Virtualization::Libvirt"];
+
+sub isEnabled {
+    return canRun('xm');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $command = 'xm list';
+    foreach my $machine (_getVirtualMachines(command => $command, logger => $logger)) {
+        my $uuid = _getUUID(
+            command => "xm list -l $machine->{NAME}",
+            logger  => $logger
+        );
+        $machine->{UUID} = $uuid;
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+}
+
+sub _getUUID {
+    my (%params) = @_;
+
+    return getFirstMatch(
+        pattern => qr/\( uuid \s ([^)]+) \)/x,
+        %params
+    );
+}
+
+sub  _getVirtualMachines {
+
+    my $handle = getFileHandle(@_);
+
+    return unless $handle;
+
+    # xm status
+    my %status_list = (
+        'r' => 'running',
+        'b' => 'blocked',
+        'p' => 'paused',
+        's' => 'shutdown',
+        'c' => 'crashed',
+        'd' => 'dying',
+    );
+
+    # drop headers
+    my $line  = <$handle>;
+
+    my @machines;
+    while (my $line = <$handle>) {
+        chomp $line;
+        my ($name, $vmid, $memory, $vcpu, $status) = split(' ', $line);
+        next if $name eq 'Domain-0';
+        next if $vmid == 0;
+
+        $status =~ s/-//g;
+        $status = $status ? $status_list{$status} : 'off';
+
+        my $machine = {
+            MEMORY    => $memory,
+            NAME      => $name,
+            STATUS    => $status,
+            SUBSYSTEM => 'xm',
+            VMTYPE    => 'xen',
+            VCPU      => $vcpu,
+            VMID      => $vmid,
+        };
+
+        push @machines, $machine;
+
+    }
+    close $handle;
+
+    return @machines;
+}
+
+1;

@@ -0,0 +1,107 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization::XenCitrixServer;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools;
+
+our $runMeIfTheseChecksFailed = ["FusionInventory::Agent::Task::Inventory::Virtualization::Libvirt"];
+
+sub isEnabled {
+    return canRun('xe');
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $command = 'xe vm-list';
+    foreach my $machine (_getUUID(command => $command, logger => $logger)) {
+        my $machineextend = _getVirtualMachines(
+            command => "xe vm-param-list uuid=$machine->{UUID}",
+            logger  => $logger,
+        );
+        foreach my $key ($machineextend) {
+            $machine->{$key} = $machineextend->{$key};
+        }
+
+        $inventory->addEntry(
+            section => 'VIRTUALMACHINES', entry => $machine
+        );
+    }
+}
+
+sub _getUUID {
+
+    my $handle = getFileHandle(@_);
+
+    return unless $handle;
+
+    my @machines;
+    while (my $line = <$handle>) {
+        chomp $line;
+        next unless $line =~ /uuid ( RO)/;
+        my (undef, $uuid) = split(':', $line);
+        chomp $uuid;
+
+        my $machine = {
+            UUID      => $uuid,
+            SUBSYSTEM => 'xe',
+            VMTYPE    => 'xen',
+        };
+
+        push @machines, $machine;
+
+    }
+    close $handle;
+
+    return @machines;
+}
+
+sub  _getVirtualMachines {
+
+    my $handle   = getFileHandle(@_);
+
+    return unless $handle;
+
+    # xe status
+    my %status_list = (
+        'running' => 'running',
+        'halted'  => 'shutdown',
+    );
+
+    my $machine;
+
+    while (my $line = <$handle>) {
+        chomp $line;
+        my ($extendedlabel, $value) = split('\): ', $line);
+        chomp $value;
+        if ($extendedlabel =~ /name-label/) {
+            $machine->{NAME} = $value;
+            next;
+        }
+        if ($extendedlabel =~ /memory-actual/) {
+            $machine->{MEMORY} = ($value / 1048576);
+            next;
+        }
+        if ($extendedlabel =~ /power-state/) {
+            $machine->{STATUS} = $value ? $status_list{$value} : 'off';
+            next;
+        }
+        if ($extendedlabel =~ /VCPUs-number/) {
+            $machine->{VCPU} = $value;
+            next;
+        }
+        if ($extendedlabel =~ /name-description/) {
+            next if $value eq '';
+            $machine->{COMMENT} = $value;
+            next;
+        }
+    }
+
+    return $machine;
+}
+
+1;

@@ -0,0 +1,15 @@
+package FusionInventory::Agent::Task::Inventory::Virtualization;
+
+use strict;
+use warnings;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{virtualmachine};
+    return 1;
+}
+
+sub doInventory {
+}
+
+1;

@@ -0,0 +1,65 @@
+package FusionInventory::Agent::Task::Inventory::Win32::AntiVirus;
+
+use strict;
+use warnings;
+
+use FusionInventory::Agent::Tools::Win32;
+
+my $seen;
+
+sub isEnabled {
+    my (%params) = @_;
+    return 0 if $params{no_category}->{antivirus};
+    return 1;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+
+    # Doesn't works on Win2003 Server
+    # On Win7, we need to use SecurityCenter2
+    foreach my $instance (qw/SecurityCenter SecurityCenter2/) {
+        my $moniker = "winmgmts:{impersonationLevel=impersonate,(security)}!//./root/$instance";
+
+        foreach my $object (getWMIObjects(
+                moniker    => $moniker,
+                class      => "AntiVirusProduct",
+                properties => [ qw/
+                    companyName displayName instanceGuid onAccessScanningEnabled
+                    productUptoDate versionNumber productState
+               / ]
+        )) {
+            next unless $object;
+
+            my $antivirus = {
+                COMPANY  => $object->{companyName},
+                NAME     => $object->{displayName},
+                GUID     => $object->{instanceGuid},
+                VERSION  => $object->{versionNumber},
+                ENABLED  => $object->{onAccessScanningEnabled},
+                UPTODATE => $object->{productUptoDate}
+            };
+
+            if ($object->{productState}) {
+                my $bin = sprintf( "%b\n", $object->{productState});
+# http://blogs.msdn.com/b/alejacma/archive/2008/05/12/how-to-get-antivirus-information-with-wmi-vbscript.aspx?PageIndex=2#comments
+                if ($bin =~ /(\d)\d{5}(\d)\d{6}(\d)\d{5}$/) {
+                    $antivirus->{UPTODATE} = $1 || $2;
+                    $antivirus->{ENABLED}  = $3 ? 0 : 1;
+                }
+            }
+
+            # avoid duplicates
+            next if $seen->{$antivirus->{NAME}}->{$antivirus->{VERSION}||'_undef_'}++;
+
+            $inventory->addEntry(
+                section => 'ANTIVIRUS',
+                entry   => $antivirus
+            );
+        }
+    }
+}
+
+1;

@@ -0,0 +1,132 @@
+package FusionInventory::Agent::Task::Inventory::Win32::Bios;
+
+use strict;
+use warnings;
+
+use English qw(-no_match_vars);
+
+use FusionInventory::Agent::Tools::Win32;
+
+# Only run this module if dmidecode has not been found
+our $runMeIfTheseChecksFailed =
+    ["FusionInventory::Agent::Task::Inventory::Generic::Dmidecode::Bios"];
+
+sub isEnabled {
+    return 1;
+}
+
+sub _dateFromIntString {
+    my ($string) = @_;
+
+    if ($string && $string =~ /^(\d{4})(\d{2})(\d{2})/) {
+        return "$2/$3/$1";
+    }
+
+    return $string;
+}
+
+sub doInventory {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $logger    = $params{logger};
+
+    my $bios = {
+        BDATE => _dateFromIntString(getRegistryValue(
+            path   => "HKEY_LOCAL_MACHINE/Hardware/Description/System/BIOS/BIOSReleaseDate",
+            logger => $logger
+        ))
+    };
+
+    foreach my $object (getWMIObjects(
+        class      => 'Win32_Bios',
+        properties => [ qw/
+            SerialNumber Version Manufacturer SMBIOSBIOSVersion BIOSVersion ReleaseDate
+        / ]
+    )) {
+        $bios->{BIOSSERIAL}    = $object->{SerialNumber};
+        $bios->{SSN}           = $object->{SerialNumber};
+        $bios->{BMANUFACTURER} = $object->{Manufacturer};
+        $bios->{BVERSION}      = $object->{SMBIOSBIOSVersion} ||
+                                 $object->{BIOSVersion}       ||
+                                 $object->{Version};
+        $bios->{BDATE}         = _dateFromIntString($object->{ReleaseDate});
+    }
+
+    foreach my $object (getWMIObjects(
+        class      => 'Win32_ComputerSystem',
+        properties => [ qw/
+            Manufacturer Model
+        / ]
+    )) {
+        $bios->{SMANUFACTURER} = $object->{Manufacturer};
+        $bios->{SMODEL}        = $object->{Model};
+    }
+
+    foreach my $object (getWMIObjects(
+            class      => 'Win32_SystemEnclosure',
+            properties => [ qw/
+                SerialNumber SMBIOSAssetTag
+            / ]
+    )) {
+        $bios->{ENCLOSURESERIAL} = $object->{SerialNumber} ;
+        $bios->{SSN}             = $object->{SerialNumber} unless $bios->{SSN};
+        $bios->{ASSETTAG}        = $object->{SMBIOSAssetTag};
+    }
+
+    foreach my $object (getWMIObjects(
+            class => 'Win32_BaseBoard',
+            properties => [ qw/
+                SerialNumber Product Manufacturer
+            / ]
+    )) {
+        $bios->{MSN}             = $object->{SerialNumber};
+        $bios->{MMODEL}          = $object->{Product};
+        $bios->{SSN}             = $object->{SerialNumber}
+            unless $bios->{SSN};
+        $bios->{SMANUFACTURER}   = $object->{Manufacturer}
+            unless $bios->{SMANUFACTURER};
+
+    }
+
+    foreach (keys %$bios) {
+        $bios->{$_} =~ s/\s+$// if $bios->{$_};
+    }
+
+    $inventory->setBios($bios);
+
+    SWITCH: {
+        if (
+            ($bios->{VERSION} && $bios->{VERSION} eq 'VirtualBox') ||
+            ($bios->{MMODEL}  && $bios->{MMODEL} eq 'VirtualBox')
+           ) {
+            $inventory->setHardware ({
+                VMSYSTEM => 'VirtualBox'
+            });
+            last SWITCH;
+        }
+
+        if (
+            ($bios->{BIOSSERIAL} && $bios->{BIOSSERIAL} =~ /VMware/i) ||
+            ($bios->{SMODEL}     && $bios->{SMODEL} eq 'VirtualBox')
+           ) {
+            $inventory->setHardware ({
+                VMSYSTEM => 'VMware'
+            });
+            last SWITCH;
+        }
+
+        if (
+            ($bios->{SMANUFACTURER} && $bios->{SMANUFACTURER} eq 'Xen') ||
+            ($bios->{BMANUFACTURER} && $bios->{BMANUFACTURER} eq 'Xen')
+           ) {
+            $inventory->setHardware ({
+                VMSYSTEM => 'Xen'
+            });
+            last SWITCH;
+        }
+    }
+
+}
+
+1;