Changeset 831 for trunk

Timestamp:

04/08/16 15:35:32 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Fill in VRF when generating poolips entries

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1812 +1812 @@
   eval {
     # have to insert all pool IPs into poolips table as "unallocated".
-    $sth = $dbh->prepare("INSERT INTO poolips (ip,custid,city,type,parent_id,master_id) VALUES (?,?,?,?,?,?)");
+    $sth = $dbh->prepare("INSERT INTO poolips (ip,custid,city,type,parent_id,master_id,vrf) VALUES (?,?,?,?,?,?,?)");
 
     # in case of pool extension by some means, we need to see what IPs were already inserted
@@ -1848 +1848 @@
       my $baseip = $poolip_list[$i]->addr;
       if ($baseip !~ /\.(?:0|255)$/ && !$foundips{$poolip_list[$i]}) {
-        $sth->execute($baseip, $pcustid, $city, $type, $parent, $master);
+        $sth->execute($baseip, $pcustid, $city, $type, $parent, $master, $vrf);
       }
     }
@@ -1856 +1856 @@
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
       if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
-        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$pool->addr."/32"};
-      }
-      $sth->execute($poolip_list[0]->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$poolip_list[0]};
+        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master, $vrf)
+          unless $foundips{$pool->addr."/32"};
+      }
+      $sth->execute($poolip_list[0]->addr, $pcustid, $city, $type, $parent, $master, $vrf)
+        unless $foundips{$poolip_list[0]};
       $pool--;
       if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
-        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$pool->addr."/32"};
+        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master, $vrf)
+          unless $foundips{$pool->addr."/32"};
       }
     }