diff options
Diffstat (limited to 'tests/dogtag/acceptance/cli-tests/pki-user-cli/ca')
13 files changed, 370 insertions, 341 deletions
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 b100cdbf7..335f2322a 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,33 +46,34 @@ run_pki-user-cli-user-add-ca_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId - 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 + rlPhaseStartSetup "pki_user_cli_user_add-ca-startup: Create temporary directory" + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_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" - rlPhaseEnd - rlPhaseStartTest "pki_user_cli-configtest: pki user --help configuration test" rlRun "pki user --help > $TmpDir/pki_user_cfg.out 2>&1" \ 0 \ @@ -802,7 +803,7 @@ run_pki-user-cli-user-add-ca_tests(){ -t ca \ group-member-add \"Certificate Manager Agents\" $user > $TmpDir/pki-user-add-ca-007_1_1.out" \ 0 \ - "Add user $user to Administrators group" + "Add user $user to Certificate Manager Agents group" rlAssertGrep "Added group member \"$user\"" "$TmpDir/pki-user-add-ca-007_1_1.out" rlAssertGrep "User: $user" "$TmpDir/pki-user-add-ca-007_1_1.out" @@ -815,7 +816,7 @@ run_pki-user-cli-user-add-ca_tests(){ -t ca \ group-member-find \"Certificate Manager Agents\" > $TmpDir/pki-user-add-ca-007_2.out" \ 0 \ - "Show pki group-member-find Administrators" + "Show pki group-member-find Certificate Manager Agents" rlAssertGrep "User: $user" "$TmpDir/pki-user-add-ca-007_2.out" rlPhaseEnd @@ -1005,7 +1006,7 @@ run_pki-user-cli-user-add-ca_tests(){ "Adding user using ${prefix}_adminV with user id length exceed maximum defined in ldap schema" rlAssertGrep "ClientResponseFailure: ldap can't save, exceeds max length" "$TmpDir/pki-user-add-ca-001_50.out" rlAssertNotGrep "ClientResponseFailure: Error status 500 Internal Server Error returned" "$TmpDir/pki-user-add-ca-001_50.out" - rlAssertNotGrep "ProcessingException: Unable to invoke request" "$TmpDir/pki-user-add-ca-001_50.out" + rlAssertGrep "ProcessingException: Unable to invoke request" "$TmpDir/pki-user-add-ca-001_50.out" rlLog "PKI Ticket:: https://fedorahosted.org/pki/ticket/842" rlPhaseEnd @@ -1408,7 +1409,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Adding user using Normal user credential" rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting users" + rlPhaseStartCleanup "pki_user_cli_user_cleanup: Deleting users" #===Deleting users created using ${prefix}_adminV cert===# i=1 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 eef873cf6..829e3ed97 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 @@ -50,37 +50,37 @@ ######################################################################## run_pki-user-cli-user-cert-add-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) + subsystemId=$1 + SUBSYSTEM_TYPE=$2 + MYROLE=$3 + + ##### 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" + rlRun "pushd $TmpDir" + rlPhaseEnd + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi else - prefix=ROOTCA - ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) fi -else - prefix=$MYROLE - ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) -fi -SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) + 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" - rlRun "pushd $TmpDir" - rlPhaseEnd - local cert_info="$TmpDir/cert_info" user1=testuser1 user2=testuser2 @@ -2651,7 +2651,7 @@ rlPhaseEnd # rlFail "PKI ticket: https://fedorahosted.org/pki/ticket/1171" #rlPhaseEnd #===Deleting users===# -rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" +rlPhaseStartCleanup "pki_user_cli_user_cleanup: Deleting role users" j=1 while [ $j -lt 3 ] ; do 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 4c24bb7fa..25c1db37a 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 @@ -41,34 +41,37 @@ # pki user-cert ran without any options should show all the command line options of pki cert run_pki-user-cert() { -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) + subsystemId=$1 + SUBSYSTEM_TYPE=$2 + MYROLE=$3 + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + rlPhaseStartSetup "Create Temporary Directory " + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi else - prefix=ROOTCA - ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) fi -else - prefix=$MYROLE - ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) -fi -SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) + 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" - rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_cert-CA-001: pki user-cert help option" local temp_out="$TmpDir/pki_user-cert" rlLog "Executing pki user-cert --help" 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 87f0cbc44..be078f0e0 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 @@ -42,35 +42,37 @@ #pki-user-cli-role-user-create-tests should be first executed prior to pki-user-cli-user-cert-delete-ca.sh ###################################################################################### 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}) + subsystemId=$1 + SUBSYSTEM_TYPE=$2 + MYROLE=$3 + ##### 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" + rlRun "pushd $TmpDir" + rlPhaseEnd -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" - rlRun "pushd $TmpDir" - rlPhaseEnd + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + + SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) +if [ "$ca_instance_created" = "TRUE" ] ; then user1=testuser1 user2=testuser2 user1fullname="Test user1" @@ -1007,7 +1009,7 @@ rlPhaseStartTest "pki_user_cli_user_cert-delete-CA-0022: Add an Agent user agent #===Deleting users===# -rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" +rlPhaseStartCleanup "pki_user_cli_user_cleanup: Deleting role users" j=1 while [ $j -lt 3 ] ; do 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 cf81b334b..bd7f1b81f 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 @@ -43,37 +43,37 @@ ###################################################################################### 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) + subsystemId=$1 + SUBSYSTEM_TYPE=$2 + MYROLE=$3 + + ####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" + rlRun "pushd $TmpDir" + rlPhaseEnd + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi else - prefix=ROOTCA - ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS - fi -else - prefix=$MYROLE - ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) -fi + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi -SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) + 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" - rlRun "pushd $TmpDir" - rlPhaseEnd - user1=testuser1 user2=testuser2 user1fullname="Test user1" @@ -1063,7 +1063,7 @@ rlPhaseStartTest "pki_user_cli_user_cert-find-CA-034: Find the certs of a user m rlPhaseEnd #===Deleting users===# -rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" +rlPhaseStartCleanup "pki_user_cli_user_cleanup: Deleting role users" j=1 while [ $j -lt 4 ] ; do @@ -1081,7 +1081,7 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" done #Delete temporary directory - rlRun "popd" + rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd else 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 34487da16..bce7c0906 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 @@ -43,36 +43,38 @@ ###################################################################################### 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 + subsystemId=$1 + SUBSYSTEM_TYPE=$2 + MYROLE=$3 -SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) + ##### 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" + rlRun "pushd $TmpDir" + rlPhaseEnd -if [ "$ca_instance_created" = "TRUE" ] ; then + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi - ##### 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" - rlRun "pushd $TmpDir" - rlPhaseEnd + SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) +if [ "$ca_instance_created" = "TRUE" ] ; then user1=testuser1 user2=testuser2 user1fullname="Test user1" @@ -1095,7 +1097,7 @@ rlPhaseStartTest "pki_user_cli_user_cert-show-CA-033: Show certs assigned to use #===Deleting users===# -rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" +rlPhaseStartCleanup "pki_user_cli_user_cleanup: Deleting role users" j=1 while [ $j -lt 3 ] ; do @@ -1117,6 +1119,6 @@ rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd else - rlLog "CA instance not installed" + 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 a9c9147e7..d8f8c803a 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,31 +47,33 @@ run_pki-user-cli-user-del-ca_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId - 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 + rlPhaseStartSetup "pki_user_cli_user_del-CA-ca-startup: Create temporary directory" + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd - rlPhaseStartSetup "pki_user_cli_user_del-CA-ca-startup: Create temporary directory" - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) + if [ "$ca_instance_created" = "TRUE" ] ; then rlPhaseStartTest "pki_user_cli_user_del-CA-ca-configtest-001: pki user-del --help configuration test" rlRun "pki user-del --help > $TmpDir/user_del.out 2>&1" 0 "pki user-del --help" rlAssertGrep "usage: user-del <User ID>" "$TmpDir/user_del.out" @@ -665,7 +667,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - deleted user id with name 'ÉricTêko' should not exist" rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_del-ROOTCA_cleanup: Deleting the temp directory" + rlPhaseStartCleanup "pki_user_cli_user_del-ROOTCA_cleanup: Deleting the temp directory" rlRun "popd" rlRun "rm -r $TmpDir" 0 "Removing tmp directory" rlPhaseEnd 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 428d6e742..4bfc38b51 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,22 +47,29 @@ run_pki-user-cli-user-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 + # Creating Temporary Directory + rlPhaseStartSetup "pki user-find-ca Temporary Directory" + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -77,9 +84,7 @@ if [ "$ca_instance_created" = "TRUE" ] ; then user6=abc? user7=0 - rlPhaseStartSetup "pki_user_cli_user_find-ca-startup-addusers: Create temporary directory and add users" - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" + rlPhaseStartSetup "pki_user_cli_user_find-ca-startup-addusers: Add users for user_find test" i=1 while [ $i -lt 25 ] ; do rlRun "pki -d $CERTDB_DIR \ @@ -699,7 +704,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlAssertGrep "Full name: Éric Têko" "$TmpDir/pki-user-show-ca-001_32_2.out" rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_cleanup-021: Deleting users" + rlPhaseStartCleanup "pki_user_cli_user_cleanup-021: Deleting users" #===Deleting users created using ${prefix}_adminV cert===# i=1 while [ $i -lt 27 ] ; do 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 6046f1f56..478d7eb06 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,22 +47,30 @@ run_pki-user-cli-user-membership-add-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 + + rlPhaseStartSetup "pki_user_cli_user_membership-add-CA-001: Create temporary directory" + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA @@ -83,12 +91,6 @@ if [ "$ca_instance_created" = "TRUE" ] ; then groupid12="Enterprise TKS Administrators" groupid13="Enterprise RA Administrators" groupid14="Enterprise TPS Administrators" - - rlPhaseStartSetup "pki_user_cli_user_membership-add-CA-001: Create temporary directory" - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_membership-add-CA-002: pki user-membership configuration test" rlRun "pki -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) user-membership > $TmpDir/pki_user_membership_cfg.out 2>&1" \ 0 \ @@ -653,7 +655,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlLog "PKI Ticket:: https://fedorahosted.org/pki/ticket/1024" rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_membership-add-ca-cleanup-001: Deleting the temp directory and users" + rlPhaseStartCleanup "pki_user_cli_user_membership-add-ca-cleanup-001: Deleting the temp directory and users" #===Deleting users created using CA_adminV cert===# i=1 while [ $i -lt 17 ] ; do 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 e419c53bc..1dc7eefbd 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,23 +44,30 @@ run_pki-user-cli-user-membership-del-ca_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId - 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 + + rlPhaseStartSetup "pki_user_cli_user_membership-del-CA-001: Create temporary directory" + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) @@ -81,12 +88,6 @@ run_pki-user-cli-user-membership-del-ca_tests(){ groupid12="Enterprise TKS Administrators" groupid13="Enterprise RA Administrators" groupid14="Enterprise TPS Administrators" - - rlPhaseStartTest "pki_user_cli_user_membership-del-CA-001: Create temporary directory" - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_membership-del-CA-002: pki user-membership-del --help configuration test" rlRun "pki user-membership-del --help > $TmpDir/pki_user_membership_del_cfg.out 2>&1" \ 0 \ @@ -751,7 +752,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Approve Certificate request using testuser1" rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_membership-del-ca-cleanup-001: Deleting the temp directory and users" + rlPhaseStartCleanup "pki_user_cli_user_membership-del-ca-cleanup-001: Deleting the temp directory and users" #===Deleting users created using CA_adminV cert===# i=1 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 f605edca6..4b566bb37 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,22 +47,30 @@ run_pki-user-cli-user-membership-find-ca_tests(){ SUBSYSTEM_TYPE=$2 MYROLE=$3 prefix=$subsystemId - 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 + + rlPhaseStartSetup "pki_user_cli_user_membership-find-CA-001: Create temporary directory" + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi if [ "$ca_instance_created" = "TRUE" ] ; then SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) @@ -84,12 +92,6 @@ run_pki-user-cli-user-membership-find-ca_tests(){ groupid12="Enterprise TKS Administrators" groupid13="Enterprise RA Administrators" groupid14="Enterprise TPS Administrators" - - rlPhaseStartTest "pki_user_cli_user_membership-find-CA-001: Create temporary directory" - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_membership-find-CA-002: pki user-membership-find --help configuration test" rlRun "pki user-membership-find --help > $TmpDir/pki_user_membership_find_cfg.out 2>&1" \ 0 \ @@ -271,6 +273,7 @@ run_pki-user-cli-user-membership-find-ca_tests(){ 0 \ "Checking user-mambership to group " rlAssertGrep "14 entries matched" "$TmpDir/pki-user-membership-find-groupadd-find-ca-start-002.out" + i=1 while [ $i -lt 15 ] ; do eval gid=\$groupid$i rlAssertGrep "Group: $gid" "$TmpDir/pki-user-membership-find-groupadd-find-ca-start-002.out" @@ -289,6 +292,7 @@ run_pki-user-cli-user-membership-find-ca_tests(){ 0 \ "Checking user-membership to group" rlAssertGrep "14 entries matched" "$TmpDir/pki-user-membership-find-groupadd-find-ca-start-003.out" + i=1 while [ $i -lt 15 ] ; do eval gid=\$groupid$i rlAssertGrep "Group: $gid" "$TmpDir/pki-user-membership-find-groupadd-find-ca-start-003.out" @@ -365,6 +369,7 @@ run_pki-user-cli-user-membership-find-ca_tests(){ user-membership-find userall --size=15 > $TmpDir/pki-user-membership-find-groupadd-find-ca-size-009.out" 0 \ "user_membership-find with size parameter as 15" rlAssertGrep "14 entries matched" "$TmpDir/pki-user-membership-find-groupadd-find-ca-size-009.out" + i=1 while [ $i -lt 15 ] ; do eval gid=\$groupid$i rlAssertGrep "Group: $gid" "$TmpDir/pki-user-membership-find-groupadd-find-ca-size-009.out" @@ -382,6 +387,7 @@ run_pki-user-cli-user-membership-find-ca_tests(){ user-membership-find userall --size=100 > $TmpDir/pki-user-membership-find-groupadd-find-ca-size-0010.out" 0 \ "user_membership-find with size parameter as 100" rlAssertGrep "14 entries matched" "$TmpDir/pki-user-membership-find-groupadd-find-ca-size-0010.out" + i=1 while [ $i -lt 15 ] ; do eval gid=\$groupid$i rlAssertGrep "Group: $gid" "$TmpDir/pki-user-membership-find-groupadd-find-ca-size-0010.out" @@ -427,7 +433,7 @@ run_pki-user-cli-user-membership-find-ca_tests(){ 0 \ "Find user-membership with -t ca option" rlAssertGrep "14 entries matched" "$TmpDir/pki-user-membership-find-ca-018.out" - i=0 + i=1 while [ $i -lt 5 ] ; do eval gid=\$groupid$i rlAssertGrep "Group: $gid" "$TmpDir/pki-user-membership-find-ca-018.out" @@ -628,7 +634,7 @@ run_pki-user-cli-user-membership-find-ca_tests(){ 0 \ "Find user-membership with group \"dadministʁasjɔ̃\"" rlAssertGrep "1 entries matched" "$TmpDir/pki-user-membership-find-groupadd-find-ca-031_3.out" - rlAssertGrep "Group: dadministʁasjɔ̃" "$TmpDir/pki-user-membership-find-groupadd-find-ca-031_3.out" + rlAssertGrep "Group: dadministʁasjɔ̃" "$TmpDir/pki-user-membership-find-groupadd-find-ca-031_3.out" rlPhaseEnd rlPhaseStartTest "pki_user_cli_user_membership-find-CA-031: Find user-membership for user fullname with i18n characters" @@ -696,7 +702,7 @@ run_pki-user-cli-user-membership-find-ca_tests(){ rlAssertGrep "0 entries matched" "$TmpDir/pki-user-membership-find-user-find-ca-033_2.out" rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_membership-find-ca-cleanup-001: Deleting the temp directory and users" + rlPhaseStartCleanup "pki_user_cli_user_membership-find-ca-cleanup-001: Deleting the temp directory and users" #===Deleting users created using CA_adminV cert===# i=1 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 b1bf013bc..7669b0d49 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 @@ -49,38 +49,38 @@ ######################################################################## 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) + subsystemId=$1 + SUBSYSTEM_TYPE=$2 + MYROLE=$3 + + #####Create temporary dir to save the output files ##### + rlPhaseStartSetup "pki_user_cli_user_mod-ca-startup: Create temporary directory" + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi else - prefix=ROOTCA - ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) fi -else - prefix=$MYROLE - ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS) -fi 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" - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - +SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) +untrusted_cert_db_location=$UNTRUSTED_CERT_DB_LOCATION +untrusted_cert_db_password=$UNTRUSTED_CERT_DB_PASSWORD user1=ca_agent2 user1fullname="Test ca agent" user2=abcdefghijklmnopqrstuvwxyx12345678 @@ -541,7 +541,9 @@ rlPhaseStartTest "pki_user_cli_user_mod-CA-017:--phone with maximum length and s -h $SUBSYSTEM_HOST \ -p $(eval echo \$${subsystemId}_UNSECURE_PORT) \ user-add --fullName=test usr1" - command="pki -d $CERTDB_DIR -n ${prefix}_adminV -c $CERTDB_DIR_PASSWORD -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) user-mod --phone='$randsym' usr1" + special_symbols="*$#" + command="pki -d $CERTDB_DIR -n ${prefix}_adminV -c $CERTDB_DIR_PASSWORD -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) user-mod --phone='$randsym$special_symbols' usr1" + rlLog "Executing: $command" errmsg="PKIException: LDAP error (21): error result" errorcode=255 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Cannot modify user using ${prefix}_adminV with maximum length --phone with character symbols in it" @@ -1017,7 +1019,7 @@ rlPhaseStartTest "pki_user_cli_user_mod-CA-044: Modify a user's email having i18 rlPhaseEnd #===Deleting users===# -rlPhaseStartTest "pki_user_cli_user_cleanup: Deleting role users" +rlPhaseStartCleanup "pki_user_cli_user_cleanup: Deleting role users" i=1 while [ $i -lt 17 ] ; do diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh index 37baae890..9b7e4ee45 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh @@ -45,6 +45,36 @@ ######################################################################## run_pki-user-cli-user-show-ca_tests(){ + subsystemId=$1 + SUBSYSTEM_TYPE=$2 + MYROLE=$3 + prefix=$subsystemId + + rlPhaseStartSetup "pki_user_cli_user_show-ca-startup: Create temporary directory" + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + get_topo_stack $MYROLE $TmpDir/topo_file + local CA_INST=$(cat $TmpDir/topo_file | grep MY_CA | cut -d= -f2) + ca_instance_created="False" + if [ "$TOPO9" = "TRUE" ] ; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + elif [ "$MYROLE" = "MASTER" ] ; then + if [[ $CA_INST == SUBCA* ]]; then + prefix=$CA_INST + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + else + prefix=ROOTCA + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + else + prefix=$MYROLE + ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS) + fi + + if [ "$ca_instance_created" = "TRUE" ] ; then #local variables user1=ca_agent2 user1fullname="Test ca_agent" @@ -54,39 +84,9 @@ run_pki-user-cli-user-show-ca_tests(){ user5=abc@ user6=abc? user7=0 - subsystemId=$1 - SUBSYSTEM_TYPE=$2 - MYROLE=$3 - prefix=$subsystemId - - if [ "$TOPO9" = "TRUE" ] ; then - ADMIN_CERT_LOCATION=$(eval echo \$${subsystemId}_ADMIN_CERT_LOCATION) - prefix=$subsystemId - CLIENT_PKCS12_PASSWORD=$(eval echo \$${subsystemId}_CLIENT_PKCS12_PASSWORD) - 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) - else - ADMIN_CERT_LOCATION=$ROOTCA_ADMIN_CERT_LOCATION - prefix=ROOTCA - CLIENT_PKCS12_PASSWORD=$ROOTCA_CLIENT_PKCS12_PASSWORD - fi - else - ADMIN_CERT_LOCATION=$(eval echo \$${MYROLE}_ADMIN_CERT_LOCATION) - prefix=$MYROLE - CLIENT_PKCS12_PASSWORD=$(eval echo \$${MYROLE}_CLIENT_PKCS12_PASSWORD) - fi - SUBSYSTEM_HOST=$(eval echo \$${MYROLE}) untrusted_cert_nickname=role_user_UTCA - rlPhaseStartSetup "pki_user_cli_user_show-ca-startup: Create temporary directory" - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - rlPhaseStartTest "pki_user_show-configtest: pki user-show configuration test" rlRun "pki user-show --help > $TmpDir/pki_user_show_cfg.out 2>&1" \ 0 \ @@ -697,15 +697,15 @@ run_pki-user-cli-user-show-ca_tests(){ rlAssertGrep "Type: Registration Manager Agents" "$TmpDir/pki-user-show-ca-001_27.out" rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_show-CA-025: --type Subsytem Group" + rlPhaseStartTest "pki_user_cli_user_show-CA-025: --type Subsystem Group" rlRun "pki -d $CERTDB_DIR \ -n ${prefix}_adminV \ -c $CERTDB_DIR_PASSWORD \ -h $SUBSYSTEM_HOST \ -p $(eval echo \$${subsystemId}_UNSECURE_PORT) \ - user-add --fullName=test --type=\"Subsytem Group\" u18" \ + user-add --fullName=test --type=\"Subsystem Group\" u18" \ 0 \ - "Adding user using ${prefix}_adminV with --type Subsytem Group" + "Adding user using ${prefix}_adminV with --type Subsystem Group" rlRun "pki -d $CERTDB_DIR \ -n ${prefix}_adminV \ -c $CERTDB_DIR_PASSWORD \ @@ -717,7 +717,7 @@ run_pki-user-cli-user-show-ca_tests(){ rlAssertGrep "User \"u18\"" "$TmpDir/pki-user-show-ca-001_28.out" rlAssertGrep "User ID: u18" "$TmpDir/pki-user-show-ca-001_28.out" rlAssertGrep "Full name: test" "$TmpDir/pki-user-show-ca-001_28.out" - rlAssertGrep "Type: Subsytem Group" "$TmpDir/pki-user-show-ca-001_28.out" + rlAssertGrep "Type: Subsystem Group" "$TmpDir/pki-user-show-ca-001_28.out" rlPhaseEnd rlPhaseStartTest "pki_user_cli_user_show-CA-026: --type Security Domain Administrators" @@ -1081,7 +1081,7 @@ Import CA certificate (Y/n)? \"" >> $expfile rlAssertGrep "Full name: ÉricTêko" "$TmpDir/pki-user-show-ca-001_57_2.out" rlPhaseEnd - rlPhaseStartTest "pki_user_cli_user_cleanup-046: Deleting the temp directory and users" + rlPhaseStartCleanup "pki_user_cli_user_cleanup-046: Deleting the temp directory and users" del_user=(${prefix}_adminV_user ${prefix}_adminR_user ${prefix}_adminE_user role_user_UTCA_user ${prefix}_agentV_user ${prefix}_agentR_user ${prefix}_agentE_user ${prefix}_auditV_user ${prefix}_operatorV_user) #===Deleting users created using ${prefix}_adminV cert===# @@ -1118,4 +1118,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 } |