From bed7dac4acf30e935e1b10c6e0f9b04a3ba64760 Mon Sep 17 00:00:00 2001
From: Andrey Pazychev <anp135@yandex.ru>
Date: Wed, 20 May 2020 17:30:13 +0300
Subject: [PATCH] Eltex added one more model suport

---
 lib/SNMP/Info/Layer3/Eltex.pm | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/lib/SNMP/Info/Layer3/Eltex.pm b/lib/SNMP/Info/Layer3/Eltex.pm
index cb2b0aac..8934014d 100644
--- a/lib/SNMP/Info/Layer3/Eltex.pm
+++ b/lib/SNMP/Info/Layer3/Eltex.pm
@@ -48,21 +48,8 @@ $VERSION = '3.70-135';
 
 sub model {
     my $obj = shift;
-    my $model; my $hw;
-    my $id = $obj->id();
-    $model = $obj->model_oid || undef;
-    $hw = $obj->hwver() || undef;
-    if ( $id =~ /35265\.1\.22/ ) {
-        my $descr = $obj->descr_oid;
-        $descr =~ /Eltex\s(.*)\ssoftware\sversion\s(.*)\sbuild\s(\d+)/;
-        return $1;
-    }
-    elsif ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28/) {
-        return $obj->model_oid_mxa;
-    }
-    elsif (defined $model and $model !~ /MES\d+/) {
-        $model = $obj->model_oid_mes . ' ' . $obj->model_oid || undef;
-    }
+    my $model = $obj->description() || undef;
+    my $hw = $obj->hwver() || undef;
 
     if (defined $model and defined $hw) {
         return $model . ' HW:' . $hw;
@@ -91,8 +78,10 @@ sub os_ver {
         $os_ver = $obj->os_ver_oid_140;
         return $os_ver;
     }
-    if ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28$/) {
-        return $obj->os_ver_oid_mxa;
+    if ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.(28$)|(21\.)/) {
+        $os_ver = $obj->os_ver_oid_mxa;
+        $os_ver =~ s/^\s*Eltex\s*LTE\s*software\s*version\s*//;
+        return $os_ver;
     }
     elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9])$/) {
         $os_ver = $obj->os_ver_oid;
@@ -109,6 +98,7 @@ sub os_ver {
     else {
         return 'unknown';
     }
+
     return $os_ver . ' bootrom: ' . $bootrom;
 }
 
@@ -122,7 +112,7 @@ sub serial {
     elsif ($id =~ /34300\.1\.6/ or $id =~ /35265\.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;
     }
     elsif ( $id =~ /35265\.1\.22$/ ) {