Merge branch 'timezonefix' into develop

Author: Marcin Przepiorowski

lib/Snapshot_obj.pm

@@ -329,27 +329,58 @@ sub getSnapshotTime {
 # if timezone defined as GMT+/-offset return undef
 # parameters:
 # - timezone
-# Return 0 if OK
+# Return timezone of OK or N/A if timezone is not recognized by perl
 
 sub checkTZ {
     my $self = shift;
     my $timezone = shift;
     logger($self->{_debug}, "Entering Snapshot_obj::checkTZ",1);
 
+    # fixes for timezones supported by Delphix but not recognized by Perl
+    if ($timezone eq 'Etc/Zulu') {
+        $timezone = 'UTC';
+    }
+    if ($timezone eq 'Zulu') {
+        $timezone = 'UTC';
+    }
+    if ($timezone eq 'Etc/Universal') {
+        $timezone = 'UTC';
+    }
+    if ($timezone eq 'Universal') {
+        $timezone = 'UTC';
+    }
+    if ($timezone eq 'Etc/Greenwich') {
+        $timezone = 'GMT';
+    }
+    if ($timezone eq 'Greenwich') {
+        $timezone = 'GMT';
+    }
+    if ($timezone eq 'GMT0') {
+        $timezone = 'GMT';
+    }
+    if ($timezone eq 'Etc/GMT0') {
+        $timezone = 'GMT';
+    }
+    if ($timezone eq 'Etc/GMT-0') {
+        $timezone = 'GMT';
+    }
+    if ($timezone eq 'Etc/GMT+0') {
+        $timezone = 'GMT';
+    }
 
     my $checktime = time();
     my $dt = ParseDate($checktime);
     my $tz = new Date::Manip::TZ;
     my ($err,$date,$offset,$isdst,$abbrev) = $tz->convert_from_gmt($dt, $timezone);
 
-    if (defined($abbrev)) {
+    if (!$err) {
         logger($self->{_debug}, "checkTZ abbrev-" . $abbrev ,1);
     } else {
         logger($self->{_debug}, "checkTZ abbrev-undefined" ,1);
+        $timezone = 'N/A';
     }
 
-    return $err;
-
+    return $timezone;
 }
 
 # Procedure getSnapshotTimeZone
@@ -366,30 +397,11 @@ sub getSnapshotTimeZone {
     chomp($ts);
     my @temp = split(',',$ts);
     my $ret = $temp[0];
-    if ($ret eq 'Etc/Zulu') {
-        $ret = 'Etc/GMT';
-    }
-
-    if ($ret eq 'Greenwich') {
-        $ret = 'GMT+00:00';
-    }
-
-    my $tz = new Date::Manip::TZ;
-
-    my @zone = ('Etc/GMT');
-    my ($err,$val) = $tz->define_offset('+0000', @zone);
-
-    logger($self->{debug}, "Setting GMT timezone err-" . $err );
-
-    @zone = ('Asia/Singapore');
-    ($err,$val) = $tz->define_offset('+0800', @zone);
-
-    logger($self->{debug}, "Setting SGT timezone err-" . $err );
 
     if (! ($ret =~ /[a-zA-Z]{3}.\d\d:\d\d/ )) {
-      if ($self->checkTZ($ret)) {
-        $ret = 'N/A';
-      }
+      # if timezone is not GMT+-00:00 format
+      # check if this format can be recognized and amended by checkTZ function
+      $ret = $self->checkTZ($ret);
     }
 
     return $ret;

test/test_snapshot/snapshot.t

@@ -46,7 +46,7 @@ local,Sources,Oracle dsource,\@2017-06-06T12:00:04.096Z,2017-06-06 07:59:59 EDT,
 local,Sources,Oracle dsource,\@2017-06-06T12:18:28.754Z,2017-06-06 08:18:29 EDT,2017-06-06 08:54:00 EDT
 local,Sources,Oracle dsource,\@2017-06-06T12:54:00.857Z,2017-06-06 08:54:00 EDT,2017-06-06 08:58:12 EDT
 local,Sources,PDB,\@2017-05-22T15:17:45.106Z,2017-05-22 11:17:44 EDT,2017-05-22 11:17:44 EDT
-local,Sources,racdba,\@2016-12-23T13:24:08.203Z,2016-12-23 13:23:44 GMT,2016-12-23 13:23:56 GMT
+local,Sources,racdba,\@2016-12-23T13:24:08.203Z,2016-12-23 13:23:44 UTC,2016-12-23 13:23:56 UTC
 local,Sources,singpdb,\@2017-03-17T12:23:34.209Z,2017-03-17 08:23:25 EDT,2017-03-17 08:24:01 EDT
 local,Sources,singpdb,\@2017-04-04T14:11:13.784Z,2017-04-04 10:11:12 EDT,2017-05-22 11:14:24 EDT
 local,Sources,singpdb,\@2017-05-22T15:14:25.413Z,2017-05-22 11:14:24 EDT,2017-05-22 11:17:44 EDT