Changeset 732 for trunk

Timestamp:

05/22/15 11:44:39 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fill in next mergeBlocks() working segment: Merge to container, keep
suballocations, convert mergeable leaf blocks to free blocks. See #8.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -2181 +2181 @@
 
       } elsif ($args{scope} eq 'mergepeer') { # should this just be an else?
+        # Default case.  Merge "peer" blocks, but keep all suballocations
+        my $substh = $dbh->prepare("UPDATE allocations SET parent_id = ? WHERE parent_id = ?");
+        my $delsth = $dbh->prepare("DELETE FROM allocations WHERE id = ?");
+        # Reparent freeblocks in parent
+        $fbreparentsth->execute($prime, $binfo->{master_id}, $binfo->{city}, $newcontainerclass, $binfo->{vrf},
+            $binfo->{parent_id}, $newblock);
+        # Loop over "peer" allocations to be merged
+        while (my ($peercidr, $peer_id, $peertype, $m_id) = $peersth->fetchrow_array) {
+          # Snag existing peer data since we may need it
+          my $peerfull = getBlockData($dbh, $peer_id);
+          # Reparent free blocks from existing containers
+          $fbreparentsth->execute($prime, $binfo->{master_id}, $binfo->{city}, $newcontainerclass,
+              $binfo->{vrf}, $peer_id, $newblock);
+          # Reparent any subblocks from existing containers
+          $substh->execute($prime, $peer_id);
+          # Delete the old container
+          $delsth->execute($peer_id) unless $peer_id == $prime;
+          # Add new freeblocks for merged leaf blocks
+          $insfbsth->execute($peercidr, $binfo->{city}, $newcontainerclass, $binfo->{vrf}, $binfo->{id},
+              $binfo->{master_id}) if $peertype =~ /.[enr]/;
+          # Convert pool IPs into allocations or aggregated free blocks
+          _poolToAllocations($dbh, $peerfull, $pinfo, newparent => $prime) if $peertype =~ /.[dp];
+          # Fix up master_id on free blocks if we're merging a master block
+          $mfbsth->execute($binfo->{master_id}, $m_id) if $peertype eq 'mm';
+        } # merge peers
+        # update the primary allocation info.  Do this last so we don't stomp extra data-retrieval in the loop above
+        $dbh->do("UPDATE allocations SET cidr = ?, type = ? WHERE id = ?", undef, ($newblock, $args{newtype}, $prime) );
+
       } # scope