Changeset 562 for trunk

Timestamp:

12/19/12 16:18:39 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Update listFree() to handle new table logic and fields

File:

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

trunk/cgi-bin/IPDB.pm

@@ -472 +472 @@
 
 ## IPDB::listFree()
-# Gets a list of free blocks in the requested parent/master in both CIDR and range notation
-# Takes a parent/master and an optional "routed or unrouted" flag that defaults to unrouted.
+# 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.
 # 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
 sub listFree {
   my $dbh = shift;
-  my $master = shift;
-  my $routed = shift || 'n';
+
+  my %args = @_;
+  # 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,routed FROM freeblocks WHERE cidr <<= ? AND ".
-        ($routed eq 'n' ? '' : 'NOT')." routed = 'n' ORDER BY cidr");
-  $sth->execute($master);
+  my $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE parent = ? AND rdepth = ? AND vrf = ? ".
+        "ORDER BY cidr");
+  $sth->execute($args{master}, $args{rdepth}, $args{vrf});
   my @flist;
-  while (my ($cidr,$rtype) = $sth->fetchrow_array()) {
+  while (my ($cidr) = $sth->fetchrow_array()) {
     $cidr = new NetAddr::IP $cidr;
     my %row = (
@@ -492 +495 @@
         frange => $cidr->range,
         );
-    if ($routed eq 'y') {
-      $row{subblock} = ($rtype ne 'y' && $rtype ne 'n');
-      $row{fbtype} = $rtype;
-    }
     push @flist, \%row;
   }