===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/t/51-network-add_su-ap.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 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:23:17	1.2
@@ -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.1 2007/02/06 00:42:33 andrew Exp $
 
-use Test::More tests => 7;
+use Test::More tests => 17;
 use File::Spec;
 
 BEGIN {
@@ -15,7 +15,7 @@
 my ($cir, $mir) = (128, 256);
 
 SKIP: {
-    my $skipped = 6;
+    my $skipped = 16;
     my %cfg;
     if (-e $cfg_file) {
         if (open my $fh, $cfg_file) {
@@ -70,37 +70,94 @@
 
 
     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);
     }
 
+    $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($in_sudb, 1, "Correct SU is in SUDB");
+
     my $opmode;
     ok($opmode = $t->opmode, "getting current opmode");
 
+    if ($opmode->{Opmode} eq 'ap') {
+        ok(1, "Already opmode ap");
+    } else {
+        if ((! ok($result = $t->opmode('ap y'), "Setting opmode ap y")) 
+          && $t->last_error ) {
+            diag('ERR: ' . $t->last_error);
+        }
+    }
+
+    $opmode = {};
+    ok($opmode = $t->opmode, "getting current opmode");
     if (ref $opmode eq 'HASH' && $opmode->{ERR}) {
         diag("Error: $opmode->{ERR}");
     }
 
     is($opmode->{Opmode}, 'ap', "Checking opmode is ap");
+
+    if (! ok($result = $t->save_ss, "Saving systemsetting") 
+      && $t->last_error ) {
+        diag('ERR: ' . $t->last_error);
+    }
 
     ok($t->bye, "Goodbye");
 }