Changeset 598 for branches/stable/cgi-bin/IPDB.pm

Timestamp:

05/16/13 16:43:45 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Introduce informational VRF tags on allocations to match uncomitted patch
in production.
Also add a minor main.cgi error-log-cleanup hack around deleting routed
blocks and master blocks instead of bending getBlockData() out of shape
only to have to put it back when the database structure changes get merged.

File:

• branches/stable/cgi-bin/IPDB.pm (modified) (11 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -396 +396 @@
 
   # Snag the allocations for this block
-  my $sth = $dbh->prepare("SELECT cidr,city,type,custid,swip,description".
+  my $sth = $dbh->prepare("SELECT cidr,city,type,custid,swip,description,vrf".
         " FROM allocations WHERE cidr <<= ? ORDER BY cidr");
   $sth->execute($routed);
@@ -405 +405 @@
 
   my @blocklist;
-  while (my ($cidr,$city,$type,$custid,$swip,$desc) = $sth->fetchrow_array()) {
+  while (my ($cidr,$city,$type,$custid,$swip,$desc,$vrf) = $sth->fetchrow_array()) {
+    $desc .= " - vrf:$vrf" if $desc && $vrf;
+    $desc = "vrf:$vrf" if !$desc && $vrf;
     $custsth->execute($custid);
     my ($ncust) = $custsth->fetchrow_array();
@@ -462 +464 @@
   my $pool = shift;
 
-  my $sth = $dbh->prepare("SELECT ip,custid,available,description,type".
+  my $sth = $dbh->prepare("SELECT ip,custid,available,description,type,vrf".
         " FROM poolips WHERE pool = ? ORDER BY ip");
   $sth->execute($pool);
   my @poolips;
-  while (my ($ip,$custid,$available,$desc,$type) = $sth->fetchrow_array) {
+  while (my ($ip,$custid,$available,$desc,$type,$vrf) = $sth->fetchrow_array) {
+    $desc .= " - vrf:$vrf" if $desc && $vrf;
+    $desc = "vrf:$vrf" if !$desc && $vrf;
     my %row = (
         ip => $ip,
@@ -673 +677 @@
 # Returns a success code and optional error message.
 sub allocateBlock {
-  my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid,$privdata,$nodeid) = @_;
+  my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid,$privdata,$nodeid,$vrf) = @_;
   $privdata = '' if !defined($privdata);
+  $vrf = '' if !defined($vrf);
 
   my $cidr = new NetAddr::IP $_[1];
@@ -720 +725 @@
                 undef, ($alloc_from) );
       }
-      $dbh->do("UPDATE poolips SET custid=?,city=?,available='n',description=?,notes=?,circuitid=?,privdata=? ".
-        "WHERE ip=?", undef, ($custid, $city, $desc, $notes, $circid, $privdata, $cidr) );
+      $dbh->do("UPDATE poolips SET custid=?,city=?,available='n',description=?,".
+        "notes=?,circuitid=?,privdata=?,vrf=? ".
+        "WHERE ip=?", undef, ($custid, $city, $desc, $notes, $circid, $privdata, $vrf, $cidr) );
 
 # node hack
@@ -771 +777 @@
           }
           $sth = $dbh->prepare("insert into allocations".
-                " (cidr,custid,type,city,description,notes,maskbits,circuitid,privdata)".
-                " values (?,?,?,?,?,?,?,?,?)");
-          $sth->execute("$cidr", $custid, $type, $city, $desc, $notes, $cidr->masklen, $circid, $privdata);
+                " (cidr,custid,type,city,description,notes,maskbits,circuitid,privdata,vrf)".
+                " values (?,?,?,?,?,?,?,?,?,?)");
+          $sth->execute("$cidr", $custid, $type, $city, $desc, $notes, $cidr->masklen, $circid, $privdata, $vrf);
 
           # And initialize the pool, if necessary
@@ -884 +890 @@
           # Insert the allocations entry
           $sth = $dbh->prepare("insert into allocations (cidr,custid,type,city,".
-                "description,notes,maskbits,circuitid,privdata)".
-                " values (?,?,?,?,?,?,?,?,?)");
-          $sth->execute("$cidr", $custid, $type, $city, $desc, $notes, $cidr->masklen, $circid, $privdata);
+                "description,notes,maskbits,circuitid,privdata,vrf)".
+                " values (?,?,?,?,?,?,?,?,?,?)");
+          $sth->execute("$cidr", $custid, $type, $city, $desc, $notes, $cidr->masklen, $circid, $privdata, $vrf);
 
           # And initialize the pool, if necessary
@@ -997 +1003 @@
   my @fieldlist;
   my @vallist;
-  foreach ('custid', 'city', 'description', 'notes', 'circuitid', 'privdata') {
+  foreach ('custid', 'city', 'description', 'notes', 'circuitid', 'privdata', 'vrf') {
     if ($args{$_}) {
       push @fieldlist, $_;
@@ -1100 +1106 @@
     $msg = "Unable to delete master block $cidr";
     eval {
-      $sth = $dbh->prepare("delete from masterblocks where cidr='$cidr'");
-      $sth->execute;
-      $sth = $dbh->prepare("delete from freeblocks where cidr <<= '$cidr'");
-      $sth->execute;
+      $sth = $dbh->prepare("delete from masterblocks where cidr=?");
+      $sth->execute($cidr);
+      $sth = $dbh->prepare("delete from freeblocks where cidr <<= ?");
+      $sth->execute($cidr);
       $dbh->commit;
     };
@@ -1264 +1270 @@
 ## IPDB::getBlockData()
 # Get CIDR or IP, custid, type, city, circuit ID, description, notes, modification time, private/restricted 
-# data, for a CIDR block or pool IP
+# data, and VRF tag, for a CIDR block or pool IP
 # Also returns SWIP status flag for CIDR blocks
 # Takes the block/IP to look up
@@ -1286 +1292 @@
   }
   my $binfo = $dbh->selectrow_hashref("SELECT $keycol AS block, custid, type, city, circuitid, description,".
-        " notes, modifystamp AS lastmod, privdata".($poolip ? '' : ', swip')." FROM $blocktable".
+        " notes, modifystamp AS lastmod, privdata, vrf".($poolip ? '' : ', swip')." FROM $blocktable".
         " WHERE $keycol = ?", undef, ($block) );
   return $binfo;