diff --git a/debian/changelog b/debian/changelog
index 4ba7cbbdeae7e9903b8bd0ed083987d90e6db479..f8254c7dfe8fbd047f2c9eb701cf6974b6dd4e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fusioninventory-agent (1:2.4.1-1) unstable; urgency=low
+
+ * New upstream version 2.4.1
+ * Removed obsolete patches as merged upstream
+ * Add upstream patch to fix perl error while --lazy option from script
+
+ -- Guillaume Bougard <gbougard@teclib.com> Wed, 04 Jul 2018 14:07:26 +0200
+
fusioninventory-agent (1:2.4-1) unstable; urgency=low
* New upstream release (closes: #816754)
diff --git a/debian/patches/00bb19f26-upstream-github-commit.path b/debian/patches/00bb19f26-upstream-github-commit.path
deleted file mode 100644
index 0b77a3d026be86b97b3e9071b7543a796ee4ce9f..0000000000000000000000000000000000000000
--- a/debian/patches/00bb19f26-upstream-github-commit.path
+++ /dev/null
@@ -1,1596 +0,0 @@
-Description: 2.4.1-dev / 00bb19f26 upstream github commit
- * Rebased sources on 2.4.1-dev / 00bb19f26 upstream github commit
-Author: Guillaume Bougard <gbougard@teclib.com>
-Origin: upstream, https://github.com/fusioninventory/fusioninventory-agent/commit/00bb19f26
-Last-Update: 2018-06-22
-
---- fusioninventory-agent-2.4.orig/Changes
-+++ fusioninventory-agent-2.4/Changes
-@@ -1,5 +1,18 @@
- Revision history for FusionInventory agent
-
-+2.4.1 not released yet
-+
-+netdiscovery/netinventory:
-+* Bump NetDiscovery & NetInventory task version to 2.6
-+* Added support for HP Net Peripheral, involving better HP printers inventory
-+ * Get Serial number & firmware version
-+ * Fix total printed pages counter in many case
-+ * Added total color pages counter support
-+* Don't assume colors table was read: fixes black toner detection on many HP printers
-+* Added Microtik devices support
-+* Enhanced Epson printers support, including model name, serial number and firmwares
-+* Updated LLDP support
-+
- 2.4 Fri, 29 Dec 2017
- core:
- * Cleanup confdir use in task so using deprecated etc/softwares folder is no more
---- fusioninventory-agent-2.4.orig/lib/FusionInventory/Agent/SNMP/Device.pm
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/SNMP/Device.pm
-@@ -196,12 +196,12 @@ sub setSerial {
- my ($self) = @_;
-
- my $serial =
-+ # First try MIB Support mechanism
-+ $self->getSerialByMibSupport() ||
- # Entity-MIB::entPhysicalSerialNum
- $self->{snmp}->get_first('.1.3.6.1.2.1.47.1.1.1.1.11') ||
- # Printer-MIB::prtGeneralSerialNumber
-- $self->{snmp}->get_first('.1.3.6.1.2.1.43.5.1.1.17') ||
-- # Try MIB Support mechanism
-- $self->getSerialByMibSupport();
-+ $self->{snmp}->get_first('.1.3.6.1.2.1.43.5.1.1.17');
-
- if ( not defined $serial ) {
- # vendor specific OIDs
-@@ -223,21 +223,26 @@ sub setSerial {
- }
- }
-
-+ $serial = getCanonicalSerialNumber($serial);
-+
- return unless $serial;
-
-- $self->{SERIAL} = getCanonicalSerialNumber($serial);
-+ # Skip well-known invalid serial number
-+ return if $serial =~ /^X+$/;
-+
-+ $self->{SERIAL} = $serial;
- }
-
- sub setFirmware {
- my ($self) = @_;
-
- my $firmware =
-+ # First try to get firmware from MIB Support mechanism
-+ $self->getFirmwareByMibSupport() ||
- # entPhysicalSoftwareRev
- $self->{snmp}->get_first('.1.3.6.1.2.1.47.1.1.1.1.10') ||
- # entPhysicalFirmwareRev
-- $self->{snmp}->get_first('.1.3.6.1.2.1.47.1.1.1.1.9') ||
-- # firmware from supported mib
-- $self->getFirmwareByMibSupport();
-+ $self->{snmp}->get_first('.1.3.6.1.2.1.47.1.1.1.1.9');
-
- if ( not defined $firmware ) {
- # vendor specific OIDs
-@@ -250,12 +255,15 @@ sub setFirmware {
- $firmware = $self->get($oid);
- last if defined $firmware;
- }
-+ return unless defined $firmware;
- }
-
-- return unless defined $firmware;
-+ $firmware = getCanonicalString($firmware);
-+
-+ return unless $firmware;
-
- # Set device firmware
-- $self->{FIRMWARE} = getCanonicalString($firmware);
-+ $self->{FIRMWARE} = $firmware;
-
- # Also add firmware as device FIRMWARES
- $self->addFirmware({
-@@ -333,6 +341,46 @@ sub setMacAddress {
- }
- }
-
-+# rules on model name to reset manufacturer to real vendor
-+my %sysmodel_first_word = (
-+ 'dell' => { manufacturer => 'Dell', },
-+);
-+
-+sub setModel {
-+ my ($self) = @_;
-+
-+ # fallback model identification attempt, using type-specific OID value
-+ if (!exists $self->{MODEL}) {
-+ my $model = exists $self->{TYPE} && $self->{TYPE} eq 'PRINTER' ?
-+ $self->get('.1.3.6.1.2.1.25.3.2.1.3.1') :
-+ exists $self->{TYPE} && $self->{TYPE} eq 'POWER' ?
-+ $self->get('.1.3.6.1.2.1.33.1.1.5.0') : # UPS-MIB
-+ $self->get('.1.3.6.1.2.1.47.1.1.1.1.13.1') ;
-+ $self->{MODEL} = getCanonicalString($model) if $model;
-+ }
-+
-+ # fallback manufacturer identification attempt, using type-agnostic OID
-+ if (!exists $self->{MANUFACTURER}) {
-+ my $manufacturer = $self->get('.1.3.6.1.2.1.43.8.2.1.14.1.1');
-+ $self->{MANUFACTURER} = $manufacturer if $manufacturer;
-+ }
-+
-+ # reset manufacturer by rule as real vendor based on first model word
-+ if (exists $self->{MODEL}) {
-+ my ($first_word) = $self->{MODEL} =~ /(\S+)/;
-+ my $result = $sysmodel_first_word{lc($first_word)};
-+ if ($result && $result->{manufacturer}) {
-+ $self->{MANUFACTURER} = $result->{manufacturer};
-+ }
-+ }
-+
-+ # Permit mib support to reset model
-+ if ($self->{MIBSUPPORT}) {
-+ my $model = $self->{MIBSUPPORT}->getMethod('getModel');
-+ $self->{MODEL} = getCanonicalString($model) if $model;
-+ }
-+}
-+
- sub _numericMac {
- my ($mac) = @_;
-
---- /dev/null
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/SNMP/MibSupport/Epson.pm
-@@ -0,0 +1,69 @@
-+package FusionInventory::Agent::SNMP::MibSupport::Epson;
-+
-+use strict;
-+use warnings;
-+
-+use parent 'FusionInventory::Agent::SNMP::MibSupportTemplate';
-+
-+use FusionInventory::Agent::Tools;
-+use FusionInventory::Agent::Tools::SNMP;
-+
-+use constant epson => '.1.3.6.1.4.1.1248' ;
-+use constant model => epson .'.1.2.2.1.1.1.2.1' ;
-+use constant serial => epson .'.1.2.2.1.1.1.5.1' ;
-+use constant fw_base => epson . '.1.2.2.2.1.1' ;
-+
-+our $mibSupport = [
-+ {
-+ name => "epson-printer",
-+ sysobjectid => getRegexpOidMatch(epson)
-+ }
-+];
-+
-+sub getSerial {
-+ my ($self) = @_;
-+
-+ return $self->get(serial);
-+}
-+
-+sub getModel {
-+ my ($self) = @_;
-+
-+ return $self->get(model)
-+}
-+
-+sub run {
-+ my ($self) = @_;
-+
-+ my $device = $self->device
-+ or return;
-+
-+ my $versions = $self->walk(fw_base.'.2') || {};
-+ my $names = $self->walk(fw_base.'.3') || {};
-+ my $firmwares = $self->walk(fw_base.'.4') || $names;
-+ if ($firmwares) {
-+ foreach my $index (keys(%{$firmwares})) {
-+ next unless $versions->{$index};
-+ my $firmware = {
-+ NAME => "Epson ".($names->{$index} || "printer"),
-+ DESCRIPTION => "Epson printer ".($names->{$index} || "firmware"),
-+ TYPE => "printer",
-+ VERSION => $versions->{$index},
-+ MANUFACTURER => "Epson"
-+ };
-+ $device->addFirmware($firmware);
-+ }
-+ }
-+}
-+
-+1;
-+
-+__END__
-+
-+=head1 NAME
-+
-+Inventory module for Epson Printers
-+
-+=head1 DESCRIPTION
-+
-+The module enhances Epson printers devices support.
---- /dev/null
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/SNMP/MibSupport/HPNetPeripheral.pm
-@@ -0,0 +1,126 @@
-+package FusionInventory::Agent::SNMP::MibSupport::HPNetPeripheral;
-+
-+use strict;
-+use warnings;
-+
-+use parent 'FusionInventory::Agent::SNMP::MibSupportTemplate';
-+
-+use FusionInventory::Agent::Tools;
-+use FusionInventory::Agent::Tools::SNMP;
-+
-+# See HP-LASERJET-COMMON-MIB / JETDIRECT3-MIB
-+use constant hpPeripheral => '.1.3.6.1.4.1.11.2.3.9' ; # hp.nm.system.net-peripheral
-+use constant hpNetPrinter => hpPeripheral .'.1' ;
-+use constant hpDevice => hpPeripheral . '.4.2.1' ; # + netPML.netPMLmgmt.device
-+
-+use constant gdStatusId => hpNetPrinter . '.1.7.0' ;
-+
-+# System id
-+use constant systemId => hpDevice . '.1.3' ; # + system.id
-+use constant model_name => systemId . '.2.0' ;
-+use constant serial_number => systemId . '.3.0' ;
-+use constant fw_rom_datecode => systemId . '.5.0' ;
-+use constant fw_rom => systemId . '.6.0' ;
-+
-+# Status print engine: status-prt-eng
-+use constant statusPrtEngine => hpDevice . '.4.1.2' ;
-+use constant totalEnginePageCount => statusPrtEngine . '.5.0' ;
-+use constant totalColorPageCount => statusPrtEngine . '.7.0' ;
-+use constant duplexPageCount => statusPrtEngine . '.22.0' ;
-+
-+my %counters = (
-+ TOTAL => totalEnginePageCount,
-+ COLOR => totalColorPageCount,
-+ DUPLEX => duplexPageCount
-+);
-+
-+our $mibSupport = [
-+ {
-+ name => "hp-peripheral",
-+ sysobjectid => getRegexpOidMatch(hpPeripheral)
-+ }
-+];
-+
-+sub getFirmware {
-+ my ($self) = @_;
-+
-+ my $device = $self->device
-+ or return;
-+
-+ my $firmware = $self->_getClean(fw_rom);
-+
-+ # Eventually extract EEPROM revision from device description
-+ if (!$firmware && $device->{DESCRIPTION}) {
-+ foreach (split(/,+/, $device->{DESCRIPTION})) {
-+ return $1 if /EEPROM\s+(\S+)/;
-+ }
-+ }
-+
-+ return $firmware;
-+}
-+
-+sub getFirmwareDate {
-+ my ($self) = @_;
-+
-+ return $self->_getClean(fw_rom_datecode);
-+}
-+
-+sub getSerial {
-+ my ($self) = @_;
-+
-+ return $self->get(serial_number);
-+}
-+
-+sub getModel {
-+ my ($self) = @_;
-+
-+ # Try first to get model if set in StatusId string
-+ my $statusId = getCanonicalString($self->get(gdStatusId));
-+ if ($statusId) {
-+ foreach (split(/\s*;\s*/, $statusId)) {
-+ return $1 if /^MODEL:\s*(.*)$/;
-+ }
-+ }
-+
-+ # Else try to get model from model-name string
-+ return $self->_getClean(model_name);
-+}
-+
-+sub run {
-+ my ($self) = @_;
-+
-+ my $device = $self->device
-+ or return;
-+
-+ # Update counters if still not found
-+ foreach my $counter (keys %counters) {
-+ next if $device->{PAGECOUNTERS} && $device->{PAGECOUNTERS}->{$counter};
-+ my $count = $self->get($counters{$counter})
-+ or next;
-+ $device->{PAGECOUNTERS}->{$counter} = getCanonicalConstant($count);
-+ }
-+}
-+
-+sub _getClean {
-+ my ($self, $oid) = @_;
-+
-+ my $clean_string = hex2char($self->get($oid));
-+
-+ return unless defined $clean_string;
-+
-+ $clean_string =~ s/[[:^print:]]//g;
-+
-+ return $clean_string;
-+}
-+
-+1;
-+
-+__END__
-+
-+=head1 NAME
-+
-+Inventory module for HP Printers
-+
-+=head1 DESCRIPTION
-+
-+The module enhances HP printers devices support.
---- /dev/null
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/SNMP/MibSupport/Mikrotik.pm
-@@ -0,0 +1,62 @@
-+package FusionInventory::Agent::SNMP::MibSupport::Mikrotik;
-+
-+use strict;
-+use warnings;
-+
-+use parent 'FusionInventory::Agent::SNMP::MibSupportTemplate';
-+
-+use FusionInventory::Agent::Tools;
-+use FusionInventory::Agent::Tools::SNMP;
-+
-+# See MIKROTIK-MIB
-+use constant mikrotikExperimentalModule => '.1.3.6.1.4.1.14988.1' ;
-+use constant mtxrSystem => mikrotikExperimentalModule .'.1.7' ;
-+
-+use constant mtxrSerialNumber => mtxrSystem . '.3.0' ;
-+use constant mtxrFirmwareVersion => mtxrSystem . '.4.0' ;
-+
-+our $mibSupport = [
-+ {
-+ name => "mikrotik",
-+ sysobjectid => getRegexpOidMatch(mikrotikExperimentalModule)
-+ }
-+];
-+
-+sub getFirmware {
-+ my ($self) = @_;
-+
-+ return $self->get(mtxrFirmwareVersion);
-+}
-+
-+sub getSerial {
-+ my ($self) = @_;
-+
-+ return $self->get(mtxrSerialNumber);
-+}
-+
-+sub getModel {
-+ my ($self) = @_;
-+
-+ my $device = $self->device
-+ or return;
-+
-+ my $model;
-+
-+ # Extract model from device description for RouterOS based systems
-+ ( $model ) = $device->{DESCRIPTION} =~ /^RouterOS\s+(.*)$/
-+ if $device->{DESCRIPTION};
-+
-+ return $model;
-+}
-+
-+1;
-+
-+__END__
-+
-+=head1 NAME
-+
-+Inventory module for Mikrotik devices
-+
-+=head1 DESCRIPTION
-+
-+The module fixes Mikrotik SerialNumber & Firmware version support.
---- fusioninventory-agent-2.4.orig/lib/FusionInventory/Agent/SNMP/MibSupportTemplate.pm
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/SNMP/MibSupportTemplate.pm
-@@ -5,6 +5,8 @@ use warnings;
-
- #use parent 'FusionInventory::Agent::SNMP::MibSupportTemplate';
-
-+#use FusionInventory::Agent::Tools::SNMP;
-+
- # define here constants as defined in related mib
- use constant enterprises => '.1.3.6.1.4.1' ;
- #use constant sectionOID => enterprises . '.XYZ';
-@@ -12,11 +14,15 @@ use constant enterprises => '.1.3
- #use constant mibOID => oidSection . '.x.y.z';
-
- our $mibSupport = [
-- # Example of mib support by sysobjectid matching
-+ # Examples of mib support by sysobjectid matching
- #{
- # name => "mibName",
- # sysobjectid => qr/^\.1\.3\.6\.1\.4\.1\.ENTREPRISE\.X\.Y/
- #},
-+ #{
-+ # name => "mibName",
-+ # sysobjectid => getRegexpOidMatch(enterprises . '.ENTREPRISE.X.Y')
-+ #},
- # Example of mib support by checking snmp agent exposed mib support
- # via sysORID entries
- #{
-@@ -103,6 +109,12 @@ sub getIp {
- #return $self->get(sectionOID . '.X.E');
- }
-
-+sub getModel {
-+ #my ($self) = @_;
-+
-+ #return $self->get(sectionOID . '.X.F');
-+}
-+
- sub run {
- #my ($self) = @_;
-
---- fusioninventory-agent-2.4.orig/lib/FusionInventory/Agent/Task/NetDiscovery/Version.pm
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/Task/NetDiscovery/Version.pm
-@@ -3,6 +3,6 @@ package FusionInventory::Agent::Task::Ne
- use strict;
- use warnings;
-
--use constant VERSION => "2.5";
-+use constant VERSION => "2.6";
-
- 1;
---- fusioninventory-agent-2.4.orig/lib/FusionInventory/Agent/Task/NetInventory/Version.pm
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/Task/NetInventory/Version.pm
-@@ -3,6 +3,6 @@ package FusionInventory::Agent::Task::Ne
- use strict;
- use warnings;
-
--use constant VERSION => "2.5";
-+use constant VERSION => "2.6";
-
- 1;
---- fusioninventory-agent-2.4.orig/lib/FusionInventory/Agent/Tools/Hardware.pm
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/Tools/Hardware.pm
-@@ -101,11 +101,6 @@ my @sysdescr_rules = (
- },
- );
-
--# rules on model name to reset manufacturer to real vendor
--my %sysmodel_first_word = (
-- 'dell' => { manufacturer => 'Dell', },
--);
--
- # common base variables
- my %base_variables = (
- CPU => {
-@@ -340,30 +335,8 @@ sub _getDevice {
- }
- }
-
-- # fallback model identification attempt, using type-specific OID value
-- if (!exists $device->{MODEL}) {
-- my $model = exists $device->{TYPE} && $device->{TYPE} eq 'PRINTER' ?
-- $snmp->get('.1.3.6.1.2.1.25.3.2.1.3.1') :
-- exists $device->{TYPE} && $device->{TYPE} eq 'POWER' ?
-- $snmp->get('.1.3.6.1.2.1.33.1.1.5.0') : # UPS-MIB
-- $snmp->get('.1.3.6.1.2.1.47.1.1.1.1.13.1') ;
-- $device->{MODEL} = getCanonicalString($model) if $model;
-- }
--
-- # fallback manufacturer identification attempt, using type-agnostic OID
-- if (!exists $device->{MANUFACTURER}) {
-- my $manufacturer = $snmp->get('.1.3.6.1.2.1.43.8.2.1.14.1.1');
-- $device->{MANUFACTURER} = $manufacturer if $manufacturer;
-- }
--
-- # reset manufacturer by rule as real vendor based on first model word
-- if (exists $device->{MODEL}) {
-- my ($first_word) = $device->{MODEL} =~ /(\S+)/;
-- my $result = $sysmodel_first_word{lc($first_word)};
-- if ($result && $result->{manufacturer}) {
-- $device->{MANUFACTURER} = $result->{manufacturer};
-- }
-- }
-+ # Find and set model
-+ $device->setModel();
-
- # remaining informations
- foreach my $key (keys %base_variables) {
-@@ -653,13 +626,13 @@ sub _setGenericProperties {
- next unless $value;
- # safety checks
- if (! exists $ports->{$value}) {
-- $logger->warning(
-+ $logger->debug(
- "unknown interface $value for IP address $suffix, ignoring"
- ) if $logger;
- next;
- }
- if ($suffix !~ /^$ip_address_pattern$/) {
-- $logger->error("invalid IP address $suffix") if $logger;
-+ $logger->debug("invalid IP address $suffix") if $logger;
- next;
- }
- $ports->{$value}->{IP} = $suffix;
-@@ -701,7 +674,7 @@ sub _setPrinterProperties {
- $type = $consumable_types{$type_id};
- } else {
- # fallback on description
-- my $description = $descriptions->{$consumable_id};
-+ my $description = getCanonicalString($descriptions->{$consumable_id});
- $type =
- $description =~ /maintenance/i ? 'MAINTENANCEKIT' :
- $description =~ /fuser/i ? 'FUSERKIT' :
-@@ -710,23 +683,27 @@ sub _setPrinterProperties {
- }
-
- if (!$type) {
-- $logger->debug("unknown consumable type $type_id") if $logger;
-+ $logger->debug("unknown consumable type $type_id: " .
-+ (getCanonicalString($descriptions->{$consumable_id}) || "no description")
-+ ) if $logger;
- next;
- }
-
- if ($type eq 'TONER' || $type eq 'DRUM' || $type eq 'CARTRIDGE' || $type eq 'DEVELOPER') {
- my $color;
-- if ($color_id) {
-+ if ($colors && $color_id) {
- $color = getCanonicalString($colors->{$color_id});
- if (!$color) {
-- $logger->debug("invalid color ID $color_id") if $logger;
-+ $logger->debug("invalid consumable color ID $color_id for : " .
-+ (getCanonicalString($descriptions->{$consumable_id}) || "no description")
-+ ) if $logger;
- next;
- }
- # remove space and following char, XML tag does not accept space
- $color =~ s/\s.*$//;
- } else {
- # fallback on description
-- my $description = $descriptions->{$consumable_id};
-+ my $description = getCanonicalString($descriptions->{$consumable_id});
- $color =
- $description =~ /cyan/i ? 'cyan' :
- $description =~ /magenta/i ? 'magenta' :
-@@ -784,7 +761,7 @@ sub _setPrinterProperties {
- }
- next unless defined $value;
- if (!isInteger($value)) {
-- $logger->error("incorrect counter value $value, check $variable->{mapping} mapping") if $logger;
-+ $logger->debug("incorrect counter value $value, check $variable->{mapping} mapping") if $logger;
- next;
- }
- $device->{PAGECOUNTERS}->{$key} = $value;
-@@ -974,7 +951,7 @@ sub _addKnownMacAddresses {
- foreach my $port_id (keys %$mac_addresses) {
- # safety check
- if (! exists $ports->{$port_id}) {
-- $logger->error(
-+ $logger->debug(
- "invalid interface ID $port_id while setting known mac " .
- "addresses, aborting"
- ) if $logger;
-@@ -1072,8 +1049,8 @@ sub _setConnectedDevices {
- foreach my $interface_id (keys %$lldp_info) {
- # safety check
- if (! exists $ports->{$interface_id}) {
-- $logger->warning(
-- "unknown interface $interface_id in LLDP info, ignoring"
-+ $logger->debug(
-+ "LLDP support: unknown interface $interface_id in LLDP info, ignoring"
- ) if $logger;
- next;
- }
-@@ -1093,8 +1070,8 @@ sub _setConnectedDevices {
- foreach my $interface_id (keys %$cdp_info) {
- # safety check
- if (! exists $ports->{$interface_id}) {
-- $logger->warning(
-- "unknown interface $interface_id in CDP info, ignoring"
-+ $logger->debug(
-+ "CDP support: unknown interface $interface_id in CDP info, ignoring"
- ) if $logger;
- next;
- }
-@@ -1111,8 +1088,8 @@ sub _setConnectedDevices {
- }
- } else {
- # undecidable situation
-- $logger->warning(
-- "multiple neighbors found by LLDP and CDP for " .
-+ $logger->debug(
-+ "CDP support: multiple neighbors found by LLDP and CDP for " .
- "interface $interface_id, ignoring"
- );
- delete $port->{CONNECTIONS};
-@@ -1131,8 +1108,8 @@ sub _setConnectedDevices {
- foreach my $interface_id (keys %$edp_info) {
- # safety check
- if (! exists $ports->{$interface_id}) {
-- $logger->warning(
-- "unknown interface $interface_id in EDP info, ignoring"
-+ $logger->debug(
-+ "EDP support: unknown interface $interface_id in EDP info, ignoring"
- ) if $logger;
- next;
- }
-@@ -1149,8 +1126,8 @@ sub _setConnectedDevices {
- }
- } else {
- # undecidable situation
-- $logger->warning(
-- "multiple neighbors found by LLDP and EDP for " .
-+ $logger->debug(
-+ "EDP support: multiple neighbors found by LLDP and EDP for " .
- "interface $interface_id, ignoring"
- );
- delete $port->{CONNECTIONS};
-@@ -1188,18 +1165,42 @@ sub _getLLDPInfo {
- # $prefix.x.y.z = $value
- # whereas y is either a port or an interface id
-
-+ # See LldpChassisIdSubtype textual convention in lldp.mib RFC
-+ # We only report macAddress='4' at the moment
-+ my %not_supported_subtype = (
-+ '1' => "chassis component",
-+ '2' => "interface alias",
-+ '3' => "port component",
-+ '5' => "network address",
-+ '6' => "interface name",
-+ '7' => "local"
-+ );
-+
- while (my ($suffix, $mac) = each %{$lldpRemChassisId}) {
- my $sysdescr = getCanonicalString($lldpRemSysDesc->{$suffix});
- my $sysname = getCanonicalString($lldpRemSysName->{$suffix});
- next unless ($sysdescr || $sysname);
-
-- # We only support macAddress as LldpChassisIdSubtype at the moment
-+ # Skip unexpected suffix format (seen at least on mikrotik devices)
-+ if ($suffix =~ /^\d+$/) {
-+ $logger->debug2("LLDP support: skipping unsupported suffix interface $suffix")
-+ if ($logger);
-+ next;
-+ }
-+
-+ # Skip unsupported LldpChassisIdSubtype
- my $subtype = $ChassisIdSubType->{$suffix} || "n/a";
- unless ($subtype eq '4') {
-- $logger->debug(
-- "ChassisId subtype $subtype not supported for <$sysdescr>, value was " .
-- ($mac||"n/a") . ", please report this issue"
-- ) if $logger;
-+ if ($logger) {
-+ my $info = ($sysname || "no name") . ", " .
-+ (getCanonicalString($mac) || "no chassis id") . ", " .
-+ ($sysdescr || "no description");
-+ if ($not_supported_subtype{$subtype}) {
-+ $logger->debug("LLDP support: skipping $not_supported_subtype{$subtype}: $info");
-+ } else {
-+ $logger->debug("LLDP support: ChassisId subtype $subtype not supported for <$info>, please report this issue");
-+ }
-+ }
- next;
- }
-
-@@ -1213,7 +1214,7 @@ sub _getLLDPInfo {
- # duplicating chassiId
- my $portId = $lldpRemPortId->{$suffix};
- if ($portId !~ /^0x/ or length($portId) != 14) {
-- $connection->{IFNUMBER} = $portId;
-+ $connection->{IFNUMBER} = getCanonicalString($portId);
- }
-
- my $ifdescr = getCanonicalString($lldpRemPortDesc->{$suffix});
-@@ -1268,7 +1269,7 @@ sub _getCDPInfo {
- if ($devicePort =~ /^\d+$/) {
- $connection->{IFNUMBER} = $devicePort;
- } else {
-- $connection->{IFDESCR} = $devicePort;
-+ $connection->{IFDESCR} = getCanonicalString($devicePort);
- }
-
- # cdpCacheDeviceId is either remote host name, either remote mac address
-@@ -1293,8 +1294,8 @@ sub _getCDPInfo {
- # warning: multiple neighbors announcement for the same interface
- # usually means a non-CDP aware intermediate equipement
- if ($results->{$interface_id}) {
-- $logger->warning(
-- "multiple neighbors found by CDP for interface $interface_id," .
-+ $logger->debug(
-+ "CDP support: multiple neighbors found by CDP for interface $interface_id," .
- " ignoring"
- );
- $blacklist->{$interface_id} = 1;
-@@ -1340,16 +1341,16 @@ sub _getEDPInfo {
-
- my $connection = {
- IP => $ip,
-- IFDESCR => $edpNeighborPort->{$short_suffix},
-- SYSNAME => $edpNeighborName->{$short_suffix},
-+ IFDESCR => getCanonicalString($edpNeighborPort->{$short_suffix}),
-+ SYSNAME => getCanonicalString($edpNeighborName->{$short_suffix}),
- SYSMAC => sprintf "%02x:%02x:%02x:%02x:%02x:%02x", @mac_elements
- };
-
- # warning: multiple neighbors announcement for the same interface
- # usually means a non-EDP aware intermediate equipement
- if ($results->{$interface_id}) {
-- $logger->warning(
-- "multiple neighbors found by EDP for interface $interface_id," .
-+ $logger->debug(
-+ "EDP support: multiple neighbors found by EDP for interface $interface_id," .
- " ignoring"
- );
- $blacklist->{$interface_id} = 1;
-@@ -1379,7 +1380,7 @@ sub _setVlans {
- foreach my $port_id (keys %$vlans) {
- # safety check
- if (! exists $ports->{$port_id}) {
-- $logger->error(
-+ $logger->debug(
- "invalid interface ID $port_id while setting vlans, aborting"
- ) if $logger;
- last;
-@@ -1464,7 +1465,7 @@ sub _setTrunkPorts {
- foreach my $port_id (keys %$trunk_ports) {
- # safety check
- if (! exists $ports->{$port_id}) {
-- $logger->error(
-+ $logger->debug(
- "invalid interface ID $port_id while setting trunk flag, " .
- "aborting"
- ) if $logger;
-@@ -1542,7 +1543,7 @@ sub _setAggregatePorts {
- foreach my $interface_id (keys %$lacp_info) {
- # safety check
- if (!$ports->{$interface_id}) {
-- $logger->warning(
-+ $logger->debug(
- "unknown interface $interface_id in LACP info, ignoring"
- ) if $logger;
- next;
-@@ -1556,7 +1557,7 @@ sub _setAggregatePorts {
- foreach my $interface_id (keys %$pagp_info) {
- # safety check
- if (!$ports->{$interface_id}) {
-- $logger->error(
-+ $logger->debug(
- "unknown interface $interface_id in PAGP info, ignoring"
- ) if $logger;
- next;
---- fusioninventory-agent-2.4.orig/lib/FusionInventory/Agent/Tools/SNMP.pm
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/Tools/SNMP.pm
-@@ -12,6 +12,7 @@ our @EXPORT = qw(
- getCanonicalMacAddress
- getCanonicalConstant
- isInteger
-+ getRegexpOidMatch
- );
-
- sub getCanonicalSerialNumber {
-@@ -39,11 +40,11 @@ sub getCanonicalString {
- $value =~ s/^\\?["']//;
- $value =~ s/\\?["']$//;
-
-- return unless defined $value;
--
- # Be sure to work on utf-8 string
- $value = getUtf8String($value);
-
-+ return unless defined $value;
-+
- # reduce linefeeds which can be found in descriptions or comments
- $value =~ s/\p{Control}+\n/\n/g;
-
-@@ -108,6 +109,17 @@ sub getCanonicalConstant {
- return $1 if $value =~ /\((\d+)\)$/;
- }
-
-+sub getRegexpOidMatch {
-+ my ($match) = @_;
-+
-+ return $match unless $match && $match =~ /^[0-9.]+$/;
-+
-+ # Protect dots for regexp compilation
-+ $match =~ s/\./\\./g;
-+
-+ return qr/^$match/;
-+}
-+
- 1;
- __END__
-
-@@ -140,3 +152,7 @@ return a clean integer value.
- =head2 isInteger($value)
-
- return true if value is an integer.
-+
-+=head2 getRegexpOidMatch($oid)
-+
-+return compiled regexp to match given oid.
---- fusioninventory-agent-2.4.orig/lib/FusionInventory/Agent/Tools/Win32.pm
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/Tools/Win32.pm
-@@ -674,7 +674,7 @@ sub getInterfaces {
- $interface->{DNSDomain} = $configuration->{DNSDomain}
- if $configuration->{DNSDomain};
-
-- $interface->{SPEED} = $object->{Speed} / 1_000_000
-+ $interface->{SPEED} = int($object->{Speed} / 1_000_000)
- if $object->{Speed};
- $interface->{VIRTUALDEV} = _isVirtual($object, $configuration);
-
-@@ -698,7 +698,7 @@ sub getInterfaces {
- $interface->{DNSDomain} = $configuration->{DNSDomain}
- if $configuration->{DNSDomain};
-
-- $interface->{SPEED} = $object->{Speed} / 1_000_000
-+ $interface->{SPEED} = int($object->{Speed} / 1_000_000)
- if $object->{Speed};
- $interface->{VIRTUALDEV} = _isVirtual($object, $configuration);
-
---- fusioninventory-agent-2.4.orig/lib/FusionInventory/Agent/Version.pm
-+++ fusioninventory-agent-2.4/lib/FusionInventory/Agent/Version.pm
-@@ -3,7 +3,7 @@ package FusionInventory::Agent::Version;
- use strict;
- use warnings;
-
--our $VERSION = "2.4";
-+our $VERSION = "2.4.1-dev";
- our $PROVIDER = "FusionInventory";
- our $COMMENTS = [];
-
---- fusioninventory-agent-2.4.orig/share/sysobject.ids
-+++ fusioninventory-agent-2.4/share/sysobject.ids
-@@ -1643,8 +1643,13 @@
- 11.2.3.7.5.22 Hewlett-Packard NETWORKING 100Base-T Hub-12M
- 11.2.3.7.5.23 Hewlett-Packard NETWORKING 100Base-T Hub-24M
- 11.2.3.7.8.2.5 Hewlett-Packard NETWORKING AdvanceStack 10BT Switching
-+11.2.3.7.8.5.1 Hewlett-Packard NETWORKING AdvanceStack 10BT Stack
- 11.2.3.7.8.5.2 Hewlett-Packard NETWORKING 3800 Stack
- 11.2.3.7.8.5.3 Hewlett-Packard NETWORKING 2920 Stack
-+11.2.3.7.8.5.4 Hewlett-Packard NETWORKING Aruba 3810 Stack
-+11.2.3.7.8.5.5 Hewlett-Packard NETWORKING Aruba 2930 Stack
-+11.2.3.7.8.5.6 Hewlett-Packard NETWORKING 5400R VSF Stack
-+11.2.3.7.8.5.7 Hewlett-Packard NETWORKING Aruba 2930M BPS Stack
- 11.2.3.7.11 Hewlett-Packard NETWORKING Unknown Switches
- 11.2.3.7.11.1 Hewlett-Packard NETWORKING AdvanceStack Switch 2000 (J3100A)
- 11.2.3.7.11.2 Hewlett-Packard NETWORKING AdvanceStack Switch 2000B (J3100B)
-@@ -1676,12 +1681,17 @@
- 11.2.3.7.11.22 Hewlett-Packard NETWORKING ProCurve 3124 (J4851A)
- 11.2.3.7.11.23 Hewlett-Packard NETWORKING ProCurve 4108GL (J4865A)
- 11.2.3.7.11.24 Hewlett-Packard NETWORKING ProCurve Copper GE Blade for BH7800 BladeServer (A6713A)
-+11.2.3.7.11.24.11 Hewlett-Packard NETWORKING A6713A 16+8-port 10/100T + Gig TX module
- 11.2.3.7.11.25 Hewlett-Packard NETWORKING ProCurve SX Fiber Blade for BH7800 BladeServer (A6716A)
-+11.2.3.7.11.25.12 Hewlett-Packard NETWORKING A6716A 16+8-port 10/100T + Gig SX module
- 11.2.3.7.11.26 Hewlett-Packard NETWORKING ProCurve LX Fiber Blade for BH7800 BladeServer (A6717A)
-+11.2.3.7.11.26.13 Hewlett-Packard NETWORKING A6717A 16+8-port 10/100T + Gig LX module
- 11.2.3.7.11.27 Hewlett-Packard NETWORKING ProCurve 4104GL (J4887A)
- 11.2.3.7.11.28 Hewlett-Packard NETWORKING ProCurve 9315M (J4874A)
- 11.2.3.7.11.29 Hewlett-Packard NETWORKING ProCurve 2650 (J4899A)
-+11.2.3.7.11.29.1 Hewlett-Packard NETWORKING 2650 48-port 10/100-T + 2-port Gig module
- 11.2.3.7.11.30 Hewlett-Packard NETWORKING ProCurve 6108 (J4902A)
-+11.2.3.7.11.30.1 Hewlett-Packard NETWORKING 6108 6-port 10/100/1000-TX + 2-port Gig module
- 11.2.3.7.11.31 Hewlett-Packard NETWORKING ProCurve 2824 (J4903A)
- 11.2.3.7.11.32 Hewlett-Packard NETWORKING ProCurve 2848 (J4904A)
- 11.2.3.7.11.33 Hewlett-Packard NETWORKING Proliant Switch
-@@ -1690,63 +1700,133 @@
- 11.2.3.7.11.33.4.1.1 Hewlett-Packard NETWORKING ProLiant C-Class BladeSystem GbE2c Ethernet Blade Switch
- 11.2.3.7.11.33.5.1.1 Hewlett-Packard NETWORKING ProLiant BL p-Class C-GbE2C Ethernet Blade Switch
- 11.2.3.7.11.34 Hewlett-Packard NETWORKING ProCurve 2626 (J4900A)
-+11.2.3.7.11.34.1 Hewlett-Packard NETWORKING 2626 24-port 10/100-T + 2-port Gig module
- 11.2.3.7.11.35 Hewlett-Packard NETWORKING ProCurve 2650-PoE (J8165A)
-+11.2.3.7.11.35.1 Hewlett-Packard NETWORKING 2650-PWR 48-port 10/100-T + 2-port Gig module
- 11.2.3.7.11.36 Hewlett-Packard NETWORKING ProCurve 2626-PoE (J8164A)
-+11.2.3.7.11.36.1 Hewlett-Packard NETWORKING 2626-PWR 24-port 10/100-T + 2-port Gig module
- 11.2.3.7.11.37 Hewlett-Packard NETWORKING Wireless Access Point AP420WL (J8130A)
- 11.2.3.7.11.38 Hewlett-Packard NETWORKING Wireless Access Point AP520WL (J8133A)
- 11.2.3.7.11.39 Hewlett-Packard NETWORKING Access Controller 720WL (J8153A)
- 11.2.3.7.11.40 Hewlett-Packard NETWORKING Access Controller Server 740WL (J8154A)
- 11.2.3.7.11.41 Hewlett-Packard NETWORKING Integrated Access Manager 760WL (J8155A)
- 11.2.3.7.11.42 Hewlett-Packard NETWORKING ProCurve Switch 3400cl-24G (J4905A)
-+11.2.3.7.11.42.1 Hewlett-Packard NETWORKING 3400cl-24-port 10/100/1000-T + 4-port Gigabit module
- 11.2.3.7.11.43 Hewlett-Packard NETWORKING ProCurve Switch 3400cl-48G (J4906A)
-+11.2.3.7.11.43.1 Hewlett-Packard NETWORKING 3400cl-48-port 10/100/1000-T + 4-port Gigabit module
- 11.2.3.7.11.44 Hewlett-Packard NETWORKING ProCurve 2650 (J4899B)
-+11.2.3.7.11.44.1 Hewlett-Packard NETWORKING 2650 48-port 10/100-T + 2-port Gig module
- 11.2.3.7.11.45 Hewlett-Packard NETWORKING ProCurve 2626B (J4900B)
-+11.2.3.7.11.45.1 Hewlett-Packard NETWORKING 2626 24-port 10/100-T + 2-port Gig module
- 11.2.3.7.11.46 Hewlett-Packard NETWORKING ProCurve 5404yl (J8718A)
- 11.2.3.7.11.47 Hewlett-Packard NETWORKING ProCurve 5408yl (J8719A)
- 11.2.3.7.11.48 Hewlett-Packard NETWORKING ProCurve 6400 (J8433A)
- 11.2.3.7.11.49 Hewlett-Packard NETWORKING ProCurve 6410 (J8474A)
- 11.2.3.7.11.50 Hewlett-Packard NETWORKING ProCurve 5406zl (J8697A)
--11.2.3.7.11.50.14 Hewlett-Packard NETWORKING Wireless Service zl Module
--11.2.3.7.11.50.15 Hewlett-Packard NETWORKING Redundant Wireless Service zl Module
--11.2.3.7.11.50.17 Hewlett-Packard NETWORKING TMS zl Module
--11.2.3.7.11.50.41 Hewlett-Packard NETWORKING MSM775 zl Premium Controller Module/Advanced Services v2 zl Module w/ HDD&SSD
-+11.2.3.7.11.50.1 Hewlett-Packard NETWORKING 5400-24 port Gig-T
-+11.2.3.7.11.50.2 Hewlett-Packard NETWORKING 5400-24 port Gig-T zl Module
-+11.2.3.7.11.50.3 Hewlett-Packard NETWORKING 5400-Gig-T/SFP zl Module
-+11.2.3.7.11.50.4 Hewlett-Packard NETWORKING 5400-24 port SFP zl Module
-+11.2.3.7.11.50.5 Hewlett-Packard NETWORKING 5400-4 port 10-GbE zl Module
-+11.2.3.7.11.50.6 Hewlett-Packard NETWORKING 5400-4 port 10G CX4 zl Module
-+11.2.3.7.11.50.7 Hewlett-Packard NETWORKING 5400-yl Fixed Gig-T/SFP
-+11.2.3.7.11.50.8 Hewlett-Packard NETWORKING 5400-yl Fixed 24p Gig-T
-+11.2.3.7.11.50.9 Hewlett-Packard NETWORKING 5400-yl X2/CX4 10-GbE Module
-+11.2.3.7.11.50.10 Hewlett-Packard NETWORKING 5400-zl Switch Management Module
-+11.2.3.7.11.50.14 Hewlett-Packard NETWORKING 5400-Wireless Service zl Module
-+11.2.3.7.11.50.15 Hewlett-Packard NETWORKING 5400-Redundant Wireless Service zl Module
-+11.2.3.7.11.50.16 Hewlett-Packard NETWORKING 5400-Services zl Module
-+11.2.3.7.11.50.17 Hewlett-Packard NETWORKING 5400-TMS zl Module
-+11.2.3.7.11.50.18 Hewlett-Packard NETWORKING 5400-zl Data Center Connection Manager ONE Module
-+11.2.3.7.11.50.19 Hewlett-Packard NETWORKING 5400-24-Port 10/100/1000 PoE+ zl Module
-+11.2.3.7.11.50.20 Hewlett-Packard NETWORKING 5400-20-Port 10/100/1000 PoE+ with 4-Port SFP zl Module
-+11.2.3.7.11.50.21 Hewlett-Packard NETWORKING 5400-24-Port 10/100 PoE+ zl Module
-+11.2.3.7.11.50.22 Hewlett-Packard NETWORKING 5400-4-Port 10-GbE SFP+ zl Module
-+11.2.3.7.11.50.23 Hewlett-Packard NETWORKING 5400-yl SFP+/CX4 10G Module
-+11.2.3.7.11.50.24 Hewlett-Packard NETWORKING 5400-24 port Gig-T PoE+ v2 zl Module
-+11.2.3.7.11.50.25 Hewlett-Packard NETWORKING 5400-20-Port Gig-T PoE+ / 4-Port SFP v2 zl Module
-+11.2.3.7.11.50.26 Hewlett-Packard NETWORKING 5400-20-Port Gig-T PoE+ / 2-Port SFP+ zl Module
-+11.2.3.7.11.50.27 Hewlett-Packard NETWORKING 5400-24-Port SFP v2 zl Module
-+11.2.3.7.11.50.28 Hewlett-Packard NETWORKING 5400-8-Port 10GbE SFP+ v2 zl Module
-+11.2.3.7.11.50.29 Hewlett-Packard NETWORKING 5400-8-Port 10Gig-T LH zl Module
-+11.2.3.7.11.50.30 Hewlett-Packard NETWORKING 5400-24-Port 10/100 PoE+ zl Module
-+11.2.3.7.11.50.31 Hewlett-Packard NETWORKING 5400-20-Port Gig-T / 2-Port 10GbE SFP+ v2 zl Module
-+11.2.3.7.11.50.32 Hewlett-Packard NETWORKING 5400-20-Port Gig-T / 4-Port SFP v2 zl Module
-+11.2.3.7.11.50.33 Hewlett-Packard NETWORKING 5400-24-Port Gig-T v2 zl Module
-+11.2.3.7.11.50.34 Hewlett-Packard NETWORKING 5400-Advanced Services zl Module
-+11.2.3.7.11.50.35 Hewlett-Packard NETWORKING 5400-Extended Services zl Module
-+11.2.3.7.11.50.36 Hewlett-Packard NETWORKING 5400-AllianceONE zl Module
-+11.2.3.7.11.50.37 Hewlett-Packard NETWORKING 5400-12-Port Gig-T PoE+ / 12-Port SFP v2 zl Module
-+11.2.3.7.11.50.41 Hewlett-Packard NETWORKING 5400-MSM775 zl Premium Controller Module/Advanced Services v2 zl Module w/ HDD&SSD
- 11.2.3.7.11.51 Hewlett-Packard NETWORKING ProCurve 5412zl (J8698A)
- 11.2.3.7.11.52 Hewlett-Packard NETWORKING ProCurve 4204vl (J8770A)
-+11.2.3.7.11.52.1 Hewlett-Packard NETWORKING 4200-10/100 module
-+11.2.3.7.11.52.2 Hewlett-Packard NETWORKING 4200-10/100/1000 module
-+11.2.3.7.11.52.3 Hewlett-Packard NETWORKING 4200-miniGBIC module
-+11.2.3.7.11.52.4 Hewlett-Packard NETWORKING 4200-100FX module
-+11.2.3.7.11.52.5 Hewlett-Packard NETWORKING 4200-Gig-T vl module
-+11.2.3.7.11.52.6 Hewlett-Packard NETWORKING 4200-Gig-T/SFP vl module
-+11.2.3.7.11.52.10 Hewlett-Packard NETWORKING 4200-10-GbE X2 vl module
- 11.2.3.7.11.53 Hewlett-Packard NETWORKING ProCurve 4208vl (J8773A)
- 11.2.3.7.11.54 Hewlett-Packard NETWORKING ProCurve 9400 (J8453A)
- 11.2.3.7.11.55 Hewlett-Packard NETWORKING ProCurve 2600-8-PoE (J8762A)
-+11.2.3.7.11.55.1 Hewlett-Packard NETWORKING 2600-8-PWR 8-port 10/100-T + 1-port Gig module
- 11.2.3.7.11.56 Hewlett-Packard NETWORKING ProCurve 4202vl-48G (J8771A)
- 11.2.3.7.11.57 Hewlett-Packard NETWORKING ProCurve 4202vl-72 (J8772A)
- 11.2.3.7.11.58 Hewlett-Packard NETWORKING ProCurve Switch 3500yl-24G-PoE (J8692A)
- 11.2.3.7.11.59 Hewlett-Packard NETWORKING ProCurve Switch 3500yl-48G-PoE (J8693A)
- 11.2.3.7.11.60 Hewlett-Packard NETWORKING ProCurve 6200yl-24G (J8992A)
- 11.2.3.7.11.61 Hewlett-Packard NETWORKING ProCurve 2510-24 (J9019A)
-+11.2.3.7.11.61.1 Hewlett-Packard NETWORKING 2510-Fixed 24-port 10/100-T module
- 11.2.3.7.11.62 Hewlett-Packard NETWORKING ProCurve 2510-48 (J9020A)
-+11.2.3.7.11.62.1 Hewlett-Packard NETWORKING 2510-Fixed 48-port 10/100-T module
- 11.2.3.7.11.63 Hewlett-Packard NETWORKING ProCurve 2810-24G (J9021A)
-+11.2.3.7.11.63.1 Hewlett-Packard NETWORKING 2810-Fixed 24-port 10/100/1000-T module
- 11.2.3.7.11.64 Hewlett-Packard NETWORKING ProCurve 2810-48G (J9022A)
-+11.2.3.7.11.64.1 Hewlett-Packard NETWORKING 2810-Fixed 48-port 10/100/1000-T module
- 11.2.3.7.11.65 Hewlett-Packard NETWORKING ProCurve 1800-24G (J9028A)
- 11.2.3.7.11.66 Hewlett-Packard NETWORKING ProCurve 1800-8G (J9029A)
- 11.2.3.7.11.67 Hewlett-Packard NETWORKING ProCurve (J9038A)
- 11.2.3.7.11.68 Hewlett-Packard NETWORKING ProCurve 2900-48G (J9050A)
-+11.2.3.7.11.68.11 Hewlett-Packard NETWORKING 2900-yl Fixed Gig-T/SFP
-+11.2.3.7.11.68.12 Hewlett-Packard NETWORKING 2900-yl Fixed 24p Gig-T
-+11.2.3.7.11.68.13 Hewlett-Packard NETWORKING 2900-yl X2/CX4 10-GbE Module
- 11.2.3.7.11.69 Hewlett-Packard NETWORKING ProCurve 2900-24G (J9049A)
- 11.2.3.7.11.70 Hewlett-Packard NETWORKING ProCurve 4202vl-68G (J9032A)
- 11.2.3.7.11.71 Hewlett-Packard NETWORKING 4202vl-68
- 11.2.3.7.11.72 Hewlett-Packard NETWORKING ProCurve 8212zl (J8715A)
-+11.2.3.7.11.72.1 Hewlett-Packard NETWORKING 8200zl Switch Management Module
-+11.2.3.7.11.72.2 Hewlett-Packard NETWORKING 8200zl Switch Fabric Module
-+11.2.3.7.11.72.3 Hewlett-Packard NETWORKING 8212zl Switch System Support Module
- 11.2.3.7.11.73 Hewlett-Packard NETWORKING Access Controller 800
- 11.2.3.7.11.74 Hewlett-Packard NETWORKING ProCurve 1700-8 (J9079A)
- 11.2.3.7.11.75 Hewlett-Packard NETWORKING ProCurve 1700-24 (J9080A)
- 11.2.3.7.11.76 Hewlett-Packard NETWORKING ProCurve 2610-24
-+11.2.3.7.11.76.1 Hewlett-Packard NETWORKING 2610-Fixed 24-port 10/100-T + 4-port Gigabit module
- 11.2.3.7.11.77 Hewlett-Packard NETWORKING ProCurve 2610-48
-+11.2.3.7.11.77.1 Hewlett-Packard NETWORKING 2610-Fixed 48-port 10/100-T + 4-port Gigabit module
- 11.2.3.7.11.78 Hewlett-Packard NETWORKING ProCurve 2610-24-PoE
-+11.2.3.7.11.78.1 Hewlett-Packard NETWORKING 2610-Fixed 24-port 10/100-T + 4-port Gigabit module
- 11.2.3.7.11.79 Hewlett-Packard NETWORKING ProCurve 2610-48-PoE
-+11.2.3.7.11.79.1 Hewlett-Packard NETWORKING 2610-Fixed 48-port 10/100-T + 4-port Gigabit module
- 11.2.3.7.11.80 Hewlett-Packard NETWORKING ProCurve 2610-24/12-PoE (J9086A)
-+11.2.3.7.11.80.1 Hewlett-Packard NETWORKING 2610-Fixed 24-port 10/100-T + 4-port Gigabit module
- 11.2.3.7.11.81 Hewlett-Packard NETWORKING ProCurve 1800-24G-B (J9028B)
- 11.2.3.7.11.82 Hewlett-Packard NETWORKING ProCurve 2626C
-+11.2.3.7.11.82.1 Hewlett-Packard NETWORKING 2626 24-port 10/100-T + 2-port Gig module
- 11.2.3.7.11.83 Hewlett-Packard NETWORKING ProCurve 2650 (J4899C)
-+11.2.3.7.11.83.1 Hewlett-Packard NETWORKING 2650 48-port 10/100-T + 2-port Gig module
- 11.2.3.7.11.84 Hewlett-Packard NETWORKING ProCurve 2910al-24G-PoE (J9146A)
-+11.2.3.7.11.84.1 Hewlett-Packard NETWORKING 2910al-Fixed 24p Gig-T/SFP module
-+11.2.3.7.11.84.2 Hewlett-Packard NETWORKING 2910al-10-GbE 2-port CX4
-+11.2.3.7.11.84.3 Hewlett-Packard NETWORKING 2910al-10-GbE 2-port SFP+
-+11.2.3.7.11.84.4 Hewlett-Packard NETWORKING 2910al-10-GbE 1-port passive CX4
- 11.2.3.7.11.85 Hewlett-Packard NETWORKING ProCurve 2910al-48G-PoE
-+11.2.3.7.11.85.1 Hewlett-Packard NETWORKING 2910al-Fixed 48p Gig-T/SFP module
- 11.2.3.7.11.86 Hewlett-Packard NETWORKING ProCurve 2910al-24G
-+11.2.3.7.11.86.1 Hewlett-Packard NETWORKING 2910al-Fixed 24p Gig-T/SFP module
- 11.2.3.7.11.87 Hewlett-Packard NETWORKING ProCurve 2910al-48G
-+11.2.3.7.11.87.1 Hewlett-Packard NETWORKING 2910al-Fixed 48p Gig-T/SFP module
- 11.2.3.7.11.88 Hewlett-Packard NETWORKING ProCurve 2510G-24
- 11.2.3.7.11.89 Hewlett-Packard NETWORKING ProCurve 2510G-48
- 11.2.3.7.11.90 Hewlett-Packard NETWORKING ProCurve 2510B-24
-@@ -1755,6 +1835,12 @@
- 11.2.3.7.11.96 Hewlett-Packard NETWORKING ProCurve 2520G-8-PoE (J9298A)
- 11.2.3.7.11.97 Hewlett-Packard NETWORKING ProCurve 2520G-24-PoE (J9299A)
- 11.2.3.7.11.98 Hewlett-Packard NETWORKING ProCurve 6600ml-24XG (J9265A)
-+11.2.3.7.11.98.1 Hewlett-Packard NETWORKING 6600ml Fixed 4p SFP+ Module
-+11.2.3.7.11.98.2 Hewlett-Packard NETWORKING 6600ml Fixed Gig-T/SFP Module
-+11.2.3.7.11.98.3 Hewlett-Packard NETWORKING 6600ml Fixed 24 Gig Module
-+11.2.3.7.11.98.4 Hewlett-Packard NETWORKING 6600ml Fixed 24 Gig DP Module
-+11.2.3.7.11.98.5 Hewlett-Packard NETWORKING 6600ml Fixed 24 Gig Non DP Module
-+11.2.3.7.11.98.6 Hewlett-Packard NETWORKING 6600ml Fixed 2 10Gig Module
- 11.2.3.7.11.100 Hewlett-Packard NETWORKING ProCurve 6600ml-24G (J9263A)
- 11.2.3.7.11.101 Hewlett-Packard NETWORKING ProCurve 6600ml-24G-4XG (J9264A)
- 11.2.3.7.11.102 Hewlett-Packard NETWORKING DCM Controller (J9445A)
-@@ -1766,13 +1852,21 @@
- 11.2.3.7.11.108 Hewlett-Packard NETWORKING ProCurve 6120G/XG (498358-B21)
- 11.2.3.7.11.109 Hewlett-Packard NETWORKING ProCurve 3500-24-PoE (J9471A)
- 11.2.3.7.11.110 Hewlett-Packard NETWORKING ProCurve 3500-48-PoE (J9473A)
-+11.2.3.7.11.110.1 Hewlett-Packard NETWORKING 3500-Fixed 10/100Base-TX/SFP PoE Module
-+11.2.3.7.11.110.2 Hewlett-Packard NETWORKING 3500-Fixed 24p 10/100Base-TX PoE Module
- 11.2.3.7.11.111 Hewlett-Packard NETWORKING ProCurve 3500-24 (J9470A)
- 11.2.3.7.11.112 Hewlett-Packard NETWORKING ProCurve 3500-48 (J9472A)
-+11.2.3.7.11.112.1 Hewlett-Packard NETWORKING 3500-Fixed 10/100Base-TX/SFP Module
-+11.2.3.7.11.112.2 Hewlett-Packard NETWORKING 3500-Fixed 24p 10/100Base-TX Module
- 11.2.3.7.11.113 Hewlett-Packard NETWORKING ProCurve 8206zl (J9477A)
- 11.2.3.7.11.114 Hewlett-Packard NETWORKING ProCurve 3500yl-24G-PoE+ (J9310A)
- 11.2.3.7.11.115 Hewlett-Packard NETWORKING 3500-48G-PoE+ yl
-+11.2.3.7.11.115.1 Hewlett-Packard NETWORKING 3500-Fixed Gig-T/SFP PoE+ Module
-+11.2.3.7.11.115.2 Hewlett-Packard NETWORKING 3500-Fixed 24p Gig-T PoE+ Module
- 11.2.3.7.11.117 Hewlett-Packard NETWORKING ProCurve 2615-8-PoE (J9565A)
-+11.2.3.7.11.117.1 Hewlett-Packard NETWORKING 2615-Fixed 8-port 10/100-T + 2-port Gigabit module
- 11.2.3.7.11.118 Hewlett-Packard NETWORKING 2915-8G-PoE
-+11.2.3.7.11.118.1 Hewlett-Packard NETWORKING 2915-8-port 10/100/1000-T + 2-port Gigabit module
- 11.2.3.7.11.119 Hewlett-Packard NETWORKING 3800-24G-PoE+-2SFP+
- 11.2.3.7.11.120 Hewlett-Packard NETWORKING 3800-48G-PoE+-4SFP+
- 11.2.3.7.11.121 Hewlett-Packard NETWORKING 3800-24G-2SFP+
-@@ -1782,35 +1876,74 @@
- 11.2.3.7.11.125 Hewlett-Packard NETWORKING 3800-48G-4XG
- 11.2.3.7.11.126 Hewlett-Packard NETWORKING 3800-24G-PoE+-2XG
- 11.2.3.7.11.127 Hewlett-Packard NETWORKING 3800-48G-PoE+-4XG
-+11.2.3.7.11.128 Hewlett-Packard NETWORKING E3800-4-port Stacking Module
- 11.2.3.7.11.129 Hewlett-Packard NETWORKING 2620-24
-+11.2.3.7.11.129.1 Hewlett-Packard NETWORKING 2620-Fixed 24p 10/100 module
- 11.2.3.7.11.130 Hewlett-Packard NETWORKING 2620-24-PPoE+
-+11.2.3.7.11.130.1 Hewlett-Packard NETWORKING 2620-Fixed 24p PPoEP 10/100 module
- 11.2.3.7.11.131 Hewlett-Packard NETWORKING 2620-24-PoE+
-+11.2.3.7.11.131.1 Hewlett-Packard NETWORKING 2620-Fixed 24p PoEP 10/100 module
- 11.2.3.7.11.132 Hewlett-Packard NETWORKING 2620-48
-+11.2.3.7.11.132.1 Hewlett-Packard NETWORKING 2620-Fixed 48p 10/100 module
- 11.2.3.7.11.133 Hewlett-Packard NETWORKING 2620-48-PoE+
-+11.2.3.7.11.133.1 Hewlett-Packard NETWORKING 2620-Fixed 48p PoEP 10/100 module
- 11.2.3.7.11.134 Hewlett-Packard NETWORKING Procurve 1810-48G
- 11.2.3.7.11.136 Hewlett-Packard NETWORKING 2530-48G-PoE+
-+11.2.3.7.11.136.1 Hewlett-Packard NETWORKING 2530-Fixed 48p PoEP 10/100/1000-T module
- 11.2.3.7.11.137 Hewlett-Packard NETWORKING 2530-24G-PoE+
-+11.2.3.7.11.137.1 Hewlett-Packard NETWORKING 2530-Fixed 24p PoEP 10/100/1000-T module
- 11.2.3.7.11.138 Hewlett-Packard NETWORKING 2530-8G-PoE+
-+11.2.3.7.11.138.1 Hewlett-Packard NETWORKING 2530-Fixed 8p PoEP 10/100/1000-T module
- 11.2.3.7.11.139 Hewlett-Packard NETWORKING 2530-48G
-+11.2.3.7.11.139.1 Hewlett-Packard NETWORKING 2530-Fixed 48p 10/100/1000-T module
- 11.2.3.7.11.140 Hewlett-Packard NETWORKING 2530-24G
-+11.2.3.7.11.140.1 Hewlett-Packard NETWORKING 2530-Fixed 24p 10/100/1000-T module
- 11.2.3.7.11.141 Hewlett-Packard NETWORKING 2530-8G
-+11.2.3.7.11.141.1 Hewlett-Packard NETWORKING 2530-Fixed 8p 10/100/1000-T module
- 11.2.3.7.11.142 Hewlett-Packard NETWORKING 2530-48-PoE+
-+11.2.3.7.11.142.1 Hewlett-Packard NETWORKING 2530-Fixed 48p PoEP 10/100 module
- 11.2.3.7.11.143 Hewlett-Packard NETWORKING 2530-24-PoE+
-+11.2.3.7.11.143.1 Hewlett-Packard NETWORKING 2530-Fixed 24p PoEP 10/100 module
- 11.2.3.7.11.144 Hewlett-Packard NETWORKING 2530-8-PoE+
-+11.2.3.7.11.144.1 Hewlett-Packard NETWORKING 2530-Fixed 8p PoEP 10/100 module
- 11.2.3.7.11.145 Hewlett-Packard NETWORKING 2530-48
-+11.2.3.7.11.145.1 Hewlett-Packard NETWORKING 2530-Fixed 48p 10/100 module
- 11.2.3.7.11.146 Hewlett-Packard NETWORKING 2530-24
-+11.2.3.7.11.146.1 Hewlett-Packard NETWORKING 2530-Fixed 24p 10/100 module
- 11.2.3.7.11.147 Hewlett-Packard NETWORKING 2530-8
-+11.2.3.7.11.147.1 Hewlett-Packard NETWORKING 2530-Fixed 8p 10/100 module
- 11.2.3.7.11.148 Hewlett-Packard NETWORKING Procurve 1810-8 V2 J9800A
- 11.2.3.7.11.149 Hewlett-Packard NETWORKING 1810-24
- 11.2.3.7.11.150 Hewlett-Packard NETWORKING 1810-8G
- 11.2.3.7.11.151 Hewlett-Packard NETWORKING 1810-24G
- 11.2.3.7.11.152 Hewlett-Packard NETWORKING 2920-24G
-+11.2.3.7.11.152.1 Hewlett-Packard NETWORKING 2920-Fixed 24G module
- 11.2.3.7.11.153 Hewlett-Packard NETWORKING 2920-24G-PoE+
-+11.2.3.7.11.153.1 Hewlett-Packard NETWORKING 2920-Fixed 24G PoE+ module
- 11.2.3.7.11.154 Hewlett-Packard NETWORKING 2920-48G
-+11.2.3.7.11.154.1 Hewlett-Packard NETWORKING 2920-Fixed 48G module
- 11.2.3.7.11.155 Hewlett-Packard NETWORKING 2920-48G-PoE+
-+11.2.3.7.11.155.1 Hewlett-Packard NETWORKING 2920-Fixed 8p PoEP Internal PS 10/100 module
-+11.2.3.7.11.155.2 Hewlett-Packard NETWORKING 2920-10-GbE 2-port CX4
-+11.2.3.7.11.155.3 Hewlett-Packard NETWORKING 2920-10-GbE 2-port SFP+
-+11.2.3.7.11.155.4 Hewlett-Packard NETWORKING 2920-10GBASE-T
-+11.2.3.7.11.155.5 Hewlett-Packard NETWORKING 2920-2 Port Stacking
-+11.2.3.7.11.156 Hewlett-Packard NETWORKING 3800-4G-6SFP+-ONE
-+11.2.3.7.11.157 Hewlett-Packard NETWORKING 3800-4G-8SFP+-ONE
- 11.2.3.7.11.158 Hewlett-Packard NETWORKING PS1810-8G
- 11.2.3.7.11.159 Hewlett-Packard NETWORKING PS1810-24G
- 11.2.3.7.11.160 Hewlett-Packard NETWORKING 5406R zl2
-+11.2.3.7.11.160.1 Hewlett-Packard NETWORKING 5400R zl2 Switch Management Module
-+11.2.3.7.11.160.2 Hewlett-Packard NETWORKING 5400R 24-port 10/100/1000BASE-T PoE+ MACsec v3 zl2 Module
-+11.2.3.7.11.160.3 Hewlett-Packard NETWORKING 5400R 24-port 10/100/1000BASE-T MACsec v3 zl2 Module
-+11.2.3.7.11.160.4 Hewlett-Packard NETWORKING 5400R 24-port 1GbE SFP MACsec v3 zl2 Module
-+11.2.3.7.11.160.5 Hewlett-Packard NETWORKING 5400R 12-port 10/100/1000BASE-T PoE+ / 12-port 1GbE SFP MACsec v3 zl2 Module
-+11.2.3.7.11.160.6 Hewlett-Packard NETWORKING 5400R 20-port 10/100/1000BASE-T PoE+ / 4-port 1G/10GbE SFP+ MACsec v3 zl2 Module
-+11.2.3.7.11.160.7 Hewlett-Packard NETWORKING 5400R 20-port 10/100/1000BASE-T PoE+ / 4-port 1/2.5/5/10GBASE-T PoE+ MACsec v3 zl2 Module
-+11.2.3.7.11.160.8 Hewlett-Packard NETWORKING 5400R 20-port 10/100/1000BASE-T PoE+ MACsec / 1-port 40GbE QSFP+ v3 zl2 Module
-+11.2.3.7.11.160.9 Hewlett-Packard NETWORKING 5400R 8-port 1G/10GbE SFP+ MACsec v3 zl2 Module
-+11.2.3.7.11.160.10 Hewlett-Packard NETWORKING 5400R 8-port 1/2.5/5/10GBASE-T PoE+ MACsec v3 zl2 Module
-+11.2.3.7.11.160.11 Hewlett-Packard NETWORKING 5400R 2-port 40GbE QSFP+ v3 zl2 Module
- 11.2.3.7.11.161 Hewlett-Packard NETWORKING 5412R zl2
- 11.2.3.7.11.162.1 Hewlett-Packard NETWORKING 501 Wireless Client Bridge
- 11.2.3.7.11.162.2 Hewlett-Packard NETWORKING R110 Wireless 11n VPN AM
-@@ -1823,15 +1956,86 @@
- 11.2.3.7.11.162.11 Hewlett-Packard NETWORKING PS110 Wireless 11n VPN AM
- 11.2.3.7.11.162.12 Hewlett-Packard NETWORKING PS110 Wireless 11n VPN WW
- 11.2.3.7.11.163 Hewlett-Packard NETWORKING 2530-48G-PoE+-2SFP+
-+11.2.3.7.11.163.1 Hewlett-Packard NETWORKING 2530-Fixed 48p PoEP 10/100/1000-T 2SFP+ module
- 11.2.3.7.11.164 Hewlett-Packard NETWORKING 2530-24G-PoE+-2SFP+
-+11.2.3.7.11.164.1 Hewlett-Packard NETWORKING 2530-Fixed 24p PoEP 10/100/1000-T 2SFP+ module
- 11.2.3.7.11.165 Hewlett-Packard NETWORKING 2530-48G-2SFP+
-+11.2.3.7.11.165.1 Hewlett-Packard NETWORKING 2530-Fixed 48p 10/100/1000-T 2SFP+ module
- 11.2.3.7.11.166 Hewlett-Packard NETWORKING 2530-24G-2SFP+
-+11.2.3.7.11.166.1 Hewlett-Packard NETWORKING 2530-Fixed 24p 10/100/1000-T 2SFP+ module
- 11.2.3.7.11.167 Hewlett-Packard NETWORKING 1820-8G
- 11.2.3.7.11.168 Hewlett-Packard NETWORKING 1820-24G
- 11.2.3.7.11.169 Hewlett-Packard NETWORKING 1820-48G
- 11.2.3.7.11.170 Hewlett-Packard NETWORKING 1820-8G-PoE+ (65W)
- 11.2.3.7.11.171 Hewlett-Packard NETWORKING 1820-24G-PoE+ (185W)
- 11.2.3.7.11.172 Hewlett-Packard NETWORKING 1820-48G-PoE+ (370W)
-+11.2.3.7.11.173 Hewlett-Packard NETWORKING 2530-8-PoE+ Internal PS
-+11.2.3.7.11.173.1 Hewlett-Packard NETWORKING 2530-Fixed 8p PoEP Internal PS 10/100 module
-+11.2.3.7.11.174.1 Hewlett-Packard NETWORKING Aruba 3810M 24G 1-slot
-+11.2.3.7.11.174.1.1 Hewlett-Packard NETWORKING Aruba 3810M 24G 1-slot Module
-+11.2.3.7.11.174.2 Hewlett-Packard NETWORKING Aruba 3810M 48G 1-slot
-+11.2.3.7.11.174.2.1 Hewlett-Packard NETWORKING Aruba 3810M 48G 1-slot Module
-+11.2.3.7.11.174.3 Hewlett-Packard NETWORKING Aruba 3810M 24G PoE+ 1-slot
-+11.2.3.7.11.174.3.1 Hewlett-Packard NETWORKING Aruba 3810M 24G PoE+ 1-slot Module
-+11.2.3.7.11.174.4 Hewlett-Packard NETWORKING Aruba 3810M 48G PoE+ 1-slot
-+11.2.3.7.11.174.4.1 Hewlett-Packard NETWORKING Aruba 3810M 48G PoE+ 1-slot Module
-+11.2.3.7.11.174.5 Hewlett-Packard NETWORKING Aruba 3810M 16SFP+ 2-slot
-+11.2.3.7.11.174.5.1 Hewlett-Packard NETWORKING Aruba 3810M 16SFP+ 2-slot Module
-+11.2.3.7.11.174.6 Hewlett-Packard NETWORKING Aruba 3810M 40G 8 HPE Smart Rate PoE+ 1-slot
-+11.2.3.7.11.174.6.1 Hewlett-Packard NETWORKING Aruba 3810M 20G 8 HPE Smart Rate PoE+ 1-slot Module
-+11.2.3.7.11.174.7 Hewlett-Packard NETWORKING Aruba 3810M 16 HPE Smart Rate PoE+ 2-slot
-+11.2.3.7.11.174.7.1 Hewlett-Packard NETWORKING Aruba 3810M 16 HPE Smart Rate PoE+ 2-slot Module
-+11.2.3.7.11.174.8 Hewlett-Packard NETWORKING Aruba 3810M 4-port Stacking Module
-+11.2.3.7.11.174.9 Hewlett-Packard NETWORKING Aruba 3810 Switch Fan Tray
-+11.2.3.7.11.180.1 Hewlett-Packard NETWORKING Aruba 1QSFP+ 40GbE Module
-+11.2.3.7.11.180.2 Hewlett-Packard NETWORKING Aruba 2QSFP+ 40GbE Module
-+11.2.3.7.11.180.3 Hewlett-Packard NETWORKING Aruba 2 HPE Smart Rate PoE+ Module
-+11.2.3.7.11.180.4 Hewlett-Packard NETWORKING Aruba 4 HPE Smart Rate PoE+ Module
-+11.2.3.7.11.180.5 Hewlett-Packard NETWORKING Aruba 2SFP+ Module
-+11.2.3.7.11.180.6 Hewlett-Packard NETWORKING Aruba 4SFP+ Module
-+11.2.3.7.11.181.1 Hewlett-Packard NETWORKING Aruba 2930M 2 port Stacking Module
-+11.2.3.7.11.181.2 Hewlett-Packard NETWORKING Aruba 2930M-24G
-+11.2.3.7.11.181.2.1 Hewlett-Packard NETWORKING Aruba 2930M-24G Module
-+11.2.3.7.11.181.3 Hewlett-Packard NETWORKING Aruba 2930M-48G
-+11.2.3.7.11.181.3.1 Hewlett-Packard NETWORKING Aruba 2930M-48G Module
-+11.2.3.7.11.181.4 Hewlett-Packard NETWORKING Aruba 2930M-24G-PoE+
-+11.2.3.7.11.181.4.1 Hewlett-Packard NETWORKING Aruba 2930M-24G-PoE+ Module
-+11.2.3.7.11.181.5 Hewlett-Packard NETWORKING Aruba 2930M-48G-PoE+
-+11.2.3.7.11.181.5.1 Hewlett-Packard NETWORKING Aruba 2930M-48G-PoE+ Module
-+11.2.3.7.11.181.6 Hewlett-Packard NETWORKING Aruba 2930M-24SR-PoE+
-+11.2.3.7.11.181.6.1 Hewlett-Packard NETWORKING Aruba 2930M-24SR-PoE+ Module
-+11.2.3.7.11.181.9 Hewlett-Packard NETWORKING Aruba 2930M-40G-8SR-PoE+
-+11.2.3.7.11.181.9.1 Hewlett-Packard NETWORKING Aruba 2930M-40G-8SR-PoE+ Module
-+11.2.3.7.11.181.16 Hewlett-Packard NETWORKING Aruba 2930F-8G-PoE+-2SFP+
-+11.2.3.7.11.181.16.1 Hewlett-Packard NETWORKING Aruba 2930F-8G-PoE+-2SFP+ Module
-+11.2.3.7.11.181.18 Hewlett-Packard NETWORKING Aruba 2930F-24G-4SFP+
-+11.2.3.7.11.181.18.1 Hewlett-Packard NETWORKING Aruba 2930F-24G-4SFP+ Module
-+11.2.3.7.11.181.19 Hewlett-Packard NETWORKING Aruba 2930F-48G-4SFP+
-+11.2.3.7.11.181.19.1 Hewlett-Packard NETWORKING Aruba 2930F-48G-4SFP+ Module
-+11.2.3.7.11.181.20 Hewlett-Packard NETWORKING Aruba 2930F-24G-PoE+-4SFP+
-+11.2.3.7.11.181.20.1 Hewlett-Packard NETWORKING Aruba 2930F-24G-PoE+-4SFP+ Module
-+11.2.3.7.11.181.21 Hewlett-Packard NETWORKING Aruba 2930F-48G-PoE+-4SFP+
-+11.2.3.7.11.181.21.1 Hewlett-Packard NETWORKING Aruba 2930F-48G-PoE+-4SFP+ Module
-+11.2.3.7.11.181.22 Hewlett-Packard NETWORKING Aruba 2930F-24G-4SFP
-+11.2.3.7.11.181.22.1 Hewlett-Packard NETWORKING Aruba 2930F-24G-4SFP Module
-+11.2.3.7.11.181.23 Hewlett-Packard NETWORKING Aruba 2930F-48G-4SFP
-+11.2.3.7.11.181.23.1 Hewlett-Packard NETWORKING Aruba 2930F-48G-4SFP Module
-+11.2.3.7.11.181.24 Hewlett-Packard NETWORKING Aruba 2930F-24G-PoE+-4SFP
-+11.2.3.7.11.181.24.1 Hewlett-Packard NETWORKING Aruba 2930F-24G-PoE+-4SFP Module
-+11.2.3.7.11.181.25 Hewlett-Packard NETWORKING Aruba 2930F-48G-PoE+-4SFP
-+11.2.3.7.11.181.25.1 Hewlett-Packard NETWORKING Aruba 2930F-48G-PoE+-4SFP Module
-+11.2.3.7.11.181.276 Hewlett-Packard NETWORKING Aruba 2930F-24G-PoE+-4SFP+-TAA
-+11.2.3.7.11.181.276.1 Hewlett-Packard NETWORKING Aruba 2930F-24G-PoE+-4SFP+-TAA Module
-+11.2.3.7.11.181.277 Hewlett-Packard NETWORKING Aruba 2930F-48G-PoE+-4SFP+-TAA
-+11.2.3.7.11.181.277.1 Hewlett-Packard NETWORKING Aruba 2930F-48G-PoE+-4SFP+-TAA Module
-+11.2.3.7.11.182.18 Hewlett-Packard NETWORKING Aruba 2540-24G-4SFP+
-+11.2.3.7.11.182.18.1 Hewlett-Packard NETWORKING Aruba 2540-24G-4SFP+ Module
-+11.2.3.7.11.182.19 Hewlett-Packard NETWORKING Aruba 2540-48G-4SFP+
-+11.2.3.7.11.182.19.1 Hewlett-Packard NETWORKING Aruba 2540-48G-4SFP+ Module
-+11.2.3.7.11.182.20 Hewlett-Packard NETWORKING Aruba 2540-24G-PoE+-4SFP+
-+11.2.3.7.11.182.20.1 Hewlett-Packard NETWORKING Aruba 2540-24G-PoE+-4SFP+ Module
-+11.2.3.7.11.182.21 Hewlett-Packard NETWORKING Aruba 2540-48G-PoE+-4SFP+
-+11.2.3.7.11.182.21.1 Hewlett-Packard NETWORKING Aruba 2540-48G-PoE+-4SFP+ Module
- 11.2.3.7.15.1.3.1 Hewlett-Packard NETWORKING 10500/7500 20G Wired-WLAN module
- 11.2.3.7.15.1.3.2 Hewlett-Packard NETWORKING 830-24P
- 11.2.3.7.15.1.3.3 Hewlett-Packard NETWORKING 830-24P-LSW
-@@ -1871,7 +2075,7 @@
- 11.2.14.11.7.1.1 Hewlett-Packard NETWORKING WAN Secure Router 7001dl
- 11.2.14.11.7.1.2 Hewlett-Packard NETWORKING WAN Secure Router 7102dl
- 11.2.14.11.7.1.3 Hewlett-Packard NETWORKING WAN Secure Router 7203dl
--11.2.14.11.7.1.4 Hewlett-Packard NETWORKING WAN Router hpSRJ8751A
-+11.2.14.11.7.1.4 Hewlett-Packard NETWORKING WAN Secure Router 7306dl
- 11.2.14.11.8.1.1 Hewlett-Packard NETWORKING 8116fl
- 11.2.14.11.8.1.2 Hewlett-Packard NETWORKING 8108fl
- 11.2.51 Hewlett-Packard STORAGE Modular Smart Array
-@@ -6280,6 +6484,9 @@
- 14823.1.2.9999 Aruba NETWORKING Undefined Access Point
- 14823.1.3.1 Aruba NETWORKING ZMaster
-
-+14988 Mikrotik NETWORKING
-+14988.1 Mikrotik NETWORKING
-+
- 15004 RuggedCom NETWORKING
- 15004.2.2 RuggedCom NETWORKING RS401
-
-@@ -6414,7 +6621,7 @@
- 25461.2.3.19 Palo Alto Networks NETWORKING PA-3000 series
- 25461.2.3.29 Palo Alto Networks NETWORKING PA-VM
-
--# https://github.com/dotysan/switchmap/blob/master/hh3c-product-id.mib
-+# https://github.com/netdisco/netdisco-mibs/blob/master/h3c/hh3c-product-id.mib - v1.57
- 25506 H3C NETWORKING
- 25506.1.1 H3C NETWORKING S5500-28C-EI
- 25506.1.2 H3C NETWORKING S5500-52C-EI
-@@ -7290,6 +7497,8 @@
- 25506.1.893 H3C NETWORKING VSR1008
- 25506.1.894 H3C NETWORKING S5120S-28P-EI
- 25506.1.895 H3C NETWORKING S5120S-52P-EI
-+25506.1.896 H3C NETWORKING MSR930WiNetW
-+25506.1.897 H3C NETWORKING WA3628iAGNX
- 25506.1.898 H3C NETWORKING S2110
- 25506.1.899 H3C NETWORKING S2110-PWR
- 25506.1.900 H3C NETWORKING S2126
-@@ -7297,6 +7506,8 @@
- 25506.1.902 H3C NETWORKING S2152
- 25506.1.903 H3C NETWORKING WX5540-WCM
- 25506.1.904 H3C NETWORKING WX5540-LSW
-+25506.1.905 H3C NETWORKING WX5520-WCM
-+25506.1.906 H3C NETWORKING WX5520-LSW
- 25506.1.907 H3C NETWORKING MSR930-WGT
- 25506.1.908 H3C NETWORKING ICG 5000T
- 25506.1.909 H3C NETWORKING ICG 6000
-@@ -7308,6 +7519,8 @@
- 25506.1.915 H3C NETWORKING MSR2600-17
- 25506.1.916 H3C NETWORKING ICG 3000D
- 25506.1.917 H3C NETWORKING ICG 3000E
-+25506.1.918 H3C NETWORKING SecBladeLSU1ADECEA0
-+25506.1.919 H3C NETWORKING SecBladeLST1ADE1A1
- 25506.1.920 H3C NETWORKING SR8804-X
- 25506.1.921 H3C NETWORKING SR8808-X
- 25506.1.922 H3C NETWORKING SR8812-X
-@@ -7322,7 +7535,15 @@
- 25506.1.931 H3C NETWORKING S2626
- 25506.1.932 H3C NETWORKING S2626-PWR
- 25506.1.933 H3C NETWORKING S2652
-+25506.1.934 H3C NETWORKING Simware7BoxCen
-+25506.1.935 H3C NETWORKING Simware7BoxIRF
-+25506.1.936 H3C NETWORKING Simware7ChassisDevice
- 25506.1.937 H3C NETWORKING VSR1000
-+25506.1.938 H3C NETWORKING secpathM9000
-+25506.1.939 H3C NETWORKING secpathM9006
-+25506.1.940 H3C NETWORKING secpathM9010
-+25506.1.941 H3C NETWORKING secpathM9014
-+25506.1.942 H3C NETWORKING SecBladeIIINSQM1FWCEA0
- 25506.1.943 H3C NETWORKING WB521X
- 25506.1.944 H3C NETWORKING WB511X
- 25506.1.945 H3C NETWORKING ER3108G
-@@ -7334,6 +7555,8 @@
- 25506.1.951 H3C NETWORKING S5130-52S-PWR-EI
- 25506.1.952 H3C NETWORKING MSR3600-28
- 25506.1.953 H3C NETWORKING MSR3600-51
-+25506.1.954 H3C NETWORKING WA2612E
-+25506.1.955 H3C NETWORKING WA2622
- 25506.1.956 H3C NETWORKING S5110-10P
- 25506.1.957 H3C NETWORKING S5110-10P-PWR
- 25506.1.958 H3C NETWORKING S5110-28P
-@@ -7349,6 +7572,7 @@
- 25506.1.968 H3C NETWORKING S5500-52SC-HI
- 25506.1.969 H3C NETWORKING S5500-28SC-HI-D
- 25506.1.970 H3C NETWORKING S5500-52SC-HI-D
-+25506.1.971 H3C NETWORKING LA2608
- 25506.1.972 H3C NETWORKING S3110-10TP
- 25506.1.973 H3C NETWORKING S3110-10TP-PWR
- 25506.1.974 H3C NETWORKING S3110-26TP
-@@ -7357,6 +7581,9 @@
- 25506.1.977 H3C NETWORKING WA2610H-GN
- 25506.1.978 H3C NETWORKING WA4620E-ACN
- 25506.1.979 H3C NETWORKING WA4620I-ACN
-+25506.1.980 H3C NETWORKING EWPX1MAC0
-+25506.1.981 H3C NETWORKING CRIMMAC1A
-+25506.1.982 H3C NETWORKING SecBladeIIILST1FW3B1
- 25506.1.983 H3C NETWORKING WA2620I-AGN-X
- 25506.1.984 H3C NETWORKING S3110-10TP-SI
- 25506.1.985 H3C NETWORKING S3110-26TP-SI
-@@ -7369,12 +7596,22 @@
- 25506.1.992 H3C NETWORKING S5500-48P-WiNet
- 25506.1.993 H3C NETWORKING S5500-28F-WiNet
- 25506.1.994 H3C NETWORKING WA2620E-X
-+25506.1.995 H3C NETWORKING secpathL5000S
-+25506.1.996 H3C NETWORKING secpathL5000C
- 25506.1.997 H3C NETWORKING CC721E
- 25506.1.998 H3C NETWORKING S5820V2-52QF-U
-+25506.1.999 H3C NETWORKING secpathVFW1000
- 25506.1.1000 H3C NETWORKING S7003
- 25506.1.1001 H3C NETWORKING S7006
-+25506.1.1002 H3C NETWORKING secpathF100CSI
- 25506.1.1003 H3C NETWORKING WX3510E
- 25506.1.1004 H3C NETWORKING WX3540E
-+25506.1.1005 H3C NETWORKING SecBladeLSU3FWCEA0
-+25506.1.1006 H3C NETWORKING SecBladeLSU1NSCEA0
-+25506.1.1007 H3C NETWORKING SecBladeLST1FW3C1
-+25506.1.1008 H3C NETWORKING SecBladeLST1NSM2C1
-+25506.1.1009 H3C NETWORKING SecBladeLSX1FWCEA1
-+25506.1.1010 H3C NETWORKING SecBladeLSX1NSCEA1
- 25506.1.1011 H3C NETWORKING WA2620-AGN-C
- 25506.1.1012 H3C NETWORKING WA2610-GN
- 25506.1.1013 H3C NETWORKING WA2610-GNE
-@@ -7404,6 +7641,8 @@
- 25506.1.1037 H3C NETWORKING SR8806-X-S
- 25506.1.1038 H3C NETWORKING SR8803-X-S
- 25506.1.1039 H3C NETWORKING SR8802-X-S
-+25506.1.1040 H3C NETWORKING SecPathF5020
-+25506.1.1041 H3C NETWORKING SecPathF5040
- 25506.1.1042 H3C NETWORKING RA100
- 25506.1.1043 H3C NETWORKING MSR930-LM
- 25506.1.1044 H3C NETWORKING MSR930-W-LM
-@@ -7430,6 +7669,9 @@
- 25506.1.1065 H3C NETWORKING S5560-54C-PWR-EI
- 25506.1.1066 H3C NETWORKING S5560-54QS-EI
- 25506.1.1067 H3C NETWORKING RA200
-+25506.1.1068 H3C NETWORKING F1000CSI
-+25506.1.1069 H3C NETWORKING F100MSI
-+25506.1.1070 H3C NETWORKING F100ASI
- 25506.1.1071 H3C NETWORKING S5820V2-48S
- 25506.1.1072 H3C NETWORKING S6300-42QT
- 25506.1.1073 H3C NETWORKING S6300-42QF
-@@ -7441,12 +7683,20 @@
- 25506.1.1079 H3C NETWORKING S5024PV2-EI-PWR
- 25506.1.1080 H3C NETWORKING S5110-52P-PWR
- 25506.1.1081 H3C NETWORKING S5110-52P-PWR-D
-+25506.1.1082 H3C NETWORKING NSC1000
- 25506.1.1083 H3C NETWORKING MS4308
- 25506.1.1084 H3C NETWORKING MS4308-PWR
- 25506.1.1085 H3C NETWORKING S5130-28TP-EI
- 25506.1.1086 H3C NETWORKING S5130-52TP-EI
- 25506.1.1087 H3C NETWORKING S5130-28TP-PWR-EI
- 25506.1.1088 H3C NETWORKING S5130-52TP-PWR-EI
-+25506.1.1089 H3C NETWORKING secpathF1020
-+25506.1.1090 H3C NETWORKING secpathF1030
-+25506.1.1091 H3C NETWORKING secpathF1050
-+25506.1.1092 H3C NETWORKING secpathF1060
-+25506.1.1093 H3C NETWORKING secpathF1070
-+25506.1.1094 H3C NETWORKING secpathF1080
-+25506.1.1095 H3C NETWORKING secpathVMSGVLB1000
- 25506.1.1096 H3C NETWORKING S5864-F
- 25506.1.1097 H3C NETWORKING S5864U-F
- 25506.1.1098 H3C NETWORKING S5864T-F
-@@ -7455,6 +7705,7 @@
- 25506.1.1101 H3C NETWORKING CR16006-F
- 25506.1.1102 H3C NETWORKING CR16010-F
- 25506.1.1103 H3C NETWORKING CR16014-F
-+25506.1.1104 H3C NETWORKING SecPathM9000Context
- 25506.1.1105 H3C NETWORKING ICG3000S
- 25506.1.1106 H3C NETWORKING S6800-4C
- 25506.1.1107 H3C NETWORKING S6800-2C
-@@ -7477,6 +7728,7 @@
- 25506.1.1124 H3C NETWORKING S5560-28S-SI
- 25506.1.1125 H3C NETWORKING S5560-52S-SI
- 25506.1.1126 H3C NETWORKING S5560-28F-SI
-+25506.1.1127 H3C NETWORKING LA4608E
- 25506.1.1128 H3C NETWORKING WA4320-ACN
- 25506.1.1129 H3C NETWORKING WA4320i-ACN
- 25506.1.1130 H3C NETWORKING WA4320i-X
-@@ -7489,6 +7741,11 @@
- 25506.1.1137 H3C NETWORKING S7610-X
- 25506.1.1138 H3C NETWORKING MSR930
- 25506.1.1139 H3C NETWORKING MSR930
-+25506.1.1140 H3C NETWORKING SecPathACG1000E
-+25506.1.1141 H3C NETWORKING SecPathACG1000A
-+25506.1.1142 H3C NETWORKING SecPathACG1000M
-+25506.1.1143 H3C NETWORKING SecPathACG1000S
-+25506.1.1144 H3C NETWORKING SecPathACG1000C
- 25506.1.1145 H3C NETWORKING VBRAS1000
- 25506.1.1146 H3C NETWORKING VSR1000P
- 25506.1.1147 H3C NETWORKING VBRAS1000P
-@@ -7502,6 +7759,7 @@
- 25506.1.1155 H3C NETWORKING ER2100V2
- 25506.1.1156 H3C NETWORKING WX5560H
- 25506.1.1157 H3C NETWORKING WX5580H
-+25506.1.1158 H3C NETWORKING WAP621
- 25506.1.1159 H3C NETWORKING MSR810-W
- 25506.1.1160 H3C NETWORKING ER3260G2
- 25506.1.1161 H3C NETWORKING ER5100G2
-@@ -7511,6 +7769,8 @@
- 25506.1.1165 H3C NETWORKING ER8300G2X
- 25506.1.1166 H3C NETWORKING S9904
- 25506.1.1167 H3C NETWORKING S9910
-+25506.1.1168 H3C NETWORKING SecBladeLSU1ADECEA01
-+25506.1.1169 H3C NETWORKING SecBladeLSXM1ADECEA1
- 25506.1.1170 H3C NETWORKING S6900-2F
- 25506.1.1171 H3C NETWORKING S6900-4F
- 25506.1.1172 H3C NETWORKING S6348S-F
-@@ -7519,6 +7779,10 @@
- 25506.1.1175 H3C NETWORKING S1808G
- 25506.1.1176 H3C NETWORKING S1824G
- 25506.1.1177 H3C NETWORKING S1848G
-+25506.1.1178 H3C NETWORKING SecPathACG1010
-+25506.1.1179 H3C NETWORKING SecPathACG1020
-+25506.1.1180 H3C NETWORKING SecPathACG1030
-+25506.1.1181 H3C NETWORKING SecPathACG1040
- 25506.1.1182 H3C NETWORKING WX3510H
- 25506.1.1183 H3C NETWORKING WX3520H
- 25506.1.1184 H3C NETWORKING WX3540H
-@@ -7560,14 +7824,24 @@
- 25506.1.1220 H3C NETWORKING LA4320V
- 25506.1.1221 H3C NETWORKING WA4320X
- 25506.1.1222 H3C NETWORKING LA4320X
-+25506.1.1223 H3C NETWORKING SecBlade4NSQM1FWDFG0
- 25506.1.1224 H3C NETWORKING WX5510EV7
- 25506.1.1225 H3C NETWORKING WX5540EV7
-+25506.1.1226 H3C NETWORKING SecPathL1000E
-+25506.1.1227 H3C NETWORKING SecPathL1000M
-+25506.1.1228 H3C NETWORKING SecPathL1000S
-+25506.1.1229 H3C NETWORKING SecPathF5000Context
-+25506.1.1230 H3C NETWORKING SecPathF1000Context
-+25506.1.1231 H3C NETWORKING SecPathL5000Context
-+25506.1.1232 H3C NETWORKING SecPathL1000Context
- 25506.1.1233 H3C NETWORKING WA4320-TQ-V
- 25506.1.1234 H3C NETWORKING MSR810-W-DB
- 25506.1.1235 H3C NETWORKING MSR810-LM
- 25506.1.1236 H3C NETWORKING MSR810-W-LM
- 25506.1.1237 H3C NETWORKING S6820-32H
- 25506.1.1238 H3C NETWORKING S6820-54HF
-+25506.1.1239 H3C NETWORKING MSR5620
-+25506.1.1240 H3C NETWORKING MSR3620DP
- 25506.1.1241 H3C NETWORKING MSR810-W-WiNet
- 25506.1.1242 H3C NETWORKING MSR810-LM-WiNet
- 25506.1.1243 H3C NETWORKING RA100AC
-@@ -7579,17 +7853,37 @@
- 25506.1.1249 H3C NETWORKING S12510-S
- 25506.1.1250 H3C NETWORKING S12508-S
- 25506.1.1251 H3C NETWORKING S12512-S
-+25506.1.1252 H3C NETWORKING S515024SPWREI
- 25506.1.1253 H3C NETWORKING S5150X-16S-EI
-+25506.1.1254 H3C NETWORKING S5150X-16S-TEI
-+25506.1.1255 H3C NETWORKING SecPathF100AG2
-+25506.1.1256 H3C NETWORKING SecPathF1000CG2
- 25506.1.1257 H3C NETWORKING UIS M8310-48G
- 25506.1.1258 H3C NETWORKING UIS M8320-48XG
- 25506.1.1259 H3C NETWORKING UIS M6300-XLG
- 25506.1.1260 H3C NETWORKING MSR810
-+25506.1.1261 H3C NETWORKING SecPathW2001
-+25506.1.1262 H3C NETWORKING SecPathW2005
-+25506.1.1263 H3C NETWORKING SecPathW2010
-+25506.1.1264 H3C NETWORKING SecPathW2020
-+25506.1.1265 H3C NETWORKING SecPathW2040
-+25506.1.1266 H3C NETWORKING SecPathW2080
-+25506.1.1267 H3C NETWORKING SecPathW2200
-+25506.1.1268 H3C NETWORKING SecPathW1020D
-+25506.1.1269 H3C NETWORKING SecPathW1040D
-+25506.1.1270 H3C NETWORKING SecPathW1200D
-+25506.1.1271 H3C NETWORKING SecPathA2020
-+25506.1.1272 H3C NETWORKING SecPathA2100
-+25506.1.1273 H3C NETWORKING SecPathD2020
-+25506.1.1274 H3C NETWORKING SecPathD2050
- 25506.1.1275 H3C NETWORKING S5560-34C-EI
- 25506.1.1276 H3C NETWORKING S5130-34C-HI
- 25506.1.1277 H3C NETWORKING MS4120-26TP
-+25506.1.1278 H3C NETWORKING WA4330ACN
- 25506.1.1279 H3C NETWORKING MS4320S-28F
- 25506.1.1280 H3C NETWORKING MS4320S-28P
- 25506.1.1281 H3C NETWORKING MS4520-28S
-+25506.1.1282 H3C NETWORKING SecBlade3Context
- 25506.1.1283 H3C NETWORKING MSR26-30-R
- 25506.1.1284 H3C NETWORKING MSR36-10-AC-R
- 25506.1.1285 H3C NETWORKING MSR36-20-AC-R
-@@ -7607,6 +7901,11 @@
- 25506.1.1297 H3C NETWORKING S5560-56C-HI
- 25506.1.1298 H3C NETWORKING S5560-56C-PWR-HI
- 25506.1.1299 H3C NETWORKING S12502X-AF
-+25506.1.1300 H3C NETWORKING NS228
-+25506.1.1301 H3C NETWORKING NS252
-+25506.1.1302 H3C NETWORKING SecBladeFW
-+25506.1.1303 H3C NETWORKING SecBladeADE
-+25506.1.1304 H3C NETWORKING SecBladeIIILSUM1FWCEAB0
- 25506.1.1305 H3C NETWORKING S5130-28PS-EI
- 25506.1.1306 H3C NETWORKING S7506E-X
- 25506.1.1307 H3C NETWORKING S7510E-X
-@@ -7782,6 +8081,14 @@
- 25506.11.1.151 Hewlett-Packard NETWORKING 6125-XLG-TAA
- 25506.11.1.152 Hewlett-Packard NETWORKING 6125-GXG-TAA
- 25506.11.1.153 Hewlett-Packard NETWORKING 6125-G-TAA
-+25506.11.1.154 Hewlett-Packard NETWORKING 5120-24G-4SFP-XI-2Slot
-+25506.11.1.155 Hewlett-Packard NETWORKING 5120-48G-4SFP-XI-2Slot
-+25506.11.1.156 Hewlett-Packard NETWORKING 5120-24G-PoE-Plus-4SFP-XI-2Slot
-+25506.11.1.157 Hewlett-Packard NETWORKING 5120-48G-PoE-Plus-4SFP-XI-2Slot
-+25506.11.1.158 Hewlett-Packard NETWORKING 5120-24G-4SFP-XI-TAA-2Slot
-+25506.11.1.159 Hewlett-Packard NETWORKING 5120-48G-4SFP-XI-TAA-2Slot
-+25506.11.1.160 Hewlett-Packard NETWORKING 5120-24G-PoE-Plus-4SFP-XI-TAA-2Slot
-+25506.11.1.161 Hewlett-Packard NETWORKING 5120-48G-PoE-Plus-4SFP-XI-TAA-2Slot
- 25506.11.1.162 Hewlett-Packard NETWORKING 1920-8G
- 25506.11.1.163 Hewlett-Packard NETWORKING 1920-8G-PoE+(65W)
- 25506.11.1.164 Hewlett-Packard NETWORKING 1920-8G-PoE+(180W)
-@@ -7832,6 +8139,7 @@
- 25506.11.1.209 Hewlett-Packard NETWORKING 5130-48G-4SFP+ EI Brazil
- 25506.11.1.210 Hewlett-Packard NETWORKING 5130-24G-PoE+-4SFP+ (370W) EI Brazil
- 25506.11.1.211 Hewlett-Packard NETWORKING 5130-48G-PoE+-4SFP+ (370W) EI Brazil
-+25506.11.1.212 Hewlett-Packard NETWORKING ThunderBird
- 25506.11.1.213 Hewlett-Packard NETWORKING FF 12916E
- 25506.11.1.214 Hewlett-Packard NETWORKING NJ5000-5G-PoE+ Wall jack
- 25506.11.1.215 Hewlett-Packard NETWORKING 5510-24G-4SFP+ HI 1 Interface Slot
-@@ -7853,6 +8161,7 @@
- 25506.11.1.231 Hewlett-Packard NETWORKING FF 5930-4Slot
- 25506.11.1.232 Hewlett-Packard NETWORKING FF 5930-4Slot TAA
- 25506.11.1.233 Hewlett-Packard NETWORKING 6127XLG-TAA
-+25506.11.1.234 Hewlett-Packard NETWORKING 1950-12X-GT-4SFP-Plus
- 25506.11.1.235 Hewlett-Packard NETWORKING FF 12916E TAA
- 25506.11.1.236 Hewlett-Packard NETWORKING FF 12908E
- 25506.11.1.237 Hewlett-Packard NETWORKING FF 12908E TAA
-@@ -7985,12 +8294,23 @@
- 25506.11.2.105 Hewlett-Packard NETWORKING HSR6602G-TAA
- 25506.11.2.106 Hewlett-Packard NETWORKING HSR6602XG-TAA
- 25506.11.2.107 Hewlett-Packard NETWORKING MSR1002-4
-+25506.11.2.108 Hewlett-Packard NETWORKING NSC1000
- 25506.11.2.109 Hewlett-Packard NETWORKING MSR930
- 25506.11.2.110 Hewlett-Packard NETWORKING MSR935
-+25506.11.2.111 Hewlett-Packard NETWORKING MSR2003-TAA
-+25506.11.2.112 Hewlett-Packard NETWORKING MSR3024-TAA
-+25506.11.2.113 Hewlett-Packard NETWORKING MSR3044-TAA
- 25506.11.2.114 Hewlett-Packard NETWORKING MSR935
- 25506.11.2.115 Hewlett-Packard NETWORKING MSR933
- 25506.11.2.116 Hewlett-Packard NETWORKING MSR931
- 25506.11.2.117 Hewlett-Packard NETWORKING MSR1003-8S
-+25506.11.2.118 Hewlett-Packard NETWORKING MSR932
-+25506.11.2.119 Hewlett-Packard NETWORKING MSR932W
-+25506.11.2.120 Hewlett-Packard NETWORKING MSR932WNA
-+25506.11.2.121 Hewlett-Packard NETWORKING MSR9328
-+25506.11.2.122 Hewlett-Packard NETWORKING MSR9328W
-+25506.11.2.123 Hewlett-Packard NETWORKING MSR9328WNA
-+25506.11.2.124 Hewlett-Packard NETWORKING VBRAS1000
- 25506.11.2.125 Hewlett-Packard NETWORKING HSR6802-E
- 25506.11.2.126 Hewlett-Packard NETWORKING HSR6804-E
- 25506.11.2.127 Hewlett-Packard NETWORKING HSR6808-E
-@@ -8000,6 +8320,8 @@
- 25506.11.2.131 Hewlett-Packard NETWORKING MSR954-W
- 25506.11.2.132 Hewlett-Packard NETWORKING MSR954-W-LTE-AM
- 25506.11.2.133 Hewlett-Packard NETWORKING MSR954-W-LTE
-+25506.11.2.134 Hewlett-Packard NETWORKING MSR958
-+25506.11.2.135 Hewlett-Packard NETWORKING MSR958POE
- 25506.11.2.136 Hewlett-Packard NETWORKING MSR930B
- 25506.11.2.137 Hewlett-Packard NETWORKING MSR930GB
- 25506.11.2.138 Hewlett-Packard NETWORKING MSR931B
-@@ -8055,6 +8377,10 @@
- 25506.11.4.22 Hewlett-Packard NETWORKING SecBladeLSU1FWCEA0
- 25506.11.4.23 Hewlett-Packard NETWORKING F5000C
- 25506.11.4.24 Hewlett-Packard NETWORKING F5000S
-+25506.11.4.25 Hewlett-Packard NETWORKING VFW1000
-+25506.11.4.26 Hewlett-Packard NETWORKING SecBladeLSX1FWCEA1
-+25506.11.4.27 Hewlett-Packard NETWORKING VMSGVLB1000
-+25506.11.4.28 Hewlett-Packard NETWORKING SecBlade3Context
-
- 26866 Gigamon NETWORKING
- 26866.1.1 Gigamon NETWORKING GigaVUE-420
diff --git a/debian/patches/Makefile.PL-2.patch b/debian/patches/Makefile.PL-2.patch
deleted file mode 100644
index 4c6677a066f82a098c7c382d597462548c1dba54..0000000000000000000000000000000000000000
--- a/debian/patches/Makefile.PL-2.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Description: Fix setup & Version modules in Makefile
- Cleanup and update setup module to only needed %setup hash
- Cleanup and update Version module with default COMMENTS
- Support setting VERSION while configuring
-Author: Guillaume Bougard <gbougard@teclib.com>
-Origin: upstream, https://github.com/fusioninventory/fusioninventory-agent/commit/445e3ef0a9
-Last-Update: 2018-06-28
-
---- fusioninventory-agent-2.4.orig/Makefile.PL
-+++ fusioninventory-agent-2.4/Makefile.PL
-@@ -137,16 +137,19 @@
-
- Installation summary
- --------------------
--prefix: $MY::variables{PREFIX}
--configuration installation directory: $MY::variables{SYSCONFDIR}
--constant data installation directory: $MY::variables{DATADIR}
--variable data installation directory: $MY::variables{LOCALSTATEDIR}
-+version : '$MY::variables{VERSION}'
-+comments: '$MY::variables{COMMENTS}'
-+prefix : '$MY::variables{PREFIX}'
-+configuration installation directory: '$MY::variables{SYSCONFDIR}'
-+constant data installation directory: '$MY::variables{DATADIR}'
-+variable data installation directory: '$MY::variables{LOCALSTATEDIR}'
-
- $config_file_message
- EOF
-
- package MY;
-
-+use Config;
- use English qw(-no_match_vars);
-
- our %variables;
-@@ -158,6 +161,9 @@
- # for some reason, initialising variables from the global scope doesn't work
- %variables = (
- PREFIX => '/usr/local',
-+ VERSION => '$(VERSION)',
-+ COMMENTS => "Platform : $Config{myuname},Build date: ".gmtime()." (GMT)",
-+ RAWCOMMENTS => '',
- INSTALLSCRIPT => '$(PREFIX)/bin',
- INSTALLSITESCRIPT => '$(PREFIX)/bin',
- INSTALLVENDORSCRIPT => '$(PREFIX)/bin',
-@@ -194,8 +200,16 @@
- $line = "$name = $variables{$name}";
- }
-
-+ # Fix COMMENTS and prepare it as a list of perl strings
-+ if ($variables{COMMENTS}) {
-+ $variables{COMMENTS} =~ s/[^a-zA-Z0-9 ,.:_-]//g;
-+ $variables{RAWCOMMENTS} = "\\n "
-+ . join(",\\n ",map { "\\\"$_\\\"" } split(/,/,$variables{COMMENTS}))
-+ . "\\n";
-+ }
-+
- # add out own variables
-- foreach my $name (qw/SYSCONFDIR DATADIR LOCALSTATEDIR/) {
-+ foreach my $name (qw/SYSCONFDIR DATADIR LOCALSTATEDIR COMMENTS RAWCOMMENTS/) {
- push @code, "$name = $variables{$name}";
- }
-
-@@ -209,8 +223,8 @@
- # 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 setup_install/;
-- $install =~ s/install :: all pure_install doc_install/install :: all pure_install config_install data_install setup_install/;
-+ $install =~ s/install :: pure_install doc_install/install :: pure_install config_install data_install setup_install version_install/;
-+ $install =~ s/install :: all pure_install doc_install/install :: all pure_install config_install data_install setup_install version_install/;
-
- # suppress all lines related to packlist file installation
- $install =~ s/.*\.packlist \\\n//g;
-@@ -239,11 +253,22 @@
- install -m 644 share/html/* $(DESTDIR)$(DATADIR)/html
-
- setup_install : pure_install
-+ # Cleanup setup file to only really needed hash during install
- $(ABSPERLRUN) -pi \
-+ -e 'undef $$_ if m/^use (File::Spec|Cwd)/;' \
-+ -e 'if (m/# Compute/) { print "1;\n"; last; };' \
- -e 's|datadir => .*|datadir => "$(DATADIR)",|;' \
- -e 's|libdir => .*|libdir => "$(DATADIR)/lib",|;' \
- -e 's|vardir => .*|vardir => "$(LOCALSTATEDIR)",|' \
- $(DESTDIR)$(DATADIR)/lib/setup.pm
-+
-+version_install : pure_install
-+ # Cleanup and update Version module during install
-+ $(ABSPERLRUN) -pi \
-+ -e 'last if m|^__END__|;' \
-+ -e 's|^our \$$VERSION =.*|our \$$VERSION = "$(VERSION)";|;' \
-+ -e 's|^our \$$COMMENTS =.*|our \$$COMMENTS = [$(RAWCOMMENTS)];|;' \
-+ $(DESTDIR)$(DATADIR)/lib/FusionInventory/Agent/Version.pm
- EOF
- return $install;
- }
diff --git a/debian/patches/Makefile.PL.patch b/debian/patches/Makefile.PL.patch
deleted file mode 100644
index 2eb128ef0f72f61e53982be051f2718df713a94b..0000000000000000000000000000000000000000
--- a/debian/patches/Makefile.PL.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix install order in Makefile
- * Make sure install section in Makefile applies at the right time during
- the build stage
-Author: Guillaume Bougard <gbougard@teclib.com>
-Origin: upstream, https://github.com/fusioninventory/fusioninventory-agent/commit/a6dfaa546e
-Last-Update: 2018-06-22
-
---- fusioninventory-agent-2.4.orig/Makefile.PL
-+++ fusioninventory-agent-2.4/Makefile.PL
-@@ -218,7 +218,7 @@ sub install {
- # add data and configuration installation targets
- $install .= <<'EOF';
-
--config_install :
-+config_install : pure_install
- install -d -m 755 $(DESTDIR)$(SYSCONFDIR)
- if [ -f $(DESTDIR)/$(SYSCONFDIR)/agent.cfg ]; then \
- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.new; \
-@@ -229,7 +229,7 @@ config_install :
- -e "s|=> undef, # SYSCONFDIR.*|=> '$(SYSCONFDIR)',|;" \
- $(DESTDIR)$(DATADIR)/lib/FusionInventory/Agent/Config.pm
-
--data_install :
-+data_install : pure_install
- install -d -m 755 $(DESTDIR)$(DATADIR)
- install -m 644 share/pci.ids $(DESTDIR)$(DATADIR)/
- install -m 644 share/usb.ids $(DESTDIR)$(DATADIR)/
-@@ -238,7 +238,7 @@ data_install :
- install -d -m 755 $(DESTDIR)$(DATADIR)/html
- install -m 644 share/html/* $(DESTDIR)$(DATADIR)/html
-
--setup_install :
-+setup_install : pure_install
- $(ABSPERLRUN) -pi \
- -e 's|datadir => .*|datadir => "$(DATADIR)",|;' \
- -e 's|libdir => .*|libdir => "$(DATADIR)/lib",|;' \
diff --git a/debian/patches/fix-lazy-option-error.patch b/debian/patches/fix-lazy-option-error.patch
new file mode 100644
index 0000000000000000000000000000000000000000..51433791dd04842c2f31b39475e4e9219c0f6cfe
--- /dev/null
+++ b/debian/patches/fix-lazy-option-error.patch
@@ -0,0 +1,27 @@
+Description: fix error displayed while using --lazy option
+ * Fix typo and wrong variable usage in new Scheduler target only visible while
+ using --lazy option from agent script
+Author: Guillaume Bougard <gbougard@teclib.com>
+Origin: upstream, https://github.com/fusioninventory/fusioninventory-agent/commit/f950c72426
+Last-Update: 2018-07-04
+
+--- fusioninventory-agent-2.4.1.orig/lib/FusionInventory/Agent/Target/Scheduler.pm
++++ fusioninventory-agent-2.4.1/lib/FusionInventory/Agent/Target/Scheduler.pm
+@@ -16,7 +16,7 @@ sub new {
+ my $self = $class->SUPER::new(%params);
+
+ $self->{storage} = $params{storage};
+- $self->{name} = 'scheduler' . $count++,
++ $self->{id} = 'scheduler' . $count++;
+
+ # handle persistent state
+ $self->_loadState();
+@@ -32,7 +32,7 @@ sub new {
+ sub getName {
+ my ($self) = @_;
+
+- return $self->{name};
++ return $self->{id};
+ }
+
+ sub getType {
diff --git a/debian/patches/series b/debian/patches/series
index 0ba3bb52e0c9464a10a5009c9d6d861bb80e72de..b3df5a223855844d772fd5cf1c4490a5c55e6494 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-00bb19f26-upstream-github-commit.path
-systemd-obsolete-after-fix.patch
-Makefile.PL.patch
default_config.patch
simpler-setup-module.patch
-Makefile.PL-2.patch
skip-rpm-parsing-test.patch
+fix-lazy-option-error.patch
diff --git a/debian/patches/systemd-obsolete-after-fix.patch b/debian/patches/systemd-obsolete-after-fix.patch
deleted file mode 100644
index d8daf13e58b1e497924169486d02bac2f44b1a55..0000000000000000000000000000000000000000
--- a/debian/patches/systemd-obsolete-after-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: fusioninventory-agent service fix
- * Don't make fusioninventory-agent systemd service depends on syslog one.
-Author: Guillaume Bougard <gbougard@teclib.com>
-Origin: upstream, https://github.com/fusioninventory/fusioninventory-agent/commit/094f984365
-Last-Update: 2018-06-22
-
---- fusioninventory-agent-2.4.orig/contrib/unix/fusioninventory-agent.service
-+++ fusioninventory-agent-2.4/contrib/unix/fusioninventory-agent.service
-@@ -11,7 +11,7 @@
-
- [Unit]
- Description=FusionInventory agent
--After=syslog.target network.target
-+After=network.target
-
- [Service]
- ExecStart=/usr/bin/fusioninventory-agent --daemon --no-fork $OPTIONS