v.2.4.19.2

Author: Marcin Przepiorowski

bin/dx_get_hierarchy.pl

@@ -111,7 +111,8 @@
       {'dSource',     30},
       {'dS time',     35},
       {'Physical DB', 30},
-      {'First child DB', 30}
+      {'First child DB', 30},
+      {'Parent database', 30}
     );
 
 
@@ -212,6 +213,8 @@
   my $hierc = $databases->generateHierarchy($object_map, $databases_parent);
 
   my $parentname;
+  my $parent1leveldb;
+  my $parent1levelname;
 
   # for filtered databases on current engine - display status
   for my $dbitem ( @{$db_list} ) {
@@ -254,6 +257,18 @@
         ($topdsc, $childc) = $databases->finddSource($dbitem, $hierc);
 
 
+        if ( $dbobj->getParentContainer() ne '' ) {
+          my $parent1leveldb = $databases->getDB($dbobj->getParentContainer());
+          if (defined($parent1leveldb)) {
+            $parent1levelname = $parent1leveldb->getName();
+          } else {
+            $parent1levelname = 'N/A';
+          }
+        } else {
+          $parent1levelname = 'N/A';
+        }
+
+
         if (defined($topdsc)) {
           if ($topdsc eq 'deleted') {
             $parentname = 'parent deleted';
@@ -346,6 +361,7 @@
         $snaptime = 'N/A';
         $childname = 'N/A';
         $parentname = '';
+        $parent1levelname = '';
         if ($dbobj->getType() ne 'detached' ) {
           $physicaldb = $dbobj->getSourceConfigName();
         } else {
@@ -361,7 +377,8 @@
           $parentname,
           $snaptime,
           $physicaldb,
-          $childname
+          $childname,
+          $parent1levelname
         );
       }
 

lib/Toolkit_helpers.pm

@@ -29,7 +29,7 @@ use File::Spec;
 
 use lib '../lib';
 
-our $version = '2.4.19';
+our $version = '2.4.19.2';
 
 my $tz = new Date::Manip::TZ;
 my $dt = new Date::Manip::Date;

test/test_hierarchy/hierarchy.t

@@ -34,30 +34,30 @@ script_compiles('../../bin/dx_get_hierarchy.pl');
 script_runs(['../../bin/dx_get_hierarchy.pl', '-d', 'local32', '-format','csv','-nohead'] ,  "All hierachy test");
 
 my $expected_stdout = <<EOF;
-local32,CDOMLOTG2E25,Analytics,CDB,,N/A,CDOMLOTG2E25,N/A
-local32,mssqltest,Analytics,VDB,Soda,2021-12-17 05:08:25 PST,Soda,mssqltest
-local32,oramask,Analytics,VDB,DBOMSR3A85E9,2021-12-22 07:53:08 EST,DBOMSR3A85E9,oramask
-local32,pdbtest,Analytics,VDB,CDOMLOSRCA1DPDB1,2021-12-17 05:05:09 EST,CDOMLOSRCA1DPDB1,pdbtest
-local32,pdbtest2,Analytics,VDB,CDOMLOSRCA1DPDB1,2021-12-17 05:05:09 EST,CDOMLOSRCA1DPDB1,pdbtest2
-local32,sybasetest,Analytics,VDB,db_rhel83_160_1,2021-12-17 05:01:49 EST,db_rhel83_160_1,sybasetest
-local32,vcdbtest,Analytics,vCDB,,N/A,vcdbtest,N/A
-local32,CDOMLOSRCA1D,Sources,CDB,,N/A,CDOMLOSRCA1D,N/A
-local32,CDOMLOSRCA1DPDB1,Sources,dSource,,N/A,CDOMLOSRCA1DPDB1,N/A
-local32,db_rhel83_160_1,Sources,dSource,,N/A,db_rhel83_160_1,N/A
-local32,DBOMSR3A85E9,Sources,dSource,,N/A,DBOMSR3A85E9,N/A
-local32,Macaroon,Sources,dSource,,N/A,Macaroon,N/A
-local32,Soda,Sources,dSource,,N/A,Soda,N/A
+local32,CDOMLOTG2E25,Analytics,CDB,,N/A,CDOMLOTG2E25,N/A,
+local32,mssqltest,Analytics,VDB,Soda,2021-12-17 05:08:25 PST,Soda,mssqltest,Soda
+local32,oramask,Analytics,VDB,DBOMSR3A85E9,2021-12-22 07:53:08 EST,DBOMSR3A85E9,oramask,DBOMSR3A85E9
+local32,pdbtest,Analytics,VDB,CDOMLOSRCA1DPDB1,2021-12-17 05:05:09 EST,CDOMLOSRCA1DPDB1,pdbtest,CDOMLOSRCA1DPDB1
+local32,pdbtest2,Analytics,VDB,CDOMLOSRCA1DPDB1,2021-12-17 05:05:09 EST,CDOMLOSRCA1DPDB1,pdbtest2,CDOMLOSRCA1DPDB1
+local32,sybasetest,Analytics,VDB,db_rhel83_160_1,2021-12-17 05:01:49 EST,db_rhel83_160_1,sybasetest,db_rhel83_160_1
+local32,vcdbtest,Analytics,vCDB,,N/A,vcdbtest,N/A,
+local32,CDOMLOSRCA1D,Sources,CDB,,N/A,CDOMLOSRCA1D,N/A,
+local32,CDOMLOSRCA1DPDB1,Sources,dSource,,N/A,CDOMLOSRCA1DPDB1,N/A,
+local32,db_rhel83_160_1,Sources,dSource,,N/A,db_rhel83_160_1,N/A,
+local32,DBOMSR3A85E9,Sources,dSource,,N/A,DBOMSR3A85E9,N/A,
+local32,Macaroon,Sources,dSource,,N/A,Macaroon,N/A,
+local32,Soda,Sources,dSource,,N/A,Soda,N/A,
 EOF
 
 script_stdout_is $expected_stdout, "All hierachy results compare";
 
 script_runs(['../../bin/dx_get_hierarchy.pl', '-d', 'local33', '-format','csv','-nohead','-parent_engine','local32'] ,  "2 engine test");
 
 my $expected_stdout = <<EOF;
-local33,oramask\@ip-10-110-251-90-1,Analytics\@ip-10-110-251-90-1,VDB,DBOMSR3A85E9,2021-12-22 07:53:08 EST,DBOMSR3A85E9,oramask
-local33,clony,Untitled,VDB,DBOMSR3A85E9,2021-12-17 06:30:40 EST,DBOMSR3A85E9,oramask
-local33,mask2,Untitled,VDB,DBOMSR3A85E9,2021-12-17 06:30:40 EST,DBOMSR3A85E9,oramask
-local33,maskmask,Untitled,VDB,DBOMSR3A85E9,2021-12-22 07:53:08 EST,DBOMSR3A85E9,oramask
+local33,oramask\@ip-10-110-251-90-1,Analytics\@ip-10-110-251-90-1,VDB,DBOMSR3A85E9,2021-12-22 07:53:08 EST,DBOMSR3A85E9,oramask,N/A
+local33,clony,Untitled,VDB,DBOMSR3A85E9,2021-12-17 06:30:40 EST,DBOMSR3A85E9,oramask,mask2
+local33,mask2,Untitled,VDB,DBOMSR3A85E9,2021-12-17 06:30:40 EST,DBOMSR3A85E9,oramask,oramask\@ip-10-110-251-90-1
+local33,maskmask,Untitled,VDB,DBOMSR3A85E9,2021-12-22 07:53:08 EST,DBOMSR3A85E9,oramask,oramask\@ip-10-110-251-90-1
 EOF
 
 script_stdout_is $expected_stdout, "2 engine results compare";
@@ -66,10 +66,10 @@ script_stdout_is $expected_stdout, "2 engine results compare";
 script_runs(['../../bin/dx_get_hierarchy.pl', '-d', 'local33', '-format','csv','-nohead'] ,  "target engine test");
 
 my $expected_stdout = <<EOF;
-local33,oramask\@ip-10-110-251-90-1,Analytics\@ip-10-110-251-90-1,VDB,dSource on other DE,N/A,N/A,N/A
-local33,clony,Untitled,VDB,dSource on other DE,N/A,N/A,N/A
-local33,mask2,Untitled,VDB,dSource on other DE,N/A,N/A,N/A
-local33,maskmask,Untitled,VDB,dSource on other DE,N/A,N/A,N/A
+local33,oramask\@ip-10-110-251-90-1,Analytics\@ip-10-110-251-90-1,VDB,dSource on other DE,N/A,N/A,N/A,N/A
+local33,clony,Untitled,VDB,dSource on other DE,N/A,N/A,N/A,mask2
+local33,mask2,Untitled,VDB,dSource on other DE,N/A,N/A,N/A,oramask\@ip-10-110-251-90-1
+local33,maskmask,Untitled,VDB,dSource on other DE,N/A,N/A,N/A,oramask\@ip-10-110-251-90-1
 EOF
 
 script_stdout_is $expected_stdout, "target engine results compare";

test/test_hierarchy/start_server.pl

@@ -1,3 +1,6 @@
+use lib '../../lib/';
+use lib '../';
+use lib '.';
 use server;
 
 my $server = server->new(8080);