Changeset 713

Timestamp:

03/25/15 17:18:30 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Review and revise splitBlock() and shrinkBlock() to properly handle
n-depth nested allocation structures, as well as making sure master
blocks can be shrunk or split without leaving dangling data. See #7.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1460 +1460 @@
 # Returns an arrayref to a list of hashrefs with ID and CIDR keys for the list of new allocations.
 # Should probably commit DNS magic to realign DNS data
+# Mostly works but may return Strange Things(TM) if used on a master block
 sub splitBlock {
   my $dbh = shift;
@@ -1522 +1523 @@
     # prepare
     my $idsth = $dbh->prepare("SELECT currval('allocations_id_seq')");
-    my $poolsth = $dbh->prepare("INSERT INTO allocations (cidr, $fields_sql)".
+    my $allocsth = $dbh->prepare("INSERT INTO allocations (cidr, $fields_sql)".
         " VALUES (?".',?'x(scalar(@fieldlist)).")");
-    my $poolchildsth = $dbh->prepare("UPDATE poolips SET parent_id = ? WHERE ip << ? AND parent_id = ?");
     my $nbsth = $dbh->prepare("DELETE FROM poolips WHERE parent_id = ? AND ip = ?");
+    my $upd_psth = $dbh->prepare("UPDATE allocations SET parent_id = ? WHERE parent_id = ? AND cidr <<= ?");
+    my $upd_msth = $dbh->prepare("UPDATE allocations SET master_id = ? WHERE master_id = ? AND cidr <<= ?");
+    my $fb_psth = $dbh->prepare("UPDATE freeblocks SET parent_id = ? WHERE parent_id = ? AND cidr <<= ?");
+    my $fb_msth = $dbh->prepare("UPDATE freeblocks SET master_id = ? WHERE master_id = ? AND cidr <<= ?");
+    my $pool_psth = $dbh->prepare("UPDATE poolips SET parent_id = ? WHERE parent_id = ? AND ip << ?");
+    my $pool_msth = $dbh->prepare("UPDATE poolips SET master_id = ? WHERE master_id = ? AND ip <<= ?");
 
     # set up update of existing block
     $dbh->do("UPDATE allocations SET cidr = ? WHERE id = ?", undef, ("$newblocks[0]", $args{id}) );
 
-    # axe the net, gw, and bcast IPs as necessary when splitting a "normal" pool
+    # axe the new bcast IP from the smaller pool at the "base" block, if it's a "normal" pool
     if ($binfo->{type} =~ /.d/) {
       $newblocks[0]--;
@@ -1538 +1544 @@
     # Loop over the new blocks that are not the base block
     for (my $i = 1; $i <= $#newblocks; $i++) {
-      # add the new pool
-      $poolsth->execute($newblocks[$i], @vals);
+      # add the new allocation
+      $allocsth->execute($newblocks[$i], @vals);
       # fetch the ID of the entry we just added...
       $idsth->execute();
@@ -1558 +1564 @@
         $newblocks[$i]++;
       }
-      # ... and update the existing IPs with the new parent_id
-      $poolchildsth->execute($nid, $newblocks[$i], $args{id});
-    }
+
+      # Reparent allocations, freeblocks, and pool IPs.  
+      $upd_psth->execute($nid, $args{id}, $newblocks[$i]);
+      $fb_psth->execute($nid, $args{id}, $newblocks[$i]);
+      $pool_psth->execute($nid, $args{id}, $newblocks[$i]);
+
+      # Update master if we've split a master block
+      if ($binfo->{type} eq 'mm') {
+        $upd_msth->execute($nid, $args{id}, $newblocks[$i]);
+        $fb_msth->execute($nid, $args{id}, $newblocks[$i]);
+        $pool_msth->execute($nid, $args{id}, $newblocks[$i]);
+      }
+
+    } # for (... @newblocks)
 
     $dbh->commit;
@@ -1614 +1631 @@
   local $dbh->{RaiseError} = 1;
 
-  my $fbsth = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,vrf,parent_id,master_id) VALUES (?,?,?,?,?,?)");
+  my $addfbsth = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,vrf,parent_id,master_id) VALUES (?,?,?,?,?,?)");
   my $idsth = $dbh->prepare("SELECT currval('freeblocks_id_seq')");
   my $poolsth = $dbh->prepare("DELETE FROM poolips WHERE parent_id = ? AND ip << ?");
   my $netsth = $dbh->prepare("DELETE FROM poolips WHERE parent_id = ? AND ip = ?");
+  my $allocsth = $dbh->prepare("DELETE FROM allocations WHERE parent_id = ? AND cidr <<= ?");
+  my $delfbsth = $dbh->prepare("DELETE FROM freeblocks WHERE parent_id = ? AND cidr <<= ?");
+
+##fixme:  turn this into a public/top-level sub?
+  sub getchildren {
+    my $dbh = shift;
+    my $id = shift;
+    my $master = shift;
+    my $retlist = shift;  # better than trying to return complex structures recursively. Ow.
+    my $cidr = shift;
+
+    if (!$cidr) {
+      my $bd = getBlockData($dbh, $id);
+      $cidr = $bd->{cidr};
+    }
+
+    my $sth = $dbh->prepare(q(
+        SELECT id,cidr,type FROM allocations
+        WHERE parent_id = ? AND master_id = ? AND cidr <<= ?
+        ) );
+    $sth->execute($id, $master, $cidr);
+    while (my $row = $sth->fetchrow_hashref) {
+      push @$retlist, $row;
+      getchildren($dbh, $row->{id}, $master, $retlist, $cidr);
+    }
+  }
 
   my @ret;
@@ -1634 +1677 @@
     # set new freeblocks, and clean up any IP pool entries if needed.
     foreach my $newfree (@wb2) {
-      # add as freeblock
-      $fbsth->execute($newfree, $pinfo->{city}, (split //, $pinfo->{type})[1], $pinfo->{vrf},
-        $binfo->{parent_id}, $binfo->{master_id});
-      $idsth->execute;
-      my ($nid) = $idsth->fetchrow_array();
-      # add to return list
-      push @ret, {fbid => $nid, newfree => "$newfree", fbparent => $binfo->{parent_id} };
-      # clean up pool IPs if necessary
-      if ($binfo->{type} =~ /.[dp]/) {
-        $poolsth->execute($id, $newfree);
-      }
-    }
+      my @clist;
+      # the block we're munging
+      push @clist, { id => $id, type => $binfo->{type}, cidr => $binfo->{block} };
+      getchildren($dbh, $id, $binfo->{master_id}, \@clist, $newfree);
+
+      foreach my $goner (@clist) {
+        $poolsth->execute($goner->{id}, $newfree) if $goner->{type} =~ /.[dp]/;
+        $allocsth->execute($goner->{id}, $newfree);
+        $delfbsth->execute($goner->{id}, $newfree);
+      }
+
+      # No pinfo means we're shrinking a master block, which means the free space is returned outside of IPDB.
+      if ($pinfo) {
+        $addfbsth->execute($newfree, $pinfo->{city}, 'm', $pinfo->{vrf}, $binfo->{parent_id}, $pinfo->{master_id});
+        $idsth->execute;
+        my ($nid) = $idsth->fetchrow_array();
+        # add to return list
+        push @ret, {fbid => $nid, newfree => "$newfree", fbparent => $binfo->{parent_id} };
+      }
+
+    } # $newfree (@wb2)
 
     # additional cleanup on net/gw/bcast IPs in pool