version 2.4.1

Author: Marcin Przepiorowski

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 2.4.1
+
+Configuration files with an encrypted passwords has to be regenerated due
+to changes with encryption keys and adding a checksum to password encryption.
+
+### Added
+
+- dx_get_engine_time script to display an engine time using a time zone defined in Delphix Engine
+- [fix for #84](https://github.com/delphix/dxtoolkit/issues/84) - shared / unshare action added to dx_ctl_js_bookmarks
+- [fix for #94](https://github.com/delphix/dxtoolkit/issues/94) - shared / unshare action added to dx_ctl_js_bookmarks
+- [fix for #96](https://github.com/delphix/dxtoolkit/issues/96) - support for changing a host in an environment added
+- [fix for #97](https://github.com/delphix/dxtoolkit/issues/97) - dx_ctl_users enhancement - adding a SSH key to user 
+
+### Changed
+- better support for log in errors ( cookie clean up )
+- dx_get_js_snapshots will skip a template bookmarks
+- fix for disabled databases
+- [fix for #93](https://github.com/delphix/dxtoolkit/issues/93) - fix for file upload in dx_ctl_engine_upgrade. TODO: apply needs to detect engine reboot
+- [fix for #98](https://github.com/delphix/dxtoolkit/issues/98) - fix for session user check if user has a domain specified
+
+
 ## 2.4.0
 
 Configuration files with an encrypted passwords has to be regenerated due

bin/dx_ctl_engine_upgrade.pl

@@ -90,25 +90,26 @@
 
 my $file_version;
 
-if ((lc $action eq 'upload')  && (!defined($filename))) {
-  print "Parameter -filename is required for upload action \n";
-  pod2usage(-verbose => 1,  -input=>\*DATA);
-  exit (1);
-} else {
-
-  my $namechek = basename($filename);
-  if ( ! (($file_version) = $namechek =~ /^delphix_(\d.\d.\d.\d)_\d\d\d\d-\d\d-\d\d-\d\d-\d\d.upgrade.tar.gz$/ )) {
-    print "Filename is not matching delphix upgrade pattern \n";
+if (lc $action eq 'upload')  {
+  if (!defined($filename)) {
+    print "Parameter -filename is required for upload action \n";
+    pod2usage(-verbose => 1,  -input=>\*DATA);
     exit (1);
-  }
+  } else {
 
-  if (!defined($file_version)) {
-    print "Filename is not matching delphix upgrade pattern. Can't find version number \n";
-    exit (1);
-  }
+    my $namechek = basename($filename);
+    if ( ! (($file_version) = $namechek =~ /^delphix_(\d.\d.\d.\d)_\d\d\d\d-\d\d-\d\d-\d\d-\d\d.upgrade.tar.gz$/ )) {
+      print "Filename is not matching delphix upgrade pattern \n";
+      exit (1);
+    }
 
-}
+    if (!defined($file_version)) {
+      print "Filename is not matching delphix upgrade pattern. Can't find version number \n";
+      exit (1);
+    }
 
+  }
+}
 
 # 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);
@@ -142,40 +143,77 @@
       next;
     }
 
-    $jobstart = Toolkit_helpers::timestamp("-0mins", $engine_obj);
+    $jobstart = Toolkit_helpers::timestamp("-0min", $engine_obj);
 
     my $rc = $engine_obj->uploadupdate($filename);
-    if ($rc eq 0) {
-      print "Checking status of upload verification job\n";
+
+    if ($rc ne 0) {
+      $ret = $ret + $rc;
+      next;
     }
-    $ret = $ret + $rc;
 
-    my $jobs = new Jobs($engine_obj, $jobstart, undef, undef, undef, undef, undef, undef, 1, undef, $debug);
-    my $joblist = $jobs->getJobList();
+    print "Checking status of upload verification job\n";
+
 
-    my @refresh = grep { ($jobs->getJob($_)->getJobActionType()) eq 'REFRESH_VERSIONS' } @{$joblist};
+    my $jobs = new Jobs($engine_obj, $jobstart, undef, undef, undef, undef, undef, undef, 1, undef, $debug);
+    my $counter = 0;
+    my @refresh;
+    my $joblist;
+
+    do {
+      $jobs->loadJobs();
+      $joblist = $jobs->getJobList();
+      if (version->parse($engine_obj->getApi()) >= version->parse(1.10.0)) {
+        @refresh = grep { ($jobs->getJob($_)->getJobActionType()) eq 'UNPACK_VERSION' } @{$joblist};
+      } else {
+        @refresh = grep { ($jobs->getJob($_)->getJobActionType()) eq 'REFRESH_VERSIONS' } @{$joblist};
+      }
+      sleep 10;
+      $counter = $counter + 1;
+      if ($counter > 18) {
+        print "There is no job started for 3 minutes - exiting. File is uploaded please check GUI for job\n";
+        $ret = $ret + 1;
+        next;
+      }
+    }
+    while (scalar(@refresh)<1);
 
     my $job = $jobs->getJob($refresh[-1]);
     my $retjob = $job->waitForJob();
     if ($retjob eq 'COMPLETED') {
-      print "Uncompressing job $job finished.\n";
+      print "Uncompressing job " . $refresh[-1] . " finished.\n";
     } else {
       $ret = $ret + 1;
+      next;
     }
 
-    $jobs = new Jobs($engine_obj, $jobstart, undef, undef, undef, undef, undef, undef, 1, undef, $debug);
-    $joblist = $jobs->getJobList();
-    @refresh = grep { ($jobs->getJob($_)->getJobActionType()) eq 'UPGRADE_VERIFY' } @{$joblist};
 
     if (version->parse($engine_obj->getApi()) >= version->parse(1.9.0)) {
       # above 5.2 there is a verification job
+      $counter = 0;
+      $jobs = new Jobs($engine_obj, $jobstart, undef, undef, undef, undef, undef, undef, 1, undef, $debug);
+      do {
+        $jobs->loadJobs();
+        $joblist = $jobs->getJobList();
+        @refresh = grep { ($jobs->getJob($_)->getJobActionType()) eq 'UPGRADE_VERIFY' } @{$joblist};
+        sleep 10;
+        $counter = $counter + 1;
+        if ($counter > 18) {
+          print "There is no verification job started for 3 minutes - exiting. File is uploaded please check GUI for job\n";
+          $ret = $ret + 1;
+          next;
+        }
+      } while (scalar(@refresh)<1);
+
       $job = $jobs->getJob($refresh[-1]);
       $retjob = $job->waitForJob();
       if ($retjob eq 'COMPLETED') {
         print "Verification job $job finished\n";
       } else {
         $ret = $ret + 1;
       }
+
+
     }
   }
 

bin/dx_ctl_env.pl

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Copyright (c) 2014,2016 by Delphix. All rights reserved.
+# Copyright (c) 2014,2019 by Delphix. All rights reserved.
 #
 # Program Name : dx_ctl_env.pl
 # Description  : Get database and host information
@@ -48,6 +48,8 @@
   'name|n=s' => \(my $envname),
   'reference|r=s' => \(my $reference),
   'action=s' => \(my $action),
+  'host=s' => \(my $host),
+  'newhost=s' => \(my $newhost),
   'username=s' => \(my $username),
   'authtype=s' => \(my $authtype),
   'password=s' => \(my $password),
@@ -98,14 +100,26 @@
     (lc $action eq 'addrepo') || (lc $action eq 'deleterepo') ||
     (lc $action eq 'adddatabase') || (lc $action eq 'deletedatabase') ||
     (lc $action eq 'addlistener') || (lc $action eq 'deletelistener') ||
-    (lc $action eq 'adduser') || (lc $action eq 'deleteuser')
+    (lc $action eq 'adduser') || (lc $action eq 'deleteuser') ||
+    (lc $action eq 'updatehost')
     ))
     {
       print "Unknown action $action\n";
       pod2usage(-verbose => 1,  -input=>\*DATA);
       exit (1);
 }
 
+if (lc $action eq 'updatehost') {
+  if (!defined($newhost)) {
+    print "New host has to be set\n";
+    exit 1;
+  }
+  if ((!defined($envname)) && (!defined($host))) {
+    print "Environment name or an existing host name has to be set for updatehost action\n";
+    exit 1;
+  }
+}
+
 if (lc $action eq 'addrepo') {
   if (!defined($repotype)) {
     print "Repository type has to be set\n";
@@ -203,6 +217,7 @@
 
   my @env_list;
   my @jobs;
+  my $hostupdate;
 
   if (defined($reference)) {
     push(@env_list, $reference);
@@ -227,7 +242,8 @@
 
     my $env_name = $environments->getName($envitem);
 
-    if ((lc $action eq 'enable') || (lc $action eq 'disable') || (lc $action eq 'refresh')) {
+    if ((lc $action eq 'enable') || (lc $action eq 'disable') || (lc $action eq 'refresh') ||
+        (lc $action eq 'updatehost') ) {
 
       if ( $action eq 'enable' ) {
         if ( $environments->getStatus($envitem) eq 'enabled' ) {
@@ -254,6 +270,14 @@
         $jobno = $environments->refresh($envitem);
       }
 
+      if ( lc $action eq 'updatehost' ) {
+        print "Checking environment for host update $env_name ";
+        $jobno = $environments->updatehost($envitem, $host, $newhost);
+        if (defined($jobno)) {
+          $hostupdate = 1;
+        }
+      }
+
       if (defined ($jobno) ) {
         print "Starting job $jobno for environment $env_name.\n";
         my $job = new Jobs_obj($engine_obj, $jobno, 'true', $debug);
@@ -393,6 +417,8 @@
       }
     }
 
+
+
   }
 
   if (defined($parallel) && (scalar(@jobs) > 0)) {
@@ -402,6 +428,11 @@
     }
   }
 
+  if (!defined($hostupdate)) {
+    # no environment found with a IP - need to report an error
+    $ret = $ret + 1;
+  }
+
 }
 
 exit $ret;
@@ -413,7 +444,8 @@ =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|deleteuser|deleterepo|deletedatabase|deletelistener>
+            -acton <enable|disable|refresh|adduser|addrepo|adddatabase|addlistener
+                   |deleteuser|deleterepo|deletedatabase|deletelistener|updatehost>
             [-dbname dbname]
             [-instancename instancename]
             [-uniquename db_unique_name]
@@ -425,6 +457,8 @@ =head1 SYNOPSIS
             [-password password]
             [-repotype oracle|vfiles]
             [-repopath ORACLE_HOME]
+            [-host name/ip of existing host to update]
+            [-newhost new name/ip of the host]
             [-help|? ]
             [-debug ]
 
@@ -457,7 +491,7 @@ =head2 Actions
 
 =over 1
 
-=item B<-action> <enable|disable|refresh|adduser|addrepo|adddatabase|addlistener|deleteuser|deleterepo|deletedatabase|deletelistener>
+=item B<-action> <enable|disable|refresh|adduser|addrepo|adddatabase|addlistener|deleteuser|deleterepo|deletedatabase|deletelistener|updatehost>
 Run an action specified for environments selected by filter or all environments deployed on Delphix Engine
 
 =back
@@ -517,6 +551,13 @@ =head1 OPTIONS
 =item B<-oraclebase path>
 Oracle Base path
 
+=item B<-host hostname/IP>
+Host name or IP from an environment to be updated.
+Not required if environment name is specified
+
+=item B<-newhost hostname/IP>
+New Host name or IP of host being updated
+
 =item B<-help>
 Print this screen
 
@@ -608,4 +649,23 @@ =head1 EXAMPLES
  Deleting vfiles swingbench from environment LINUXSOURCE
  Database swingbench deleted from Unstructured Files
 
+Chaging an IP of the environment
+
+ dx_ctl_env -d 53 -name linuxsource -newhost 172.16.200.130 -action updatehost
+ Checking environment for host update linuxsource Starting job JOB-2850 for environment linuxsource.
+ 0 - 30 - 40 - 80 - 100
+ Job JOB-2850 finished with state: COMPLETED
+
+Chaging an IP of particular host
+
+ dx_ctl_env -d 53 -host 172.16.200.130 -newhost 172.16.180.129 -action updatehost
+ Checking environment for host update racattack121 Host with IP 172.16.200.130 not found
+ Checking environment for host update racattack Host with IP 172.16.200.130 not found
+ Checking environment for host update oracle18tgt Host with IP 172.16.200.130 not found
+ Checking environment for host update oracle18 Host with IP 172.16.200.130 not found
+ Checking environment for host update linuxsource Starting job JOB-2852 for environment linuxsource.
+ 0 - 30 - 40 - 80 - 100
+ Job JOB-2852 finished with state: COMPLETED
+ Checking environment for host update linuxtarget Host with IP 172.16.200.130 not found
+
 =cut