Fix Eltex two verdor numer DSLAM MXA64

This commit is contained in:
Andrey Pazychev
2020-05-17 17:07:34 +03:00
parent 10e0a53b3c
commit fe3bc6afe0
2 changed files with 11 additions and 9 deletions

View File

@@ -1725,6 +1725,7 @@ sub device_type {
27514 => 'SNMP::Info::Layer3::Qtech', 27514 => 'SNMP::Info::Layer3::Qtech',
30065 => 'SNMP::Info::Layer3::Arista', 30065 => 'SNMP::Info::Layer3::Arista',
30803 => 'SNMP::Info::Layer3::VyOS', 30803 => 'SNMP::Info::Layer3::VyOS',
34300 => 'SNMP::Info::Layer3::Eltex',
35098 => 'SNMP::Info::Layer3::Pica8', 35098 => 'SNMP::Info::Layer3::Pica8',
35265 => 'SNMP::Info::Layer3::Eltex', 35265 => 'SNMP::Info::Layer3::Eltex',
40310 => 'SNMP::Info::Layer3::Cumulus', 40310 => 'SNMP::Info::Layer3::Cumulus',
@@ -1773,6 +1774,7 @@ sub device_type {
26543 => 'SNMP::Info::Layer3::IBMGbTor', 26543 => 'SNMP::Info::Layer3::IBMGbTor',
26928 => 'SNMP::Info::Layer2::Aerohive', 26928 => 'SNMP::Info::Layer2::Aerohive',
27514 => 'SNMP::Info::Layer3::Qtech', 27514 => 'SNMP::Info::Layer3::Qtech',
34300 => 'SNMP::Info::Layer3::Eltex',
35265 => 'SNMP::Info::Layer3::Eltex', 35265 => 'SNMP::Info::Layer3::Eltex',
); );

View File

@@ -24,13 +24,13 @@ $VERSION = '3.70-135';
'model_oid_mes' => 'mib-2.47.1.1.1.1.13.67108992', 'model_oid_mes' => 'mib-2.47.1.1.1.1.13.67108992',
#'hw_oid' => 'mib-2.47.1.1.1.1.8.67108992', #'hw_oid' => 'mib-2.47.1.1.1.1.8.67108992',
'model_oid' => 'iso.0.8802.1.1.2.1.3.4.0', 'model_oid' => 'iso.0.8802.1.1.2.1.3.4.0',
'model_oid_1_28' => 'enterprises.35265.4.2.0', 'model_oid_mxa' => 'enterprises.35265.4.2.0',
'hw_oid' => 'iso.0.8802.1.1.2.1.5.4795.1.2.2.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' => 'mib-2.47.1.1.1.1.11.67108992',
'serial_oid_22' => 'enterprises.35265.1.22.1.18.4.0', 'serial_oid_22' => 'enterprises.35265.1.22.1.18.4.0',
'serial_oid_1_28' => 'enterprises.35265.4.3.0', 'serial_oid_mxa' => 'enterprises.35265.4.3.0',
'os_ver_oid' => 'mib-2.47.1.1.1.1.10.67108992', 'os_ver_oid' => 'mib-2.47.1.1.1.1.10.67108992',
'os_ver_oid_1_28' => 'enterprises.35265.4.5.0', 'os_ver_oid_mxa' => 'enterprises.35265.4.5.0',
'bootrom_oid' => 'mib-2.47.1.1.1.1.9.67108992', 'bootrom_oid' => 'mib-2.47.1.1.1.1.9.67108992',
#'serial_oid_140' => '', #'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',
@@ -54,8 +54,8 @@ sub model {
$descr =~ /Eltex\s(.*)\ssoftware\sversion\s(.*)\sbuild\s(\d+)/; $descr =~ /Eltex\s(.*)\ssoftware\sversion\s(.*)\sbuild\s(\d+)/;
return $1; return $1;
} }
elsif ($id =~ /35265\.1\.28/) { elsif ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28/) {
return $obj->model_oid_1_28; return $obj->model_oid_mxa;
} }
elsif (defined $model and $model !~ /MES\d+/) { elsif (defined $model and $model !~ /MES\d+/) {
$model = $obj->model_oid_mes . ' ' . $obj->model_oid || undef; $model = $obj->model_oid_mes . ' ' . $obj->model_oid || undef;
@@ -87,8 +87,8 @@ sub os_ver {
$os_ver = $obj->os_ver_oid_140; $os_ver = $obj->os_ver_oid_140;
return $os_ver; return $os_ver;
} }
if ($id =~ /35265\.1\.28/) { if ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28/) {
return $obj->os_ver_oid_1_28; return $obj->os_ver_oid_mxa;
} }
elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9])$/) { elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9])$/) {
$os_ver = $obj->os_ver_oid; $os_ver = $obj->os_ver_oid;
@@ -112,8 +112,8 @@ sub serial {
if ($id =~ /35265\.(140|158)$/) { if ($id =~ /35265\.(140|158)$/) {
return; return;
} }
elsif ($id =~ /35265\.1\.28/) { elsif ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28/) {
return $obj->serial_oid_1_28; return $obj->serial_oid_mxa;
} }
elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9]])$/) { elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9]])$/) {
$serial = $obj->serial_oid; $serial = $obj->serial_oid;