version 2.4.13

Author: Marcin Przepiorowski

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.4.13
+
+### Added
+- Support for Commvault in adding MSSQL dSource
+
+### Changed
+- remove bookmark in self service fix
+- fix for snapshot size reporting
+
+
 ## 2.4.12
 
 ### Added

bin/dx_ctl_dsource.pl

@@ -72,6 +72,9 @@
   'logsyncmode=s' => \(my $logsyncmode),
   'validatedsync=s' => \(my $validatedsync),
   'delphixmanaged=s' => \(my $delphixmanaged),
+  'commserver=s' => \(my $commserver),
+  'commsourceclient=s' => \(my $commsourceclient),
+  'commstagingclient=s' => \(my $commstagingclient),
   'exclude=s@' => \(my $exclude),
   'hadr=s' => \(my $hadr),
   'compression=s' => \($compression),
@@ -166,6 +169,22 @@
   }
 }
 
+if ( (defined($commserver)) && ( ! ( defined($commsourceclient) && defined($commstagingclient) ) ) ) {
+  print "Options -commserver requires commsourceclient and commstagingclient to be configured\n";
+  pod2usage(-verbose => 1,  -input=>\*DATA);
+  exit (1);
+}
+
+my %commvault;
+
+if (defined($commserver)) {
+  %commvault = (
+    'commserveHostName' => $commserver,
+    'sourceClientName' => $commsourceclient,
+    'stagingClientName' => $commstagingclient
+  );
+}
+
 
 # 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);
@@ -336,7 +355,7 @@
     }
     elsif ($type eq 'mssql') {
       my $db = new MSSQLVDB_obj($engine_obj,$debug);
-      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$dsourcename,$group,$logsync,$stageenv,$stageinst,$stage_os_user, $backup_dir, $dumppwd, $validatedsync, $delphixmanaged, $compression, $dbusertype);
+      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$dsourcename,$group,$logsync,$stageenv,$stageinst,$stage_os_user, $backup_dir, $dumppwd, $validatedsync, $delphixmanaged, $compression, $dbusertype, \%commvault);
     }
     elsif ($type eq 'vFiles') {
       my $db = new AppDataVDB_obj($engine_obj,$debug);
@@ -387,6 +406,9 @@ =head1 SYNOPSIS
   [-delphixmanaged yes/no ]
   [-dbusertype database|environment|domain]
   [-cdbcont container -cdbuser user -cdbpass password]
+  [-commserver Commvault servername]
+  [-commsourceclient Commvault client name]
+  [-commstagingclient Commvault staging name]
   [-exclude path]
   [-debug ]
   [-version ]
@@ -507,6 +529,15 @@ =head2 dSource arguments
 =item B<-dbusertype database|environment|domain>
 Specify a database user type for MS SQL. Default value is database.
 
+=item B<-commserver Commvault servername>
+Commvault server name
+
+=item B<-commsourceclient Commvault client name>
+Commvault client name
+
+=item B<-commstagingclient Commvault staging name>
+Commvault staging name
+
 =item B<-hadr hadrPrimarySVC:XXX,hadrPrimaryHostname:hostname,hadrStandbySVC:YYY>
 Add DB2 dSource with HADR support
 Parameter hadrTargetList is optional.

bin/dx_ctl_env.pl

@@ -503,7 +503,7 @@ =head1 SYNOPSIS
 
  dx_ctl_env [ -engine|d <delphix identifier> | -all ] [ -configfile file ]
             [ -name env_name | -reference reference ]
-            -acton <enable|disable|refresh|adduser|addrepo|adddatabase|addlistener
+            -action <enable|disable|refresh|adduser|addrepo|adddatabase|addlistener
                    |deleteuser|deleterepo|deletedatabase|deletelistener|updatehost>
             [-dbname dbname]
             [-instancename instancename]

bin/dx_ctl_js_bookmarks.pl

@@ -302,7 +302,7 @@
 
       $bookmark_name = $bookmarks->getName($bookmarkitem);
 
-      if (lc $action eq 'delete') {
+      if (lc $action eq 'remove') {
         my $jobno = $bookmarks->deleteBookmark($bookmarkitem);
         $ret = $ret + Toolkit_helpers::waitForJob($engine_obj, $jobno, "Bookmark $bookmark_name deleted", "Problem with deleting bookmark $bookmark_name")
 

lib/Engine.pm

@@ -510,10 +510,13 @@ sub extended_password {
       return 1;
     }
 
-    if (! -x "$engine_config->{passwordscript}") {
-      print "Password script $engine_config->{passwordscript} is not executable\n";
-      logger($self->{_debug}, "Password script $engine_config->{passwordscript} is not executable");
-      return 1;
+    my $osname = $^O;
+    if ( $osname ne 'MSWin32' ) {
+      if (! -x "$engine_config->{passwordscript}") {
+        print "Password script $engine_config->{passwordscript} is not executable\n";
+        logger($self->{_debug}, "Password script $engine_config->{passwordscript} is not executable");
+        return 1;
+      }
     }
 
     my $out = qx|$line|;

lib/MSSQLVDB_obj.pm

@@ -392,6 +392,7 @@ sub addSource {
     my $delphixmanaged = shift;
     my $compression = shift;
     my $dbusertype = shift;
+    my $commvault = shift;
 
     logger($self->{_debug}, "Entering MSSQLVDB_obj::addSource",1);
 
@@ -644,6 +645,12 @@ sub addSource {
 
 
 
+        if (defined($commvault->{"commserveHostName"})) {
+           $commvault->{"type"} = "MSSqlCommvaultConfig";
+           $dsource_params{"linkData"}{"mssqlCommvaultConfig"} = $commvault;
+        }
+
+
         if (defined($delphixmanaged) && ($delphixmanaged eq 'yes')) {
           my $compression_json = JSON::false;
 
@@ -699,6 +706,10 @@ sub addSource {
           }
         );
 
+        if (defined($commvault->{"commserveHostName"})) {
+           $commvault->{"type"} = "MSSqlCommvaultConfig";
+           $dsource_params{"linkData"}{"syncStrategy"}{"mssqlCommvaultConfig"} = $commvault;
+        }
 
 
         if (defined($delphixmanaged) && ($delphixmanaged eq 'yes')) {

lib/Snapshot_obj.pm

@@ -173,7 +173,13 @@ sub getSnapshotName {
     my $self = shift;
     my $reference = shift;
     logger($self->{_debug}, "Entering Snapshot_obj::getSnapshotName",1);
-    return $self->{_snapshots}->{$reference}->{name};
+    my $ret;
+    if (defined($self->{_snapshots}->{$reference}->{name})) {
+      $ret = $self->{_snapshots}->{$reference}->{name};
+    } else {
+      $ret = 'No snapshot data'
+    }
+    return $ret;
 }
 
 
@@ -392,7 +398,18 @@ sub getSnapshotTimeZone {
     my $self = shift;
     my $reference = shift;
     logger($self->{_debug}, "Entering Snapshot_obj::getSnapshotTimeZone",1);
+
+    if (!defined($self->{_snapshots}->{$reference})) {
+      return 'N/A';
+    }
+
     my $ts = $self->{_snapshots}->{$reference}->{timezone} ;
+
+    if (!defined($self->{_snapshots}->{$reference}->{timezone})) {
+      return 'N/A';
+    }
+
+    #print Dumper $self->{_snapshots}->{$reference};
     logger($self->{_debug}, "Snapshot timezone returned by DE $ts",1);
     chomp($ts);
     my @temp = split(',',$ts);

lib/Toolkit_helpers.pm

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