Changeset 923 for trunk

Timestamp:

06/18/19 18:15:33 (5 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine selection handling in static IP section of allocateBlock().

• properly accept an IP ID or IP
• properly accept either the pool ID (parent) or VRF to uniquely identify the pool

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1622 +1622 @@
 ##fixme:  IP pools across VRFs, need to use the IP ID instead of the CIDR
 # ...  or the VRF itself?
-      if ($args{cidr}) {        # IP specified
-        my ($isavail) = $dbh->selectrow_array(
-          "SELECT available FROM poolips WHERE ip=?".($args{vrf} ? " AND vrf=?" : ''),
-          undef, ($args{vrf} ? ($args{cidr},$args{vrf}) : $args{cidr}) );
+      if ($args{cidr}) {
+        # IP specified
+        my $availsql = "SELECT available FROM poolips WHERE ";
+        my @availargs;
+        if ($args{cidr} =~ /^\d+$/) {
+          # IP passed as ID
+          $availsql .= "id = ?";
+          push @availargs, $args{cidr};
+        } else {
+          # IP passed as IP address
+          $availsql .= "ip = ?";
+          push @availargs, $args{cidr};
+        }
+        if ($args{parent}) {
+          # Limit by parent ID
+          $availsql .= " AND parent_id = ?";
+          push @availargs, $args{parent};
+        } elsif ($args{vfr}) {
+          # Limit by VRF, but only if the parent ID isn't available
+          $availsql .= " AND vrf = ?";
+          push @availargs, $args{vrf};
+        } else {
+          # Fail if we don't have a handle for the pool
+          die "Missing parent ID or VRF.\n";
+        }
+        my ($isavail) = $dbh->selectrow_array($availsql, undef, @availargs);
         die "IP is not in an IP pool.\n"
           if !$isavail;