Changeset 692 for trunk/cgi-bin/IPDB.pm

Timestamp:

02/11/15 18:43:22 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Start adding support for advisory "reserved block" assignments - when
creating a new assignment, flag an equal-sized block ahead or behind
to expand the assignment in the future. See #24.

• free block assignment
• guided assignment (still needs tweaking to dodge existing reserved blocks)
• note flagged blocks in free block list

File:

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

trunk/cgi-bin/IPDB.pm

@@ -674 +674 @@
   $args{vrf} = '' if !$args{vrf};
 
-  my $sth = $dbh->prepare("SELECT cidr,id FROM freeblocks WHERE parent_id = ? ORDER BY cidr");
+  my $sth = $dbh->prepare(q(
+        SELECT f.cidr,f.id,allocations.cidr
+        FROM freeblocks f
+        LEFT JOIN allocations ON f.reserve_for = allocations.id
+        WHERE f.parent_id = ?
+        ORDER BY f.cidr
+        ) );
 #  $sth->execute($args{parent}, $args{vrf});
   $sth->execute($args{parent});
   my @flist;
-  while (my ($cidr,$id) = $sth->fetchrow_array()) {
+  while (my ($cidr,$id,$resv) = $sth->fetchrow_array()) {
     $cidr = new NetAddr::IP $cidr;
     my %row = (
@@ -685 +691 @@
         fbid => $id,
         fbparent => $args{parent},
+        resv => $resv,
         );
     push @flist, \%row;
@@ -985 +992 @@
         undef, $args{fbid});
   $alloc_from = new NetAddr::IP $alloc_from;
+  return ('FAIL',"Failed to allocate $args{cidr};  intended free block was used by another allocation.")
+        if !$fbparent;
+##fixme:  fail here if !$alloc_from
+# also consider "lock for allocation" due to multistep allocation process
 
   # To contain the error message, if any.
@@ -1117 +1128 @@
         $dbh->do("DELETE FROM freeblocks WHERE id = ?", undef, ($args{fbid}) );
 
-        # Insert new list of smaller free blocks left over
-        $sth = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,vrf,parent_id,master_id) VALUES (?,?,?,?,?,?)");
-        foreach my $block (@newfreeblocks) {
-          $sth->execute($block, $fcity, $alloc_from_type, $args{vrf}, $fbparent, $fbmaster);
-        }
-
         # Insert the allocations entry
         $dbh->do("INSERT INTO allocations ".
@@ -1130 +1135 @@
                 $args{desc}, $args{notes}, $args{circid}, $args{privdata}, $args{rdns}) );
         my ($bid) = $dbh->selectrow_array("SELECT currval('allocations_id_seq')");
+
+        # Insert new list of smaller free blocks left over. Flag the one that matches the
+        # masklength of the new allocation, if a reserve block was requested.
+        $sth = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,vrf,parent_id,master_id,reserve_for) ".
+                "VALUES (?,?,?,?,?,?,?)");
+        foreach my $block (@newfreeblocks) {
+          $sth->execute($block, $fcity, $alloc_from_type, $args{vrf}, $fbparent, $fbmaster,
+                ($block->masklen == $wantmaskbits ? $bid : 0));
+        }
 
         # For routed/container types, add a freeblock within the allocated block so we can subdivide it further
@@ -1714 +1728 @@
   my ($btype) = $dbh->selectrow_array("SELECT type FROM allocations WHERE id=?", undef, ($id) );
 
+  # Note city, vrf, parent_id and master_id removed due to JOIN uncertainty for block allocations
+  my $commonfields = q(custid, type, circuitid, description, notes, modifystamp AS lastmod,
+        privdata, vlan, rdns);
+
   if ($type eq 'i') {
-    my $binfo = $dbh->selectrow_hashref("SELECT ip AS block, custid, type, city, circuitid, description,".
-        " notes, modifystamp AS lastmod, privdata, vrf, vlan, rdns, parent_id, master_id".
-        " FROM poolips WHERE id = ?", undef, ($id) );
+    my $binfo = $dbh->selectrow_hashref(qq(
+        SELECT ip AS block, city, vrf, parent_id, master_id, $commonfields
+        FROM poolips WHERE id = ?
+        ), undef, ($id) );
     return $binfo;
   } else {
-    my $binfo = $dbh->selectrow_hashref("SELECT cidr AS block, custid, type, city, circuitid, ".
-        "description, notes, modifystamp AS lastmod, privdata, vrf, vlan, swip, rdns, parent_id, master_id".
-        " FROM allocations WHERE id = ?", undef, ($id) );
+    my $binfo = $dbh->selectrow_hashref(qq(
+        SELECT a.cidr AS block, a.city, a.vrf, a.parent_id, a.master_id, swip, $commonfields,
+                f.cidr AS reserve, f.id as reserve_id
+        FROM allocations a LEFT JOIN freeblocks f ON a.id=f.reserve_for
+        WHERE a.id = ?
+        ), undef, ($id) );
     return $binfo;
   }