Fix Eltex a lot model.

Add Telindus
Add serial to Zixel
This commit is contained in:
Andrey Pazychev
2020-05-17 15:18:08 +03:00
parent aa44871f83
commit 272b56d625
5 changed files with 205 additions and 61 deletions

View File

@@ -8,7 +8,6 @@ package SNMP::Info::Layer3::Eltex;
use strict;
use warnings;
use Exporter;
#use SNMP::Info::Layer2;
use SNMP::Info::Layer3;
@SNMP::Info::Layer3::Eltex::ISA = qw/SNMP::Info::Layer3 Exporter/;
@@ -21,18 +20,19 @@ $VERSION = '3.70-135';
%MIBS = ( %SNMP::Info::Layer3::MIBS, );
%GLOBALS = (
#%SNMP::Info::Layer2::GLOBALS,
%SNMP::Info::Layer3::GLOBALS,
'model_oid' => 'mib-2.47.1.1.1.1.13.67108992',
'hw_oid' => 'mib-2.47.1.1.1.1.8.67108992',
'serial_oid' => 'mib-2.47.1.1.1.1.11.67108992',
'os_ver_oid' => 'mib-2.47.1.1.1.1.10.67108992',
'bootrom_oid' => 'mib-2.47.1.1.1.1.9.67108992',
#'model_oid_140' => '',
'hw_oid_140' => 'mib-2.47.1.1.1.1.8.1',
'model_oid_mes' => 'mib-2.47.1.1.1.1.13.67108992',
#'hw_oid' => 'mib-2.47.1.1.1.1.8.67108992',
'model_oid' => 'iso.0.8802.1.1.2.1.3.4.0',
'hw_oid' => 'iso.0.8802.1.1.2.1.5.4795.1.2.2.0',
'serial_oid' => 'mib-2.47.1.1.1.1.11.67108992',
'serial_oid_22' => 'enterprises.35265.1.22.1.18.4.0',
'os_ver_oid' => 'mib-2.47.1.1.1.1.10.67108992',
'bootrom_oid' => 'mib-2.47.1.1.1.1.9.67108992',
#'serial_oid_140' => '',
'os_ver_oid_140' => 'mib-2.47.1.1.1.1.9.1',
'os_ver_oid_140' => 'mib-2.47.1.1.1.1.9.1',
#'bootrom_oid_140' => '',
'descr_oid' => 'iso.0.8802.1.1.2.1.3.4.0',
);
@@ -41,21 +41,28 @@ $VERSION = '3.70-135';
%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
sub model {
my $eltex = shift;
my $obj = shift;
my $model; my $hw;
my $id = $eltex->id();
if ($id =~ /35265\.(140|158)$/) {
return;
my $id = $obj->id();
$model = $obj->model_oid || undef;
$hw = $obj->hw_oid || undef;
if ( $id =~ /35265\.1\.22/ ) {
my $descr = $obj->descr_oid;
$descr =~ /Eltex\s(.*)\ssoftware\sversion\s(.*)\sbuild\s(\d+)/;
return $1;
}
# default behaviour for 35265.1.120
elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9])$/) {
$model = $eltex->model_oid;
$hw = $eltex->hw_oid;
elsif ($model !~ /MES\d+/) {
$model = $obj->model_oid_mes . ' ' . $obj->model_oid || undef;
}
if (defined $model and defined $hw) {
return $model . ' HW:' . $hw;
}
elsif (defined $model) {
return $model;
}
else {
return 'unknown';
}
return $model . ' HW:' . $hw;
}
sub vendor {
@@ -67,16 +74,21 @@ sub os {
}
sub os_ver {
my $eltex = shift;
my $obj = shift;
my $os_ver; my $bootrom;
my $id = $eltex->id();
my $id = $obj->id();
if ($id =~ /35265\.(140|158)$/) {
$os_ver = $eltex->os_ver_oid_140;
$os_ver = $obj->os_ver_oid_140;
return $os_ver;
}
elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9])$/) {
$os_ver = $eltex->os_ver_oid;
$bootrom = $eltex->bootrom_oid;
$os_ver = $obj->os_ver_oid;
$bootrom = $obj->bootrom_oid;
}
elsif ( $id =~ /35265\.1\.22/ ) {
my $descr = $obj->descr_oid;
$descr =~ /Eltex\s(.*)\ssoftware\sversion\s(.*)\sbuild\s(\d+)/;
return $2;
}
else {
return 'unknown';
@@ -85,14 +97,17 @@ sub os_ver {
}
sub serial {
my $eltex = shift;
my $obj = shift;
my $serial;
my $id = $eltex->id();
my $id = $obj->id();
if ($id =~ /35265\.(140|158)$/) {
return;
}
elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9]])$/) {
$serial = $eltex->serial_oid;
$serial = $obj->serial_oid;
}
elsif ( $id =~ /35265\.1\.22/ ) {
$serial = $obj->serial_oid_22;
}
else {
return 'unknown';
@@ -110,7 +125,7 @@ SNMP::Info::Layer3::Eltex - SNMP Interface to Eltex Devices
=head1 SYNOPSIS
# Let SNMP::Info determine the correct subclass for you.
my $eltex = new SNMP::Info(
my $obj = new SNMP::Info(
AutoSpecify => 1,
Debug => 1,
DestHost => 'myrouter',
@@ -119,7 +134,7 @@ SNMP::Info::Layer3::Eltex - SNMP Interface to Eltex Devices
)
or die "Can't connect to DestHost.\n";
my $class = $eltex->class();
my $class = $obj->class();
print "SNMP::Info determined this device to fall under subclass : $class\n";
=head1 DESCRIPTION
@@ -144,27 +159,27 @@ These are methods that return scalar value from SNMP
=over
=item $eltex->model()
=item $obj->model()
Returns the ID or else description.
=item $eltex->vendor()
=item $obj->vendor()
Returns 'eltex'.
=item $eltex->serial()
=item $obj->serial()
Returns serial number.
=item $eltex->fwver()
=item $obj->fwver()
Returns the firmware version.
=item $eltex->hwver()
=item $obj->hwver()
Returns the hardware version.
=item $eltex->stp_i_root_port()
=item $obj->stp_i_root_port()
Returns the STP root port.
@@ -181,7 +196,7 @@ to a hash.
=over
=item $eltex->interfaces();
=item $obj->interfaces();
Returns the map between SNMP Interface Identifier (iid) and C<ifName>.