Changeset 544 for trunk

Timestamp:

11/05/12 16:53:38 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend findAllocateFrom() to allow passing a target block to allocate
to restrict the freeblock selection
Remove local SQL for confirmation page for "assign this block" in
admin.cgi in favour of existing data and subs. See #34.
For admin.cgi "assign this block", if the requested IP type does not
match the pool, the type will be adjusted and a warning pushed out.
Add space on "assign this block" template for a warning.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (1 diff)
• cgi-bin/admin.cgi (modified) (3 diffs)
• ipdb.css (modified) (1 diff)
• templates/admin/alloc.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -549 +549 @@
   ##fixme:  chain cities to align roughly with a full layer-2 node graph
   $city = $pop if $type !~ /^.[pc]$/;
-  if ($type ne 'rm') {
+  if ($type ne 'rm' && $city) {
     $sql .= " AND city = ?";
     push @vallist, $city;
+  }
+  # Allow specifying an arbitrary full block, instead of a master
+  if ($optargs{gimme}) {
+    $sql .= " AND cidr >>= ?";
+    push @vallist, $optargs{gimme};
   }
   # if a specific master was requested, allow the requestor to self->shoot(foot)

trunk/cgi-bin/admin.cgi

@@ -121 +121 @@
   }
 
-  $sth = $ip_dbh->prepare("select def_custid from alloctypes where type='$webvar{alloctype}'");
-  $sth->execute;
-  my @data = $sth->fetchrow_array;
-  my $custid = $data[0];
+  my $custid = $def_custids{$webvar{alloctype}};
   if ($custid eq '') {
     if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) {
@@ -146 +143 @@
   }
 
-  my @data;
+  my $maskbits = $cidr->masklen;
+  my $fbtmp = findAllocateFrom($ip_dbh, $maskbits, $webvar{alloctype}, '','',
+        (gimme => "$cidr", allowpriv => 1));
+
   if ($webvar{alloctype} eq 'rm') {
-    $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and routed='n'");
-    $sth->execute;
-    @data = $sth->fetchrow_array;
-# User deserves errors if user can't be bothered to find the free block first.
-    if (!$data[0]) {
+    if (!$fbtmp) {
       $page->param(errmsg => "Can't allocate from outside a free block!!");
       goto ERRJUMP;
     }
   } elsif ($webvar{alloctype} =~ /^(.)i$/) {
-    $sth = $ip_dbh->prepare("select cidr from allocations where cidr >>='$cidr' and (type like '_d' or type like '_p')");
-    $sth->execute;
-    @data = $sth->fetchrow_array;
-# User deserves errors if user can't be bothered to find the pool and a free IP first.
-    if (!$data[0]) {
+    my $iptype = $1;
+    my $ptmp = ipParent($ip_dbh, "$cidr");
+    if ($ptmp->{type} =~ /^(.)[dp]$/) {
+      my $newiptype = "$1i";
+      $fbtmp = $ptmp->{cidr};
+      if ($ptmp->{type} !~ /^$iptype./) {
+        $page->param(warnmsg => "Warning:  Allocating IP as '".$disp_alloctypes{$newiptype}."' instead of '".
+                $disp_alloctypes{$webvar{alloctype}}."' to match pool $fbtmp\n");
+        $webvar{alloctype} = $newiptype;
+      }
+    }
+    if (!$fbtmp) {
       $page->param(errmsg => "Can't allocate static IP from outside a pool!!");
       goto ERRJUMP;
     }
   } else {
-    $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and not (routed='n')");
-    $sth->execute;
-    @data = $sth->fetchrow_array;
-# User deserves errors if user can't be bothered to find the free block first.
-    if (!$data[0]) {
+    if (!$fbtmp) {
       $page->param(errmsg => "Can't allocate from outside a routed block!!");
       goto ERRJUMP;
@@ -176 +175 @@
   }
 
-  my $alloc_from = new NetAddr::IP $data[0];
-  $sth->finish;
+  my $alloc_from = new NetAddr::IP $fbtmp;
 
   my @cities;

trunk/ipdb.css

@@ -109 +109 @@
 }
 
+.warnmsg {
+        border: solid 2px #FFFF00;
+        color: #333300;
+        background-color: #e0e0e0;
+        text-align: center;
+        padding: 5px;
+        width: 70%;
+}
+
+
 hr.w60 {
         width: 60%;

trunk/templates/admin/alloc.tmpl

@@ -2 +2 @@
 <TMPL_VAR NAME=errmsg>
 <TMPL_ELSE>
+<TMPL_IF warnmsg><div class="warnmsg"><TMPL_VAR NAME=warnmsg></div></TMPL_IF>
 <form method="POST" action="admin.cgi">
 <fieldset><legend class="noshow">&nbsp;</legend>