Changeset 738 for trunk

Timestamp:

05/28/15 18:13:44 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fill in merge-to-leaf. See #8.

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -2380 +2380 @@
     } elsif ($args{newtype} =~ /.[enr]/) {
       ## Leaf
-
-    } # new type if()
+      # Merging to a leaf type of any kind is, pretty much be definition, scope == 'clearall'.
+      # keepall, mergepeer, and clearpeer all imply keeping suballocations, where leaf allocations
+      # by definition do not have suballocations.
+      # Snag the new parent info for the return list
+      push @retlist, {block => "$newblock", type => $disp_alloctypes{$args{newtype}}, id => $prime};
+      while (my ($peercidr, $peer_id, $peertype, $m_id) = $peersth->fetchrow_array) {
+        next if $peer_id == $prime;
+        # Push existing allocations down a level before deleting,
+        # so that when they're deleted the parent info is correct
+        $reparentsth->execute($prime, $binfo->{master_id}, $peer_id);
+        _deleteCascade($dbh, $peer_id, 0);
+        # Capture block for return
+        push @retlist, { block => $peercidr, mtype => $disp_alloctypes{$peertype} };
+      }
+      # Delete any subs of $prime as well
+      my $substh = $dbh->prepare("SELECT cidr,id FROM allocations WHERE parent_id = ?");
+      $substh->execute($prime);
+      while (my ($scidr, $s_id) = $substh->fetchrow_array) {
+        _deleteCascade($dbh, $s_id);
+      }
+      # Clean up lingering free blocks and pool IPs
+      $dbh->do("DELETE FROM freeblocks WHERE cidr <<= ? AND (parent_id = ? OR parent_id = ?)", undef,
+          $newblock, $binfo->{parent_id}, $prime);
+      $dbh->do("DELETE FROM poolips WHERE parent_id = ? AND ip <<= ? ", undef,
+          $prime, $newblock);
+
+    } # $args{newtype} if()
 
     $dbh->commit;