clean up exinda and add regression test (#324)

* simplify and clean up exinda code. perhaps mac handling should be done in a munge routine

* added exinda regression tests

MANIFEST

@@ -200,6 +200,7 @@ xt/lib/Test/SNMP/Info/Layer2/Catalyst.pm
 xt/lib/Test/SNMP/Info/Layer2/Centillion.pm
 xt/lib/Test/SNMP/Info/Layer2/Cisco.pm
 xt/lib/Test/SNMP/Info/Layer2/CiscoSB.pm
+xt/lib/Test/SNMP/Info/Layer2/Exinda.pm
 xt/lib/Test/SNMP/Info/Layer2/HP.pm
 xt/lib/Test/SNMP/Info/Layer2/HP4000.pm
 xt/lib/Test/SNMP/Info/Layer2/HPVC.pm

lib/SNMP/Info/Layer2/Exinda.pm

@@ -30,6 +30,7 @@
 package SNMP::Info::Layer2::Exinda;
 
 use strict;
+use warnings;
 
 use Exporter;
 use SNMP::Info::Layer2;
@@ -52,9 +53,10 @@ $VERSION = '3.66';
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,
     # EXINDA-MIB
-    'uptime' => 'systemUptime',
+    'exinda_model' => 'hardwareSeries',
-    'os_ver' => 'systemVersion',
+    'serial1'      => 'systemHostId',
-    'serial1' => 'systemHostId',
+    'uptime'       => 'systemUptime',
+    'os_ver'       => 'systemVersion',
 );
 
 %FUNCS = (
@@ -65,10 +67,11 @@ $VERSION = '3.66';
     %SNMP::Info::Layer2::MUNGE,
 );
 
+
+# layer 2: bridged shaping and failopen interfaces
+# layer 3/4: ip and layer 4 protocol fiddling and accell
+# layer 7: wccp support
 sub layers {
-    # layer 2: bridged shaping and failopen interfaces
-    # layer 3/4: ip and layer 4 protocol fiddling and accell
-    # layer 7: wccp supprt
     return '01001110';
 }
 
@@ -76,21 +79,19 @@ sub vendor {
     return 'exinda';
 }
 
+# overwrite l2->model, hardwareSeries returns a plain string
 sub model {
     my $exinda = shift;
-
+    return $exinda->exinda_model;
-    return $exinda->hardwareSeries();
 }
 
+# systemHostId (and thus serial1) is actually also a mac address
 sub mac {
-    # systemHostId is actually also a mac address
     my $exinda = shift;
-    my $exinda_mac = $exinda->systemHostId();
+    my $exinda_mac = $exinda->serial1;
 
-    $exinda_mac =~ s/(..)/$1:/g;
+    return unless (defined $exinda_mac && (length $exinda_mac) == 12);
-    chop $exinda_mac;
+    return join(":", $exinda_mac =~ m/\w{2}/g);
-
-    return $exinda_mac;
 }
 
 sub os {
@@ -164,7 +165,7 @@ Returns a mac address extracted from C<systemHostId>.
 
 =item $exinda->model()
 
-Returns the model extracted from C<hardwareSeries>.
+Returns C<hardwareSeries>.
 
 =item $exinda->os()
 
@@ -172,11 +173,7 @@ Returns 'exos'.
 
 =item $exinda->os_ver()
 
-Returns the os version extracted from C<systemVersion>.
+Returns C<systemVersion>.
-
-=item $exinda->serial1()
-
-Returns the serial extracted from C<systemHostId>.
 
 =item $exinda->uptime()
 

xt/lib/Test/SNMP/Info/Layer2/Exinda.pm

@@ -0,0 +1,101 @@
+# Test::SNMP::Info::Layer2::Exinda
+#
+# Copyright (c) 2019 nick nauwelaerts
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package Test::SNMP::Info::Layer2::Exinda;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer2::Exinda;
+
+sub setup : Tests(setup) {
+  my $test = shift;
+  $test->SUPER::setup;
+
+  # Start with a common cache that will serve most tests
+  my $cache_data = {
+    '_id'          => '.1.3.6.1.4.1.21091',
+    '_layers'      => 72,
+    '_description' => 'Linux exinda-8063 3.10.72-72EXINDAsmp #0 SMP @1484583999 x86_64',
+
+    '_serial1' => '109836a9a4a9',
+    '_exinda_model'  => '8063',
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+sub os : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'os');
+  is($test->{info}->os(), 'exos', q(os returns 'exos'));
+
+  # hardcoded, so no check for undef
+}
+
+sub vendor : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'exinda');
+  is($test->{info}->vendor(), 'exinda', q(vendor returns 'exinda'));
+
+  # hardcoded, so no check for undef
+}
+
+sub layers : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'layers');
+  is($test->{info}->layers(), '01001110', q(layers returns '01001110'));
+
+  # hardcoded, so no check for undef
+}
+
+sub model : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'model');
+  is($test->{info}->model(), '8063', q(model is expected value));
+
+  $test->{info}->clear_cache();
+  is($test->{info}->model(), undef, q(no data returns undef model));
+}
+
+sub mac : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'mac');
+  is($test->{info}->mac(), '10:98:36:a9:a4:a9', q(mac is expected value));
+
+  $test->{info}->clear_cache();
+  is($test->{info}->mac(), undef, q(no data returns undef mac));
+}
+
+
+1;