Merge branch 'exclude' into develop

Author: Marcin Przepiorowski

bin/dx_ctl_dsource.pl

@@ -72,6 +72,7 @@
   'logsyncmode=s' => \(my $logsyncmode),
   'validatedsync=s' => \(my $validatedsync),
   'delphixmanaged=s' => \(my $delphixmanaged),
+  'exclude=s@' => \(my $exclude),
   'hadr=s' => \(my $hadr),
   'compression=s' => \($compression),
   'type=s' => \(my $type),
@@ -339,7 +340,7 @@
     }
     elsif ($type eq 'vFiles') {
       my $db = new AppDataVDB_obj($engine_obj,$debug);
-      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dsourcename,$group);
+      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dsourcename,$group, $exclude);
     }
     elsif ($type eq 'db2') {
       my $db = new DB2VDB_obj($engine_obj,$debug);
@@ -386,6 +387,7 @@ =head1 SYNOPSIS
   [-delphixmanaged yes/no ]
   [-dbusertype database|environment|domain]
   [-cdbcont container -cdbuser user -cdbpass password]
+  [-exclude path]
   [-debug ]
   [-version ]
   [-help|? ]
@@ -512,6 +514,9 @@ =head2 dSource arguments
 ex.
 hadrPrimarySVC:50001,hadrPrimaryHostname:marcindb2src.dcenter,hadrStandbySVC:50011,hadrTargetList:marcindb2src.dcenter:50001
 
+=item B<-exclude path>
+Exclude path for vFiles dSources
+
 
 =back
 
@@ -603,6 +608,14 @@ =head1 EXAMPLES
  Waiting for all actions to complete. Parent action is ACTION-1879
  Action completed with success
 
+
+Adding a vFiles dSource
+
+ dx_ctl_dsource -d test -action create -group "Untitled" -creategroup -dsourcename "vtest"  -type vFiles -sourcename "vtest" -sourceinst "Unstructured Files" \
+                -sourceenv "marcintgt" -source_os_user "delphix" -exclude "dir1/dir2" -exclude "dir3"
+ Waiting for all actions to complete. Parent action is ACTION-2919
+ Action completed with success
+
 Updating a backup path and validated sync mode for Sybase
 
  dx_ctl_dsource -d Landshark5 -action update -validatedsync ENABLED -backup_dir "/u02/sybase_back" -dsourcename pubs3

lib/AppDataVDB_obj.pm

@@ -134,10 +134,20 @@ sub getdSourceBackup
 
     my $osuser = $self->getOSUser();
 
+    my $exludes = $self->getExludelist();
+
     $restore_args = "dx_ctl_dsource$suffix -d $engine -action create -group \"$groupname\" -creategroup ";
     $restore_args = $restore_args . "-dsourcename \"$dbn\"  -type $vendor -sourcename \"$dbhostname\" ";
     $restore_args = $restore_args . "-sourceinst \"$rephome\" -sourceenv \"" . $self->getEnvironmentName() . "\" -source_os_user \"$osuser\" ";
 
+    if (scalar(@{$exludes}) > 0) {
+      $exclude_str = '';
+      for my $i (@{$exludes}) {
+          $exclude_str = $exclude_str . "-exclude \"" . $i . "\" ";
+      }
+      $restore_args = $restore_args . $exclude_str;
+    }
+
     $output->addLine(
       $restore_args
     );
@@ -374,6 +384,7 @@ sub createVDB {
 # - source_osuser - name of source OS user
 # - dsource_name - name of dsource in environment
 # - group - dsource  group
+# - exclude - exclude list
 # Start job to add AppData dSource
 # all above parameters are required. Additional parameters should by set by setXXXX procedures before this one is called
 # Return job number if provisioning has been started, otherwise return undef
@@ -386,6 +397,7 @@ sub addSource {
     my $source_osuser = shift;
     my $dsource_name = shift;
     my $group = shift;
+    my $exclude = shift;
 
 
     logger($self->{_debug}, "Entering AppDataVDB_obj::addSource",1);
@@ -412,7 +424,7 @@ sub addSource {
     }
 
     my @followarray;
-    my @excludes;
+    #my @excludes;
     my %dsource_params;
 
     if (version->parse($self->{_dlpxObject}->getApi()) < version->parse(1.8.0)) {
@@ -427,7 +439,7 @@ sub addSource {
           "source" => {
               "type" => "AppDataLinkedDirectSource",
               "config" => $config->{reference},
-              "excludes" => \@excludes,
+              "excludes" => $exclude,
               "followSymlinks" => \@followarray
           },
           "environmentUser" => $source_os_ref
@@ -446,7 +458,7 @@ sub addSource {
             "type" => "AppDataDirectLinkData",
             "config" => $config->{reference},
             "environmentUser" => $source_os_ref,
-            "excludes" => \@excludes,
+            "excludes" => $exclude,
             "followSymlinks" => \@followarray,
             "parameters" => {}
         }
@@ -461,7 +473,7 @@ sub addSource {
             "type" => "AppDataDirectLinkData",
             "config" => $config->{reference},
             "environmentUser" => $source_os_ref,
-            "excludes" => \@excludes,
+            "excludes" => $exclude,
             "followSymlinks" => \@followarray,
             "parameters" => {},
             "syncParameters" => {
@@ -502,6 +514,20 @@ sub setName {
 
 }
 
+
+# Procedure getExludelist
+# parameters: none
+# Return an array with combained list of excludes
+
+sub getExludelist
+{
+    my $self = shift;
+    logger($self->{_debug}, "Entering AppDataVDB_obj::getExludelist",1);
+    my $exludearray = $self->{source}->{excludes};
+    return $exludearray;
+}
+
+
 # Procedure getAdditionalMountpoints
 # parameters: none
 # Return an array with combained list of additional mount point env,path,sharedPath