added the default backend where needed, added a test "Fractional Include Br...

tdj_tx

06.52.2007 1a43fbb6b00b288fc894af5da38c1b63cd54b8c1

added the default backend where needed, added a test "Fractional Include Branch with backend ID".
The behavior now is to allow include branch with and without a backend id. Also replaced importLdif
with importLdifWithScript when using multiple branches, attributes, and filters.

 opends/tests/functional-tests/testcases/backends/import.xml

@@ -81,7 +81,8 @@
    
              <call function="'ImportLdifWithScript'">
                { 'location'    : STAF_REMOTE_HOSTNAME ,
                  'dsLdifFile'  : '%s/backends/Example.ldif' % logsRemoteDataDir }
                  'dsLdifFile'  : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'dsBackEnd'   : 'userRoot'}
              </call>
    
              <call function="'checktestRC'">
@@ -160,7 +161,51 @@
              <call function="'ImportLdifWithScript'">
                { 'location'        : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'      : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'dsIncludeBranch' : 'dc=com' }
                  'dsIncludeBranch' : ['dc=com'] }
              </call>
    
              <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
              </call>
    
              <call function="'checkImport'">
                { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
                                       'uid=dmiller, ou=People, dc=example,dc=com',
                                       'uid=rhunt, ou=People, dc=example,dc=com'] }
              </call>
              
              <call function="'testCase_Postamble'"/>
    
            </sequence>
    
          </testcase>
              
          <!--- Test Case information
          #@TestMarker          Backend Import Tests
          #@TestName            Backend: Import: Fractional Include Branch with backend ID
          #@TestID              Fractional Include Branch
          #@TestPurpose         Verify an import of a LDIF file specifying a branch that should be included in the import
                                along with the backendID.
                                
          #@TestPreamble
          #@TestSteps
          #@TestPostamble
          #@TestResult
          -->
    
          <testcase name="'Backend: Import: Fractional Include Branch with backend ID'">
    
            <sequence>
    
              <call function="'testCase_Preamble'"/>

              <call function="'ImportLdifWithScript'">
                { 'location'        : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'      : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'dsIncludeBranch' : ['dc=com'],
                  'dsBackEnd'       : 'userRoot' 
                }
              </call>
    
              <call function="'checktestRC'">
@@ -197,9 +242,10 @@
    
              <call function="'testCase_Preamble'"/>
                  
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'extraParams' : '-b "dc=com" -b "dc=example,dc=com"'
              <call function="'ImportLdifWithScript'">
                { 'location'        : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'      : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'dsIncludeBranch' : ['dc=com','dc=example,dc=com']
                }
              </call>
    
@@ -237,9 +283,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-B "ou=Departed,ou=People,dc=example,dc=com"'
              <call function="'ImportLdifWithScript'">
                { 'location'        : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'      : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
                  'dsBackEnd'       : 'userRoot'
                }
              </call>
    
@@ -280,9 +328,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-B "ou=Departed,ou=People,dc=example,dc=com"'
              <call function="'ImportLdifWithScript'">
                { 'location'        : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'      : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
                  'dsBackEnd'       : 'userRoot'
                }
              </call>
    
@@ -323,9 +373,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-b dc=com -B "ou=Departed,ou=People,dc=example,dc=com"'
              <call function="'ImportLdifWithScript'">
                  { 'location'        : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'      : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsIncludeBranch' : ['dc=com'],
                  'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com']
                }
              </call>
    
@@ -366,9 +418,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'extraParams' : '-i dc'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'dsIncludeAttribute' : ['dc'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -406,9 +460,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'extraParams' : '-i dc -i cn -i ou -i sn'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'dsIncludeAttribute' : ['dc','cn','ou','sn'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -447,9 +503,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-e userpassword'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsExcludeAttribute' : ['userpassword'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -487,9 +545,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-e userpassword -e mail -e roomnumber'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsExcludeAttribute' : ['userpassword','mail','roomnumber'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -527,9 +587,12 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'extraParams' : '-i dc -i cn -i ou -i sn -b "dc=com" -b "dc=example,dc=com" -b "ou=People,dc=example,dc=com" -B "ou=Departed,ou=People,dc=example,dc=com"'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'dsIncludeAttribute' : ['dc','cn','ou','sn'],
                  'dsIncludeBranch'    : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
                  'dsExcludeBranch'    : ['ou=Departed,ou=People,dc=example,dc=com']
                }
              </call>
    
@@ -570,9 +633,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'extraParams' : '-I "objectclass=*'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'dsIncludeFilter'    : ['objectclass=*'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -611,9 +676,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-E "objectclass=person"'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsExcludeFilter'    : ['objectclass=person'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -654,9 +721,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'extraParams' : '-I "objectclass=domain" -I "objectclass=organizationalunit"'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'dsIncludeFilter'    : ['objectclass=domain','objectclass=organizationalunit'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -697,9 +766,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-E "objectclass=person" -E "objectclass=organizationalunit"'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsExcludeFilter'    : ['objectclass=person','objectclass=organizationalunit'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -737,9 +808,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'extraParams' : '-I "|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)"'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Include.ldif' % logsRemoteDataDir,
                  'dsIncludeFilter'    : ['|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -778,9 +851,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-E "&amp;(objectclass=person)(ou=Departed)"'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsExcludeFilter'    : ['&amp;(objectclass=person)(ou=Departed)'],
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -818,9 +893,12 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'extraParams' : '-E "&amp;(objectclass=person)(ou=Departed)" -b "dc=com" -e userpassword'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
                  'dsExcludeFilter'    : ['&amp;(objectclass=person)(ou=Departed)'],
                  'dsIncludeBranch'    : ['dc=com'],
                  'dsExcludeAttribute' : ['userpassword']
                }
              </call>
    
@@ -858,9 +936,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Append.ldif' % logsRemoteDataDir,
                  'extraParams' : '-a'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Append.ldif' % logsRemoteDataDir,
                  'dsAppend'           : 'TRUE',
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -899,9 +979,12 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Append.ldif' % logsRemoteDataDir,
                  'extraParams' : '-a -r'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Append.ldif' % logsRemoteDataDir,
                  'dsAppend'           : 'TRUE',
                  'dsReplaceExisting'  : 'TRUE',
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -940,9 +1023,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Example.ldif.gz' % logsRemoteDataDir,
                  'extraParams' : '-c'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Example.ldif.gz' % logsRemoteDataDir,
                  'dsIsCompressed'     : 'TRUE',
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -981,9 +1066,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'extraParams' : '-y'
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'dsIsEncrypted'      : 'TRUE',
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -1041,9 +1128,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'extraParams' : '-R %s/rejects.txt' % TMPDIR
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'dsRejectFile'       : '%s/rejects.txt' % TMPDIR,
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -1082,9 +1171,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'extraParams' : '-R %s/rejects.txt -O' % TMPDIR
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Example.ldif' % logsRemoteDataDir,
                  'dsRejectFile'       : '%s/rejects.txt' % TMPDIR,
                  'dsBackEnd'          : 'userRoot'
                }
              </call>
    
@@ -1123,9 +1214,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Schema.ldif' % logsRemoteDataDir,
                  'extraParams' : '-S'
              <call function="'ImportLdifWithScript'">
                  { 'location'             : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'             : '%s/backends/Schema.ldif' % logsRemoteDataDir,
                  'dsSkipSchemaValidation' : 'TRUE',
                  'dsBackEnd'              : 'userRoot'
                }
              </call>
    
@@ -1164,8 +1257,11 @@
    
              <call function="'testCase_Preamble'"/>
    
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/Schema.ldif' % logsRemoteDataDir }
              <call function="'ImportLdifWithScript'">
                  { 'location'         : STAF_REMOTE_HOSTNAME,
                  'dsLdifFile'         : '%s/backends/Schema.ldif' % logsRemoteDataDir,
                  'dsBackEnd'          : 'userRoot'
                  }
              </call>
    
              <call function="'checktestRC'">