Changeset 579 for trunk

Timestamp:

12/28/12 16:52:45 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Pull back a little on making the VRF a key field; it's not yet
clear how the UI should present the restriction:

-> make VRF a layer above the master blocks?
-> present the VRF as a part of the master?
-> only use VRF as a key on private-net blocks? (pretty sane,

public IP space may lie in different VRFs but actually
allocating the same public IP in more than one VRF makes no
sense I can see)

-> ???

File:

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

trunk/cgi-bin/IPDB.pm

@@ -485 +485 @@
 
   # do it this way so we can waste a little less time iterating
-  my $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE parent = ? AND rdepth = ? AND vrf = ? ".
+#  my $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE parent = ? AND rdepth = ? AND vrf = ? ".
+  my $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE parent = ? AND rdepth = ? ".
         "ORDER BY cidr");
-  $sth->execute($args{master}, $args{rdepth}, $args{vrf});
+#  $sth->execute($args{master}, $args{rdepth}, $args{vrf});
+  $sth->execute($args{master}, $args{rdepth});
   my @flist;
   while (my ($cidr) = $sth->fetchrow_array()) {
@@ -1059 +1061 @@
   return ('FAIL', 'No fields to update') if !@fieldlist;
 
-  push @vallist, $args{block}, $args{rdepth}, $args{vrf};
+#  push @vallist, $args{block}, $args{rdepth}, $args{vrf};
+  push @vallist, $args{block}, $args{rdepth};
   my $sql = "UPDATE $updtable SET ";
   $sql .= join " = ?, ", @fieldlist;
-  $sql .= " = ? WHERE $keyfield = ? AND rdepth = ? AND vrf = ?";
+#  $sql .= " = ? WHERE $keyfield = ? AND rdepth = ? AND vrf = ?";
+  $sql .= " = ? WHERE $keyfield = ? AND rdepth = ? ";
 
   eval {
@@ -1363 +1367 @@
     my $binfo = $dbh->selectrow_hashref("SELECT cidr AS block, 'mm' AS type, 0 AS parent, cidr,".
         " ctime, mtime, rwhois, vrf".
-        " FROM masterblocks WHERE cidr = ? AND vrf = ?", undef, ($block, $vrf) );
+        " FROM masterblocks WHERE cidr = ?", undef, ($block) );
+#       " FROM masterblocks WHERE cidr = ? AND vrf = ?", undef, ($block, $vrf) );
     return $binfo;
   } elsif ($btype =~ /^.i$/) {
     my $binfo = $dbh->selectrow_hashref("SELECT ip AS block, custid, type, city, circuitid, description,".
         " notes, modifystamp AS lastmod, privdata, vrf, pool, rdepth".
-        " FROM poolips WHERE ip = ? AND vrf = ?", undef, ($block, $vrf) );
+        " FROM poolips WHERE ip = ?", undef, ($block) );
+#       " FROM poolips WHERE ip = ? AND vrf = ?", undef, ($block, $vrf) );
     return $binfo;
   } else {