mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 60d827f7 | patch | commit | ignore whitespace
mkeyes
30.55.2007 f192842a7b62b5cd828151998945b17fb2f226a9 
Converted the ACI functional test suites to use dsconfig to modify the global ACIs.
2 files deleted
11 files modified
474 ■■■■■ changed files
opends/tests/functional-tests/shared/data/aci/aci_reset_global_search.ldif 31 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/data/aci/aci_rm_global_search.ldif 31 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci.xml 1 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml 39 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml 38 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml 41 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml 39 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml 37 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_target.xml 45 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml 51 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml 37 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targetscope.xml 43 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml 41 ●●●●● patch | view | raw | blame | history 
 opends/tests/functional-tests/shared/data/aci/aci_reset_global_search.ldif


File was deleted




 opends/tests/functional-tests/shared/data/aci/aci_rm_global_search.ldif


File was deleted




 opends/tests/functional-tests/testcases/aci/aci.xml


@@ -39,6 +39,7 @@


    


          <script>


            CurrentTestPath['group']='aci'


            GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"


          </script>


      


          <call function="'testGroup_Preamble'"/>




 opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml


@@ -88,18 +88,15 @@


                   'ACI: Bind Types: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


            


                <message>


                   'ACI: Bind Types: Preamble - Adding Entries For Bind Types Tests'


                </message>


@@ -5607,20 +5604,16 @@


                   'ACI: Bind Types: Resetting Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


                </call>


                


              <call function="'testCase_Postamble'"/>


                <call function="'testCase_Postamble'"/>


  


            </sequence>


          </testcase>




 opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml


@@ -80,17 +80,13 @@


                   'ACI: Comparet: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


                


                <call function="'testCase_Postamble'"/>


@@ -1822,20 +1818,16 @@


                   'ACI: Compare: Resetting Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


                </call>


                


              <call function="'testCase_Postamble'"/>


                <call function="'testCase_Postamble'"/>


  


            </sequence>


          </testcase>




 opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml


@@ -79,18 +79,15 @@


                   'ACI: Effective Rights: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


            


                <script>


                    allow_aci='(targetcontrol=\"*\") (version 3.0; acl \"allow control access\"; allow(read) userdn=\"ldap:///anyone\";)'


                </script>


@@ -3062,20 +3059,16 @@


                   'ACI: Effective Rights: Preamble - putting back Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                </call>


    


                <call function="'testCase_Postamble'"/>


                


               <call function="'testCase_Postamble'"/>


    


              </sequence>


            </testcase>




 opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml


@@ -80,18 +80,15 @@


                   'ACI: Proxy Auth: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


            


                <script>


                    allow_aci='(targetcontrol=\"*\") (version 3.0; acl \"allow control access\"; allow(read) userdn=\"ldap:///anyone\";)'


                </script>


@@ -2671,20 +2668,16 @@


                   'ACI: Proxy Auth: Postamble - Resetting Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


                </call>


                


              <call function="'testCase_Postamble'"/>


                <call function="'testCase_Postamble'"/>


  


            </sequence>


          </testcase>




 opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml


@@ -82,18 +82,15 @@


                   'ACI: Targattrfilter: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


            


                <message>


                   'ACI: Targattrfilter: Preamble - user searching entry that will be targeted in future tests'


                </message>


@@ -1703,17 +1700,13 @@


                   'ACI: Targattrfilter: Resetting Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


                </call>


                


                <call function="'testCase_Postamble'"/>




 opends/tests/functional-tests/testcases/aci/aci_target.xml


@@ -82,19 +82,16 @@


                <message>


                   'ACI: Target: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


            


                <message>


                   'ACI: Target: Preamble - existing branch, user searching entry that will be targeted in future tests'


                </message>


@@ -4036,22 +4033,18 @@


                  <tcstatus result="'fail'"/>


              </if>


  


                <message>


              <message>


                   'ACI: Target: Resetting Search Global ACI'


                </message>


              </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                </call>


              <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


              </call>


                


              <call function="'testCase_Postamble'"/>


  




 opends/tests/functional-tests/testcases/aci/aci_targetattr.xml


@@ -76,22 +76,19 @@


          <testcase name="'ACI: Targetattr: Preamble'">


            <sequence>


              <call function="'testCase_Preamble'"/>


                <message>


              <message>


                   'ACI: Targetattr: Preamble - Removing Search Global ACI'


                </message>


              </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


              <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


              </call>


            


              <message>


                 'ACI: Targetattr: Preamble - existing branch, user searching entry that will be targeted in future tests'


              </message>


@@ -1583,23 +1580,19 @@


                  <tcstatus result="'fail'"/>


              </if>


  


                <message>


              <message>


                   'ACI: Targetattr: Postamble - Resetting Search Global ACI'


                </message>


              </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                </call>


                


              <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


              </call>


            


              <call function="'testCase_Postamble'"/>


  


            </sequence>




 opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml


@@ -80,18 +80,15 @@


                   'ACI: Targetfilter: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


            


                <message>


                   'ACI: Targetfilter: Preamble - user searching entry that will be targeted in future tests'


                </message>


@@ -3236,17 +3233,13 @@


                   'ACI: Targetfilter: Postamble - Resetting Search Global ACI'


              </message>


    


              <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


              </call>


    


              <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


              <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


              </call>


                


              <call function="'testCase_Postamble'"/>




 opends/tests/functional-tests/testcases/aci/aci_targetscope.xml


@@ -83,18 +83,15 @@


                   'ACI: Targetscope: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


            


                <message>


                   'ACI: Targetscope: Preamble - Adding Entries For Targetscope Tests'


                </message>


@@ -1154,20 +1151,16 @@


                   'ACI: Targetscope: Resetting Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                </call>


                


              <call function="'testCase_Postamble'"/>


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


               </call>


            


               <call function="'testCase_Postamble'"/>


  


            </sequence>


          </testcase>




 opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml


@@ -99,18 +99,15 @@


                   'ACI: Multiple ACIs: Preamble - Removing Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'remove' }


                </call>


    


                <if expr="RC != 0">


                    <tcstatus result="'fail'"/>


                </if>


    


            


                <message>


                   'ACI: Multiple ACIs: Preamble - user searching entry that will be targeted in future tests'


                </message>


@@ -4330,20 +4327,16 @@


                   'ACI: Multiple ACIs: Postamble - Resetting Search Global ACI'


                </message>


    


                <call function="'modifyEntry'">


                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,


                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }


                <call function="'modifyGlobalAci'">


                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,


                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,


                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,


                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,


                    'aciValue'               : GLOBAL_ACI_SEARCH ,


                    'opType'                 : 'add' }


                </call>


    


                <call function="'checktestRC'">


                    { 'returncode' : RC ,


                      'result'     : STAXResult }


                </call>


                


              <call function="'testCase_Postamble'"/>


            


                <call function="'testCase_Postamble'"/>


  


            </sequence>


          </testcase>