Changeset 820 for trunk

Timestamp:

03/11/16 15:14:08 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Add "delete VRF" confirmation and action pages. Refine link from showvrf
template since a VRF is a completely different type of entity than a
netblock. See #54.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (1 diff)
• templates/delvrf.tmpl (added)
• templates/finaldelvrf.tmpl (added)
• templates/showvrf.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -28 +28 @@
         $errstr
         &initIPDBGlobals &connectDB &finish &checkDBSanity
-        &addVRF &getVRF &addMaster &touchMaster
+        &addVRF &getVRF &deleteVRF &addMaster &touchMaster
         &listVRF &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
         &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
@@ -44 +44 @@
                 $errstr
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
-                &addVRF &getVRF &addMaster &touchMaster
+                &addVRF &getVRF &deleteVRF &addMaster &touchMaster
                 &listVRF &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
                 &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
@@ -688 +688 @@
   return $dbh->selectrow_hashref("SELECT comment,location FROM vrfs WHERE vrf = ?", {Slice=>{}}, $vrf);
 } # end getVRF()
+
+
+## IPDB::deleteVRF()
+#
+sub deleteVRF {
+  my $dbh = shift;
+  my $vrf = shift;
+
+  # Allow transactions, and raise an exception on errors so we can catch it later.
+  # Use local to make sure these get "reset" properly on exiting this block
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  eval {
+    $dbh->do("DELETE FROM vrfs WHERE vrf = ?", undef, $vrf);
+    $dbh->commit;
+  };
+  if ($@) {
+    my $msg = $@;       # not much complexity here just yet.
+    return ('FAIL',$msg);
+  }
+
+  return ('OK','OK');
+} # end deleteVRF()
 
 

trunk/cgi-bin/main.cgi

@@ -148 +148 @@
 
   } # ACL check
+
+} elsif ($webvar{action} eq 'delvrf') {
+  if ($IPDBacl{$authuser} !~ /s/) {
+    $aclerr = 'delvrf';
+  }
+
+  my $vrf = getVRF($ip_dbh, $webvar{vrf});
+
+  $page->param(vrf => $webvar{vrf});
+  $page->param(vrfcomment => $vrf->{comment});
+
+} elsif ($webvar{action} eq 'finaldelvrf') {
+  if ($IPDBacl{$authuser} !~ /s/) {
+    $aclerr = 'finaldelvrf';
+  }
+
+  my $vrf = getVRF($ip_dbh, $webvar{vrf});
+  $page->param(vrf => $webvar{vrf});
+  $page->param(vrfcomment => $vrf->{comment});
+
+  my ($code,$msg) = deleteVRF($ip_dbh, $webvar{vrf}, $authuser);
+
+  if ($code eq 'FAIL') {
+    $page->param(failmsg => $msg);
+  }
 
 } elsif ($webvar{action} eq 'addmaster') {

trunk/templates/showvrf.tmpl

@@ -29 +29 @@
 <form action="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi" method=POST>
 <fieldset><legend class="noshow">&nbsp;</legend>
-<input type=hidden name=action value="delete">
+<input type=hidden name=action value="delvrf">
 <input type=hidden name=vrf value="<TMPL_VAR NAME=vrf>">
 <input type=submit value=" Remove this VRF ">