1 files changed, 40 insertions, 9 deletions

diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t
index 369314ec..4820aace 100644
--- a/plugins/t/check_snmp.t
+++ b/plugins/t/check_snmp.t
@@ -8,9 +8,8 @@ use strict;
 use Test::More;
 use NPTest;
 
-use vars qw($tests);
-BEGIN {$tests = 14; plan tests => $tests}
-
+my $tests = 32;
+plan tests => $tests;
 my $res;
 
 SKIP: {
@@ -20,7 +19,7 @@ SKIP: {
                                            "A host providing an SNMP Service");
 
         my $snmp_community = getTestParameter( "snmp_community",     "NP_SNMP_COMMUNITY", "public",
-                                           "The SNMP Community string for SNMP Testing" );
+                                           "The SNMP Community string for SNMP Testing (assumes snmp v1)" );
 
         my $host_nonresponsive = getTestParameter( "host_nonresponsive", "NP_HOST_NONRESPONSIVE", "10.0.0.1",
                                                    "The hostname of system not responsive to network requests" );
@@ -28,12 +27,32 @@ SKIP: {
         my $hostname_invalid   = getTestParameter( "hostname_invalid",   "NP_HOSTNAME_INVALID",   "nosuchhost",
                                                    "An invalid (not known to DNS) hostname" );
 
+        $res = NPTest->testCmd( "./check_snmp -t 1" );
+        is( $res->return_code, 3, "No host name" );
+        is( $res->output, "No host specified" );
+        
+        $res = NPTest->testCmd( "./check_snmp -H fakehostname" );
+        is( $res->return_code, 3, "No OIDs specified" );
+        is( $res->output, "No OIDs specified" );
+
+        $res = NPTest->testCmd( "./check_snmp -H fakehost -o oids -P 3 --seclevel=rubbish" );
+        is( $res->return_code, 3, "Invalid seclevel" );
+        like( $res->output, "/check_snmp: Invalid seclevel - rubbish/" );
+
+        $res = NPTest->testCmd( "./check_snmp -H fakehost -o oids -P 3c" );
+        is( $res->return_code, 3, "Invalid protocol" );
+        like( $res->output, "/check_snmp: Invalid SNMP version - 3c/" );
+
         SKIP: {
-                skip "no snmp host defined", 10 if ( ! $host_snmp );
+                skip "no snmp host defined", 20 if ( ! $host_snmp );
 
                 $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
                 cmp_ok( $res->return_code, '==', 0, "Exit OK when querying uptime" ); 
-                like($res->output, '/^SNMP OK - \d+/', "String contains SNMP OK");
+                like($res->output, '/^SNMP OK - (\d+)/', "String contains SNMP OK");
+                $res->output =~ /^SNMP OK - (\d+)/;
+                my $value = $1;
+                cmp_ok( $value, ">", 0, "Got a time value" );
+                like($res->perf_output, "/sysUpTime.*$1/", "Got perfdata with value '$1' in it");
 
                 $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysDescr.0");
                 cmp_ok( $res->return_code, '==', 0, "Exit OK when querying sysDescr" ); 
@@ -49,21 +68,33 @@ SKIP: {
 
                 $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w  :0 -c 0");
                 cmp_ok( $res->return_code, '==', 2, "Exit CRITICAL when querying hrSWRunIndex.1 and crit-th doesn't apply" ); 
-                like($res->output, '/^SNMP CRITICAL - \*1\*\s.*$/', "String matches SNMP CRITICAL and ouput format");
+                like($res->output, '/^SNMP CRITICAL - \*1\*\s.*$/', "String matches SNMP CRITICAL and output format");
+
+                $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o ifIndex.2,ifIndex.1 -w 1:2 -c 1:2");
+                cmp_ok( $res->return_code, '==', 0, "Checking two OIDs at once" );
+                like($res->output, "/^SNMP OK - 2 1/", "Got two values back" );
+                like( $res->perf_output, "/ifIndex.2=2/", "Got 1st perf data" );
+                like( $res->perf_output, "/ifIndex.1=1/", "Got 2nd perf data" );
+
+                $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o ifIndex.2,ifIndex.1 -w 1:2,1:2 -c 2:2,2:2");
+                cmp_ok( $res->return_code, '==', 2, "Checking critical threshold is passed if any one value crosses" );
+                like($res->output, "/^SNMP CRITICAL - 2 *1*/", "Got two values back" );
+                like( $res->perf_output, "/ifIndex.2=2/", "Got 1st perf data" );
+                like( $res->perf_output, "/ifIndex.1=1/", "Got 2nd perf data" );
         }
 
         SKIP: {
                 skip "no non responsive host defined", 2 if ( ! $host_nonresponsive );
                 $res = NPTest->testCmd( "./check_snmp -H $host_nonresponsive -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
                 cmp_ok( $res->return_code, '==', 3, "Exit UNKNOWN with non responsive host" ); 
-                like($res->output, '/SNMP problem - /', "String matches SNMP Problem");
+                like($res->output, '/External command error: Timeout: No Response from /', "String matches timeout problem");
         }
 
         SKIP: {
                 skip "no non invalid host defined", 2 if ( ! $hostname_invalid );
                 $res = NPTest->testCmd( "./check_snmp -H $hostname_invalid   -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
                 cmp_ok( $res->return_code, '==', 3, "Exit UNKNOWN with non responsive host" ); 
-                like($res->output, '/SNMP problem - /', "String matches SNMP Problem");
+                like($res->output, '/External command error: .*nosuchhost/', "String matches invalid host");
         }
 
 }