Fix for filemapping issue #50

Marcin Przepiorowski · Marcin Przepiorowski · commit 0f67b202b04d · 2018-06-29T13:01:28.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.3.6
+
+### Changed
+- fix for file mapping API changes in 5.2 
+
+
 ## 2.3.6-rc2
 
 ### Added
diff --git a/bin/dx_v2p.pl b/bin/dx_v2p.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.
@@ -45,15 +45,15 @@
 my $timestamp = 'LATEST_SNAPSHOT';
 
 GetOptions(
-  'help|?' => \(my $help), 
-  'd|engine=s' => \(my $dx_host), 
+  'help|?' => \(my $help),
+  'd|engine=s' => \(my $dx_host),
   'sourcename=s' => \(my $sourcename),
-  'srcgroup=s' => \(my $srcgroup),  
-  'dbname=s'  => \(my $dbname), 
-  'instname=s'  => \(my $instname), 
-  'uniqname=s'  => \(my $uniqname), 
-  'environment=s' => \(my $environment), 
-  'type=s' => \(my $type),  
+  'srcgroup=s' => \(my $srcgroup),
+  'dbname=s'  => \(my $dbname),
+  'instname=s'  => \(my $instname),
+  'uniqname=s'  => \(my $uniqname),
+  'environment=s' => \(my $environment),
+  'type=s' => \(my $type),
   'envinst=s' => \(my $envinst),
   'template=s' => \(my $template),
   'mapfile=s' =>\(my $map_file),
@@ -71,7 +71,7 @@
   'dspusecompression' => \(my $dspusecompression),
   'dspuseencryption' => \(my $dspuseencryption),
   'dever=s' => \(my $dever),
-  'debug:n' => \(my $debug), 
+  'debug:n' => \(my $debug),
   'all' => (\my $all),
   'version' => \(my $print_version),
   'configfile|c=s' => \(my $config_file)
@@ -80,7 +80,7 @@
 
 
 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);
@@ -109,12 +109,12 @@
 if ( ( ( $type eq 'oracle') || ( $type eq 'mssql') ) && (! defined($targetDirectory)) ) {
   print "Option targetDirectory is required. \n";
   pod2usage(-verbose => 1,  -input=>\*DATA);
-  exit (1);  
+  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); 
+my $engine_list = Toolkit_helpers::get_engine_list($all, $dx_host, $engine_obj);
 
 my $ret = 0;
 
@@ -150,7 +150,7 @@
   }
 
   my $source = ($databases->getDB($source_ref->[0]));
-  
+
 
   # create a new DB object
   if ( $type eq 'oracle' ) {
@@ -186,13 +186,13 @@
       if ( $db->setTemplate($template) ) {
         print  "Template $template not found. V2P process won't be created\n";
         exit(1);
-      }  
+      }
     }
 
     if ( defined($map_file) ) {
       my $filemap_obj = new FileMap($engine_obj,$debug);
       $filemap_obj->loadMapFile($map_file);
-      $filemap_obj->setSource($sourcename);
+      $filemap_obj->setSource($source);
       if ($filemap_obj->validate()) {
         die ("Problem with mapping file. V2P process won't be created.")
       }
@@ -215,28 +215,28 @@
     $db->setDSP($dspconnections, $dspusecompression, $dspuseencryption);
     $jobno = $db->v2pSI($environment,$envinst);
 
-  } 
+  }
   elsif ($type eq 'mssql') {
 
     if ( $db->setFileSystemLayout($targetDirectory,$archiveDirectory,$dataDirectory,$externalDirectory,$scriptDirectory,$tempDirectory) ) {
       print "Problem with export file system layout. Is targetDiretory and dataDirectory set ?\n";
       exit(1);
     }
-    
+
     if (defined($norecovery)) {
       $db->setNoRecovery();
     }
     $jobno = $db->v2p($environment,$envinst);
-  } 
+  }
   elsif ($type eq 'sybase') {
     if (defined($norecovery)) {
       $db->setNoRecovery();
     }
     $jobno = $db->v2p($environment,$envinst);
-  } 
+  }
 
   $ret = $ret + Toolkit_helpers::waitForJob($engine_obj, $jobno, "V2P finished.","Problem with V2P process");
-  
+
 }
 
 
@@ -247,28 +247,28 @@
 =head1 SYNOPSIS
 
  dx_v2p   [ -engine|d <delphix identifier> | -all ] [ -configfile file ]
-            -sourcename src_name  
-            -dbname db_name 
-            -environment environment_name 
-            -type oracle|mssql|sybase 
+            -sourcename src_name
+            -dbname db_name
+            -environment environment_name
+            -type oracle|mssql|sybase
             -envinst OracleHome/MSSQLinstance/SybaseInstance
-          [ -targetDirectory target_directory ] 
+          [ -targetDirectory target_directory ]
           [ -timestamp LATEST_SNAPSHOT|LATEST_POINT|time_stamp ]
-          [ -template template_name ] 
-          [ -mapfile mapping_file ]  
+          [ -template template_name ]
+          [ -mapfile mapping_file ]
           [ -norecovery ]
           [ -noopen ]
-          [ -instname SID ] 
-          [ -uniqname db_unique_name ] 
-          [ -archiveDirectory arch_directory ] 
+          [ -instname SID ]
+          [ -uniqname db_unique_name ]
+          [ -archiveDirectory arch_directory ]
           [ -dataDirectory data_dir ]
-          [ -externalDirectory external_dir ] 
+          [ -externalDirectory external_dir ]
           [ -tempDirectory temp_dir ]
           [ -dspconnections=n ]
           [ -dspusecompression ]
           [ -dspuseencryption ]
           [ -concurrentfiles=n ]
-          [ -help] 
+          [ -help]
           [ -debug]
 
 
@@ -373,7 +373,7 @@ =head1 OPTIONS
 
 =over 2
 
-=item B<-help>          
+=item B<-help>
 Print this screen
 
 =item B<-debug>
@@ -383,10 +383,10 @@ =head1 OPTIONS
 
 =head1 EXAMPLES
 
-Oracle V2P process 
+Oracle V2P process
 
  dx_v2p -d Landshark -sourcename testdx -dbname v2p -environment LINUXTARGET -type oracle -envinst "/u01/app/oracle/product/11.2.0/dbhome_1" -targetDirectory /data/u02/v2p
- Starting provisioning job - JOB-231 
+ Starting provisioning job - JOB-231
  0 - 2 - 3 - 5 - 6 - 7 - 8 - 9 - 10 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 25 - 26 - 27 - 28 - 29 - 30 - 31 - 32 - 33 - 34 - 35 - 36 - 37 - 38 - 39 - 40 - 41 - 42 - 43 - 44 - 46 - 47 - 49 - 50 - 51 - 52 - 54 - 55 - 56 - 57 - 58 - 59 - 60 - 61 - 62 - 63 - 64 - 65 - 66 - 67 - 68 - 69 - 70 - 71 - 72 - 73 - 74 - 75 - 76 - 77 - 78 - 79 - 80 - 81 - 82 - 83 - 84 - 85 - 86 - 87 - 88 - 89 - 90 - 92 - 93 - 94 - 95 - 96 - 97 - 98 - 99 - 100
  Job JOB-231 finised with state: COMPLETED
  V2P job finished with COMPLETED status.
@@ -408,5 +408,3 @@ =head1 EXAMPLES
  V2P finished..
 
 =cut
-
-
diff --git a/lib/FileMap.pm b/lib/FileMap.pm
@@ -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.
@@ -30,7 +30,7 @@ use JSON;
 use Toolkit_helpers qw (logger);
 
 # constructor
-# parameters 
+# parameters
 # - dlpxObject - connection to DE
 # - debug - debug flag (debug on if defined)
 
@@ -39,29 +39,29 @@ sub new {
     my $dlpxObject = shift;
     my $debug = shift;
     logger($debug, "Entering FileMap::constructor",1);
-    
+
     my %hosts;
     my $self = {
         _hosts => \%hosts,
         _dlpxObject => $dlpxObject,
         _debug => $debug
     };
-    
+
     bless($self,$classname);
-    
+
     return $self;
 }
 
 # Procedure setMapFile
-# parameters: 
+# parameters:
 # - mapfile - hash with map file
 # Set a map file rules for object
 
 sub setMapFile {
     my $self = shift;
     my $mapfile = shift;
-    
-    logger($self->{_debug}, "Entering FileMap::setMapFile",1);  
+
+    logger($self->{_debug}, "Entering FileMap::setMapFile",1);
 
     $self->{_mapping_rule_hash} = $mapfile;
 
@@ -71,7 +71,7 @@ sub setMapFile {
         if ($mapping_rule_de eq '') {
             $mapping_rule_de = $key . ":" . $value;
         } else {
-            $mapping_rule_de = $mapping_rule_de . "\n" . $key . ":" . $value;      
+            $mapping_rule_de = $mapping_rule_de . "\n" . $key . ":" . $value;
         }
     }
 
@@ -80,7 +80,7 @@ sub setMapFile {
 }
 
 # Procedure loadMapFile
-# parameters: 
+# parameters:
 # - file - name of files with rules (format orig:replace, each rule in separated line)
 # Set a map file rules for object
 
@@ -89,7 +89,7 @@ sub loadMapFile {
     my $file = shift;
     my %map_hash;
 
-    logger($self->{_debug}, "Entering FileMap::loadMapFile",1);  
+    logger($self->{_debug}, "Entering FileMap::loadMapFile",1);
 
     open (my $FD, $file) or die ("Can't open file $file : $!");
 
@@ -109,7 +109,7 @@ sub loadMapFile {
         }
 
         $map_hash{$line_split[0]} = $line_split[1];
-        
+
     }
 
     close $FD;
@@ -120,20 +120,16 @@ sub loadMapFile {
 
 
 # Procedure setSource
-# parameters: 
+# parameters:
 # - source - name of source db
 # Set a reference for a source db
 
 sub setSource {
     my $self = shift;
     my $source = shift;
-    
-    logger($self->{_debug}, "Entering FileMap::setSource",1);  
-
-    my $sources = new Source_obj($self->{_dlpxObject}, $self->{_debug});
-    my $sourceitem = $sources->getSourceByName($source);
 
-    $self->{_source_ref} = $sourceitem->{container};
+    logger($self->{_debug}, "Entering FileMap::setSource",1);
+    $self->{_source_ref} = $source->{container}->{reference};
 }
 
 # Procedure validate
@@ -144,12 +140,24 @@ sub setSource {
 sub validate {
     my $self = shift;
     my %fileMapping_request;
-    logger($self->{_debug}, "Entering FileMap::validate",1);  
+    logger($self->{_debug}, "Entering FileMap::validate",1);
 
-    $fileMapping_request{"type"} = "FileMappingParameters";
-    $fileMapping_request{"mappingRules"} = $self->{_mapping_rule};
-    $fileMapping_request{"timeflowPointParameters"}{"type"} = "TimeflowPointSemantic";
-    $fileMapping_request{"timeflowPointParameters"}{"container"} = $self->{_source_ref};
+    if ($self->{_dlpxObject}->getApi() lt '1.9.0' ) {
+      $fileMapping_request{"type"} = "FileMappingParameters";
+      $fileMapping_request{"mappingRules"} = $self->{_mapping_rule};
+      $fileMapping_request{"timeflowPointParameters"}{"type"} = "TimeflowPointSemantic";
+      $fileMapping_request{"timeflowPointParameters"}{"container"} = $self->{_source_ref};
+    } else {
+      $fileMapping_request{"type"} = "FileMappingParameters";
+      $fileMapping_request{"mappingRules"} = $self->{_mapping_rule};
+      my %timeflowhash = (
+        "type"=>"TimeflowPointSemantic",
+        "container" => $self->{_source_ref},
+        "location" => "LATEST_POINT"
+      );
+      my @timeflowarray = (\%timeflowhash);
+      $fileMapping_request{"timeflowPointParameters"} = \@timeflowarray;
+    }
 
     my $json_data = to_json(\%fileMapping_request);
 
@@ -173,7 +181,7 @@ sub validate {
 
 sub GetMapping_rule {
     my $self = shift;
-    logger($self->{_debug}, "Entering FileMap::GetMapping_rule",1);  
+    logger($self->{_debug}, "Entering FileMap::GetMapping_rule",1);
     return $self->{_mapping_rule};
 }
 
@@ -183,8 +191,8 @@ sub GetMapping_rule {
 
 sub GetMappedFiles {
     my $self = shift;
-    logger($self->{_debug}, "Entering FileMap::GetMappedFiles",1);  
+    logger($self->{_debug}, "Entering FileMap::GetMappedFiles",1);
     return $self->{mappedFiles};
 }
 
-1;
+1;
