Changeset 190 for trunk

Timestamp:

03/08/05 17:40:12 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

consistency-check.pl:
Updated to be consistent with the new alloctypes and to check

the new container types for CIDR-level correctness.

Made output more consistent.

File:

• trunk/cgi-bin/consistency-check.pl (modified) (9 diffs)

trunk/cgi-bin/consistency-check.pl

@@ -19 +19 @@
 initIPDBGlobals($dbh);
 
-print "First check:  All blocks must be within one of the master blocks\n";
+print "Checking master containment...\n";
 
 # First check - make sure ALL routes and allocated blocks are part
 # of one of the master blocks.
-print "Checking routed blocks: ";
+print "  Checking routed blocks:";
 $sth = $dbh->prepare("select cidr from routed");
-# union select cidr from allocations union select cidr from freeblocks");
-$sth->execute;
+$sth->execute;
+$flag = '';
 ROUTED: while (@data = $sth->fetchrow_array) {
   $cidr = new NetAddr::IP $data[0];
@@ -32 +32 @@
     if ($master->contains($cidr)) { next ROUTED; }
   }
-  print "$cidr not mastered\n";
-}
-print " done.\n";
+  print "\n    $cidr not mastered";
+}
+print "$flag done.\n";
 
 # Next test:  All allocations must be part of a master.
-print "Checking allocations: ";
+print "  Checking allocations:";
 $sth = $dbh->prepare("select cidr from allocations");
 $sth->execute;
+$flag = '';
 ALLOCATED: while (@data = $sth->fetchrow_array) {
   $cidr = new NetAddr::IP $data[0];
@@ -45 +46 @@
     if ($master->contains($cidr)) { next ALLOCATED; }
   }
-  print "$cidr not mastered\n";
-}
-print " done.\n";
+  print "\n    $cidr not mastered";
+  $flag = "\n ";
+}
+print "$flag done.\n";
 
 # Next:  free blocks
-print "Checking freeblocks: ";
+print "  Checking freeblocks:";
 $sth = $dbh->prepare("select cidr from freeblocks order by cidr");
 $sth->execute;
+$flag = '';
 FREEBLOCK: while (@data = $sth->fetchrow_array) {
   $cidr = new NetAddr::IP $data[0];
@@ -58 +61 @@
     if ($master->contains($cidr)) { next FREEBLOCK; }
   }
-  print "$cidr not mastered\n";
-}
-print " done.\n";
-
-print "Done checking master containment.\n\nChecking pool containment...\n";
+  print "\n    $cidr not mastered";
+  $flag = "\n ";
+}
+print "$flag done.\n";
+
+print "Done checking master containment.\n\n";
+
+print "Checking pool containment...\n";
 
 $sth = $dbh->prepare("select pool,ip from poolips order by ip");
@@ -69 +75 @@
   $pool = new NetAddr::IP $data[0];
   $ip = new NetAddr::IP $data[1];
-  print "IP $ip listed with incorrect pool $pool\n"
+  print "  IP $ip listed with incorrect pool $pool\n"
     if !$pool->contains($ip);
 }
@@ -77 +83 @@
   $sth2 = $dbh->prepare("select cidr from allocations where cidr='$data[0]'");
   $sth2->execute;
-  print "Pool $data[0] does not exist in allocations table\n"
+  print "  Pool $data[0] does not exist in allocations table\n"
     if (($sth2->fetchrow_array)[0] eq '');
 }
 
-print "Done checking pool containment.\n\nChecking block-alignment consistency:\n";
+print "Done checking pool containment.\n\n";
+
+print "Checking block-alignment consistency...\n";
 
 # Block alignment consistency:  All allocated+free blocks within a master
@@ -97 +105 @@
 
 foreach $master (@masterblocks) {
-  print "Master $master:\n";
+  print "  Master $master:\n";
   $prev = $master;
   $sth = $dbh->prepare("(select network(cidr) as net, broadcast(cidr) as bcast ".
-        " from allocations where cidr <<= '$master') union ".
-        "(select network(cidr) as net, broadcast(cidr) as bcast ".
-        "from freeblocks where cidr <<= '$master') order by net");
+        "from allocations where cidr <<= '$master' and type not like '_c') ".
+        "union (select network(cidr) as net, broadcast(cidr) as bcast ".
+        "from freeblocks where cidr <<= '$master' and not (routed='c')) order by net");
   $sth->execute;
 
@@ -111 +119 @@
       # check if cur starts with master
       if ($cur->numeric > $prev->numeric) {
-        print " Gap from start of master $master to first block $cur\n";
+        print "    Gap from start of master $master to first block $cur\n";
       } elsif ($cur->numeric < $prev->numeric) {
-        print " BIG problem!  Current block $cur begins before master $master!\n";
+        print "    BIG problem!  Current block $cur begins before master $master!\n";
       }
     } else {
       if ($cur->numeric < ($prev->numeric + 1)) {
-        print " Block ".$prev->network." overlaps block $cur\n";
+        print "    Block ".$prev->network." overlaps block $cur\n";
       } elsif ($cur->numeric > ($prev->numeric + 1)) {
-        print " Gap between end of block ".$prev->network." and block $cur\n";
+        print "    Gap between end of block ".$prev->network." and block $cur\n";
       }
     }
@@ -131 +139 @@
   $master--;
   if ($cur->numeric ne $master->numeric) {
-    print " Gap from $cur to end of master at $master\n";
-  }
-  print "done $master.\n";
-}
-
-print "Done checking block alignment.\n\nChecking for correctness on 'defined' CustIDs:\n";
+    print "    Gap from $cur to end of master at $master\n";
+  }
+  print "  done $master.\n";
+}
+
+print "Done checking block alignment.\n\n";
+
+print "Checking containment on container blocks...\n";
+# First, we need a list of containers.
+# Then, we check all of the contained blocks to see if they're within
+# the proper container.
+$sth = $dbh->prepare("select cidr from allocations where type like '_c' order by cidr");
+$sth->execute;
+$i=0;
+while (@data = $sth->fetchrow_array) {
+  $containers[$i++] = new NetAddr::IP $data[0];
+}
+print "  Checking general containment:";
+$sth = $dbh->prepare("select cidr from allocations where type like '_r' order by cidr");
+$sth->execute;
+$flag = '';
+CONTAINED: while (@data = $sth->fetchrow_array) {
+  $cidr = new NetAddr::IP $data[0];
+  foreach $container (@containers) {
+    next CONTAINED if $container->contains($cidr);
+  }
+  print "\n    $cidr not contained";
+  $flag = "\n ";
+}
+print "$flag done.\n";
+print "  Checking alignment:\n";
+foreach $container (@containers) {
+  print "    Container $container:\n";
+  $prev = $container;
+  $sth = $dbh->prepare("(select network(cidr) as net, broadcast(cidr) as bcast ".
+        "from allocations where cidr <<= '$container' and type like '_r') ".
+        "union (select network(cidr) as net, broadcast(cidr) as bcast ".
+        "from freeblocks where cidr <<= '$container' and routed='w') order by net");
+    $sth->execute;
+
+  while (@data = $sth->fetchrow_array) {
+    $cur = new NetAddr::IP $data[0];
+
+    if ($container->numeric == $prev->numeric) {
+      # check if cur starts with master
+      if ($cur->numeric > $prev->numeric) {
+        print "      Gap from start of container $container to first block $cur\n";
+      } elsif ($cur->numeric < $prev->numeric) {
+        print "      BIG problem!  Current block $cur begins before container $container!\n";
+      }
+    } else {
+      if ($cur->numeric < ($prev->numeric + 1)) {
+        print "      Block ".$prev->network." overlaps block $cur\n";
+      } elsif ($cur->numeric > ($prev->numeric + 1)) {
+        print "      Gap between end of block ".$prev->network." and block $cur\n";
+      }
+    }
+
+    $prev = $cur;
+    $prev--;
+
+  } # while (@data...)
+
+  $cur--;
+  $container--;
+  if ($cur->numeric ne $container->numeric) {
+    print "      Gap from $cur to end of container at $container\n";
+  }
+  print "    done $container.\n";
+
+}
+print "  done container alignment.\n";
+print "Done checking container containment.\n\n";
+
+print "Checking for correctness on 'defined' CustIDs:\n";
 # New check:  Make sure "defined" CustIDs are correct.
 $sth = $dbh->prepare("select cidr,type,custid from allocations where not type='cn' order by cidr");