Fix vendors accoding to http://oidref.com/

- Lucent
- Deliberant
- Raisecom
- Rotek

lib/SNMP/Info/Layer3/Rotek.pm

@@ -20,9 +20,7 @@ $VERSION = '3.70-135';
 
 %GLOBALS = (
     %SNMP::Info::Layer3::GLOBALS,
-    'model_41752' => 'enterprises.41752.3.1.1.1.3.0',
-    'model_rotek' => 'enterprises.32761.3.1.1.1.3.0',
-    'submodel'    => 'enterprises.32761.3.1.1.1.2.0',
+    'model_oid' => 'enterprises.41752.3.1.1.1.3.0',
 );
 
 %FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
@@ -34,38 +32,91 @@ sub vendor {
 }
 
 sub os {
-    return 'rotek';
+    return 'rotek-os';
 }
 
 sub os_ver {
     my $obj = shift;
-    my $os_ver;
-    my $os_ver_oid = $obj->description;
-        $os_ver_oid =~ /\,\s(.*)/;
-        $os_ver = $1;
+    my $os_ver = undef;
 
-    if (defined $os_ver) {
-        return $os_ver;
+    my $os_ver_oid = $obj->os_ver_oid_41752 || undef;
+    $os_ver_oid =~ /ROS_(.*)\.(\d+)/ || undef $_ if defined $os_ver_oid;
+    $os_ver = $1 . ' (' . $2 . ')' if defined($1) and defined($2);
+
+    while(not defined $os_ver) {
+        $obj->description =~ /\,\s(.*)/;
+        $os_ver = $1 if defined $1;
+        last if defined $os_ver;
+
+        $obj->description() =~ /[\w,\W,\d,\-]+v\d+rev\d+\s+([\d,\.]+)\s+[\w,\-,\d]+$/;
+        $os_ver = $1 if defined $1;
+        last;
     }
+
+    return $os_ver if defined $os_ver;
     return 'unknown';
 }
+
+sub brom {
+    my $obj = shift;
+    my $brom = undef;
+    $obj->brom_oid_41752 =~ /.*_BOOT_(.*)_(\d+)/;
+    $brom = $1 . ' (' . $2 . ')' if defined($1) and defined($2);
+
+    return $brom if defined $brom;
+}
+
 sub model {
     my $obj = shift;
     my $id = $obj->id();
-    if ($id =~ /32761$/) {
-        return $obj->model_rotek . ' (' . $obj->submodel . ')';
-    }
-    elsif ($id =~ /41752$/) {
-        return $obj->model_41752;
+    my $hw = $obj->hwver() || undef;
+    my $model = $obj->model_oid || undef;
+
+    while (not defined $model) {
+        $model = $obj->model_oid_41752 || undef;
+        last if defined $model;
+
+        $obj->description() =~ /([\w,\W,\d,\-]+)v\d+rev\d+\s+[\d,\.]+\s+[\w,\-,\d]+$/;
+        $model = $1 if defined $1;
+        last if defined $model;
+
+        last;
     }
+
+    $model .= ' HW:' . $hw if defined $hw;
+
+    return $model if defined $model;
     return $obj->SUPER::model();
 }
 
 sub serial {
     my $obj = shift;
+    my $serial = $obj->serial_oid_41752 || undef;
+
+    while (not defined $serial) {
+        $obj->description() =~ /[\w,\W,\d,\-]+v\d+rev\d+\s+[\d,\.]+\s+([\w,\-,\d]+)$/;
+        $serial = $1 if defined $1;
+
+        last;
+    }
+    return $serial if defined $serial;
     return $obj->SUPER::serial();
 }
 
+sub hwver{
+    my $obj = shift;
+    my $hw = ($obj->hw_oid_41752 =~ /.*\sversion\s(.*)/)[0] || undef if defined $obj->hw_oid_41752;
+
+    while (not defined $hw) {
+        $obj->description() =~ /[\w,\W,\d,\-]+(v\d+rev\d+)\s+[\d,\.]+\s+[\w,\-,\d]+$/;
+        $hw = $1 if defined $1;
+
+        last;
+    }
+
+    return $hw if defined $hw;
+}
+
 1;
 __END__
 
@@ -116,7 +167,7 @@ Returns 'rotek'
 
 =item $obj->os()
 
-Returns 'rotek'
+Returns 'rotek-os'
 
 =item $obj->os_ver()