Changeset 628 for trunk

Timestamp:

10/08/14 17:26:13 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 4/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Update IPDB::addMaster() and success/error page template

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (6 diffs)
• templates/newmaster.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -271 +271 @@
   # Wrap all the SQL in a transaction
   eval {
-    my ($mexist) = $dbh->selectrow_array("SELECT cidr FROM masterblocks WHERE cidr <<= ?", undef, ($cidr) );
+    # First check - does the master exist?  Ignore VRFs until we can see a sane UI
+    my ($mcontained) = $dbh->selectrow_array("SELECT cidr FROM allocations WHERE cidr >>= ? AND type = 'mm'",
+        undef, ($cidr) );
+    die "Master block $mcontained already exists and entirely contains $cidr\n"
+        if $mcontained;
+
+    # Second check - does the new master contain an existing one or ones?
+    my ($mexist) = $dbh->selectrow_array("SELECT cidr FROM allocations WHERE cidr <<= ? AND type = 'mm'",
+        undef, ($cidr) );
 
     if (!$mexist) {
@@ -277 +285 @@
 ##fixme: rwhois should be globally-flagable somewhere, much like a number of other things
 ## maybe a db table called "config"?
-      $dbh->do("INSERT INTO masterblocks (cidr,rwhois,vrf,rdns) VALUES (?,?,?,?)", undef, ($cidr, 'y', $args{vrf}, $args{rdns}) );
+      $dbh->do("INSERT INTO allocations (cidr,type,swip,vrf,rdns) VALUES (?,?,?,?,?)", undef,
+        ($cidr, 'mm', 'y', $args{vrf}, $args{rdns}) );
+      ($mid) = $dbh->selectrow_array("SELECT currval('allocations_id_seq')");
 
 # Unrouted blocks aren't associated with a city (yet).  We don't rely on this
 # elsewhere though;  legacy data may have traps and pitfalls in it to break this.
 # Thus the "routed" flag.
-      $dbh->do("INSERT INTO freeblocks (cidr,city,routed,parent,rdepth,vrf) VALUES (?,?,?,?,?,?)", undef,
-        ($cidr, '<NULL>', 'm', $cidr, 1, $args{vrf}) );
+      $dbh->do("INSERT INTO freeblocks (cidr,city,routed,parent_id,vrf,master_id) VALUES (?,?,?,?,?,?)", undef,
+        ($cidr, '<NULL>', 'm', $mid, $args{vrf}, $mid) );
+
+      # master should be its own master, so deletes directly at the master level work
+      $dbh->do("UPDATE allocations SET master_id = ? WHERE id = ?", undef, ($mid, $mid) );
 
       # If we get here, everything is happy.  Commit changes.
@@ -293 +306 @@
       # collect the master(s) we're going to absorb, and snag the longest netmask while we're at it.
       my $smallmask = $cidr->masklen;
-      my $sth = $dbh->prepare("SELECT cidr FROM masterblocks WHERE cidr <<= ?");
+      my $sth = $dbh->prepare("SELECT cidr,id FROM allocations WHERE cidr <<= ? AND type='mm' AND parent_id=0");
       $sth->execute($cidr);
       my @cmasters;
+      my @oldmids;
       while (my @data = $sth->fetchrow_array) {
         my $master = new NetAddr::IP $data[0];
         push @cmasters, $master;
+        push @oldmids, $data[1];
         $smallmask = $master->masklen if $master->masklen > $smallmask;
       }
@@ -312 +327 @@
       }
 
+##fixme:  master_id
       # collect the unrouted free blocks within the new master
       $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE masklen(cidr) <= ? AND cidr <<= ? AND routed = 'm'");
@@ -323 +339 @@
       @blocklist = Compact(@blocklist);
 
+      # master
+      $dbh->do("INSERT INTO allocations (cidr,type,swip,vrf,rdns) VALUES (?,?,?,?,?)", undef,
+        ($cidr, 'mm', 'y', $args{vrf}, $args{rdns}) );
+      ($mid) = $dbh->selectrow_array("SELECT currval('allocations_id_seq')");
+
+      # master should be its own master, so deletes directly at the master level work
+      $dbh->do("UPDATE allocations SET master_id = ? WHERE id = ?", undef, ($mid, $mid) );
+
       # and now insert the new data.  Make sure to delete old masters too.
 
       # freeblocks
-      $sth = $dbh->prepare("DELETE FROM freeblocks WHERE cidr <<= ?");
-      my $sth2 = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,parent,rdepth,vrf)".
-        " VALUES (?,'<NULL>','m',?,1,?)");
+      $sth = $dbh->prepare("DELETE FROM freeblocks WHERE cidr <<= ? AND parent_id IN (".join(',', @oldmids).")");
+      my $sth2 = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,parent_id,vrf,master_id)".
+        " VALUES (?,'<NULL>','m',?,?,?)");
       foreach my $newblock (@blocklist) {
         $sth->execute($newblock);
-        $sth2->execute($newblock, $cidr, $args{vrf});
-      }
-
-      # update parent relations at rdepth=1
-      $dbh->do("UPDATE allocations SET parent = ? WHERE parent << ? AND rdepth=1", undef, ($cidr, $cidr) );
-      $dbh->do("UPDATE freeblocks SET parent = ? WHERE parent << ? AND rdepth=1", undef, ($cidr, $cidr) );
-
-      # master
-      $dbh->do("DELETE FROM masterblocks WHERE cidr <<= ?", undef, ($cidr) );
-      $dbh->do("INSERT INTO masterblocks (cidr,rwhois,vrf,rdns) VALUES (?,?,?,?)", undef, ($cidr, 'y', $args{vrf}, $args{rdns}) );
+        $sth2->execute($newblock, $mid, $args{vrf}, $mid);
+      }
+
+      # Update immediate allocations, and remove the old parents
+      $sth = $dbh->prepare("UPDATE allocations SET parent_id = ? WHERE parent_id = ?");
+      $sth2 = $dbh->prepare("DELETE FROM allocations WHERE id = ?");
+      foreach my $old (@oldmids) {
+        $sth->execute($mid, $old);
+        $sth2->execute($old);
+      }
 
       # *whew*  If we got here, we likely suceeded.
       $dbh->commit;
+
     } # new master contained existing master(s)
   }; # end eval
@@ -386 +411 @@
       }
       if (@fails) {
-        return ('WARN',"Warning(s) adding $cidr to reverse DNS:\n".join("\n", @fails));
-      }
-    }
-    return ('OK','OK');
+        $errstr = "Warning(s) adding $cidr to reverse DNS:\n".join("\n", @fails);
+        return ('WARN',$mid);
+      }
+    }
+    return ('OK',$mid);
   }
 } # end addMaster

trunk/templates/newmaster.tmpl

@@ -6 +6 @@
 <div class="heading">Success!</div>
 <br>
-<div class="heading"><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=cidr>&amp;rdepth=1">Browse <TMPL_VAR NAME=cidr></a></div>
+<div class="heading"><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=parent>">Browse <TMPL_VAR NAME=cidr></a></div>
 <TMPL_IF warn>
 <div class="warning"><TMPL_VAR NAME=warn></div>