From 14bbd223c6e6ac09bb2f948ec0f2b4b7255ba730 Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Fri, 11 Jan 2008 08:24:12 +0000
Subject: [PATCH] fix dsconfig interface 's changes

---
 opends/tests/functional-tests/testcases/plugins/plugins_entryUUID.xml |   96 +++++++++---------
 opends/tests/functional-tests/testcases/plugins/plugins_refint.xml    |  204 +++++++++++++++++++++-------------------
 2 files changed, 154 insertions(+), 146 deletions(-)

diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_entryUUID.xml b/opends/tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
index e8854fe..7331409 100755
--- a/opends/tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
+++ b/opends/tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
@@ -37,16 +37,16 @@
 
                         
 <!---
-#@TestMarker          Plugin entryUUID
-#@TestName            Plugin entryUUID
+#@TestMarker            Plugin entryUUID
+#@TestName              Plugin entryUUID
 #@TestIssue             Check the plugin entryUUID
-#@TestPreamble       none
+#@TestPreamble          none
 #@TestStep              Enable the plugin entryUUID
 #@TestStep              Disable  the virtual attribute entryUUID
 #@TestStep              Add an entry
 #@TestStep              Execute ldapsearch request to get entryUUID attribute
-#@TestPostamble     none
-#@TestResult           The test is passed if the attribute entryUUID is returned
+#@TestPostamble         none
+#@TestResult            The test is passed if the attribute entryUUID is returned
 -->  
     
  <testcase name="getTestCaseName('Plugins entryUUID setup')">
@@ -55,14 +55,14 @@
 
     <message>'-- Disable the virtual attribute entryUUID --'</message>   
     <call function="'dsconfig'">
-      { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST,
+      { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
         'dsInstancePort'       : DIRECTORY_INSTANCE_PORT ,
         'dsInstanceDn'         : DIRECTORY_INSTANCE_DN ,
-        'dsInstancePswd'     : DIRECTORY_INSTANCE_PSWD ,
-        'subcommand'         : 'set-virtual-attribute-prop' ,
-        'objectType'            : 'attribute-name',
+        'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD ,
+        'subcommand'           : 'set-virtual-attribute-prop' ,
+        'objectType'           : 'name',
         'objectName'           : 'entryUUID',
-        'optionsString'         : '--set enabled:false',
+        'optionsString'        : '--set enabled:false',
         'expectedRC'           : 0 } 
     </call>    
     
@@ -72,16 +72,16 @@
   
                         
 <!---
-#@TestMarker          Plugin entryUUID
-#@TestName            Plugin entryUUID
+#@TestMarker            Plugin entryUUID
+#@TestName              Plugin entryUUID
 #@TestIssue             Check the plugin entryUUID
-#@TestPreamble       none
+#@TestPreamble          none
 #@TestStep              Enable the plugin entryUUID
 #@TestStep              Disable  the virtual attribute entryUUID
 #@TestStep              Add an entry
 #@TestStep              Execute ldapsearch request to get entryUUID attribute
-#@TestPostamble     none
-#@TestResult           The test is passed if the attribute entryUUID is returned
+#@TestPostamble         none
+#@TestResult            The test is passed if the attribute entryUUID is returned
 -->  
     
  <testcase name="getTestCaseName('Plugins entryUUID enable')">
@@ -93,11 +93,11 @@
       { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
         'dsInstancePort'       : DIRECTORY_INSTANCE_PORT ,
         'dsInstanceDn'         : DIRECTORY_INSTANCE_DN ,
-        'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD ,
-        'subcommand'          : 'set-plugin-prop' ,
-        'objectType'             : 'plugin-name' ,
-        'objectName'            : 'Entry UUID',
-        'optionsString'          : '--set enabled:true',
+        'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD ,
+        'subcommand'           : 'set-plugin-prop' ,
+        'objectType'           : 'plugin-name' ,
+        'objectName'           : 'Entry UUID',
+        'optionsString'        : '--set enabled:true',
         'expectedRC'           : 0 } 
     </call>	
 
@@ -115,7 +115,7 @@
       listAttr.append('cn:testuser_entryuuid')
       listAttr.append('mail:testuser_entryuuid')      
     </script>
-	 
+       
     
     <call function="'addAnEntry'">
       { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
@@ -135,11 +135,11 @@
      { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
         'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
         'dsInstanceDn'     : DIRECTORY_INSTANCE_DN,
-        'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,	
-        'dsBaseDN'        : 'uid=testuser_entryuuid,%s' % DIRECTORY_INSTANCE_SFX,
-        'dsFilter'            : 'objectclass=*'	,
+        'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,	
+        'dsBaseDN'         : 'uid=testuser_entryuuid,%s' % DIRECTORY_INSTANCE_SFX,
+        'dsFilter'         : 'objectclass=*'	,
         'dsScope'          : 'base',		
-        'attributes'	      : 'entryUUID',
+        'attributes'	   : 'entryUUID',
         'expectedRC'	    :  0 }
     </call>  		
 
@@ -169,29 +169,29 @@
     <message>'-- Disable the entryUUID plugin --'</message>   
     <call function="'dsconfig'">
       { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
-        'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-        'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
+        'dsInstancePort'       : DIRECTORY_INSTANCE_PORT ,
+        'dsInstanceDn'         : DIRECTORY_INSTANCE_DN ,
         'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD ,
         'subcommand'           : 'set-plugin-prop' ,
-        'objectType'              : 'plugin-name' ,
-        'objectName'             : 'Entry UUID',
-        'optionsString'           : '--set enabled:false',
-        'expectedRC'             : 0 } 
+        'objectType'           : 'plugin-name' ,
+        'objectName'           : 'Entry UUID',
+        'optionsString'        : '--set enabled:false',
+        'expectedRC'           : 0 } 
     </call>
     <call function="'testCase_Postamble'"/>
   </sequence>
  </testcase>
 
 <!---
-#@TestMarker          Plugin entryUUID
-#@TestName            Plugin entryUUID
+#@TestMarker            Plugin entryUUID
+#@TestName              Plugin entryUUID
 #@TestIssue             Check the plugin entryUUID
-#@TestPreamble       none
+#@TestPreamble          none
 #@TestStep              Disable the plugin entryUUID
 #@TestStep              Disable  the virtual attribute entryUUID
 #@TestStep              Add an entry
 #@TestStep              Execute ldapsearch request to get entryUUID attribute
-#@TestPostamble     none
+#@TestPostamble         none
 #@TestResult           The test is passed if the attribute entryUUID is not returned
 -->  
     
@@ -205,11 +205,11 @@
       { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
         'dsInstancePort'       : DIRECTORY_INSTANCE_PORT ,
         'dsInstanceDn'         : DIRECTORY_INSTANCE_DN ,
-        'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD ,
-        'subcommand'          : 'set-plugin-prop' ,
-        'objectType'             : 'plugin-name' ,
-        'objectName'            : 'Entry UUID',
-        'optionsString'          : '--set enabled:false',
+        'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD ,
+        'subcommand'           : 'set-plugin-prop' ,
+        'objectType'           : 'plugin-name' ,
+        'objectName'           : 'Entry UUID',
+        'optionsString'        : '--set enabled:false',
         'expectedRC'           : 0 } 
     </call>	
 
@@ -242,15 +242,15 @@
     <!-- The plugin is disabled. the attribute entryUUID should not be returned -->
     <message>'######  Check the plugin entryUUID ###### '</message>     
     <call function="'SearchObject'">
-     { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
+     { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST ,
           'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
           'dsInstanceDn'     : DIRECTORY_INSTANCE_DN,
-          'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,	
-          'dsBaseDN'        : 'uid=testuser_entryuuid,%s' % DIRECTORY_INSTANCE_SFX,
-          'dsFilter'            : 'objectclass=*'	,
+          'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,	
+          'dsBaseDN'         : 'uid=testuser_entryuuid,%s' % DIRECTORY_INSTANCE_SFX,
+          'dsFilter'         : 'objectclass=*'	,
           'dsScope'          : 'base',		
-          'attributes'	      : 'entryUUID',
-          'expectedRC'	    :  0 }
+          'attributes'	     : 'entryUUID',
+          'expectedRC'	     :  0 }
     </call>  		
  
     <script>
@@ -259,13 +259,13 @@
     <call function="'searchStringForSubstring'">
       { 'returnString'	   : returnString ,
          'testString'	   : 'entryUUID',
-         'expectedResult'	   : '0' }
+         'expectedResult'  : '0' }
     </call>    
    
     <message>'######  Cleanup ###### '</message>         
     <message>'-- Delete the test entry --'</message>
     <call function="'DeleteEntry'">
-     { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+     { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST ,
         'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
         'dsInstanceDn'	   : DIRECTORY_INSTANCE_DN ,
         'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_refint.xml b/opends/tests/functional-tests/testcases/plugins/plugins_refint.xml
index 565deea..4ef5ff1 100755
--- a/opends/tests/functional-tests/testcases/plugins/plugins_refint.xml
+++ b/opends/tests/functional-tests/testcases/plugins/plugins_refint.xml
@@ -74,12 +74,12 @@
 
          <call function="'addAnEntry'">    
          { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
-            'dsInstancePort'     : DIRECTORY_INSTANCE_PORT ,
-            'dsInstanceDn'	      : DIRECTORY_INSTANCE_DN ,
+            'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
+            'dsInstanceDn'      : DIRECTORY_INSTANCE_DN ,
             'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD ,	
-            'DNToAdd'             : 'cn=%s,%s' % (username,DIRECTORY_INSTANCE_SFX),
-            'listAttributes'        : listAttr,
-            'expectedRC'         :  0
+            'DNToAdd'           : 'cn=%s,%s' % (username,DIRECTORY_INSTANCE_SFX),
+            'listAttributes'    : listAttr,
+            'expectedRC'        :  0
           }
          </call>                      
       </sequence>
@@ -165,12 +165,12 @@
     <!-- Check the group configuration -->
     <call function="'SearchObject'">
      { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
-          'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-          'dsInstanceDn'     : DIRECTORY_INSTANCE_DN,
-          'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,	
+          'dsInstancePort'  : DIRECTORY_INSTANCE_PORT ,
+          'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
+          'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD ,	
           'dsBaseDN'        :  'cn=my_staticgroup1,%s' % DIRECTORY_INSTANCE_SFX,
-          'dsFilter'            : 'objectclass=groupOfUniqueNames'	,
-          'attributes'        : 'uniqueMember',
+          'dsFilter'        : 'objectclass=groupOfUniqueNames'	,
+          'attributes'      : 'uniqueMember',
           'expectedRC'	    :  0 }
     </call>  		
 
@@ -184,16 +184,16 @@
          'expectedResult'	   : '1' }
     </call>                
     
- <!-- Check the group configuration -->
+   <!-- Check the group configuration -->
     <call function="'SearchObject'">
-     { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
-          'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-          'dsInstanceDn'     : DIRECTORY_INSTANCE_DN,
-          'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,	
-          'dsBaseDN'        :  'cn=my_staticgroup,dc=groups,%s' % DIRECTORY_INSTANCE_SFX,
-          'dsFilter'            : 'objectclass=groupOfUniqueNames'	,
+     { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST ,
+          'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
+          'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
+          'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD ,	
+          'dsBaseDN'          :  'cn=my_staticgroup,dc=groups,%s' % DIRECTORY_INSTANCE_SFX,
+          'dsFilter'          : 'objectclass=groupOfUniqueNames'	,
           'attributes'        : 'uniqueMember',
-          'expectedRC'	    :  0 }
+          'expectedRC'	      :  0 }
     </call>  		
 
 
@@ -203,7 +203,7 @@
     <call function="'searchStringForSubstring'">
       { 'returnString'	   : returnString ,
          'testString'	   : 'uniqueMember',
-         'expectedResult'	   : '1' }
+         'expectedResult'  : '1' }
     </call>                
         
     
@@ -228,13 +228,13 @@
           
          
 <!--
-#@TestMarker       Plugin referential integrity
-#@TestName         Referential integrity check on group after a change of base DN
-#@TestPreamble    none
+#@TestMarker         Plugin referential integrity
+#@TestName           Referential integrity check on group after a change of base DN
+#@TestPreamble       none
 #@TestStep           Check change of the base-dn  attribute is dynamic
 #@TestStep           Delete the user06
 #@TestStep           Check that the references to the deleted user are still present
-#@TestPostamble    none
+#@TestPostamble      none
 #@TestResult         all steps must be success
 -->  
     
@@ -275,11 +275,11 @@
     <message>' '</message>
 
     <call function="'DeleteEntry'">
-     { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST ,
+     { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
         'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
-        'dsInstanceDn'	      : DIRECTORY_INSTANCE_DN ,
-        'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-        'dsBaseDN'	          :  'cn=user06,%s' % (DIRECTORY_INSTANCE_SFX),
+        'dsInstanceDn'	    : DIRECTORY_INSTANCE_DN ,
+        'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD ,
+        'dsBaseDN'          :  'cn=user06,%s' % (DIRECTORY_INSTANCE_SFX),
       }
     </call>   
     
@@ -354,13 +354,13 @@
                        
                           
 <!--
-#@TestMarker       Plugin referential integrity
-#@TestName         Referential integrity check on GROUPS
-#@TestPreamble    none
+#@TestMarker         Plugin referential integrity
+#@TestName           Referential integrity check on GROUPS
+#@TestPreamble       none
 #@TestStep           Delete a user
 #@TestStep           Check that the references to the deleted user are gone.
 #@TestStep           Check that the references to an existing user are still present.
-#@TestPostamble    none
+#@TestPostamble      none
 #@TestResult         all steps must be success
 -->  
     
@@ -376,23 +376,23 @@
 
     <call function="'DeleteEntry'">
      { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST ,
-        'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
-        'dsInstanceDn'	      : DIRECTORY_INSTANCE_DN ,
+        'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
+        'dsInstanceDn'	   : DIRECTORY_INSTANCE_DN ,
         'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-        'dsBaseDN'	          :  'cn=user01,%s' % (DIRECTORY_INSTANCE_SFX),
+        'dsBaseDN'	   :  'cn=user01,%s' % (DIRECTORY_INSTANCE_SFX),
       }
     </call>   
         
 
     <call function="'SearchObject'">
-     { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
-          'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-          'dsInstanceDn'     : DIRECTORY_INSTANCE_DN,
-          'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,	
-          'dsBaseDN'        :  DIRECTORY_INSTANCE_SFX,
-          'dsFilter'            : 'objectclass=groupOfUniqueNames'	,
+     { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST ,
+          'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
+          'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
+          'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD ,	
+          'dsBaseDN'          :  DIRECTORY_INSTANCE_SFX,
+          'dsFilter'          : 'objectclass=groupOfUniqueNames'	,
           'attributes'        : 'uniquemember',
-          'expectedRC'	    :  0 }
+          'expectedRC'	      :  0 }
     </call>  		
     
     <script>
@@ -402,14 +402,14 @@
     <call function="'searchStringForSubstring'">
       { 'returnString'	   : returnString ,
          'testString'	   : 'user01',
-         'expectedResult'	   : '0' }
+         'expectedResult'  : '0' }
     </call>                
 
     <message>'references to an existing user must be still present' </message>
     <call function="'searchStringForSubstring'">
       { 'returnString'	   : returnString ,
          'testString'	   : 'user02',
-         'expectedResult'	   : '1' }
+         'expectedResult'  : '1' }
     </call>           
     
     <call function="'testCase_Postamble'"/>
@@ -420,13 +420,13 @@
 
                   
 <!--
-#@TestMarker       Plugin referential integrity
-#@TestName         Referential integrity check on GROUPS after a change of configuration
-#@TestPreamble    none
+#@TestMarker        Plugin referential integrity
+#@TestName          Referential integrity check on GROUPS after a change of configuration
+#@TestPreamble      none
 #@TestStep           Check change of the attribute-type attribute is dynamic
 #@TestStep           Delete the user02  
 #@TestStep           Check that the references to the deleted user are still present
-#@TestPostamble    none
+#@TestPostamble      none
 #@TestResult         all steps must be success
 -->  
     
@@ -442,11 +442,11 @@
       { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
         'dsInstancePort'       : DIRECTORY_INSTANCE_PORT ,
         'dsInstanceDn'         : DIRECTORY_INSTANCE_DN ,
-        'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD ,
-        'subcommand'          : 'set-plugin-prop' ,
-        'objectType'             : 'plugin-name' ,
-        'objectName'            : 'Referential Integrity',
-        'optionsString'          : '--remove attribute-type:uniquemember',
+        'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD ,
+        'subcommand'           : 'set-plugin-prop' ,
+        'objectType'           : 'plugin-name' ,
+        'objectName'           : 'Referential Integrity',
+        'optionsString'        : '--remove attribute-type:uniquemember',
         'expectedRC'           : 0 } 
     </call>	    
     
@@ -456,10 +456,10 @@
 
     <call function="'DeleteEntry'">
      { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST ,
-        'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
-        'dsInstanceDn'	      : DIRECTORY_INSTANCE_DN ,
+        'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
+        'dsInstanceDn'	   : DIRECTORY_INSTANCE_DN ,
         'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-        'dsBaseDN'	          :  'cn=user02,%s' % (DIRECTORY_INSTANCE_SFX),
+        'dsBaseDN'	   :  'cn=user02,%s' % (DIRECTORY_INSTANCE_SFX),
       }
     </call>   
     
@@ -467,14 +467,14 @@
     <message>'Check the new configuration is applied'</message>   
     
     <call function="'SearchObject'">
-     { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
+     { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST ,
           'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
           'dsInstanceDn'     : DIRECTORY_INSTANCE_DN,
-          'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,	
-          'dsBaseDN'        :  DIRECTORY_INSTANCE_SFX,
-          'dsFilter'            : 'objectclass=groupOfUniqueNames'	,
-          'attributes'        : 'uniquemember',
-          'expectedRC'	    :  0 }
+          'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,	
+          'dsBaseDN'         :  DIRECTORY_INSTANCE_SFX,
+          'dsFilter'         : 'objectclass=groupOfUniqueNames'	,
+          'attributes'       : 'uniquemember',
+          'expectedRC'	     :  0 }
     </call>  		
     
     <script>
@@ -484,7 +484,7 @@
     <call function="'searchStringForSubstring'">
       { 'returnString'	   : returnString ,
          'testString'	   : 'user02',
-         'expectedResult'	   : '1' }
+         'expectedResult'  : '1' }
     </call>                
     
   <message>'######  Restore the attribute uniquemember from the list of attribute-type ###### '</message>
@@ -542,24 +542,32 @@
     </call>	    
 
     <!-- plugin-type attribute is not dynamic. Need to restart the server -->
-	  <call function="'RestartDs'">
-     { 'dsHost'	  : DIRECTORY_INSTANCE_HOST,
-        'dsPort'	  : DIRECTORY_INSTANCE_PORT,
+    <call function="'StopDsWithScript'">
+      { 'location'  : STAF_REMOTE_HOSTNAME,
+        'dsHost'    : DIRECTORY_INSTANCE_HOST,
+        'dsPort'    : DIRECTORY_INSTANCE_PORT,
         'dsBindDN'  : DIRECTORY_INSTANCE_DN,
-        'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
-    }
+	'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
+        'dsRestart' : ' ' }
     </call>
-            
+  
+    <!--- Check that DS started -->
+    <call function="'isAlive'">
+     { 'noOfLoops'		: 5 ,
+       'noOfMilliSeconds' : 2000
+     }
+    </call>
+    
     <!-- Delete an entry -->
     <message>'######  Delete an user entry###### '</message>
     <message>' '</message>
 
     <call function="'DeleteEntry'">
-     { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST ,
+     { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
         'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
-        'dsInstanceDn'	      : DIRECTORY_INSTANCE_DN ,
-        'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-        'dsBaseDN'	          :  'cn=user05,%s' % (DIRECTORY_INSTANCE_SFX),
+        'dsInstanceDn'	    : DIRECTORY_INSTANCE_DN ,
+        'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD ,
+        'dsBaseDN'          :  'cn=user05,%s' % (DIRECTORY_INSTANCE_SFX),
       }
     </call>   
     
@@ -567,14 +575,14 @@
     <message>'Check the new configuration is applied'</message>   
     
     <call function="'SearchObject'">
-     { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
+     { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST ,
           'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
           'dsInstanceDn'     : DIRECTORY_INSTANCE_DN,
-          'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,	
-          'dsBaseDN'        :  DIRECTORY_INSTANCE_SFX,
-          'dsFilter'            : 'objectclass=groupOfUniqueNames'	,
-          'attributes'        : 'uniquemember',
-          'expectedRC'	    :  0 }
+          'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,	
+          'dsBaseDN'         :  DIRECTORY_INSTANCE_SFX,
+          'dsFilter'         : 'objectclass=groupOfUniqueNames'	,
+          'attributes'       : 'uniquemember',
+          'expectedRC'	     :  0 }
     </call>  		
     
     <script>
@@ -634,11 +642,11 @@
       { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
         'dsInstancePort'       : DIRECTORY_INSTANCE_PORT ,
         'dsInstanceDn'         : DIRECTORY_INSTANCE_DN ,
-        'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD ,
-        'subcommand'          : 'set-plugin-prop' ,
-        'objectType'             : 'plugin-name' ,
-        'objectName'            : 'Referential Integrity',
-        'optionsString'          : '--set enabled:false',
+        'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD ,
+        'subcommand'           : 'set-plugin-prop' ,
+        'objectType'           : 'plugin-name' ,
+        'objectName'           : 'Referential Integrity',
+        'optionsString'        : '--set enabled:false',
         'expectedRC'           : 0 } 
     </call>	    
     
@@ -649,11 +657,11 @@
       { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
         'dsInstancePort'       : DIRECTORY_INSTANCE_PORT ,
         'dsInstanceDn'         : DIRECTORY_INSTANCE_DN ,
-        'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD ,
-        'subcommand'          : 'set-plugin-prop' ,
-        'objectType'             : 'plugin-name' ,
-        'objectName'            : 'Referential Integrity',
-        'optionsString'          : '--set attribute-type:uniquemember --set attribute-type:member',
+        'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD ,
+        'subcommand'           : 'set-plugin-prop' ,
+        'objectType'           : 'plugin-name' ,
+        'objectName'           : 'Referential Integrity',
+        'optionsString'        : '--set attribute-type:uniquemember --set attribute-type:member',
         'expectedRC'           : 0 } 
     </call>	    
     
@@ -664,10 +672,10 @@
 
     <call function="'DeleteEntry'">
      { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST ,
-        'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
-        'dsInstanceDn'	      : DIRECTORY_INSTANCE_DN ,
+        'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
+        'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
         'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-        'dsBaseDN'	          :  'cn=user07,%s' % (DIRECTORY_INSTANCE_SFX),
+        'dsBaseDN'         :  'cn=user07,%s' % (DIRECTORY_INSTANCE_SFX),
       }
     </call>   
     
@@ -676,14 +684,14 @@
     <message>'Check the new configuration is applied'</message>   
     
     <call function="'SearchObject'">
-     { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
+     { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST ,
           'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
           'dsInstanceDn'     : DIRECTORY_INSTANCE_DN,
-          'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,	
-          'dsBaseDN'        :  DIRECTORY_INSTANCE_SFX,
-          'dsFilter'            : 'objectclass=groupOfUniqueNames'	,
-          'attributes'        : 'uniquemember',
-          'expectedRC'	    :  0 }
+          'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,	
+          'dsBaseDN'         :  DIRECTORY_INSTANCE_SFX,
+          'dsFilter'         : 'objectclass=groupOfUniqueNames'	,
+          'attributes'       : 'uniquemember',
+          'expectedRC'	     :  0 }
     </call>  		
     
     <script>
@@ -693,7 +701,7 @@
     <call function="'searchStringForSubstring'">
       { 'returnString'	   : returnString ,
          'testString'	   : 'user07',
-         'expectedResult'	   : '1' }
+         'expectedResult'  : '1' }
     </call>                
     
     <call function="'testCase_Postamble'"/>

--
Gitblit v1.10.0