===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/t/51-network-add_su-ap.t,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -r1.1 -r1.4
--- trango/Net-Telnet-Trango/t/51-network-add_su-ap.t	2007/02/06 00:42:33	1.1
+++ trango/Net-Telnet-Trango/t/51-network-add_su-ap.t	2007/02/06 16:52:21	1.4
@@ -1,7 +1,7 @@
 #!perl -T
-# $RedRiver: 50-network.t,v 1.4 2007/02/05 23:11:21 andrew Exp $
+# $RedRiver: 51-network-add_su.t,v 1.3 2007/02/06 16:29:58 andrew Exp $
 
-use Test::More tests => 7;
+use Test::More tests => 12;
 use File::Spec;
 
 BEGIN {
@@ -9,13 +9,13 @@
 }
 
 diag("Testing Net::Telnet::Trango $Net::Telnet::Trango::VERSION, Perl $], $^X");
-diag("  Generic tests");
+diag("  add SU on AP tests");
 
 my $cfg_file = File::Spec->catfile('t', 'tests.cfg');
 my ($cir, $mir) = (128, 256);
 
 SKIP: {
-    my $skipped = 6;
+    my $skipped = 11;
     my %cfg;
     if (-e $cfg_file) {
         if (open my $fh, $cfg_file) {
@@ -58,8 +58,6 @@
     my $t;
     ok($t = Net::Telnet::Trango->new(), "Instantiating object");
 
-    $t->input_log('input.log'); # XXX Debugging
-
     ok($t->open($host), "Opening connection to $host");
 
     ok($t->is_connected, "connected");
@@ -70,37 +68,69 @@
 
 
     my $sudb;
-    ok($sudb = $t->sudb_view, "Getting sudb");
+    if ((!ok($sudb = $t->sudb_view, "Getting sudb"))
+      && $t->last_error ) {
+        diag('ERR: ' . $t->last_error);
+    }
 
-    use YAML;
-    print Dump $sudb;
+    my $in_sudb = 0;
+    foreach my $su (@{ $sudb }) {
+        if ($su_id == $su->{suid}) {
+            if (lc($su_mac) eq lc($su->{mac})) {
+                $in_sudb = 1;
+            } else {
+                $in_sudb = -1;
+                diag("Incorrect mac for SUID $su_id");
+                diag("  Should be $su_mac");
+                diag("  Really is $su->{mac}");
+            }
+            last;
+        }
+    }
 
-    my $result;
-    ok($result = $t->sudb_add($su_id, 'reg', $cir, $mir, $su_mac), "Adding su");
+    if ($in_sudb) {
+        diag("Removing suid $su_id from AP");
+        if ( (! $t->sudb_delete($su_id)) 
+          && $t->last_error ) {
+            diag('ERR: ' . $t->last_error);
+        }
+    }
 
-    if ( (! $result ) && $t->last_error ) {
+
+    my $result;
+    if ( (! ok($result = $t->sudb_add($su_id, 'reg', $cir, $mir, $su_mac), 
+      "Adding su")) 
+      && $t->last_error ) {
         diag('ERR: ' . $t->last_error);
     }
 
     ok($result = $t->save_sudb, "Saving sudb");
-
     if ( (! $result ) && $t->last_error ) {
         diag('ERR: ' . $t->last_error);
     }
 
-    $result = $t->opmode('ap y');
-    if ( (! $result ) && $t->last_error ) {
+    $sudb = [];
+    if ((!ok($sudb = $t->sudb_view, "Getting sudb"))
+      && $t->last_error ) {
         diag('ERR: ' . $t->last_error);
     }
 
-    my $opmode;
-    ok($opmode = $t->opmode, "getting current opmode");
-
-    if (ref $opmode eq 'HASH' && $opmode->{ERR}) {
-        diag("Error: $opmode->{ERR}");
+    $in_sudb = 0;
+    foreach my $su (@{ $sudb }) {
+        if ($su_id == $su->{suid}) {
+            if (lc($su_mac) eq lc($su->{mac})) {
+                $in_sudb = 1;
+            } else {
+                $in_sudb = -1;
+                diag("Incorrect mac for SUID $su_id");
+                diag("  Should be $su_mac");
+                diag("  Really is $su->{mac}");
+            }
+            last;
+        }
     }
 
-    is($opmode->{Opmode}, 'ap', "Checking opmode is ap");
+    is($in_sudb, 1, "Correct SU is in SUDB");
 
     ok($t->bye, "Goodbye");
 }