Merge branch 'develop'- version 2.3.7

Author: Marcin Przepiorowski

CHANGELOG.md

@@ -1,7 +1,27 @@
+## 2.3.7-rc1
+
+### Added
+- dx_ctl_js_branch - create/delete/activate a Self Service branch
+- dx_get_js_branch - list a Self Service branches
+- dx_get_vdbthrogput - extract VDB throughout for last 24 hours
+- dx_get_dsourcesize - show dSource sizes without compression
+- support for user logging with @DOMAIN and @SYSTEM
+- new filer oldthan added to dx_get_db_env/dx_refresh_db/dx_rewind_db to refresh databases older than date
+- option -notime added to dx_get_snapshot to quickly list a list of snapshot without provision time
+- dx_ctl_js_container has an action to enable and disable container
+
+### Changed
+- bugs fixed for held space and deleted objects in dx_get_capacity
+- dx_ctl_dSource fixed with new API of 5.2.5 
+
+
+### Changed
+- fix for file mapping API changes in 5.2
+
 ## 2.3.6
 
 ### Changed
-- fix for file mapping API changes in 5.2 
+- fix for file mapping API changes in 5.2
 
 
 ## 2.3.6-rc2

bin/dx_ctl_dsource.pl

@@ -224,7 +224,7 @@
       if ( $type eq 'oracle' ) {
         $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$stageenv,$stageinst,$stage_os_user, $backup_dir);
       } else {
-        $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$stageenv,$stageinst,$stage_os_user, $backup_dir, $validatedsync);
+        $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$stageenv,$stageinst,$stage_os_user, $backup_dir, $validatedsync, $delphixmanaged, $compression);
       }
     } else {
       $jobno = $source->detach_dsource();

bin/dx_ctl_js_bookmarks.pl

@@ -1,10 +1,10 @@
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,6 +29,7 @@
 use Data::Dumper;
 use warnings;
 use strict;
+use version;
 
 my $abspath = $FindBin::Bin;
 
@@ -50,9 +51,9 @@
 my $diff = 60;
 
 GetOptions(
-  'help|?' => \(my $help), 
-  'd|engine=s' => \(my $dx_host), 
-  'action=s'  => \(my $action), 
+  'help|?' => \(my $help),
+  'd|engine=s' => \(my $dx_host),
+  'action=s'  => \(my $action),
   'template_name=s' => \(my $template_name),
   'container_name=s' => \(my $container_name),
   'bookmark_name=s' => \(my $bookmark_name),
@@ -72,7 +73,7 @@
 ) or pod2usage(-verbose => 1,  -input=>\*DATA);
 
 pod2usage(-verbose => 2,  -input=>\*DATA) && exit if $help;
-die  "$version\n" if $print_version;   
+die  "$version\n" if $print_version;
 
 my $engine_obj = new Engine ($dever, $debug);
 $engine_obj->load_config($config_file);
@@ -126,7 +127,7 @@
   if (defined($snapshots) && (!defined($source))) {
     print "Option snapshot require a source to be defined \n";
     pod2usage(-verbose => 1,  -input=>\*DATA);
-    exit (1); 
+    exit (1);
   }
 
 
@@ -145,7 +146,7 @@
 }
 
 # this array will have all engines to go through (if -d is specified it will be only one engine)
-my $engine_list = Toolkit_helpers::get_engine_list($all, $dx_host, $engine_obj); 
+my $engine_list = Toolkit_helpers::get_engine_list($all, $dx_host, $engine_obj);
 
 my $ret = 0;
 
@@ -168,19 +169,19 @@
     if (defined($container_name)) {
       $datalayout = new JS_container_obj ( $engine_obj, $datalayout_ref, $debug );
       $datalayout_ref = $datalayout->getJSContainerByName($container_name);
-    } 
+    }
   }
 
   $bookmarks = new JS_bookmark_obj ( $engine_obj, undef, undef, $debug );
-    
+
 
   if (!defined($datalayout_ref)) {
     print "Can't find template with a name $template_name on engine $engine \n";
     $ret = $ret + 1;
-    next;    
+    next;
   }
 
-  
+
   my $branchs = new JS_branch_obj ( $engine_obj, $datalayout_ref, $debug );
 
   my $active_branch;
@@ -194,15 +195,15 @@
     }
   } else {
     $active_branch =  $datalayout->getJSActiveBranch($datalayout_ref);
-  } 
+  }
 
 
   if (lc $action eq 'create') {
 
     my $datasources = new JS_datasource_obj ( $engine_obj, $datalayout_ref, undef, undef );
 
     if ( defined($snapshots) ) {
-      
+
 
       my $ds_ref = $datasources->getJSDataSourceByName($source);
 
@@ -222,7 +223,7 @@
         for my $snapitem ( @{ $snapshot->getSnapshots() }) {
           my $time = $snapshot->getSnapshotCreationTime($snapitem);
           my $goodtime;
-          if ($engine_obj->getApi() lt "1.8") { 
+          if (version->parse($engine_obj->getApi()) < version->parse(1.8.0)) {
             $goodtime = $datasources->checkTime($datalayout_ref, $time);
           } else {
             $goodtime = $datasources->checkTime($active_branch, $time);
@@ -235,14 +236,14 @@
             last;
           }
         }
-      } 
+      }
 
       if ((lc $snapshots eq 'last') || (lc $snapshots eq 'both')) {
         my $last_time = (@{ $snapshot->getSnapshots() })[-1];
 
         my $time = $snapshot->getSnapshotCreationTime($last_time);
         my $goodtime;
-        if ($engine_obj->getApi() lt "1.8") { 
+        if (version->parse($engine_obj->getApi()) < version->parse(1.8.0)) {
           $goodtime = $datasources->checkTime($datalayout_ref, $time);
         } else {
           $goodtime = $datasources->checkTime($active_branch, $time);
@@ -260,7 +261,7 @@
         for my $snapitem ( @{ $snapshot->getSnapshots() }) {
           my $time = $snapshot->getSnapshotCreationTime($snapitem);
           my $goodtime;
-          if ($engine_obj->getApi() lt "1.8") { 
+          if (version->parse($engine_obj->getApi()) < version->parse(1.8.0)) {
             $goodtime = $datasources->checkTime($datalayout_ref, $time);
           } else {
             $goodtime = $datasources->checkTime($active_branch, $time);
@@ -273,7 +274,7 @@
           }
         }
       }
-      
+
 
       for my $bookname_item (sort (keys %bookmark_times_hash)) {
 
@@ -300,7 +301,7 @@
           $bookmark_time = $operations->getEndTime($firstop);
 
           $zulu = 1;
-        
+
         } else {
           print "Can't find a first operation for template or container \n";
           $ret = $ret + 1;
@@ -336,8 +337,8 @@
 
     if (!defined($bookmarks)) {
       $bookmarks = new JS_bookmark_obj ( $engine_obj, undef, undef, $debug );
-    } 
-    
+    }
+
 
     my @bookmark_array;
 
@@ -386,7 +387,7 @@ sub create {
   my $bookmark_time = shift;
   my $zulu = shift;
   my $expireat = shift;
-  
+
   if (defined($expireat)) {
     my $tz = $engine_obj->getTimezone();
     $expireat = Toolkit_helpers::convert_to_utc($expireat, $tz, undef, 1);
@@ -417,12 +418,12 @@ =head1 SYNOPSIS
  dx_ctl_js_bookmarks    [ -engine|d <delphix identifier> | -all ] [ -configfile file ]
                          -action create | remove
                          -template_name template_name
-                         -container_name container_name 
-                         -bookmark_name bookmark_name 
+                         -container_name container_name
+                         -bookmark_name bookmark_name
                         [-bookmark_time "YYYY-MM-DD HH24:MI:SS" | first | latest ]
                         [-snapshots first | last | both | all]
                         [-source source_name]
-                        [-container_name container_name]  
+                        [-container_name container_name]
                         [-expireat timestamp ]
                         [ --help|? ] [ -debug ]
 
@@ -456,7 +457,7 @@ =head2 Options
 =over 4
 
 =item B<-action action_name>
-Action name. Allowed values are : 
+Action name. Allowed values are :
 
 create - to create bookmark
 
@@ -506,7 +507,7 @@ =head1 OPTIONS
 
 =over 3
 
-=item B<-help>          
+=item B<-help>
 Print this screen
 
 =item B<-debug>
@@ -517,8 +518,8 @@ =head1 OPTIONS
 
 =head1 EXAMPLES
 
-Create template bookmarks for all snapshots for template "template"" and source "oracle", bookmarks name starts with prefix "pre" 
-plus time of snapshot, 
+Create template bookmarks for all snapshots for template "template"" and source "oracle", bookmarks name starts with prefix "pre"
+plus time of snapshot,
 
  dx_ctl_js_bookmarks -d Landshark5 -bookmark_name "pre" -template_name template -snapshots all -source oracle -action create
  Starting job JOB-7623 for bookmark pre-2016-10-12 12:02:31.
@@ -532,7 +533,7 @@ =head1 EXAMPLES
  5 - 100
  Job JOB-7625 finished with state: COMPLETED
 
-Create template bookmark for particular time 
+Create template bookmark for particular time
 
  dx_ctl_js_bookmarks -d Landshark5 -bookmark_name "fixeddate" -template_name template -bookmark_time "2016-10-12 13:05:02" -branch_name master -action create
  Starting job JOB-7626 for bookmark fixeddate.
@@ -554,6 +555,3 @@ =head1 EXAMPLES
  Job JOB-7629 finished with state: COMPLETED
 
 =cut
-
-
-