Changeset 806 for trunk/cgi-bin

Timestamp:

03/07/16 18:05:24 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Promote VRFs to top-level entities. See #54.

1 of mumble; convert index page to list VRFs instead of master blocks.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (3 diffs)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -29 +29 @@
         &initIPDBGlobals &connectDB &finish &checkDBSanity
         &addMaster &touchMaster
-        &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
+        &listVRF &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
         &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
         &ipParent &subParent &blockParent &getBreadCrumbs &getRoutedCity
@@ -45 +45 @@
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
                 &addMaster &touchMaster
-                &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
+                &listVRF &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
                 &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
                 &ipParent &subParent &blockParent &getBreadCrumbs &getRoutedCity
@@ -843 +843 @@
   return ('OK','OK');
 } # end touchMaster()
+
+
+## IPDB::listVRF()
+# Get summary list of all VRFs
+# Returns an arrayref to a list of hashrefs with the VRF name, comment
+sub listVRF {
+  my $dbh = shift;
+  my $vrflist = $dbh->selectall_arrayref("SELECT vrf,comment FROM vrfs ORDER BY vrf", { Slice => {} });
+  return $vrflist;
+} # end listVRF()
 
 

trunk/cgi-bin/main.cgi

@@ -259 +259 @@
 
 
-# Initial display:  Show master blocks with total allocated subnets, total free subnets
+# Initial display:  Show list of VRFs
 sub showSummary {
-  my $masterlist = listSummary($ip_dbh);
-  $page->param(masterlist => $masterlist);
-
-  $page->param(addmaster => ($IPDBacl{$authuser} =~ /a/) );
+  my $vrflist = listVRF($ip_dbh);
+  $page->param(vrflist => $vrflist);
+
+  # Only systems/network should be allowed to add VRFs - or maybe higher?
+  $page->param(addvrf => ($IPDBacl{$authuser} =~ /s/) );
 } # showSummary