diff options
author | Asha Akkiangady <aakkiang@redhat.com> | 2015-04-27 20:49:42 -0400 |
---|---|---|
committer | Asha Akkiangady <aakkiang@redhat.com> | 2015-04-27 20:57:51 -0400 |
commit | ef0efaa14c65f2a19569851b6b07b6bc79eaa7f0 (patch) | |
tree | 5ef7671b82c31b50f4ab5d7e0ecb55a5640cf9ce | |
parent | c9ba4610f25f16878186901ac9d52c602910e590 (diff) | |
download | pki-ef0efaa14c65f2a19569851b6b07b6bc79eaa7f0.tar.gz pki-ef0efaa14c65f2a19569851b6b07b6bc79eaa7f0.tar.xz pki-ef0efaa14c65f2a19569851b6b07b6bc79eaa7f0.zip |
Added script to keep subsystem installed status
written to env.sh and CA pki user clis check for
CA install status before execution.
28 files changed, 390 insertions, 179 deletions
diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-add.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-add.sh index f59a31189..f172cfe03 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-add.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-add.sh @@ -48,26 +48,24 @@ run_pki-ca-user-cli-ca-user-add_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -1451,5 +1449,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance is not installed" + fi } - diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-add.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-add.sh index fe7bb6942..1a3c9ead5 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-add.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-add.sh @@ -53,21 +53,27 @@ run_pki-ca-user-cli-user-cert-add_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi -CA_HOST=$(eval echo \$${MYROLE}) -CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) +if [ "$ca_instance_created" = "TRUE" ] ; then + CA_HOST=$(eval echo \$${MYROLE}) + CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) ##### Create a temporary directory to save output files and initializing host/port variables ##### rlPhaseStartSetup "pki_user_cli_user_cert-add-ca-startup: Create temporary directory and initializing host/port variables" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" @@ -2433,5 +2439,7 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd +else + rlLog "CA instance is not installed" +fi } - diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-delete.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-delete.sh index df9f0edb8..608d1671b 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-delete.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-delete.sh @@ -53,21 +53,27 @@ run_pki-ca-user-cli-ca-user-cert-delete_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi -CA_HOST=$(eval echo \$${MYROLE}) -CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) +if [ "$ca_instance_created" = "TRUE" ] ; then + CA_HOST=$(eval echo \$${MYROLE}) + CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) ##### Create temporary directory to save output files##### rlPhaseStartSetup "pki_user_cli_user_cert-del-ca-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" @@ -997,4 +1003,7 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd +else + rlLog "CA instance is not installed" +fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-find.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-find.sh index 5d26ada1a..d6344ecd9 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-find.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-find.sh @@ -53,21 +53,26 @@ run_pki-ca-user-cli-ca-user-cert-find_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi -CA_HOST=$(eval echo \$${MYROLE}) -CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) +if [ "$ca_instance_created" = "TRUE" ] ; then + CA_HOST=$(eval echo \$${MYROLE}) + CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) #####Create temporary dir to save the output files##### rlPhaseStartSetup "pki_user_cli_user_cert-find-ca-startup: Create temporary directory" @@ -1065,4 +1070,7 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd +else + rlLog "CA instance is not installed" +fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-show.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-show.sh index 3a8079a3b..d993cf5da 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-show.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-show.sh @@ -53,21 +53,26 @@ run_pki-ca-user-cli-ca-user-cert-show_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi -CA_HOST=$(eval echo \$${MYROLE}) -CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) +if [ "$ca_instance_created" = "TRUE" ] ; then + CA_HOST=$(eval echo \$${MYROLE}) + CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) ##### Create temporary directory to save output files ##### rlPhaseStartSetup "pki_user_cli_user_cert-show-ca-startup: Create temporary directory" @@ -1069,4 +1074,7 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd +else + rlLog "CA instance is not created" +fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert.sh index 5727863cf..d8732d482 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert.sh @@ -44,27 +44,23 @@ run_pki-ca-user-cert() subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi - +if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) rlPhaseStartSetup "Create Temporary Directory " @@ -94,4 +90,7 @@ SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) rlPhaseStartCleanup "pki user-cert cleanup: Delete temp dir" rlRun "popd" rlPhaseEnd +else + rlLog "CA instance is not installed" +fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-del.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-del.sh index cdf219a3b..39b2ce3f6 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-del.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-del.sh @@ -47,25 +47,24 @@ run_pki-ca-user-cli-ca-user-del_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi + + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -121,7 +120,7 @@ run_pki-ca-user-cli-ca-user-del_tests(){ 0 \ "Deleted user u$i" rlAssertGrep "Deleted user \"u$i\"" "$TmpDir/pki-user-del-ca-user1-00$i.out" - command="pki -d $CERTDB_DIR -n ${prefix}_adminV -c $CERTDB_DIR_PASSWORD -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) user-show u$i" + command="pki -d $CERTDB_DIR -n ${prefix}_adminV -c $CERTDB_DIR_PASSWORD -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) user-show u$i" errmsg="UserNotFoundException: User u$i not found" errorcode=255 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - deleted user should not exist" @@ -677,4 +676,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance is not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-find.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-find.sh index 68738b185..4a9c4008c 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-find.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-find.sh @@ -45,27 +45,24 @@ run_pki-ca-user-cli-ca-user-find_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA user1=ca_agent2 @@ -733,4 +730,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance is not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-add.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-add.sh index ae6e7fbe6..b1eec8f96 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-add.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-add.sh @@ -47,27 +47,23 @@ run_pki-ca-user-cli-ca-user-membership-add_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId - + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi - + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -726,4 +722,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance is not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-del.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-del.sh index 150ba28b3..38865c3e5 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-del.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-del.sh @@ -44,27 +44,26 @@ run_pki-ca-user-cli-ca-user-membership-del_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi + + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -827,4 +826,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance is not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-find.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-find.sh index 8dbf4c72b..cc4beabf5 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-find.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-find.sh @@ -47,27 +47,24 @@ run_pki-ca-user-cli-ca-user-membership-find_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId - + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -749,4 +746,7 @@ run_pki-ca-user-cli-ca-user-membership-find_tests(){ rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA subsystem not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-mod.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-mod.sh index a096b8477..24bc249e2 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-mod.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-mod.sh @@ -52,21 +52,26 @@ run_pki-ca-user-cli-ca-user-mod_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi - -CA_HOST=$(eval echo \$${MYROLE}) -CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) + if [ "$ca_instance_created" = "TRUE" ] ; then + CA_HOST=$(eval echo \$${MYROLE}) + CA_PORT=$(eval echo \$${subsystemId}_UNSECURE_PORT) #####Create temporary dir to save the output files ##### rlPhaseStartSetup "pki_ca_user_cli_ca_user_mod-startup: Create temporary directory" @@ -1088,4 +1093,7 @@ $i18nuser rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-show.sh b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-show.sh index 06a695d37..1aab02361 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-show.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-show.sh @@ -58,27 +58,23 @@ run_pki-ca-user-cli-ca-user-show_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId - + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi - + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -1130,4 +1126,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh index a07556ab7..b100cdbf7 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh @@ -46,29 +46,28 @@ run_pki-user-cli-user-add-ca_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA + if [ "$ca_instance_created" = "TRUE" ] ; then + lPhaseStartSetup "pki_user_cli_user_add-ca-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" rlRun "pushd $TmpDir" @@ -1462,4 +1461,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not created." + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh index b1142cc4e..eef873cf6 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh @@ -53,29 +53,28 @@ run_pki-user-cli-user-cert-add-ca_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) +if [ "$ca_instance_created" = "TRUE" ] ; then + ##### Create a temporary directory to save output files ##### rlPhaseStartSetup "pki_user_cli_user_cert-add-ca-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" @@ -2684,9 +2683,10 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" done #Delete temporary directory - #rlRun "popd" - #rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd - - + else + rlLog "CA subsystem is not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-ca.sh index 4d170a3b4..4c24bb7fa 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-ca.sh @@ -44,29 +44,26 @@ run_pki-user-cert() subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) +if [ "$ca_instance_created" = "TRUE" ] ; then rlPhaseStartSetup "Create Temporary Directory " rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" rlRun "pushd $TmpDir" @@ -94,4 +91,7 @@ SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) rlPhaseStartCleanup "pki user-cert cleanup: Delete temp dir" rlRun "popd" rlPhaseEnd + else + rlLog "CA subsystem is not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-delete-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-delete-ca.sh index 8b526a470..87f0cbc44 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-delete-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-delete-ca.sh @@ -45,21 +45,26 @@ run_pki-user-cli-user-cert-delete-ca_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) +if [ "$ca_instance_created" = "TRUE" ] ; then ##### Create temporary directory to save output files ##### rlPhaseStartSetup "pki_user_cli_user_cert-del-ca-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" @@ -1034,7 +1039,9 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" done #Delete temporary directory rlRun "popd" - #rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd - + else + rlLog "CA subsystem is not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-find-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-find-ca.sh index 6a24e9e93..cf81b334b 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-find-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-find-ca.sh @@ -47,21 +47,27 @@ run_pki-user-cli-user-cert-find-ca_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) +if [ "$ca_instance_created" = "TRUE" ] ; then + #####Create temporary dir to save the output files ##### rlPhaseStartSetup "pki_user_cli_user_cert-find-ca-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" @@ -1075,7 +1081,10 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" done #Delete temporary directory - #rlRun "popd" - #rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA subsystem is not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-show-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-show-ca.sh index 5c512b69d..34487da16 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-show-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-show-ca.sh @@ -46,21 +46,27 @@ run_pki-user-cli-user-cert-show-ca_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) +if [ "$ca_instance_created" = "TRUE" ] ; then + ##### Create temporary directory to save output files ##### rlPhaseStartSetup "pki_user_cli_user_cert-show-ca-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" @@ -1107,7 +1113,10 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" done #Delete temporary directory - #rlRun "popd" - #rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh index f13bbd35b..a9c9147e7 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh @@ -47,27 +47,25 @@ run_pki-user-cli-user-del-ca_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) + if [ "$ca_instance_created" = "TRUE" ] ; then rlPhaseStartSetup "pki_user_cli_user_del-CA-ca-startup: Create temporary directory" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" @@ -671,4 +669,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh index 30d1104c9..428d6e742 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh @@ -47,29 +47,27 @@ run_pki-user-cli-user-find-ca_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA + +if [ "$ca_instance_created" = "TRUE" ] ; then user1=ca_agent2 user1fullname="Test ca_agent" user2=abcdefghijklmnopqrstuvwxyx12345678 @@ -736,4 +734,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-add-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-add-ca.sh index 3771b1167..6046f1f56 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-add-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-add-ca.sh @@ -47,30 +47,27 @@ run_pki-user-cli-user-membership-add-ca_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA +if [ "$ca_instance_created" = "TRUE" ] ; then #Local variables groupid1="Certificate Manager Agents" groupid2="Registration Manager Agents" @@ -728,5 +725,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } - diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-del-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-del-ca.sh index 34c459669..e419c53bc 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-del-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-del-ca.sh @@ -44,27 +44,25 @@ run_pki-user-cli-user-membership-del-ca_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -830,4 +828,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-find-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-find-ca.sh index e68a45d6a..f605edca6 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-find-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-membership-find-ca.sh @@ -47,27 +47,24 @@ run_pki-user-cli-user-membership-find-ca_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId - + ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi + if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -750,4 +747,7 @@ run_pki-user-cli-user-membership-find-ca_tests(){ rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh index b8d50069e..b1bf013bc 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh @@ -52,22 +52,28 @@ run_pki-user-cli-user-mod-ca_tests(){ subsystemId=$1 SUBSYSTEM_TYPE=$2 MYROLE=$3 - +ca_instance_created="False" if [ "$TOPO9" = "TRUE" ] ; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) elif [ "$MYROLE" = "MASTER" ] ; then if [[ $subsystemId == SUBCA* ]]; then prefix=$subsystemId + ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS) else prefix=ROOTCA + ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS fi else prefix=$MYROLE + ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) fi -SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) -untrusted_cert_db_location=$UNTRUSTED_CERT_DB_LOCATION -untrusted_cert_db_password=$UNTRUSTED_CERT_DB_PASSWORD +if [ "$ca_instance_created" = "TRUE" ] ; then + SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) + untrusted_cert_db_location=$UNTRUSTED_CERT_DB_LOCATION + untrusted_cert_db_password=$UNTRUSTED_CERT_DB_PASSWORD + #####Create temporary dir to save the output files ##### rlPhaseStartSetup "pki_user_cli_user_mod-ca-startup: Create temporary directory" @@ -1068,4 +1074,7 @@ $i18nuser rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd + else + rlLog "CA instance not installed" + fi } diff --git a/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh b/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh index 482b81b5f..b98a17c78 100755 --- a/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh +++ b/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh @@ -185,6 +185,16 @@ rhcs_install_RootCA() { echo "export ROOTCA_SERVER_ROOT=/var/lib/pki/$ROOTCA_TOMCAT_INSTANCE_NAME/ca" >> /opt/rhqa_pki/env.sh mkdir -p $CLIENT_PKCS12_DIR mv /var/lib/pki/$ROOTCA_TOMCAT_INSTANCE_NAME/alias/ca_backup_keys.p12 $CLIENT_PKCS12_DIR + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/ROOTCA_instance_status.txt 2>&1" + exp_result1="$ROOTCA_TOMCAT_INSTANCE_NAME is running" + exp_result2="Secure Admin URL = https://$(hostname):$ROOTCA_SECURE_PORT/ca/services" + if [ $(grep $exp_result1 /tmp/ROOTCA_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/ROOTCA_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog " ROOTCA instance created successfully" + sed -i s/^ROOTCA_INSTANCE_CREATED_STATUS=False/ROOTCA_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -322,6 +332,16 @@ rhcs_install_kra() { #echo "export KRA_SERVER_ROOT=/var/lib/pki/$(eval echo \$KRA${number}_TOMCAT_INSTANCE_NAME)/kra" >> /opt/rhqa_pki/env.sh mkdir -p $CLIENT_PKCS12_DIR mv /var/lib/pki/$(eval echo \$KRA${number}_TOMCAT_INSTANCE_NAME)/alias/kra_backup_keys.p12 $CLIENT_PKCS12_DIR + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/KRA${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$KRA${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$KRA${number}_SECURE_PORT)/kra/services" + if [ $(grep $exp_result1 /tmp/KRA${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/KRA${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "KRA${number} instance creation successful" + sed -i s/^KRA${number}_INSTANCE_CREATED_STATUS=False/KRA${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -453,6 +473,16 @@ rhcs_install_ocsp() { # echo "export OCSP_SERVER_ROOT=/var/lib/pki/$(eval echo \$OCSP${number}_TOMCAT_INSTANCE_NAME)/ocsp" >> /opt/rhqa_pki/env.sh mkdir -p $CLIENT_PKCS12_DIR mv /var/lib/pki/$(eval echo \$OCSP${number}_TOMCAT_INSTANCE_NAME)/alias/ocsp_backup_keys.p12 $CLIENT_PKCS12_DIR + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/OCSP${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$OCSP${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$OCSP${number}_SECURE_PORT)/ocsp/services" + if [ $(grep $exp_result1 /tmp/OCSP${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/OCSP${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "OCSP${number} instance creation successful" + sed -i s/^OCSP${number}_INSTANCE_CREATED_STATUS=False/OCSP${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } ########################################################### @@ -575,6 +605,16 @@ rhcs_install_tks() { # echo "export TKS_SERVER_ROOT=/var/lib/pki/$(eval echo \$TKS${number}_TOMCAT_INSTANCE_NAME)/tks" >> /opt/rhqa_pki/env.sh mkdir -p $CLIENT_PKCS12_DIR mv /var/lib/pki/$(eval echo \$TKS${number}_TOMCAT_INSTANCE_NAME)/alias/tks_backup_keys.p12 $CLIENT_PKCS12_DIR + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/TKS${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$TKS${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$TKS${number}_SECURE_PORT)/ocsp/services" + if [ $(grep $exp_result1 /tmp/TKS${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/TKS${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "TKS${number} instance creation successful" + sed -i s/^TKS${number}_INSTANCE_CREATED_STATUS=False/TKS${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -707,6 +747,16 @@ rhcs_install_tps() { # echo "export TKS_SERVER_ROOT=/var/lib/pki/$(eval echo \$TKS${number}_TOMCAT_INSTANCE_NAME)/tks" >> /opt/rhqa_pki/env.sh mkdir -p $CLIENT_PKCS12_DIR mv /var/lib/pki/$(eval echo \$TPS${number}_TOMCAT_INSTANCE_NAME)/alias/tps_backup_keys.p12 $CLIENT_PKCS12_DIR + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/TPS${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$TPS${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$TPS${number}_SECURE_PORT)/services" + if [ $(grep $exp_result1 /tmp/TPS${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/TPS${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "TPS${number} instance creation successful" + sed -i s/^TPS${number}_INSTANCE_CREATED_STATUS=False/TPS${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -822,6 +872,16 @@ rhcs_install_cloneCA() exp_message5_1="https://$HOSTNAME_CLONE:$(eval echo \$CLONE_CA${number}_SECURE_PORT)/ca" rlAssertGrep "$exp_message5_1" "$INSTANCE_CREATE_OUT" #echo "export CA_SERVER_ROOT=/var/lib/pki/$(eval echo \$CLONE_CA${number}_TOMCAT_INSTANCE_NAME)/ca" >> /opt/rhqa_pki/env.sh + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/CLONE_CA${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$CLONE_CA${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$CLONE_CA${number}_SECURE_PORT)/services" + if [ $(grep $exp_result1 /tmp/CLONE_CA${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/CLONE_CA${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "CLONE_CA${number} instance creation successful" + sed -i s/^CLONE_CA${number}_INSTANCE_CREATED_STATUS=False/CLONE_CA${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -964,6 +1024,16 @@ rhcs_install_SubCA(){ #echo "export CA_SERVER_ROOT=/var/lib/pki/$(eval echo \$SUBCA${number}_TOMCAT_INSTANCE_NAME)/ca" >> /opt/rhqa_pki/env.sh mkdir -p $CLIENT_PKCS12_DIR mv /var/lib/pki/$(eval echo \$SUBCA${number}_TOMCAT_INSTANCE_NAME)/alias/ca_backup_keys.p12 $CLIENT_PKCS12_DIR + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/SUBCA${number}_instance_status.txt 2>&1" + exp_result1="$SUBCA${number}_TOMCAT_INSTANCE_NAME is running" + exp_result2="Secure Admin URL = https://$(hostname):$SUBCA${number}_SECURE_PORT/ca/services" + if [ $(grep $exp_result1 /tmp/SUBCA${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/SUBCA${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "SUBCA${number} instance created successfully" + sed -i s/^SUBCA${number}_INSTANCE_CREATED_STATUS=False/SUBCA${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -1069,6 +1139,15 @@ rhcs_install_cloneKRA(){ rlAssertGrep "$exp_message8_1" "$INSTANCE_CREATE_OUT" # echo "export KRA_SERVER_ROOT=/var/lib/pki/$(eval echo \$CLONE_KRA{number}_TOMCAT_INSTANCE_NAME)/kra" >> /opt/rhqa_pki/env.sh + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/CLONE_KRA${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$CLONE_KRA${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$CLONE_KRA${number}_SECURE_PORT)/services" + if [ $(grep $exp_result1 /tmp/CLONE_KRA${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/CLONE_KRA${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "CLONE_KRA${number} instance creation successful" + sed -i s/^CLONE_KRA${number}_INSTANCE_CREATED_STATUS=False/CLONE_KRA${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -1176,6 +1255,16 @@ rhcs_install_cloneOCSP(){ rlAssertGrep "$exp_message5_1" "$INSTANCE_CREATE_OUT" #echo "export OCSP_SERVER_ROOT=/var/lib/pki/$(eval echo \$CLONE_OCSP${number}_TOMCAT_INSTANCE_NAME)/ocsp" >> /opt/rhqa_pki/env.sh rlLog "https://fedorahosted.org/pki/ticket/1058" + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/CLONE_OCSP${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$CLONE_OCSP${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$CLONE_OCSP${number}_SECURE_PORT)/services" + if [ $(grep $exp_result1 /tmp/CLONE_OCSP${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/CLONE_OCSP${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "CLONE_OCSP${number} instance creation successful" + sed -i s/^CLONE_OCSP${number}_INSTANCE_CREATED_STATUS=False/CLONE_OCSP${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -1279,6 +1368,16 @@ rhcs_install_cloneTKS(){ rlAssertGrep "$exp_message5" "$INSTANCE_CREATE_OUT" exp_message5_1="https://$(hostname):$(eval echo \$CLONE_TKS${number}_SECURE_PORT)/tks" rlAssertGrep "$exp_message5_1" "$INSTANCE_CREATE_OUT" + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/CLONE_TKS${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$CLONE_TKS${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$CLONE_TKS${number}_SECURE_PORT)/services" + if [ $(grep $exp_result1 /tmp/CLONE_TKS${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/CLONE_TKS${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "CLONE_TKS${number} instance creation successful" + sed -i s/^CLONE_TKS${number}_INSTANCE_CREATED_STATUS=False/CLONE_TKS${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } @@ -1389,6 +1488,16 @@ rhcs_install_cloneTPS(){ rlAssertGrep "$exp_message5" "$INSTANCE_CREATE_OUT" exp_message5_1="https://$(hostname):$(eval echo \$CLONE_TPS${number}_SECURE_PORT)/tks" rlAssertGrep "$exp_message5_1" "$INSTANCE_CREATE_OUT" + + #Update Instance creation status to env.sh + rlLog "Executing: pkidaemon status tomcat" + rlRun "pkidaemon status tomcat > /tmp/CLONE_TPS${number}_instance_status.txt 2>&1" + exp_result1="$(eval echo \$CLONE_TPS${number}_TOMCAT_INSTANCE_NAME) is running" + exp_result2="Secure Admin URL = https://$(hostname):$(eval echo \$CLONE_TPS${number}_SECURE_PORT)/services" + if [ $(grep $exp_result1 /tmp/CLONE_TPS${number}_instance_status.txt | wc -l) -gt 0 ] && [ $(grep $exp_result2 /tmp/CLONE_TPS${number}_instance_status.txt | wc -l) -gt 0 ] ; then + rlLog "CLONE_TPS${number} instance creation successful" + sed -i s/^CLONE_TPS${number}_INSTANCE_CREATED_STATUS=False/CLONE_TPS${number}_INSTANCE_CREATED_STATUS=TRUE/g /opt/rhqa_pki/env.sh + fi rlPhaseEnd } ########################################################### diff --git a/tests/dogtag/acceptance/quickinstall/rhcs-install.sh b/tests/dogtag/acceptance/quickinstall/rhcs-install.sh index dae68ac0e..b6685e936 100755 --- a/tests/dogtag/acceptance/quickinstall/rhcs-install.sh +++ b/tests/dogtag/acceptance/quickinstall/rhcs-install.sh @@ -56,9 +56,10 @@ run_rhcs_install_packages() { #TESTCOUNT=1 COMMON_SERVER_PACKAGES="bind expect pki-console xmlstarlet dos2unix" - RHELRHCS_PACKAGES="symkey mod-nss pki-native-tools redhat-pki-ca-ui redhat-pki-common-ui redhat-pki-console-ui redhat-pki-kra-ui redhat-pki-ocsp-ui redhat-pki-ra-ui redhat-pki-tks-ui redhat-pki-tps-ui" + #RHELRHCS_PACKAGES="symkey mod-nss pki-native-tools redhat-pki-ca-ui redhat-pki-common-ui redhat-pki-console-ui redhat-pki-kra-ui redhat-pki-ocsp-ui redhat-pki-ra-ui redhat-pki-tks-ui redhat-pki-tps-ui" DOGTAG_PACKAGES="pki-tools pki-symkey dogtag-pki dogtag-pki-console-theme dogtag-pki-server-theme" NTPDATE_PACKAGE="ntpdate" + DEPENDENT_PACKAGES="idm-console-framework pki-base pki-ca pki-console pki-kra pki-ocsp pki-server pki-symkey pki-tks pki-tools pki-tps tomcat resteasy-base-jackson-provider resteasy-base-jaxb-provider resteasy-base-jaxrs resteasy-base-jaxrs-api" rlRun "setenforce 0" cat /etc/redhat-release | grep "Fedora" if [ $? -eq 0 ] ; then @@ -127,7 +128,7 @@ run_rhcs_install_packages() { run_install_subsystem_RootCA() { rlPhaseStartSetup "rhcs_install_subsystem_RootCA: Default install" - ALL_PACKAGES="$COMMON_SERVER_PACKAGES $DOGTAG_PACKAGES $NTPDATE_PACKAGE" + ALL_PACKAGES="$COMMON_SERVER_PACKAGES $DOGTAG_PACKAGES $DEPENDENT_PACKAGES $NTPDATE_PACKAGE" for item in $ALL_PACKAGES ; do rpm -qa | grep $item if [ $? -eq 0 ] ; then @@ -136,7 +137,7 @@ run_install_subsystem_RootCA() rlLog "ERROR: $item package is NOT installed" rc=1 ROOTCA_INSTALLED=FALSE - break + rlDie "$item is not installed" fi done if [ $rc -eq 0 ] ; then diff --git a/tests/dogtag/shared/env.sh b/tests/dogtag/shared/env.sh index 6f8dd12cd..29bedd8cd 100644 --- a/tests/dogtag/shared/env.sh +++ b/tests/dogtag/shared/env.sh @@ -61,6 +61,7 @@ ROOTCA_DB_SUFFIX="dc=pki-ca" ROOTCA_LDAP_INSTANCE_NAME=pki-ca-ldap ROOTCA_CERTDB_DIR="/opt/rhqa_pki/rootca/certs_db" ROOTCA_CERTDB_DIR_PASSWORD="Secret123" +ROOTCA_INSTANCE_CREATED_STATUS=False ########End CA params######## ######## KRA1 Params used by topology 2,3,4,5, 6 and 8########### @@ -117,6 +118,7 @@ KRA1_DB_SUFFIX="dc=pki-kra1" KRA1_LDAP_INSTANCE_NAME=pki-kra1-ldap KRA1_CLIENT_PKCS12_PASSWORD="Secret123" KRA1_BACKUP_PASSWORD="Secret123" +KRA1_INSTANCE_CREATED_STATUS=False ####### End KRA1 params######## ###### KRA 2 params used by topology 5 and 6#### @@ -174,6 +176,7 @@ KRA2_DB_SUFFIX="dc=pki-kra2" KRA2_LDAP_INSTANCE_NAME=pki-kra2-ldap KRA2_CLIENT_PKCS12_PASSWORD="Secret123" KRA2_BACKUP_PASSWORD="Secret123" +KRA2_INSTANCE_CREATED_STATUS=False ############## End KRA 2 Params###### ############# KRA3 Params used by QUICKINSTALL and topology1 ############ @@ -231,6 +234,7 @@ KRA3_LDAP_INSTANCE_NAME=pki-kra3-ldap KRA3_CLIENT_PKCS12_PASSWORD="Secret123" KRA3_BACKUP_PASSWORD="Secret123" KRA3_ADMIN_PASSWORD="Secret123" +KRA3_INSTANCE_CREATED_STATUS=False ######### KRA3 Params################ ##### OCSP1 Params -- used by topology 2, 3, 4, 5, 6 and 8 ############# @@ -281,6 +285,7 @@ OCSP1_DB_SUFFIX="dc=pki-ocsp1" OCSP1_LDAP_INSTANCE_NAME=pki-ocsp1-ldap OCSP1_BACKUP_PASSWORD="Secret123" OCSP1_CLIENT_PKCS12_PASSWORD="Secret123" +OCSP1_INSTANCE_CREATED_STATUS=False ###### End OCSP1 Params ######### ######## OCSP2 Params ########## @@ -331,6 +336,7 @@ OCSP2_DB_SUFFIX="dc=pki-ocsp2" OCSP2_LDAP_INSTANCE_NAME=pki-ocsp2-ldap OCSP2_BACKUP_PASSWORD="Secret123" OCSP2_CLIENT_PKCS12_PASSWORD="Secret123" +OCSP2_INSTANCE_CREATED_STATUS=False ##### End OCSP2 Params ########## #####OCSP3 Params used in QUICKINSTALL and topology1############# @@ -380,6 +386,7 @@ OCSP3_DB_SUFFIX="dc=pki-ocsp3" OCSP3_LDAP_INSTANCE_NAME=pki-ocsp3-ldap OCSP3_BACKUP_PASSWORD="Secret123" OCSP3_CLIENT_PKCS12_PASSWORD="Secret123" +OCSP3_INSTANCE_CREATED_STATUS=False ########End OCSP3 Params##### ######### TKS1 Parmams used in QUICKINSTALL and topology1 ######### @@ -423,6 +430,7 @@ TKS1_LDAP_INSTANCE_NAME=pki-tks1-ldap TKS1_DB_SUFFIX="dc=pki-tks1" TKS1_BACKUP_PASSWORD="Secret123" TKS1_CLIENT_PKCS12_PASSWORD="Secret123" +TKS1_INSTANCE_CREATED_STATUS=False ########End TKS Params####### ####### TKS2 Params - this set of params not used in any topology ########## @@ -465,6 +473,7 @@ TKS2_DB_SUFFIX="dc=pki-tks2" TKS2_BACKUP_PASSWORD="Secret123" TKS2_ADMIN_PASSWORD="Secret123" TKS2_CLIENT_PKCS12_PASSWORD=Secret123 +TKS2_INSTANCE_CREATED_STATUS=False ####### End TKS2 Params ###### ######### TPS1 Parmams used in QUICKINSTALL and topology1 ######### @@ -510,6 +519,7 @@ TPS1_BACKUP_PASSWORD="Secret123" TPS1_CLIENT_PKCS12_PASSWORD="Secret123" TPS1_SERVER_KEYGEN=True TPS1_AUTHDB_HOST="`hostname`" +TPS1_INSTANCE_CREATED_STATUS=False ########End TPS Params####### ##### GENERIC PARAMS ##### @@ -610,6 +620,7 @@ SUBCA1_BACKUP_PASSWORD=Secret123 SUBCA1_CERTDB_DIR=$CLIENT_DIR/subca1_certs_db SUBCA1_CERTDB_DIR_PASSWORD=Secret123 SUBCA1_CLIENT_DB_PURGE=True +SUBCA1_INSTANCE_CREATED_STATUS=False ##### End of SUBCA1 params ####### ###### SUBCA2 params - topology 3,4,5 and 6 ####### @@ -683,6 +694,7 @@ SUBCA2_BACKUP_PASSWORD=Secret123 SUBCA2_CERTDB_DIR=$CLIENT_DIR/subca2_certs_db SUBCA2_CERTDB_DIR_PASSWORD=Secret123 SUBCA2_CLIENT_DB_PURGE=True +SUBCA2_INSTANCE_CREATED_STATUS=False ######## End of SUBCA2 params ####### ##### CLONE generic params ######### @@ -727,6 +739,7 @@ CLONE_CA1_LDAP_PORT=1901 CLONE_CA1_LDAP_INSTANCE_NAME=pki-cloneca1 CLONE_CA1_SECURE_CONN=False CLONE_CA1_REMOVE_DATA=True +CLONE_CA1_INSTANCE_CREATED_STATUS=False ##### End of CLONE_CA1 params ####### ##### CLONE_KRA1 params -- used by QUICKINSTALL, topology 1 and 8 ######## @@ -755,6 +768,7 @@ CLONE_KRA1_SSL_SERVER_SIGNING_ALGORITHM=SHA512withRSA CLONE_KRA1_SSL_SERVER_TOKEN=Internal CLONE_KRA1_SSL_SERVER_NICKNAME=cloneca1sslservercert CLONE_KRA1_SSL_SERVER_CERT_SUBJECT_NAME="cn=`hostname`,O=redhat" +CLONE_KRA1_INSTANCE_CREATED_STATUS=False ##### End of CLONE_KRA1 params ####### @@ -786,6 +800,7 @@ CLONE_OCSP1_SSL_SERVER_SIGNING_ALGORITHM=SHA512withRSA CLONE_OCSP1_SSL_SERVER_TOKEN=Internal CLONE_OCSP1_SSL_SERVER_NICKNAME=cloneca1sslservercert CLONE_OCSP1_SSL_SERVER_CERT_SUBJECT_NAME="cn=`hostname`,O=redhat" +CLONE_OCSP1_INSTANCE_CREATED_STATUS=False ###### End of CLONE_OCSP1 ####### ###### CLONE_TKS1 params -- used by QUICKINSTALL and topology 1 ######### @@ -815,6 +830,7 @@ CLONE_TKS1_SSL_SERVER_SIGNING_ALGORITHM=SHA512withRSA CLONE_TKS1_SSL_SERVER_TOKEN=Internal CLONE_TKS1_SSL_SERVER_NICKNAME=cloneca1sslservercert CLONE_TKS1_SSL_SERVER_CERT_SUBJECT_NAME="cn=`hostname`,O=redhat" +CLONE_TKS1_INSTANCE_CREATED_STATUS=False ##### End of CLONE_TKS1 params ###### ###### CLONE_TPS1 params -- used by QUICKINSTALL and topology 1 ######### @@ -845,6 +861,7 @@ CLONE_TPS1_SSL_SERVER_TOKEN=Internal CLONE_TPS1_SSL_SERVER_NICKNAME=cloneca1sslservercert CLONE_TPS1_SSL_SERVER_CERT_SUBJECT_NAME="cn=`hostname`,O=redhat" CLONE_TPS1_SERVER_KEYGEN=True +CLONE_TPS1_INSTANCE_CREATED_STATUS=False ##### End of CLONE_TPS1 params ###### @@ -879,6 +896,7 @@ CLONE_CA2_ADMIN_SUBJECT_DN="cn=PKI CLONE2 Admin, O=redhat" CLONE_CA2_ADMIN_CERT_NICKNAME=cloneca2admincert CLONE_CA2_ADMIN_IMPORT_CERT=False CLONE_CA2_DS_HOSTNAME=localhost +CLONE_CA2_INSTANCE_CREATED_STATUS=False ###### End of CLONE_CA2 ######## @@ -895,6 +913,7 @@ CLONE_KRA2_DS_HOSTNAME=localhost CLONE_KRA2_LDAP_PORT=3500 CLONE_KRA2_SECURE_CONN=False CLONE_KRA2_REMOVE_DATA=True +CLONE_KRA2_INSTANCE_CREATED_STATUS=False ###### End of CLONE_KRA2 params ####### @@ -912,6 +931,7 @@ CLONE_OCSP2_DS_HOSTNAME=localhost CLONE_OCSP2_LDAP_PORT=3700 CLONE_OCSP2_SECURE_CONN=False CLONE_OCSP2_REMOVE_DATA=True +CLONE_OCSP2_INSTANCE_CREATED_STATUS=False ####### End of CLONE_OCSP2 params ######## ##### CLONE_TKS2 params ####### @@ -924,13 +944,14 @@ CLONE_TKS2_ADMIN_EMAIL=example@redhat.com CLONE_TKS2_ADMIN_DUAL_KEY=True CLONE_TKS2_ADMIN_KEY_SIZE=2048 CLONE_TKS2_ADMIN_KEY_TYPE=rsa -CLONE_TKS2_ADMIN_SUBJECT_DN="cn=PKI CLONE TKS2 ADMIN CLONE, O=redhat" +CLONE_TKS2_ADMIN_SUBJECT_DN="cn=PKI CLONE TKS2 ADMIN CLONE, O=redhat" CLONE_TKS2_ADMIN_CERT_NICKNAME=clonetks2admincert CLONE_TKS2_ADMIN_PASSWORD=Secret123 CLONE_TKS2_DS_HOSTNAME=localhost +CLONE_TKS2_INSTANCE_CREATED_STATUS=False ######## End of CLONE_TKS2 params ####### -######MS ADCS params####### +###### Microsoft ADCS params ####### MS_ipaddr="10.13.129.103" MS_username="CORP\\Administrator" MS_password="Secret123" |