From f192842a7b62b5cd828151998945b17fb2f226a9 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Mon, 30 Jul 2007 19:55:54 +0000
Subject: [PATCH] Converted the ACI functional test suites to use dsconfig to modify the global ACIs.
---
/dev/null | 31 ---
opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml | 37 +--
opends/tests/functional-tests/testcases/aci/aci.xml | 1
opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml | 39 ++--
opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml | 41 ++---
opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml | 39 ++--
opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml | 38 +--
opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml | 37 +--
opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml | 41 ++---
opends/tests/functional-tests/testcases/aci/aci_target.xml | 45 ++---
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 51 ++---
opends/tests/functional-tests/testcases/aci/aci_targetscope.xml | 43 ++---
12 files changed, 171 insertions(+), 272 deletions(-)
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_reset_global_search.ldif b/opends/tests/functional-tests/shared/data/aci/aci_reset_global_search.ldif
deleted file mode 100644
index ae5986f..0000000
--- a/opends/tests/functional-tests/shared/data/aci/aci_reset_global_search.ldif
+++ /dev/null
@@ -1,31 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Access Control Handler,cn=config
-changetype: modify
-add: ds-cfg-global-aci
-ds-cfg-global-aci: (targetattr!="userPassword||authPassword")(version 3.0; acl "Anonymous read access"; allow (read,search,compare) userdn="ldap:///anyone";)
-
-
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rm_global_search.ldif b/opends/tests/functional-tests/shared/data/aci/aci_rm_global_search.ldif
deleted file mode 100644
index 7b98cf4..0000000
--- a/opends/tests/functional-tests/shared/data/aci/aci_rm_global_search.ldif
+++ /dev/null
@@ -1,31 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Access Control Handler,cn=config
-changetype: modify
-delete: ds-cfg-global-aci
-ds-cfg-global-aci: (targetattr!="userPassword||authPassword")(version 3.0; acl "Anonymous read access"; allow (read,search,compare) userdn="ldap:///anyone";)
-
-
diff --git a/opends/tests/functional-tests/testcases/aci/aci.xml b/opends/tests/functional-tests/testcases/aci/aci.xml
index a036787..5398f50 100755
--- a/opends/tests/functional-tests/testcases/aci/aci.xml
+++ b/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'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
index c5dab95..322d122 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/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>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
index 9a49689..1d017b1 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
+++ b/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>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml b/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
index 9a5ab25..de6da9b 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
+++ b/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>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml b/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
index 603fc4f..d2e449d 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
+++ b/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>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index fc34bc2..0b71918 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/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'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opends/tests/functional-tests/testcases/aci/aci_target.xml
index e422c56..285ffe0 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/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'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index fb740e1..1028da5 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/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>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
index 60f22f2..5cfb7db 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/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'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml b/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
index e186e13..84b9afe 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
+++ b/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>
diff --git a/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml b/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
index 468a017..55b674a 100644
--- a/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
+++ b/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>
--
Gitblit v1.10.0