regress: add DEDUP_CONFIG_FMT variable to select old or new config format

- define DEDUP_CONFIG_FMT in your "config" file or better on the command
  line like REGRESS_DEBUG
- values can be 1 or 2
  - 1 the dedupengine is defined in the Storage resource
  - 2 the dedupengine is defined in a separate resource and the
    dedupengine directive is added to all devices
    (like the Device Type = Dedup)

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 3f364d2c4cfe2e8f1ff2ce0dd8ffb119619c052e..d25b6c7b3cf9e9720820ac4ac3cf2b1bbd665111 100755 (executable)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -173,14 +173,25 @@ start_test()
       make -C build/src/plugins/fd install-test-dedup >/dev/null 2>&1
       make -C build/scripts install-btools >/dev/null 2>&1
       DEDUP_DRIVER=${DEDUP_DRIVER:-Legacy}
+      if [ "$DEDUP_DRIVER" = "Legacy" ] ; then
+         default_dedup_config_fmt="1"
+      else
+         default_dedup_config_fmt="2"
+      fi
+      DEDUP_CONFIG_FMT=${DEDUP_CONFIG_FMT:-$default_config_dedup_fmt}
       DEDUP_FS_OPTION=${DEDUP_FS_OPTION:-bothsides}
       mkdir ${working}/dde
       DEDUP_MAXIMUM_CONTAINER_SIZE=${DEDUP_MAXIMUM_CONTAINER_SIZE:-10MB}
       touch ${working}/dde/dde.conf # When dde.conf exists, DDE create a smaller Index
       $bperl -e 'add_attribute("$conf/bacula-sd.conf", "Plugin Directory", "$plugins", "Storage")'
       $bperl -e 'add_attribute("$conf/bacula-sd.conf", "Device Type", "Dedup", "Device")'
-      $bperl -e 'add_attribute("$conf/bacula-sd.conf", "Dedupengine", "Dedupengine1", "Device")'
-      cat >> $conf/bacula-sd.conf <<EOF
+      if [ "$DEDUP_CONFIG_FMT" = "1" ] ; then
+         $bperl -e 'add_attribute("$conf/bacula-sd.conf", "DedupDirectory", "${working}/dde", "Storage")'
+         $bperl -e 'add_attribute("$conf/bacula-sd.conf", "MaximumContainerSize", "'$DEDUP_MAXIMUM_CONTAINER_SIZE'", "Storage")'
+      else
+#         $bperl -e 'add_attribute("$conf/bacula-sd.conf", "Dedupengine", "Dedupengine1", "Device")'
+         $bperl -e 'add_attribute("$conf/bacula-sd.conf", "MaximumContainerSize", "'$DEDUP_MAXIMUM_CONTAINER_SIZE'", "Dedup")'
+         cat >> $conf/bacula-sd.conf <<EOF
 
 Dedupengine {
   Name = Dedupengine1
@@ -189,8 +200,8 @@ Dedupengine {
 }
 
 EOF
+      fi
       $bperl -e 'add_attribute("$conf/bacula-dir.conf", "Dedup", "'$DEDUP_FS_OPTION'", "Options")'
-      $bperl -e 'add_attribute("$conf/bacula-sd.conf", "MaximumContainerSize", "'$DEDUP_MAXIMUM_CONTAINER_SIZE'", "Dedup")'
       DEDUP_FD_CACHE=${DEDUP_FD_CACHE:-no}
       if [ x$DEDUP_FD_CACHE = xyes ]; then
             $bperl -e 'add_attribute("$conf/bacula-fd.conf", "DedupIndexDirectory", "$working/ddefd", "FileDaemon")'