Raisecom. Crap with HW version different style inside one object ID

This commit is contained in:
Andrey Pazychev
2020-05-18 00:58:45 +03:00
parent 3fd9f1deda
commit db06c8e75b

View File

@@ -22,19 +22,19 @@ $VERSION = '3.70-135';
%SNMP::Info::Layer3::GLOBALS, %SNMP::Info::Layer3::GLOBALS,
'model_oid' => 'mib-2.47.1.1.1.1.13.1', 'model_oid' => 'mib-2.47.1.1.1.1.13.1',
'model_oid_41752' => 'enterprises.41752.6.1.1.1.19.0', 'model_oid_41752' => 'enterprises.41752.6.1.1.1.19.0',
'model_oid_886_6_140' => 'enterprises.8886.6.1.1.1.19.0', 'model_oid_8886_6_140' => 'enterprises.8886.6.1.1.1.19.0',
'serial_oid' => 'mib-2.47.1.1.1.1.11.1', 'serial_oid' => 'mib-2.47.1.1.1.1.11.1',
'serial_oid_41752' => 'enterprises.41752.6.1.1.1.14.0', 'serial_oid_41752' => 'enterprises.41752.6.1.1.1.14.0',
'serial_oid_886_6_140' => 'enterprises.8886.6.1.1.1.14.0', 'serial_oid_8886_6_140' => 'enterprises.8886.6.1.1.1.14.0',
'os_ver_oid' => 'mib-2.47.1.1.1.1.10.1', 'os_ver_oid' => 'mib-2.47.1.1.1.1.10.1',
'os_ver_oid_41752' => 'enterprises.41752.6.1.1.1.1.0', 'os_ver_oid_41752' => 'enterprises.41752.6.1.1.1.1.0',
'os_ver_oid_886_6_140' => 'enterprises.8886.6.1.1.1.1.0', 'os_ver_oid_8886_6_140' => 'enterprises.8886.6.1.1.1.1.0',
'brom_oid' => 'mib-2.47.1.1.1.1.9.1', 'brom_oid' => 'mib-2.47.1.1.1.1.9.1',
'brom_oid_41752' => 'enterprises.41752.6.1.1.1.13.0', 'brom_oid_41752' => 'enterprises.41752.6.1.1.1.13.0',
'brom_oid_886_6_140' => 'enterprises.8886.6.1.1.1.13.0', 'brom_oid_8886_6_140' => 'enterprises.8886.6.1.1.1.13.0',
'hw_oid' => 'mib-2.47.1.1.1.1.8.1', 'hw_oid' => 'mib-2.47.1.1.1.1.8.1',
'hw_oid_41752' => 'enterprises.41752.6.1.1.1.2.0', 'hw_oid_41752' => 'enterprises.41752.6.1.1.1.2.0',
'hw_oid_886_6_140' => 'enterprises.8886.6.1.1.1.2.0', 'hw_oid_8886_6_140' => 'enterprises.8886.6.1.1.1.2.0',
); );
%FUNCS = ( %SNMP::Info::Layer3::FUNCS, ); %FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
@@ -48,7 +48,7 @@ sub vendor {
sub os { sub os {
my $obj = shift; my $obj = shift;
my $id = $obj->id(); my $id = $obj->id();
if ($id =~ /41752\.26\.502/ or $id =~ /886\.6/) { if ($id =~ /41752\.26\.502/ or $id =~ /8886\.6/) {
return 'ros'; return 'ros';
} }
return 'rcios'; return 'rcios';
@@ -64,16 +64,16 @@ sub os_ver {
$obj->brom_oid_41752 =~ /.*_BOOT_(.*)_(\d+)/; $obj->brom_oid_41752 =~ /.*_BOOT_(.*)_(\d+)/;
$brom = $1 . ' (' . $2 . ')'; $brom = $1 . ' (' . $2 . ')';
} }
elsif ($id =~ /886\.6\.(140|150)$/) { elsif ($id =~ /8886\.6\.(140|150)$/) {
$obj->os_ver_oid_886_6_140 =~ /ROS_(.*)\.ISCOM.*\.(\d*\.+\d*)/; $obj->os_ver_oid_8886_6_140 =~ /ROS_(.*)\.ISCOM.*\.(\d*\.+\d*)/;
$os_ver = $1 . ' (' . $2 . ')'; $os_ver = $1 . ' (' . $2 . ')';
$obj->brom_oid_886_6_140 =~ /Bootstrap_([\d\W]+)\.ISCOM.*\.(\d*\.+\d*)/; $obj->brom_oid_8886_6_140 =~ /Bootstrap_([\d\W]+)\.ISCOM.*\.(\d*\.+\d*)/;
$brom = $1 . ' (' . $2 . ')'; $brom = $1 . ' (' . $2 . ')';
} }
elsif ($id =~ /886\.6\.(191|21[3,4])$/) { elsif ($id =~ /8886\.6\.(191|21[3,4])$/) {
$obj->os_ver_oid_886_6_140 =~ /(\d*\.+\d*)\(Compiled/; $obj->os_ver_oid_8886_6_140 =~ /(\d*\.+\d*)\(Compiled/;
$os_ver = $1; $os_ver = $1;
$brom = $obj->brom_oid_886_6_140; $brom = $obj->brom_oid_8886_6_140;
} }
else { else {
$os_ver = $obj->os_ver_oid || undef; $os_ver = $obj->os_ver_oid || undef;
@@ -102,8 +102,8 @@ sub model {
elsif ($id =~ /41752\.26\.502/) { elsif ($id =~ /41752\.26\.502/) {
return $obj->model_oid_41752 . ' HW:' . $obj->hvver; return $obj->model_oid_41752 . ' HW:' . $obj->hvver;
} }
elsif ($id =~ /886\.6\.(140|191|150|21[3,4])$/) { elsif ($id =~ /8886\.6\.(140|191|150|21[3,4])$/) {
return $obj->model_oid_886_6_140 . ' HW:' . $obj->hvver; return $obj->model_oid_8886_6_140 . ' HW:' . $obj->hvver;
} }
return $obj->SUPER::model(); return $obj->SUPER::model();
} }
@@ -115,8 +115,8 @@ sub serial {
if ($id =~ /41752\.26\.502/) { if ($id =~ /41752\.26\.502/) {
return $obj->serial_oid_41752; return $obj->serial_oid_41752;
} }
elsif ($id =~ /886\.6\.(140|191|150|21[3,4])$/) { elsif ($id =~ /8886\.6\.(140|191|150|21[3,4])$/) {
return $obj->serial_oid_886_6_140; return $obj->serial_oid_8886_6_140;
} }
return $obj->SUPER::serial; return $obj->SUPER::serial;
} }
@@ -128,12 +128,14 @@ sub hvver {
$obj->hw_oid_41752 =~ /.*\sversion\s(.*)/; $obj->hw_oid_41752 =~ /.*\sversion\s(.*)/;
return $1; return $1;
} }
elsif ($id =~ /886\.6\.(140|150)$/) { elsif ($id =~ /8886\.6\.(140|150|191)$/) {
$obj->hw_oid_886_6_140 =~ /Hardware\s.*\sVersion\s(.*)/; $obj->hw_oid_8886_6_140 =~ /.*\s[v,V]ersion\s(.*)/;
return $1; return $1
if defined $1;
return $obj->hw_oid_8886_6_140;
} }
elsif ($id =~ /886\.6\.(21[3,4]|191)$/) { elsif ($id =~ /8886\.6\.(21[3,4])$/) {
return $obj->hw_oid_886_6_140; return $obj->hw_oid_8886_6_140;
} }
return $obj->SUPER::hvver() return $obj->SUPER::hvver()