Added library functions for configuring and unconfiguring SSL and TLS into ...

el_kaboing

13.19.2006 0489c9849ef653e6207e0e186f8f831715c5c79b

Added library functions for configuring and unconfiguring SSL and TLS into a new file called security.xml.
Modified SSL and startTLS xml test cases to use these library files.

 opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml

New file
@@ -0,0 +1,452 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "stax.dtd">
<!---
 * 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 2006 Sun Microsystems, Inc.
 -->
<stax>

    <function name="configureSSL">

    <function-prolog>
        This function makes the configuration chnanges for SSL
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="keystoreType">
            Keystore type
        </function-required-arg>
        <function-optional-arg name="extraParams" default="' '">
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <!--- Enable Key Manager Provider -->
            <message>
               'Enabling Key Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Delete Default Trust Manager Provider -->
            <message>
               'Deleting Default Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/setup/deleteTrustMgr.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Add Trust Manager Provider -->
            <message>
               'Adding Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/setup/enable_trust_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Add LDAPS Connection Handler -->
            <message>
               'Adding LDAPS Connection Handler'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/setup/enable_ldaps_conn_handler.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

      </sequence>

    </function>

    <function name="configureTLS">

    <function-prolog>
        This function makes the configuration changes for startTLS
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="keystoreType">
            Keystore type
        </function-required-arg>
        <function-optional-arg name="extraParams" default="' '">
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <!--- Enable Key Manager Provider -->
            <message>
               'Enabling Key Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Delete Default Trust Manager Provider -->
            <message>
               'Deleting Default Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/setup/deleteTrustMgr.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Add Trust Manager Provider -->
            <message>
               'Adding Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/setup/enable_trust_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Enable StartTLS -->
            <message>
               'Enabling StartTLS'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/setup/enable_startTLS.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

      </sequence>

    </function>

    <function name="unconfigureSSL">

    <function-prolog>
        This function reverses the configuration changes for SSL
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="keystoreType">
            Keystore type
        </function-required-arg>
        <function-optional-arg name="extraParams" default="' '">
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <!--- Delete LDAPS Connection Handler -->
            <message>
               'Deleting Default Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/teardown/disable_ldaps_conn_handler.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Delete SSL Trust Manager Provider -->
            <message>
               'Deleting SSL Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/teardown/deleteTrustMgr.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Add Default Trust Manager Provider -->
            <message>
               'Adding Default Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/teardown/default_trust_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Disable Key Manager Provider -->
            <message>
               'Disabling Key Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/teardown/disable_key_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

      </sequence>

    </function>

    <function name="unconfigureTLS">

    <function-prolog>
        This function reverses the configuration changes for startTLS
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="keystoreType">
            Keystore type
        </function-required-arg>
        <function-optional-arg name="extraParams" default="' '">
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

       <!--- Disable StartTLS -->
            <message>
               'Disabling StartTLS'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/teardown/disable_startTLS.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Delete StartTLS Trust Manager Provider -->
            <message>
               'Deleting StartTLS Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/teardown/deleteTrustMgr.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Add Default Trust Manager Provider -->
            <message>
               'Adding Default Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/teardown/default_trust_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Disable Key Manager Provider -->
            <message>
               'Disabling Key Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/teardown/disable_key_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

      </sequence>

    </function>


</stax>

 opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml

@@ -49,6 +49,9 @@
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/ldap.xml' % (TESTS_FUNCTIONS_DIR)"/>

      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/security.xml' % (TESTS_FUNCTIONS_DIR)"/>

      <script>
          STAXLogMessage = 1
          SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)

 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml

@@ -68,85 +68,19 @@
          </sequence>
        </testcase>

        <!--- Test Case : Enable Key Manager Provider -->
        <testcase name="'EnableKeyMgrProvider'">
        <!--- Test Case : Configure JKS Keystore -->
        <testcase name="'ConfigJKSKeystore'">
          <sequence>
            <message>
               'Enabling Key Manager Provider'
               'Configuring JKS Keystore'
            </message>

            <call function="'addEntry'">
            <call function="'configureSSL'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/jks/setup/enable_key_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Delete Default Trust Manager Provider -->
        <testcase name="'DeleteTrustMgrProvider'">
          <sequence>
            <message>
               'Deleting Default Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/jks/setup/deleteTrustMgr.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Add Trust Manager Provider -->
        <testcase name="'AddTrustMgrProvider'">
          <sequence>
            <message>
               'Adding Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/jks/setup/enable_trust_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Add LDAPS Connection Handler -->
        <testcase name="'AddLDAPSConnHandler'">
          <sequence>
            <message>
               'Adding LDAPS Connection Handler'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/jks/setup/enable_ldaps_conn_handler.ldif' % LDIF_DATA_DIR }
                'keystoreType'   : '%s' % 'jks' }
            </call>

            <call function="'checktestRC'">

 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml

@@ -57,86 +57,19 @@
          </sequence>
        </testcase>

        <!--- Test Case : Delete LDAPS Connection Handler -->
        <testcase name="'DeleteLDAPSConnHandler'">
        <!--- Test Case : Unconfigure JKS Keystore -->
        <testcase name="'UnconfigJKSKeystore'">
          <sequence>
            <message>
               'Deleting Default Trust Manager Provider'
               'Unonfiguring JKS Keystore'
            </message>

            <call function="'modifyEntry'">
            <call function="'unconfigureSSL'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/jks/teardown/disable_ldaps_conn_handler.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>


        <!--- Test Case : Delete SSL Trust Manager Provider -->
        <testcase name="'DeleteSSLTrustMgrProvider'">
          <sequence>
            <message>
               'Deleting SSL Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/jks/teardown/deleteTrustMgr.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Add Default Trust Manager Provider -->
        <testcase name="'AddDefaultTrustMgrProvider'">
          <sequence>
            <message>
               'Adding Default Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/jks/teardown/default_trust_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Disable Key Manager Provider -->
        <testcase name="'DisableKeyMgrProvider'">
          <sequence>
            <message>
               'Disabling Key Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/jks/teardown/disable_key_mgr_provider.ldif' % LDIF_DATA_DIR }
                'keystoreType'   : '%s' % 'jks' }
            </call>

            <call function="'checktestRC'">

 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml

@@ -68,85 +68,19 @@
          </sequence>
        </testcase>

        <!--- Test Case : Enable Key Manager Provider -->
        <testcase name="'EnableKeyMgrProvider'">
        <!--- Test Case : Configure PKCS12 Keystore -->
        <testcase name="'ConfigPKCS12Keystore'">
          <sequence>
            <message>
               'Enabling Key Manager Provider'
               'Configuring PKCS12 Keystore'
            </message>

            <call function="'addEntry'">
            <call function="'configureSSL'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/pkcs12/setup/enable_key_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Delete Default Trust Manager Provider -->
        <testcase name="'DeleteTrustMgrProvider'">
          <sequence>
            <message>
               'Deleting Default Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/pkcs12/setup/deleteTrustMgr.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Add Trust Manager Provider -->
        <testcase name="'AddTrustMgrProvider'">
          <sequence>
            <message>
               'Adding Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/pkcs12/setup/enable_trust_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Add LDAPS Connection Handler -->
        <testcase name="'AddLDAPSConnHandler'">
          <sequence>
            <message>
               'Adding LDAPS Connection Handler'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/pkcs12/setup/enable_ldaps_conn_handler.ldif' % LDIF_DATA_DIR }
                'keystoreType'   : '%s' % 'pkcs12' }
            </call>

            <call function="'checktestRC'">

 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml

@@ -57,86 +57,19 @@
          </sequence>
        </testcase>

        <!--- Test Case : Delete LDAPS Connection Handler -->
        <testcase name="'DeleteLDAPSConnHandler'">
        <!--- Test Case : Unconfigure PKCS12 Keystore -->
        <testcase name="'UnconfigPKCS12Keystore'">
          <sequence>
            <message>
               'Deleting Default Trust Manager Provider'
               'Unonfiguring PKCS12 Keystore'
            </message>

            <call function="'modifyEntry'">
            <call function="'unconfigureSSL'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>


        <!--- Test Case : Delete SSL Trust Manager Provider -->
        <testcase name="'DeleteSSLTrustMgrProvider'">
          <sequence>
            <message>
               'Deleting SSL Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/pkcs12/teardown/deleteTrustMgr.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Add Default Trust Manager Provider -->
        <testcase name="'AddDefaultTrustMgrProvider'">
          <sequence>
            <message>
               'Adding Default Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/pkcs12/teardown/default_trust_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Disable Key Manager Provider -->
        <testcase name="'DisableKeyMgrProvider'">
          <sequence>
            <message>
               'Disabling Key Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/pkcs12/teardown/disable_key_mgr_provider.ldif' % LDIF_DATA_DIR }
                'keystoreType'   : '%s' % 'pkcs12' }
            </call>

            <call function="'checktestRC'">

 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml

@@ -68,85 +68,19 @@
          </sequence>
        </testcase>

        <!--- Test Case : Enable Key Manager Provider -->
        <testcase name="'EnableKeyMgrProvider'">
        <!--- Test Case : Configure JKS Keystore -->
        <testcase name="'ConfigJKSKeystoreStartTLS'">
          <sequence>
            <message>
               'Enabling Key Manager Provider'
               'Configuring JKS Keystore'
            </message>

            <call function="'addEntry'">
            <call function="'configureTLS'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/startTLS/setup/enable_key_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Delete Default Trust Manager Provider -->
        <testcase name="'DeleteTrustMgrProvider'">
          <sequence>
            <message>
               'Deleting Default Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/startTLS/setup/deleteTrustMgr.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Add Trust Manager Provider -->
        <testcase name="'AddTrustMgrProvider'">
          <sequence>
            <message>
               'Adding Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/startTLS/setup/enable_trust_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Enable StartTLS -->
        <testcase name="'EnableStartTLS'">
          <sequence>
            <message>
               'Enabling StartTLS'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/startTLS/setup/enable_startTLS.ldif' % LDIF_DATA_DIR }
                'keystoreType'   : '%s' % 'startTLS' }
            </call>

            <call function="'checktestRC'">

 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml

@@ -57,86 +57,19 @@
          </sequence>
        </testcase>

        <!--- Test Case : Disable StartTLS -->
        <testcase name="'DisableStartTLS'">
         <!--- Test Case : Unconfigure JKS Keystore -->
        <testcase name="'UnconfigJKSKeystoreStartTLS'">
          <sequence>
            <message>
               'Disabling StartTLS'
               'Unconfiguring JKS Keystore'
            </message>

            <call function="'modifyEntry'">
            <call function="'unconfigureTLS'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/startTLS/teardown/disable_startTLS.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>


        <!--- Test Case : Delete StartTLS Trust Manager Provider -->
        <testcase name="'DeleteStartTLSTrustMgrProvider'">
          <sequence>
            <message>
               'Deleting StartTLS Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/startTLS/teardown/deleteTrustMgr.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Add Default Trust Manager Provider -->
        <testcase name="'AddDefaultTrustMgrProvider'">
          <sequence>
            <message>
               'Adding Default Trust Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/startTLS/teardown/default_trust_mgr_provider.ldif' % LDIF_DATA_DIR }
            </call>

            <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
          </sequence>
        </testcase>

        <!--- Test Case : Disable Key Manager Provider -->
        <testcase name="'DisableKeyMgrProvider'">
          <sequence>
            <message>
               'Disabling Key Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/startTLS/teardown/disable_key_mgr_provider.ldif' % LDIF_DATA_DIR }
                'keystoreType'   : '%s' % 'startTLS' }
            </call>

            <call function="'checktestRC'">