external-software/github_OpenIdentityPlatform_OpenDJ.git

parent: 61bfbe2a | patch | commit | ignore whitespace

Fix invalid arg values passed to dsconfig function

gary_williams

27.09.2007 1d2bb0afd11504ba65b6928f555fefa4c1dda2e0

Fix invalid arg values passed to dsconfig function

6 files modified

	opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml	40 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml	34 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml	7 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml	7 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml	7 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml	7 ●●●●● patch \| view \| raw \| blame \| history

 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>

 opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml

@@ -75,28 +75,26 @@
                
                <if expr="componentList[componentNumber][0] == 'list-local-db-indexes'">
                  <call function="'dsconfig'">
                  {   'location'       :  location ,
                      'dsPath'         :  dsPath ,
                      'dsInstanceHost' :  dsInstanceHost ,
                      'dsInstancePort' :  dsInstancePort ,
                      'dsInstanceDn'   :  dsInstanceDn ,
                      'dsInstancePswd' :  dsInstancePswd ,
                      'subcommand'     :  '%s' % componentList[componentNumber][0] ,
                      'objectType'     :  'backend-name' ,
                      'objectName'     :  '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'     :  'backend-name' ,
                    'objectName'     :  '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] ,
                      'expectedRC'     : 0 
                  {
                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD , 
                    'subcommand'     :  '%s' % componentList[componentNumber][0] ,
                    'expectedRC'     : 0 
                  }
                  </call>
                </else>

 opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml

@@ -241,12 +241,11 @@
            </message>
            
            <call function="'dsconfig'">
              { 'location'       : location,
              'dsPath'         : dsPath ,
              {
              'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
              'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
              'dsInstanceDn'   : dsInstanceDn ,
              'dsInstancePswd' : dsInstancePswd ,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
              'subcommand'     : 'get-connection-handler-prop' ,
              'objectType'     : 'handler-name' ,
              'objectName'     : 'LDAPS Connection Handler',

 opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml

@@ -241,12 +241,11 @@
            </message>

            <call function="'dsconfig'">
            { 'location'       : location,
              'dsPath'         : dsPath ,
            {
              'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
              'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
              'dsInstanceDn'   : dsInstanceDn ,
              'dsInstancePswd' : dsInstancePswd ,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
              'subcommand'     : 'get-connection-handler-prop' ,
              'objectType'     : 'handler-name' ,
              'objectName'     : 'LDAPS Connection Handler',

 opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml

@@ -235,12 +235,11 @@
            </message>
            
            <call function="'dsconfig'">
              { 'location'       : location,
              'dsPath'         : dsPath ,
              {
              'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
              'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
              'dsInstanceDn'   : dsInstanceDn ,
              'dsInstancePswd' : dsInstancePswd ,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
              'subcommand'     : 'get-connection-handler-prop' ,
              'objectType'     : 'handler-name' ,
              'objectName'     : 'LDAPS Connection Handler',

 opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml

@@ -129,12 +129,11 @@
            </message>
            
            <call function="'dsconfig'">
              { 'location'       : location,
              'dsPath'         : dsPath ,
              {
              'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
              'dsInstanceDn'   : dsInstanceDn ,
              'dsInstancePswd' : dsInstancePswd ,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
              'subcommand'     : 'get-connection-handler-prop' ,
              'objectType'     : 'handler-name' ,
              'objectName'     : 'LDAP Connection Handler',

			@@ -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>

			@@ -75,28 +75,26 @@

			<if expr="componentList[componentNumber][0] == 'list-local-db-indexes'">
			<call function="'dsconfig'">
			{ 'location' : location ,
			'dsPath' : dsPath ,
			'dsInstanceHost' : dsInstanceHost ,
			'dsInstancePort' : dsInstancePort ,
			'dsInstanceDn' : dsInstanceDn ,
			'dsInstancePswd' : dsInstancePswd ,
			'subcommand' : '%s' % componentList[componentNumber][0] ,
			'objectType' : 'backend-name' ,
			'objectName' : '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' : 'backend-name' ,
			'objectName' : '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] ,
			'expectedRC' : 0
			{
			'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
			'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
			'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
			'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
			'subcommand' : '%s' % componentList[componentNumber][0] ,
			'expectedRC' : 0
			}
			</call>
			</else>

			@@ -241,12 +241,11 @@
			</message>

			<call function="'dsconfig'">
			{ 'location' : location,
			'dsPath' : dsPath ,
			{
			'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
			'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
			'dsInstanceDn' : dsInstanceDn ,
			'dsInstancePswd' : dsInstancePswd ,
			'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
			'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
			'subcommand' : 'get-connection-handler-prop' ,
			'objectType' : 'handler-name' ,
			'objectName' : 'LDAPS Connection Handler',

			@@ -235,12 +235,11 @@
			</message>

			<call function="'dsconfig'">
			{ 'location' : location,
			'dsPath' : dsPath ,
			{
			'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
			'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
			'dsInstanceDn' : dsInstanceDn ,
			'dsInstancePswd' : dsInstancePswd ,
			'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
			'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
			'subcommand' : 'get-connection-handler-prop' ,
			'objectType' : 'handler-name' ,
			'objectName' : 'LDAPS Connection Handler',

			@@ -129,12 +129,11 @@
			</message>

			<call function="'dsconfig'">
			{ 'location' : location,
			'dsPath' : dsPath ,
			{
			'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
			'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
			'dsInstanceDn' : dsInstanceDn ,
			'dsInstancePswd' : dsInstancePswd ,
			'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
			'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
			'subcommand' : 'get-connection-handler-prop' ,
			'objectType' : 'handler-name' ,
			'objectName' : 'LDAP Connection Handler',