Changeset 720

Timestamp:

05/07/15 15:17:05 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Second page in merge sequence; show main allocations and free blocks
that would be affected by the merge, along with reminders as
appropriate about data that may be lost with the combination of merge
scope and target type selected for the new allocation.
See #8.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (2 diffs)
• templates/confmerge.tmpl (added)

trunk/cgi-bin/IPDB.pm

@@ -29 +29 @@
         &initIPDBGlobals &connectDB &finish &checkDBSanity
         &addMaster &touchMaster
-        &listSummary &listSubs &listContainers &listAllocations &listFree &listPool
+        &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 &listFree &listPool
+                &listSummary &listSubs &listContainers &listAllocations &listForMerge &listFree &listPool
                 &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
                 &ipParent &subParent &blockParent &getBreadCrumbs &getRoutedCity
@@ -810 +810 @@
 
 
+## IPDB::listForMerge()
+# Get a list of blocks targetted in a proposed merge
+sub listForMerge {
+  my $dbh = shift;
+  my $parent = shift;
+  my $newblock = shift;
+  my $btype = shift || 'a';
+  $btype = 'a' if $btype !~/^[af]$/;
+
+  my $sql;
+  if ($btype eq 'a') {
+    my $ret = $dbh->selectall_arrayref(q(
+        SELECT a.cidr,a.id,t.dispname FROM allocations a
+        JOIN alloctypes t ON a.type=t.type
+        WHERE a.parent_id = ? AND a.cidr <<= ?
+        ORDER BY a.cidr
+        ),
+        { Slice => {} }, $parent, $newblock);
+    return $ret;
+  } else {
+##fixme:  Not sure about the casting hackery in "SELECT ?::integer AS id", but it works as intended
+    my $ret = $dbh->selectall_arrayref(q(
+        SELECT cidr,id FROM freeblocks
+        WHERE parent_id IN (SELECT ?::integer AS id UNION
+                SELECT id FROM allocations WHERE parent_id = ? AND cidr <<= ?
+        ) AND cidr <<= ?
+        ORDER BY cidr
+        ),
+        { Slice => {} }, $parent, $parent, $newblock, $newblock) or print $dbh->errstr;
+    return $ret;
+  }
+} # end listForMerge()
+
+
 ## IPDB::listFree()
 # Gets a list of free blocks in the requested parent/master and VRF instance in both CIDR and range notation

trunk/cgi-bin/main.cgi

@@ -180 +180 @@
 elsif($webvar{action} eq 'merge') {
   prepMerge();
+}
+elsif($webvar{action} eq 'confmerge') {
+  confMerge();
 }
 elsif($webvar{action} eq 'delete') {
@@ -1225 +1228 @@
 
 
+# Show what will be merged, present warnings about data loss
+sub confMerge {
+  if (!$webvar{newmask} || $webvar{newmask} !~ /^\d+$/) {
+    $page->param(err => 'New netmask required');
+    return;
+  }
+
+  $page->param(block => $webvar{block});
+  my $binfo = getBlockData($ip_dbh, $webvar{block});
+  my $pinfo = getBlockData($ip_dbh, $binfo->{parent_id});
+  my $minfo = getBlockData($ip_dbh, $binfo->{master_id});
+  my $block = new NetAddr::IP $binfo->{block};
+
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $binfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+
+  $page->param(oldblock => $binfo->{block});
+  $page->param(oldtype => $disp_alloctypes{$binfo->{type}});
+  $page->param(ismaster => $binfo->{type} eq 'mm');
+  $page->param(iscontainer => $webvar{alloctype} eq 'rm' || $webvar{alloctype} =~ /.c/);
+  $page->param(ispool => $webvar{alloctype} =~ /.[dp]/);
+  $page->param(isleaf => $webvar{alloctype} =~ /.[enr]/);
+  $page->param(newtype => $webvar{alloctype});
+  $page->param(newdisptype => $disp_alloctypes{$webvar{alloctype}});
+  my $newblock = new NetAddr::IP $block->addr."/$webvar{newmask}";
+  $newblock = $newblock->network;
+  $page->param(newmask => $webvar{newmask});
+  $page->param(newblock => "$newblock");
+
+  # get list of allocations and freeblocks to be merged
+  my $malloc_list = listForMerge($ip_dbh, $binfo->{parent_id}, $newblock, 'a');
+  $page->param(mergealloc => $malloc_list);
+  my $fb_list = listForMerge($ip_dbh, $binfo->{parent_id}, $newblock, 'f');
+  $page->param(mergefree => $fb_list);
+
+  # scope
+  my %merge_friendly = (
+        keepall   => "Keep mergeable allocations as suballocations of new block",
+        mergepeer => "Make suballocations of mergeable allocations direct children of new block",
+        clearpeer => "Keep only suballocations of $binfo->{block}",
+        clearall  => "Clear all suballocations"
+    );
+  $page->param(scope => $merge_friendly{$webvar{mscope}});
+} # confMerge()
+
+
 # Delete an allocation.
 sub remove {