Changeset 808 for trunk

Timestamp:

03/08/16 13:16:44 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend UI to browse into a VRF. See #54.
Also extend breadcrumb segment to show the VRF.

Location:

trunk

Files:

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

trunk/cgi-bin/IPDB.pm

@@ -1391 +1391 @@
 sub getBreadCrumbs {
   my $dbh = shift;
-  my $parent = shift;
+  my $parent = shift || 0;
+  my $vrf = shift;      # if we're not browsing into netblocks yet, caller can pass the VRF for breadcrumbs
   my @result;
 
-  my $sth = $dbh-> prepare("SELECT cidr,type,id,parent_id FROM allocations WHERE id=?");
+  my $sth = $dbh-> prepare("SELECT cidr,type,id,parent_id,vrf FROM allocations WHERE id=?");
 
   while ($parent != 0) {
     $sth->execute($parent);
-    my ($cidr,$type,$id,$pid) = $sth->fetchrow_array;
-    push @result, {cidr => $cidr, link => $id, ispool => ($type =~ /^.[dp]$/ ? 1 : 0)};
+    my ($cidr,$type,$id,$pid,$bvrf) = $sth->fetchrow_array;
+    $vrf = $bvrf;
+    push @result, { cidr => $cidr, link => $id, ispool => ($type =~ /^.[dp]$/ ? 1 : 0) };
     $parent = $pid;
   }
 
+  push @result, { cidr => "vrf:$vrf", link => $vrf, isvrf => 1 }
+        if $vrf;
+
   return \@result;
-} # end getBread()
+} # end getBreadCrumbs()
 
 

trunk/cgi-bin/main.cgi

@@ -108 +108 @@
 if($webvar{action} eq 'index') {
   showSummary();
+} elsif ($webvar{action} eq 'showvrf') {
+  showVRF();
 } elsif ($webvar{action} eq 'addmaster') {
   if ($IPDBacl{$authuser} !~ /a/) {
@@ -269 +271 @@
 
 
+# Show IP blocks in a VRF
+sub showVRF {
+  my $masterlist = listSummary($ip_dbh, $webvar{vrf});
+  $page->param(vrf => $webvar{vrf});
+  $page->param(masterlist => $masterlist);
+
+  # we don't have a netblock;  pass 0 for the block ID
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, 0, $webvar{vrf});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+
+  $page->param(addmaster => ($IPDBacl{$authuser} =~ /s/) );
+} # showVRF
+
+
 # Display blocks immediately within a given parent
 sub showSubs {
@@ -306 +324 @@
 #$page->param(editme => 1) unless $pinfo->{type} ne 'mm';
 
-  my $crumbs = getBreadCrumbs($ip_dbh, $pinfo->{parent_id});
+  my $crumbs = getBreadCrumbs($ip_dbh, $pinfo->{parent_id}, $pinfo->{vrf});
   my @rcrumbs = reverse (@$crumbs);
   $utilbar->param(breadcrumb => \@rcrumbs);

trunk/templates/showvrf.tmpl

@@ +1 @@
+<div class="tbltitle">Master netblocks in <TMPL_VAR NAME=vrf></div>
+
 <br>
 <div class="center">
@@ -5 +7 @@
 <tr class="heading">
 <td>Master netblock</td>
-<td>Primary VRF</td>
 <td>Aggregation/Containers</td>
 <td>Allocated netblocks</td>
@@ -14 +15 @@
 <tr>
 <td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=id>"><TMPL_VAR NAME=master></a></td>
-<td><TMPL_VAR NAME=vrf></td>
 <td><TMPL_VAR NAME=routed></td>
 <td><TMPL_VAR NAME=allocated></td>
@@ -31 +31 @@
 <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=addmaster">Add new master block</a>
 </TMPL_IF>
-<br><br>
-Note:  Free blocks noted here include both routed and unrouted blocks.
 </div>