Changeset 595 for branches/stable/cgi-bin

Timestamp:

05/15/13 17:26:55 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Hand-backport pieces of the allocate-from-routed-freeblock from /trunk
post-r553. Cherrypick merge not possible due to intermingled changes
relating to the database structure updates.
Includes a handful of harmless references to the new structure.
Will likely cause merge conflicts when the structure update is merged.

Location:

branches/stable/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• main.cgi (modified) (6 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -504 +504 @@
                                 # really be specified in the call for clarity
   my $tlist;
-  if ($tgroup eq 'p') {
-    # grouping 'p' - primary allocation types.  These include static IP pools (_d and _p),
-    # dynamic-allocation ranges (_e), containers (_c), and the "miscellaneous" cn, in, and en types.
-    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder < 500 ".
-        "AND type NOT LIKE '_i' AND type NOT LIKE '_r' ORDER BY listorder", { Slice => {} });
+  if ($tgroup eq 'n') {
+    # grouping 'n' - all netblock types.  These include routed blocks, containers (_c)
+    # and contained (_r) types, dynamic-allocation ranges (_e), static IP pools (_d and _p),
+    # and the "miscellaneous" cn, in, and en types.
+    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
+        "AND type NOT LIKE '_i' ORDER BY listorder", { Slice => {} });
+  } elsif ($tgroup eq 'p') {
+    # grouping 'p' - primary allocation types.  As with 'n' above but without the _r contained types.
+    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
+        "AND type NOT LIKE '_i' AND type NOT LIKE '_r' ORDER BY listorder", { Slice => {} });
   } elsif ($tgroup eq 'c') {
     # grouping 'c' - contained types.  These include all static IPs and all _r types.
     $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
-        " AND (type LIKE '_i' OR type LIKE '_r') ORDER BY listorder", { Slice => {} });
+        " AND (type LIKE '_i' OR type LIKE '_r') ORDER BY listorder", { Slice => {} });
+  } elsif ($tgroup eq 'i') {
+    # grouping 'i' - static IP types.
+    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
+        " AND type LIKE '_i' ORDER BY listorder", { Slice => {} });
   } else {
     # grouping 'a' - all standard allocation types.  This includes everything
     # but mm (present only as a formality).  Make this the default.
     $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
-        " ORDER BY listorder", { Slice => {} });
+        " ORDER BY listorder", { Slice => {} });
   }
   return $tlist;

branches/stable/cgi-bin/main.cgi

@@ -238 +238 @@
   my $flist = listFree($ip_dbh, $webvar{block});
   $page->param(unrouted => $flist);
+  $page->param(mayadd => ($IPDBacl{$authuser} =~ /a/));
 } # showMaster
 
@@ -312 +313 @@
   $page->param(rowa => 'row'.($webvar{block} eq '' ? 1 : 0));
   $page->param(rowb => 'row'.($webvar{block} eq '' ? 0 : 1));
-  $page->param(block => $webvar{block});        # fb-assign flag, if block is set, we're in fb-assign
-  $page->param(iscontained => ($webvar{fbtype} && $webvar{fbtype} ne 'y'));
-
-  # New special case- block to assign is specified
-  if ($webvar{block} ne '') {
+  $page->param(allocfrom => $webvar{block});    # fb-assign flag, if block is set, we're in fb-assign
+
+  if ($webvar{fbtype}) {
+
+    # Common case, according to reported usage.  Block to assign is specified.
     my $block = new NetAddr::IP $webvar{block};
 
-    # Handle contained freeblock allocation.
-    # This is a little dangerous, as it's *theoretically* possible to
-    # get fbtype='n' (aka a non-routed freeblock).  However, should
-    # someone manage to get there, they get what they deserve.
-    if ($webvar{fbtype} ne 'y') {
-      # Snag the type of the container block from the database.
-## hmm.  need a flag for parent class/type, sort of?
-      my $pblock = subParent($ip_dbh, $webvar{block});
-      my $ptype = $pblock->{type};
-      $ptype =~ s/c$/r/;
-      $page->param(fbdisptype => $list_alloctypes{$ptype});
-      $page->param(type => $ptype);
+    $webvar{fbtype} = '' if !$webvar{fbtype};
+    if ($webvar{fbtype} eq 'i') {
+      my $ipinfo = getBlockData($ip_dbh, $webvar{block}, 'i');
+      my $pinfo = getBlockData($ip_dbh, $webvar{parent});
+      $page->param(
+        fbip => 1,
+        block => $ipinfo->{block},
+        fbdisptype => $list_alloctypes{$ipinfo->{type}},
+        type => $ipinfo->{type},
+        allocfrom => $pinfo->{block},
+        );
+    } elsif ($webvar{fbtype} eq 'n') {
+      $page->param(
+        fbrouted => 1,
+        fbdisptype => $list_alloctypes{'rm'},
+        type => 'rm',
+        block => $block,
+        );
     } else {
       # get "primary" alloctypes, since these are all that can correctly be assigned if we're in this branch
-      my $tlist = getTypeList($ip_dbh, 'p');
+      my $tlist = getTypeList($ip_dbh, 'n');
       $tlist->[0]->{sel} = 1;
-      $page->param(typelist => $tlist);
-    }
+      $page->param(typelist => $tlist, block => $block);
+    }
+
   } else {
+
+    # Uncommon case, according to reported usage.  Block to assign needs to be found based on criteria.
     my $mlist = getMasterList($ip_dbh, 'c');
     $page->param(masterlist => $mlist);
 
     my @pops;
-    foreach my $pop (@poplist) {
+    foreach my $pop (@citylist) {
       my %row = (pop => $pop);
       push (@pops, \%row);
@@ -353 +363 @@
     $page->param(typelist => $tlist);
   }
-
   my @cities;
   foreach my $city (@citylist) {
@@ -400 +409 @@
 
     if ($webvar{fbassign} && $webvar{fbassign} eq 'y') {
+      $cidr = new NetAddr::IP $webvar{block};
       $alloc_from = new NetAddr::IP $webvar{allocfrom};
-## possibly messy behaviour:  force the _from and block to be the network addr?
-      $alloc_from = qq($alloc_from<input type=hidden name=alloc_from value="$alloc_from">);
-      $cidr = new NetAddr::IP $webvar{block};
       $webvar{maskbits} = $cidr->masklen;
     } else { # done with direct freeblocks assignment
@@ -440 +447 @@
 
 # this chunk now specific to "guided" allocation;  freeblock-select can now slice-n-dice on its own.
-      $alloc_from = qq($cidr<input type=hidden name=alloc_from value="$cidr">);
+      $alloc_from = "$cidr";
       # If the block to be allocated is smaller than the one we found,
       # figure out the "real" block to be allocated.
@@ -452 +459 @@
       }
     } # check for freeblocks assignment or IPDB-controlled assignment
-
-    $alloc_from = "$cidr";
 
   } # if ($webvar{alloctype} =~ /^.i$/)