Changeset 872 for trunk

Timestamp:

05/11/16 18:20:05 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Review and update addMaster() to properly handle new data structures
and VRF as a top-level entity (see #54)

File:

• trunk/cgi-bin/IPDB.pm (modified) (7 diffs)

trunk/cgi-bin/IPDB.pm

@@ -729 +729 @@
   my $dbh = shift;
         # warning!  during testing, this somehow generated a "Bad file descriptor" error.  O_o
-  my $cidr = new NetAddr::IP shift;
+  my $ctext = shift;
+  my $cidr = new NetAddr::IP $ctext;
+
+  return ('FAIL',"$ctext is not a valid CIDR address") if !$cidr;
+
   my %args = @_;
 
@@ -747 +751 @@
   # Wrap all the SQL in a transaction
   eval {
-    # First check - does the master exist?  Ignore VRFs until we can see a sane UI
+    # First check - does the master exist in this VRF?
     my ($mcontained) = $dbh->selectrow_array("SELECT cidr FROM allocations WHERE cidr >>= ? AND type = 'mm' AND vrf = ?",
         undef, ($cidr, $args{vrf}) );
@@ -780 +784 @@
     else {
 
+      # insert the new 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) );
+
       # collect the master(s) we're going to absorb, and snag the longest netmask while we're at it.
+# note << is accurate and complete because our first check just into the eval is "is the new master
+# entirely contained or equal to an existing one?" - so, by definition, if it's not contained, and
+# it's not equal, it's larger.  this also lets us insert the new master without picking it up again here.
       my $smallmask = $cidr->masklen;
-      my $sth = $dbh->prepare("SELECT cidr,id FROM allocations WHERE cidr <<= ? AND type='mm' AND parent_id=0");
-      $sth->execute($cidr);
+      my $sth = $dbh->prepare("SELECT cidr,id FROM allocations WHERE cidr << ? AND type = 'mm' AND parent_id = 0 AND vrf = ? ");
+      $sth->execute($cidr, $args{vrf});
       my @cmasters;
       my @oldmids;
@@ -792 +807 @@
         $smallmask = $master->masklen if $master->masklen > $smallmask;
       }
+
+      # update existing DNS refs.  do this unconditionally Just In Case
+      $dbh->do("UPDATE dnsavail SET parent_alloc = ? WHERE zone << ?"
+        " AND parent_alloc IN (".join(',', @oldmids).")",
+        undef, $mid, $cidr);
 
       # split the new master, and keep only those blocks not part of an existing master
@@ -805 +825 @@
 ##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'");
+      $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE masklen(cidr) <= ? AND cidr <<= ? AND routed = 'm' AND master_id IN (".join(',',@oldmids).")");
       $sth->execute($smallmask, $cidr);
       while (my @data = $sth->fetchrow_array) {
@@ -815 +835 @@
       @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
+      # delete freeblocks that have been absorbed.  this is probably rare.
       $sth = $dbh->prepare("DELETE FROM freeblocks WHERE cidr <<= ? AND parent_id IN (".join(',', @oldmids).")");
+
+      # insert new combined freeblocks.
       my $sth2 = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,parent_id,vrf,master_id)".
         " VALUES (?,'<NULL>','m',?,?,?)");
@@ -835 +847 @@
 
       # 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 = ?");
+      # sigh.  going to have to churn things, since we need to do different updates to different sets of blocks.
+      my $fbfix = $dbh->prepare("UPDATE freeblocks SET master_id = ? WHERE master_id = ?");
+      my $fbfix2 = $dbh->prepare("UPDATE freeblocks SET parent_id = ? WHERE parent_id = ?");
+      my $allocfix = $dbh->prepare("UPDATE allocations SET master_id = ? WHERE master_id = ?");
+      my $allocfix2 = $dbh->prepare("UPDATE allocations SET parent_id = ? WHERE parent_id = ?");
       foreach my $old (@oldmids) {
-        $sth->execute($mid, $old);
         $sth2->execute($old);
+        $fbfix->execute($mid, $old);
+        $fbfix2->execute($mid, $old);
+        $allocfix->execute($mid, $old);
+        $allocfix2->execute($mid, $old);
       }