From 1d2bb0afd11504ba65b6928f555fefa4c1dda2e0 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 27 Sep 2007 10:09:42 +0000
Subject: [PATCH] Fix invalid arg values passed to dsconfig function 

---
 opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml b/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
index 486eecd..5df0371 100644
--- a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
+++ b/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
@@ -78,31 +78,29 @@
                 
                 <if expr="componentList[componentNumber][0] == 'get-local-db-index-prop'">
                   <call function="'dsconfig'">
-                  {   'location'       :  location ,
-                      'dsPath'         :  dsPath ,
-                      'dsInstanceHost' :  dsInstanceHost ,
-                      'dsInstancePort' :  dsInstancePort ,
-                      'dsInstanceDn'   :  dsInstanceDn ,
-                      'dsInstancePswd' :  dsInstancePswd ,
-                      'subcommand'     :  '%s' % componentList[componentNumber][0] ,
-                      'objectType'     :  '%s' % componentList[componentNumber][1] ,
-                      'objectName'     :  '%s' % componentList[componentNumber][2] ,
-                      'optionsString'  :  '--backend-name userroot' ,
-                      'expectedRC'     : 0 
+                  {   
+                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
+                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD , 
+                    'subcommand'     :  '%s' % componentList[componentNumber][0] ,
+                    'objectType'     :  '%s' % componentList[componentNumber][1] ,
+                    'objectName'     :  '%s' % componentList[componentNumber][2] ,
+                    'optionsString'  :  '--backend-name userroot' ,
+                    'expectedRC'     : 0 
                   }
                   </call>
                 <else>
                   <call function="'dsconfig'">
-                  {   'location'       :  location ,
-                      'dsPath'         :  dsPath ,
-                      'dsInstanceHost' :  dsInstanceHost ,
-                      'dsInstancePort' :  dsInstancePort ,
-                      'dsInstanceDn'   :  dsInstanceDn ,
-                      'dsInstancePswd' :  dsInstancePswd ,
-                      'subcommand'     :  '%s' % componentList[componentNumber][0] ,
-                      'objectType'     :  '%s' % componentList[componentNumber][1] ,
-                      'objectName'     :  '%s' % componentList[componentNumber][2] ,
-                      'expectedRC'     : 0 
+                  {                       
+                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
+                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD , 
+                    'subcommand'     :  '%s' % componentList[componentNumber][0] ,
+                    'objectType'     :  '%s' % componentList[componentNumber][1] ,
+                    'objectName'     :  '%s' % componentList[componentNumber][2] ,
+                    'expectedRC'     : 0 
                   }
                   </call>
                 </else>

--
Gitblit v1.10.0