Changeset 630 for trunk

Timestamp:

10/08/14 17:31:48 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 5/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Update free blocks lister IPDB::listFree()
• Update IP pool lister IPDB::listPool() and IP pool template page

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (4 diffs)
• templates/listpool.tmpl (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -590 +590 @@
 ## IPDB::listFree()
 # Gets a list of free blocks in the requested parent/master and VRF instance in both CIDR and range notation
-# Takes a parent/master and an optional VRF specifier that defaults to empty.
+# Takes a parent/master ID and an optional VRF specifier that defaults to empty.
 # Returns an arrayref to a list of hashrefs containing the CIDR and range-notation blocks
 # Returns some extra flags in the hashrefs for routed blocks, since those can have several subtypes
@@ -599 +599 @@
   # Just In Case
   $args{vrf} = '' if !$args{vrf};
-  $args{rdepth} = 1 if !$args{rdepth};
-
-  # 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 = ? ".
-        "ORDER BY cidr");
-#  $sth->execute($args{master}, $args{rdepth}, $args{vrf});
-  $sth->execute($args{master}, $args{rdepth});
+
+  my $sth = $dbh->prepare("SELECT cidr,id FROM freeblocks WHERE parent_id = ? ORDER BY cidr");
+#  $sth->execute($args{parent}, $args{vrf});
+  $sth->execute($args{parent});
   my @flist;
-  while (my ($cidr) = $sth->fetchrow_array()) {
+  while (my ($cidr,$id) = $sth->fetchrow_array()) {
     $cidr = new NetAddr::IP $cidr;
     my %row = (
         fblock => "$cidr",
         frange => $cidr->range,
+        fbid => $id,
+        fbparent => $args{parent},
         );
     push @flist, \%row;
@@ -626 +624 @@
   my $pool = shift;
 
-  my $sth = $dbh->prepare("SELECT ip,custid,available,description,type,rdepth".
-        " FROM poolips WHERE pool = ? ORDER BY ip");
+  my $sth = $dbh->prepare("SELECT ip,custid,available,description,type,id".
+        " FROM poolips WHERE parent_id = ? ORDER BY ip");
   $sth->execute($pool);
   my @poolips;
-  while (my ($ip,$custid,$available,$desc,$type,$rdepth) = $sth->fetchrow_array) {
+  while (my ($ip,$custid,$available,$desc,$type,$id) = $sth->fetchrow_array) {
     my %row = (
         ip => $ip,
@@ -637 +635 @@
         desc => $desc,
         delme => $available eq 'n',
-        ipdepth => $rdepth,
+        parent => $pool,
+        id => $id,
         );
     push @poolips, \%row;

trunk/templates/listpool.tmpl

@@ -31 +31 @@
 <td>
 <TMPL_IF delme>
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=ip>&amp;rdepth=<TMPL_VAR NAME=ipdepth>"><TMPL_VAR NAME=ip></a>
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;id=<TMPL_VAR NAME=id>&amp;basetype=i"><TMPL_VAR NAME=ip></a>
 <TMPL_ELSE>
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=assign&amp;block=<TMPL_VAR NAME=ip>&amp;rdepth=<TMPL_VAR NAME=ipdepth>&amp;fbtype=i"><TMPL_VAR NAME=ip></a>
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=assign&amp;block=<TMPL_VAR NAME=id>&amp;parent=<TMPL_VAR NAME=parent>&amp;fbtype=i"><TMPL_VAR NAME=ip></a>
 </TMPL_IF>
 </td>
@@ -40 +40 @@
 <td><TMPL_VAR NAME=desc></td>
 <TMPL_IF maydel><td><TMPL_IF delme>
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=delete&amp;block=<TMPL_VAR NAME=ip>&amp;rdepth=<TMPL_VAR NAME=ipdepth>&amp;alloctype=<TMPL_VAR NAME=type>">Unassign this IP</a>
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=delete&amp;block=<TMPL_VAR NAME=id>&amp;basetype=i&amp;parent=<TMPL_VAR NAME=parent>">Unassign this IP</a>
 </TMPL_IF></td></TMPL_IF>
 </tr>