Changeset 837 for trunk

Timestamp:

04/11/16 17:52:49 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine and regularize name for allocation type in RPC argument hash
Update rpc_allocateBlock for new VRF status and tweak the missing-data

flags. See #54.

File:

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

trunk/cgi-bin/ipdb-rpc.cgi

@@ -4 +4 @@
 # $Id$
 ###
-# Copyright (C) 2013 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright (C) 2013,2014,2016 Kris Deugau <kdeugau@deepnet.cx>
 
 use strict;
@@ -148 +148 @@
   my $argref = shift;
 
-  die "Block/IP is required\n" if !$argref->{block};
+  if (!$argref->{block}) {
+    $argref->{block} = $argref->{cidr} if $argref->{cidr};
+    die "Block/IP is required\n" if !$argref->{block};
+  }
 
   # Alloctype check.
-  chomp $argref->{alloctype};
-
-  die "Invalid allocation type\n" if (!grep /$argref->{alloctype}/, keys %disp_alloctypes);
+  chomp $argref->{type};
+
+  die "Invalid allocation type\n" if (!grep /$argref->{type}/, keys %disp_alloctypes);
 
   # Arguably not quite correct, as the custID won't be checked for
   # validity if there's a default on the type.
-  if ($def_custids{$argref->{alloctype}} eq '') {
+  if ($def_custids{$argref->{type}} eq '') {
     # Types without a default custID must have one passed in
     die "Customer ID is required\n" if !$argref->{custid};
@@ -167 +170 @@
     # Types that have a default will use it unless one is specified.
     if ((!$argref->{custid}) || ($argref->{custid} ne 'STAFF')) {
-      $argref->{custid} = $def_custids{$argref->{alloctype}};
+      $argref->{custid} = $def_custids{$argref->{type}};
     }
   }
@@ -214 +217 @@
   # Not required for update, delete
   die "City is required\n" if !$args{city};
-  die "Block/pool to allocate from is required\n" if !$args{alloc_from};
-
-  # Desc, notes, circid, privdata, node, and vrf are all optional and handled in allocateBlock()
-  my ($code,$msg) = allocateBlock($ip_dbh, $args{block}, $args{alloc_from},
-        $args{custid}, $args{alloctype}, $args{city}, $args{desc}, $args{notes},
-        $args{circid}, $args{privdata}, $args{node}, $args{vrf});
+  die "Customer ID is required\n" if !$args{custid};
+  die "Allocation type is required\n" if !$args{type};
+
+  if ($args{type} =~ /^.i$/) {
+    die "Pool ID or VRF to allocate from is required\n" if !$args{parent} && !$args{vrf};
+  } else {
+    die "Free block to allocate from is required\n" if !$args{fbid};
+  }
+
+  my ($code,$msg) = allocateBlock($ip_dbh, %args);
 
   if ($code eq 'OK' || $code eq 'WARN') {
-    if ($args{alloctype} =~ /^.i$/) {
+    if ($args{type} =~ /^.i$/) {
       $msg =~ s|/32||;
-      mailNotify($ip_dbh, "a$args{alloctype}", "ADDED: $disp_alloctypes{$args{alloctype}} allocation",
-        "$disp_alloctypes{$args{alloctype}} $msg allocated to customer $args{custid}\n".
+      mailNotify($ip_dbh, "a$args{type}", "ADDED: $disp_alloctypes{$args{type}} allocation",
+        "$disp_alloctypes{$args{type}} $msg allocated to customer $args{custid}\n".
         "Description: $args{desc}\n\nAllocated by: $args{rpcsystem}/$args{rpcuser}\n");
     } else {
       my $netblock = new NetAddr::IP $args{block};
-      mailNotify($ip_dbh, "a$args{alloctype}", "ADDED: $disp_alloctypes{$args{alloctype}} allocation",
-        "$disp_alloctypes{$args{alloctype}} $args{block} allocated to customer $args{custid}\n".
+      mailNotify($ip_dbh, "a$args{type}", "ADDED: $disp_alloctypes{$args{type}} allocation",
+        "$disp_alloctypes{$args{type}} $args{block} allocated to customer $args{custid}\n".
         "Description: $args{desc}\n\nAllocated by: $args{rpcsystem}/$args{rpcuser}\n");
     }
     syslog "notice", "$args{rpcsystem}/$args{rpcuser} allocated '$args{block}' to '$args{custid}' as ".
-        "'$args{alloctype}' ($msg)";
+        "'$args{type}' ($msg)";
   } else {
     syslog "err", "Allocation of '$args{block}' to '$args{custid}' as ".
-        "'$args{alloctype}' by $args{rpcsystem}/$args{rpcuser} failed: '$msg'";
+        "'$args{type}' by $args{rpcsystem}/$args{rpcuser} failed: '$msg'";
     die "$msg\n";
   }