Changeset 680 for trunk

Timestamp:

02/27/15 18:09:45 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

• Add new RPC sub "splitTemplate" so IPDB doesn't have to make many round trips retrieving and setting data when splitting an allocation. This non-transactionally takes a CIDR to look up, and splits the template record (if any) according to a new netmask by way of one update and 1 or more adds.
• Fine-tune some argument munging in rpc_updateRec() in case the caller *does* have a clue and sets certain fields directly; we don't want to overwrite these with nothing...

File:

• trunk/dns-rpc.cgi (modified) (4 diffs)

trunk/dns-rpc.cgi

@@ -88 +88 @@
         'dnsdb.addOrUpdateRevRec'       => \&addOrUpdateRevRec,
         'dnsdb.updateRevSet'    => \&updateRevSet,
+        'dnsdb.splitTemplate'   => \&splitTemplate,
+#       'dnsdb.shrinkTemplate'  => \&shrinkTemplate,
         'dnsdb.delRec'          => \&delRec,
         'dnsdb.delByCIDR'       => \&delByCIDR,
@@ -502 +504 @@
 
   # put some caller-friendly names in their rightful DB column places
-  $args{val} = $args{address};
-  $args{host} = $args{name};
+  $args{val} = $args{address} if !$args{val};
+  $args{host} = $args{name} if !$args{host};
 
   # get old line, so we can update only the bits that the caller passed to change
@@ -525 +527 @@
   die "$msg\n" if $code eq 'FAIL';
   return $msg;
-}
+} # rpc_updateRec
 
 # Takes a passed CIDR block and DNS pattern;  adds a new record or updates the record(s) affected
@@ -618 +620 @@
 } # done updateRevSet()
 
+# Split a template record as per a passed CIDR.
+# Requires the CIDR and the new mask length
+sub splitTemplate {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  my $cidr = new NetAddr::IP $args{cidr};
+
+  my $zonelist = $dnsdb->getZonesByCIDR(%args);
+
+  if (scalar(@$zonelist) == 0) {
+    # enhh....  WTF?
+
+  } elsif (scalar(@$zonelist) == 1) {
+    my $zone = new NetAddr::IP $zonelist->[0]->{revnet};
+    if ($zone->contains($cidr)) {
+      # Find the first record in the reverse zone that matches the CIDR we're splitting...
+      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
+        id => $zonelist->[0]->{rdns_id}, filter => $cidr, sortby => 'val', sortorder => 'DESC');
+      my $oldrec;
+      foreach my $rec (@$reclist) {
+        my $reccidr = new NetAddr::IP $rec->{val};
+        next unless $cidr->contains($reccidr);  # not sure this is needed here
+        # ... and is a reverse-template type.
+        # Could arguably trim the list below to just 65282, 65283, 65284
+        next unless $rec->{type} == 12 || $rec->{type} == 65280 || $rec->{type} == 65281 ||
+            $rec->{type} == 65282 || $rec->{type} == 65283 ||$rec->{type} == 65284;
+        # snag old record so we can copy its data
+        $oldrec = $dnsdb->getRecLine('n', 'y', $rec->{record_id});
+        last;  # we've found one record that meets our criteria;  Extras Are Irrelevant
+      }
+
+      my @newblocks = $cidr->split($args{newmask});
+      # Change the existing record with the new CIDR
+      my $up_res = rpc_updateRec(%args, val => $newblocks[0], id => $oldrec->{record_id}, defrec => 'n', revrec => 'y');
+      my @ret;
+      # the update is assumed to have succeeded if it didn't fail.
+##fixme:  find a way to save and return "warning" states?
+      push @ret, {block => "$newblocks[0]", code => "OK", msg => $up_res};
+      # And now add new record(s) for each of the new CIDR entries, reusing the old data
+      for (my $i = 1; $i <= $#newblocks; $i++) {
+        my $newval = "$newblocks[$i]";
+        my @recargs = ('n', 'y', $oldrec->{rdns_id}, \$oldrec->{host}, \$oldrec->{type}, \$newval,
+          $oldrec->{ttl}, $oldrec->{location}, 0, '');
+        my ($code, $msg) = $dnsdb->addRec(@recargs);
+        # Note failures here are not fatal;  this should typically only ever be called by IPDB
+        push @ret, {block => "$newblocks[$i]", code => $code, msg => $up_res};
+      }
+      # return an info hash in case of warnings doing the update or add(s)
+      return \@ret;
+
+    } else {  # $cidr > $zone but we only have one zone
+      # ebbeh?  CIDR is only partly represented in DNS.  This needs manual intervention.
+      return "Warning:  $args{cidr} is only partly represented in DNS.  Check and update DNS records manually.";
+    } # done single-zone-contains-$cidr
+
+  } else {
+    # multiple zones nominally "contain" $cidr
+  } # done $cidr-contains-zones
+
+} # done splitTemplate()
+
 sub delRec {
   my %args = @_;