Changeset 635 for trunk

Timestamp:

10/09/14 17:25:17 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix up consistency-check.pl; it was so stale it broke on the stable branch

File:

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

trunk/cgi-bin/consistency-check.pl

@@ -12 +12 @@
 use DBI;
 use NetAddr::IP;
+use Data::Dumper;
 
 # don't remove!  required for GNU/FHS-ish install from tarball
@@ -25 +26 @@
 initIPDBGlobals($dbh);
 
+## Do some new init things to account for IPDB.pm changes
+my $tmp;
+# get master blocks in an array
+my @masterblocks;
+$tmp = getMasterList($dbh);
+foreach (@{$tmp}) {
+  push @masterblocks, NetAddr::IP->new($_->{master});
+}
+
 print "Checking master containment...\n";
 
@@ -33 +43 @@
 $sth->execute;
 $flag = '';
+my $i;
 ROUTED: while (@data = $sth->fetchrow_array) {
   $cidr = new NetAddr::IP $data[0];
@@ -39 +50 @@
   }
   print "\n    $cidr not mastered";
+  last if $i++>10;
 }
 print "$flag done.\n";
@@ -114 +126 @@
   $prev = $master;
   $sth = $dbh->prepare("(select network(cidr) as net, broadcast(cidr) as bcast ".
-        "from allocations where cidr <<= '$master' and type not like '_c') ".
+        "from allocations where cidr <<= '$master' and not (type like '_c' or type in ('rm','mm')) ) ".
         "union (select network(cidr) as net, broadcast(cidr) as bcast ".
         "from freeblocks where cidr <<= '$master' and not (routed='c')) order by net");
   $sth->execute;
 
-  while (@data = $sth->fetchrow_array) {
-    $cur = new NetAddr::IP $data[0];
-
+  while (my ($net,$bcast) = $sth->fetchrow_array) {
+    my $prevn = $prev->broadcast->numeric + 1;
+    $cur = new NetAddr::IP $net;
+    if ($cur->numeric == $prevn) {
+      $prev = $cur;
+      next;
+    }
+#print "
+##fixme:  the rest of this could probably be squashed down quite a bit
     if ($master->numeric == $prev->numeric) {
       # check if cur starts with master
@@ -187 +205 @@
     $sth->execute;
 
-  while (@data = $sth->fetchrow_array) {
-    $cur = new NetAddr::IP $data[0];
+print "(select network(cidr) as net, broadcast(cidr) as bcast ".
+        "from allocations where cidr <<= '$container' and type like '_r')\n ".
+        "union (select network(cidr) as net, broadcast(cidr) as bcast ".
+        "from freeblocks where cidr <<= '$container' and not (routed='y' or routed='n')) ".
+        "order by net" if $container =~ /10.10.20/;
+
+  while (my ($net,$bcast) = $sth->fetchrow_array) {
+    my $prevn = $prev->broadcast->numeric + 1;
+    $cur = new NetAddr::IP $net;
+    if ($cur->numeric == $prevn) {
+      $prev = $cur;
+      next;
+    }
 
     if ($container->numeric == $prev->numeric) {