version 2.4.7

Author: Marcin Przepiorowski

.github/workflows/develop.yml

@@ -230,7 +230,8 @@ jobs:
         cpanm Text::CSV
         cpanm LWP::UserAgent
         cpanm Net::SSLeay
-        cpanm IO::Socket::SSL
+        cpanm Mozilla::CA@20180117
+        cpanm IO::Socket::[email protected]
         cpanm LWP::Protocol::https
         cpanm Term::ReadKey
         cpanm -f Archive::Zip

.gitignore

@@ -0,0 +1,4 @@
+.DS*
+tools/*
+bin/dxtools.conf
+test/debug*

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2.4.7
+
+
+### Added
+- support for backup masked VDB [issue #140](https://github.com/delphix/dxtoolkit/issues/140)
+- Oracle VDB can be created with a new DBID flag
+- Allow dSource validate sync update (MS SQL / Sybase) by specifying a group [issue #135](https://github.com/delphix/dxtoolkit/issues/135)
+
+### Changed
+- [fix for #139](https://github.com/delphix/dxtoolkit/issues/139) - Fix to allows adding users without password when Engine configured with Central Management
+- [fix for #134](https://github.com/delphix/dxtoolkit/issues/134) [fix for #142](https://github.com/delphix/dxtoolkit/issues/142) - Fix on host filtering
+- [fix for #138](https://github.com/delphix/dxtoolkit/issues/138)  - Allow run inside container without username
+- [fix for #146](https://github.com/delphix/dxtoolkit/issues/146)  - Upload upgrade files from 6.0.X
+
+
+
 ## 2.4.6
 
 

bin/dx_config.pl

@@ -1,24 +1,24 @@
-# 
+#
 # 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.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Copyright (c) 2015,2016 by Delphix. All rights reserved.
+# Copyright (c) 2015,2020 by Delphix. All rights reserved.
 #
 # Program Name : dx_config.pl
 # Description  : Convert dxtools.conf file from and to csv
 # Author       : Marcin Przepiorowski
 # Created      : 22 Apr 2015 (v2.0.0)
 #
-      
+
 
 use strict;
 use warnings;
@@ -41,19 +41,19 @@
 
 
 GetOptions(
-'help|?' => \( my$help), 
-'debug' => \(my $debug), 
+'help|?' => \( my$help),
+'debug' => \(my $debug),
 'convert=s' => \(my $convert),
 'csvfile|f=s' => \(my $csvfile),
+'text|c=s' => \(my $conf_param_file),
 'configfile|c=s' => \(my $configfile),
-'version|v' => \(my $print_version)   
+'version|v' => \(my $print_version)
 ) or pod2usage(-verbose => 1, -output=>\*STDERR);
 
-
 pod2usage(-verbose => 2, -output=>\*STDERR) && exit if $help;
-die  "$version\n" if $print_version;  
+die  "$version\n" if $print_version;
 
-if (! ( defined ($convert) && defined($csvfile) && defined($configfile) ) ) {
+if (! ( defined ($convert) && (defined($csvfile) || defined($conf_param_file)) && defined($configfile) ) ) {
 	print "Parameter convert is required.\n";
 	pod2usage(-verbose => 1, -output=>\*STDERR);
 	exit;
@@ -66,53 +66,148 @@
 
 if ( $convert eq 'tocsv' ) {
 	convert_tocsv($csvfile, $configfile);
-} 
+}
 
-if ( $convert eq 'todxconf' ) {
+if ( ($convert eq 'todxconf' ) &&  (defined(($csvfile)) ) ) {
 	convert_todxconf($csvfile, $configfile);
-} 
+}
+
+if ( ($convert eq 'todxconf')  &&  (defined($conf_param_file)))  {
+	convert_text_todxconf($conf_param_file, $configfile);
+}
+
 
 
 ############################################################################
 
 sub convert_todxconf {
-	my $csvfile = shift; 
+	my $csvfile = shift;
 	my $configfile = shift;
 
-    open(my $FD,$csvfile) || die "Can't open file: $csvfile \n";
+  open(my $FD,$csvfile) || die "Can't open file: $csvfile \n";
+
+  my @engine_list;
 
-    my @engine_list;
+  while (my $line = <$FD>) {
 
-    while (my $line = <$FD>) {
+    chomp $line;
 
-    	chomp $line;
-       
 		if  ( ! ($line =~ m/^\#/g ) ) {
 
-			my ( $hostname, $ip_address, $port, $username, $password, $default, $protocol ) = split(',',$line);
+			my ( $hostname, $ip_address, $port, $username, $password, $default, $protocol, $clientid, $clientsecret ) = split(',',$line);
 
-			if ( ! ( defined($hostname) && defined($ip_address) && defined($port) && defined($username) && defined($password) && defined($default) )) {
+			if ( ! ( defined($hostname) && defined($ip_address) && defined($port) && defined($username) && defined($password) && ((defined($username) && defined($password)) || (defined($clientid) && defined($clientsecret)) )
+        && defined($default) )) {
 				print "There is a problem with line $line \n";
 				print "Not all fields defined. Exiting\n";
-				exit;
+				exit 1;
 			}
 
-			my %engine = (
-			    hostname => $hostname,
-			    username => $username,
-			    ip_address => $ip_address,
-			    password => $password,
-			    port => $port,
-			    default => $default,
-          protocol => $protocol
-			);
+      if (($username ne '') && (defined($clientid)) && ($clientid ne '')) {
+        print "There is a problem with line $line \n";
+        print "username and clientid are mutually exclusive\n";
+        exit 1;
+      }
+
+      my %engine;
+
+      if ($username ne '') {
+        %engine = (
+    		    hostname => $hostname,
+    		    username => $username,
+    		    ip_address => $ip_address,
+    		    password => $password,
+    		    port => $port,
+    		    default => $default,
+            protocol => $protocol
+    		);
+    } else {
+        %engine = (
+    		    hostname => $hostname,
+    		    clientid => $clientid,
+    		    ip_address => $ip_address,
+    		    clientsecret => $clientsecret,
+    		    port => $port,
+    		    default => $default,
+            protocol => $protocol
+    		);
+      }
 
 
 			push (@engine_list, \%engine);
+    }
+  }
+
+
+	my $time = strftime('%Y-%m-%d-%H-%M-%S',localtime);
+
+	if ( -e $configfile ) {
+		my $backupfile = $configfile . "." . $time;
+		copy ( $configfile, $backupfile ) or die ("Can't generate backup file $backupfile");
+		print "Old config file backup file name is $backupfile \n";
+	}
+
+	my %engine_json = (
+       data => \@engine_list
+	);
+
+	open (my $fh, ">", $configfile) or die ("Can't open new config file $configfile for write");
+	print $fh to_json(\%engine_json, {pretty=>1});
+	close $fh;
+  print "New config file $configfile created.\n";
+}
+
+sub convert_text_todxconf {
+	my $conf_param_file = shift;
+	my $configfile = shift;
+  my @engine_list;
+	chomp $conf_param_file;
+
+
+	if  ( ! ($conf_param_file =~ m/^\#/g ) ) {
+		my ( $hostname, $ip_address, $port, $username, $password, $default, $protocol, $clientid, $clientsecret ) = split(',',$conf_param_file);
+		if ( ! ( defined($hostname) && defined($ip_address) && defined($port) && ((defined($username) && defined($password)) || (defined($clientid) && defined($clientsecret)) )
+             && defined($default) )) {
+			print "There is a problem with line $conf_param_file \n";
+			print "Not all fields defined. Exiting\n";
+			exit 1;
 		}
+
+    if (($username ne '') && (defined($clientid)) && ($clientid ne '')) {
+      print "There is a problem with line $conf_param_file \n";
+      print "username and clientid are mutually exclusive\n";
+      exit 1;
+    }
+
+		my %engine;
+
+    if ($username ne '') {
+      %engine = (
+  		    hostname => $hostname,
+  		    username => $username,
+  		    ip_address => $ip_address,
+  		    password => $password,
+  		    port => $port,
+  		    default => $default,
+          protocol => $protocol
+  		);
+    } else {
+      %engine = (
+  		    hostname => $hostname,
+  		    clientid => $clientid,
+  		    ip_address => $ip_address,
+  		    clientsecret => $clientsecret,
+  		    port => $port,
+  		    default => $default,
+          protocol => $protocol
+  		);
+    }
+
+		push (@engine_list, \%engine);
 	}
 
 
+
 	my $time = strftime('%Y-%m-%d-%H-%M-%S',localtime);
 
 	if ( -e $configfile ) {
@@ -133,7 +228,7 @@ sub convert_todxconf {
 
 
 sub convert_tocsv {
-	my $csvfile = shift; 
+	my $csvfile = shift;
 	my $configfile = shift;
 
 
@@ -142,12 +237,20 @@ sub convert_tocsv {
 
     open(my $FD, ">", $csvfile) || die "Can't open file: $csvfile for write \n";
 
-    print $FD "# engine nick name, engine ip/hostname, port, username, password, default, protocol \n";
+    print $FD "# engine nick name, engine ip/hostname, port, username, password, default, protocol, clientid, clientsecret \n";
 
 
     for my $engine_name ( $engine_obj->getAllEngines() ) {
     	my $engine = $engine_obj->getEngine($engine_name);
-    	print $FD $engine_name . "," . $engine->{ip_address} . "," . $engine->{port} . "," . $engine->{username} . "," . $engine->{password} . "," . $engine->{default} . "," . $engine->{protocol} . "\n";
+
+      my $line;
+      if (defined($engine->{clientid})) {
+        $line = $engine_name . "," . $engine->{ip_address} . "," . $engine->{port} . ",,," . $engine->{default} . "," . $engine->{protocol} . "," . $engine->{clientid} . "," . $engine->{clientsecret} ."\n";
+      } else {
+        $line = $engine_name . "," . $engine->{ip_address} . "," . $engine->{port} . "," . $engine->{username} . "," . $engine->{password} . "," . $engine->{default} . "," . $engine->{protocol} . ",," . "\n";
+      }
+
+    	print $FD $line;
 
     }
 
@@ -162,12 +265,12 @@ sub convert_tocsv {
 
 =head1 SYNOPSIS
 
- dx_config -convert todxconf|tocsv -csvfile file.csv -configfile dxtools.conf [-help] [-version]
+ dx_config -convert todxconf|tocsv -csvfile file.csv|-text params_list -configfile dxtools.conf [-help] [-version]
 
 
 =head1 DESCRIPTION
 
-Convert a csv file into DXTOOLKIT configuration file (dxtools.conf) or convert configuration file into csv file.
+Convert a csv file or list of parameters into DXTOOLKIT configuration file (dxtools.conf) or convert configuration file into csv file.
 Existing configuration file will be copy into backup file.
 
 ex.
@@ -178,13 +281,21 @@ =head1 ARGUMENTS
 
 =over 3
 
-=item B<-convert>
+=item B<-convert todxconf|tocsv>
 Specify a conversion direction
 
-=item B<-csvfile>
+=item B<-csvfile file.csv>
 CSV file name
 
-=item B<-configfile>
+=item B<-text parameter_list>
+Create a new config file from input. Parameter list is comma separated list of values in the following order:
+
+
+hostname, ip_address, port, username, password, default, protocol, clientid, clientsecret
+
+Only one pair is required: username and password or clientid and clientsecret
+
+=item B<-configfile dxtools.conf>
 config file name
 
 =back
@@ -194,7 +305,7 @@ =head1 OPTIONS
 
 =over 2
 
-=item B<-help>          
+=item B<-help>
 Print this screen
 
 =item B<-debug>
@@ -206,12 +317,18 @@ =head1 EXAMPLES
 
 Create CSV from dxtools.conf
 
- dx_config -convert tocsv -csvfile new.csv -configfile dxtools.conf 
+ dx_config -convert tocsv -csvfile new.csv -configfile dxtools.conf
  New csv file new.csv created.
- 
-Create dxtools.conf from CSV file 
+
+Create dxtools.conf from CSV file
 
  dx_config -convert todxconf -csvfile new.csv -configfile dxtools.conf
  New config file dxtools.conf created.
 
+Create dxtools.conf from command line
+
+ dx_config -convert todxconf -text hostname,192.168.1.100,443,username,password,N,https -configfile new.conf
+ Old config file backup file name is new.conf.2020-05-01-10-28-07
+ New config file new.conf created.
+
 =cut

bin/dx_ctl_analytics.pl

@@ -237,23 +237,17 @@ =head1 ARGUMENTS
 - dxtools.conf from dxtoolkit location
 
 
-
-=over 4
-
 =item B<-type|t> Type: cpu|disk|nfs|iscsi|network|nfs-by-client|nfs-all|all|standard|comma separated names
 
 ex.
 
-=over 4
 
 =item B<-type all> - for all analytics
 
 =item B<-type standard> - for cpu,disk,network and nfs analytics
 
 =item B<-t cpu,disk> - for cpu and disk
 
-=back
-
 =item B<-action start|stop|restart|display|create|delete>
 
 Choose action on selected analytic type