summaryrefslogtreecommitdiffstats
path: root/tests/dogtag/acceptance/cli-tests/pki-ca-user-cli
diff options
context:
space:
mode:
Diffstat (limited to 'tests/dogtag/acceptance/cli-tests/pki-ca-user-cli')
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-add.sh50
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-add.sh48
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-delete.sh48
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-find.sh49
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert-show.sh49
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-cert.sh46
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-del.sh45
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-find.sh43
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-add.sh30
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-del.sh32
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-membership-find.sh32
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-mod.sh53
-rwxr-xr-xtests/dogtag/acceptance/cli-tests/pki-ca-user-cli/pki-ca-user-cli-ca-user-show.sh46
13 files changed, 289 insertions, 282 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 f172cfe03..a9ad5315b 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
@@ -47,33 +47,33 @@ run_pki-ca-user-cli-ca-user-add_tests(){
subsystemId=$1
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_ca_user_cli_ca_user_add-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
SUBSYSTEM_HOST=$(eval echo \$${MYROLE})
untrusted_cert_nickname=role_user_UTCA
- rlPhaseStartSetup "pki_ca_user_cli_ca_user_add-startup: Create temporary directory"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
rlPhaseStartTest "pki_ca_user_cli-configtest: pki ca-user --help configuration test"
rlRun "pki ca-user --help > $TmpDir/pki_ca_user_cfg.out 2>&1" \
0 \
@@ -1133,7 +1133,7 @@ run_pki-ca-user-cli-ca-user-add_tests(){
rlLog "ca-user-add email address negyvenkettő@qetestsdomain.com with i18n characters"
command="pki -d $CERTDB_DIR -n ${prefix}_adminV -c $CERTDB_DIR_PASSWORD--h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) ca-user-add --fullName=test --email='negyvenkettő@qetestsdomain.com' u31"
rlLog "Executing $command"
- errmsg="IncorrectPasswordException: Incorrect client security database password."
+ errmsg="Unsupported e-mail address characters"
errorcode=255
rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Adding email negyvenkettő@qetestsdomain.com with i18n characters"
rlLog "PKI Ticket:: https://fedorahosted.org/pki/ticket/860"
@@ -1143,7 +1143,7 @@ run_pki-ca-user-cli-ca-user-add_tests(){
rlLog "ca-user-add email address četrdesmitdivi@qetestsdomain.com with i18n characters"
command="pki -d $CERTDB_DIR -n ${prefix}_adminV -c $CERTDB_DIR_PASSWORD-h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) ca-user-add --fullName=test --email='četrdesmitdivi@qetestsdomain.com' u32"
rlLog "Executing $command"
- errmsg="IncorrectPasswordException: Incorrect client security database password."
+ errmsg="Unsupported e-mail address characters"
errorcode=255
rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Adding email četrdesmitdivi@qetestsdomain.com with i18n characters"
rlPhaseEnd
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 1a3c9ead5..4eba42578 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
@@ -49,36 +49,38 @@
########################################################################
run_pki-ca-user-cli-user-cert-add_tests(){
+ subsystemId=$1
+ SUBSYSTEM_TYPE=$2
+ MYROLE=$3
+
+ ##### 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"
+ rlRun "pushd $TmpDir"
+ rlPhaseEnd
-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)
+ 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
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"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
local cert_info="$TmpDir/cert_info"
user1=testuser1
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 608d1671b..f74ac0394 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
@@ -49,37 +49,37 @@
########################################################################
run_pki-ca-user-cli-ca-user-cert-delete_tests(){
+ 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
-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)
+ 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
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"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
user1=testuser1
user2=testuser2
user1fullname="Test user1"
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 d6344ecd9..f6f4aae99 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
@@ -49,37 +49,38 @@
########################################################################
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)
+ 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
+ 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
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"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
user1=testuser1
user2=testuser2
user1fullname="Test user1"
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 d993cf5da..0c038a3f9 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
@@ -49,37 +49,38 @@
########################################################################
run_pki-ca-user-cli-ca-user-cert-show_tests(){
+ subsystemId=$1
+ SUBSYSTEM_TYPE=$2
+ MYROLE=$3
+
+ ##### 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
-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)
+ 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
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"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
user1=testuser1
user2=testuser2
user1fullname="Test user1"
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 d8732d482..b85a66e24 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
@@ -41,33 +41,35 @@
# pki ca-user-cert ran without any options should show all the command line options of pki cert
run_pki-ca-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
+ 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
if [ "$ca_instance_created" = "TRUE" ] ; then
SUBSYSTEM_HOST=$(eval echo \$${MYROLE})
- rlPhaseStartSetup "Create Temporary Directory "
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
rlPhaseStartTest "pki_ca_user_cli_ca_user_cert-001: pki ca-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-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 39b2ce3f6..509847047 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
@@ -46,33 +46,32 @@ run_pki-ca-user-cli-ca-user-del_tests(){
subsystemId=$1
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_ca_user_cli_ca_user_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
if [ "$ca_instance_created" = "TRUE" ] ; then
SUBSYSTEM_HOST=$(eval echo \$${MYROLE})
untrusted_cert_nickname=role_user_UTCA
- rlPhaseStartSetup "pki_ca_user_cli_ca_user_del-ca-startup: Create temporary directory"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
rlPhaseStartTest "pki_ca_user_cli_ca_user_del-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"
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 4a9c4008c..2c8a6cb27 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,23 +45,28 @@ run_pki-ca-user-cli-ca-user-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
-
+ rlPhaseStartSetup "pki_ca_user_cli_ca_user_find-startup-create-tempdir: 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})
untrusted_cert_nickname=role_user_UTCA
@@ -74,9 +79,7 @@ run_pki-ca-user-cli-ca-user-find_tests(){
user6=abc?
user7=0
- rlPhaseStartSetup "pki_ca_user_cli_ca_user_find-startup-addusers: Create temporary directory and add users"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
+ rlPhaseStartSetup "pki_ca_user_cli_ca_user_find-startup-addusers: Add users"
i=1
while [ $i -lt 25 ] ; do
rlRun "pki -d $CERTDB_DIR \
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 b1eec8f96..3a8380974 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
@@ -46,22 +46,27 @@ run_pki-ca-user-cli-ca-user-membership-add_tests(){
subsystemId=$1
SUBSYSTEM_TYPE=$2
MYROLE=$3
- prefix=$subsystemId
- ca_instance_created="False"
+ rlPhaseStartSetup "pki_ca_user_cli_ca_user_membership-add-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=$subsystemId
- ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS)
+ prefix=$CA_INST
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
elif [ "$MYROLE" = "MASTER" ] ; then
- if [[ $subsystemId == SUBCA* ]]; then
- prefix=$subsystemId
- ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS)
+ if [[ $CA_INST == SUBCA* ]]; then
+ prefix=$CA_INST
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
else
prefix=ROOTCA
- ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
fi
else
prefix=$MYROLE
- ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS)
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
fi
if [ "$ca_instance_created" = "TRUE" ] ; then
SUBSYSTEM_HOST=$(eval echo \$${MYROLE})
@@ -83,11 +88,6 @@ run_pki-ca-user-cli-ca-user-membership-add_tests(){
groupid13="Enterprise RA Administrators"
groupid14="Enterprise TPS Administrators"
- rlPhaseStartSetup "pki_ca_user_cli_ca_user_membership-add-001: Create temporary directory"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
rlPhaseStartTest "pki_ca_user_cli_ca_user_membership-add-002: pki user-membership configuration test"
rlRun "pki -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) ca-user-membership > $TmpDir/pki_ca_user_membership_cfg.out 2>&1" \
0 \
@@ -436,7 +436,7 @@ run_pki-ca-user-cli-ca-user-membership-add_tests(){
rlPhaseEnd
rlPhaseStartTest "pki_ca_user_cli_ca_user_membership-add-017: Should not be able to ca-user-membership-add using CA_adminUTCA cert"
- command="pki -d $UNTRUSTED_CERT_DB_LOCATION -n $untrusted_cert_nickname -c $UNTRUSTED_CERT_DB_PASSWORD ca-user-membership-add testuser1 \"Administrators\""
+ command="pki -d $UNTRUSTED_CERT_DB_LOCATION -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) -n $untrusted_cert_nickname -c $UNTRUSTED_CERT_DB_PASSWORD ca-user-membership-add testuser1 \"Administrators\""
rlLog "Executing $command"
errmsg="PKIException: Unauthorized"
errorcode=255
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 38865c3e5..2e027493e 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
@@ -43,26 +43,29 @@ run_pki-ca-user-cli-ca-user-membership-del_tests(){
subsystemId=$1
SUBSYSTEM_TYPE=$2
MYROLE=$3
- prefix=$subsystemId
- ca_instance_created="False"
-
+ rlPhaseStartSetup "pki_ca_user_cli_ca_user_membership-del-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=$subsystemId
- ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS)
+ prefix=$CA_INST
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
elif [ "$MYROLE" = "MASTER" ] ; then
- if [[ $subsystemId == SUBCA* ]]; then
- prefix=$subsystemId
- ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS)
+ if [[ $CA_INST == SUBCA* ]]; then
+ prefix=$CA_INST
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
else
prefix=ROOTCA
- ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
fi
else
prefix=$MYROLE
- ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS)
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
fi
-
if [ "$ca_instance_created" = "TRUE" ] ; then
SUBSYSTEM_HOST=$(eval echo \$${MYROLE})
untrusted_cert_nickname=role_user_UTCA
@@ -83,11 +86,6 @@ run_pki-ca-user-cli-ca-user-membership-del_tests(){
groupid13="Enterprise RA Administrators"
groupid14="Enterprise TPS Administrators"
- rlPhaseStartTest "pki_ca_user_cli_ca_user_membership-del-001: Create temporary directory"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
rlPhaseStartTest "pki_ca_user_cli_ca_user_membership-del-002: pki ca-user-membership-del --help configuration test"
rlRun "pki ca-user-membership-del --help > $TmpDir/pki_user_membership_del_cfg.out 2>&1" \
0 \
@@ -375,7 +373,7 @@ run_pki-ca-user-cli-ca-user-membership-del_tests(){
rlPhaseEnd
rlPhaseStartTest "pki_ca_user_cli_ca_user_membership-del-015: Should not be able to ca-user-membership-del using CA_adminUTCA cert"
- command="pki -d $UNTRUSTED_CERT_DB_LOCATION -n $untrusted_cert_nickname -c $UNTRUSTED_CERT_DB_PASSWORD ca-user-membership-del user2 \"Administrators\""
+ command="pki -d $UNTRUSTED_CERT_DB_LOCATION -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) -n $untrusted_cert_nickname -c $UNTRUSTED_CERT_DB_PASSWORD ca-user-membership-del user2 \"Administrators\""
rlLog "Executing $command"
errmsg="PKIException: Unauthorized"
errorcode=255
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 cc4beabf5..3e078f6a2 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
@@ -46,24 +46,29 @@ run_pki-ca-user-cli-ca-user-membership-find_tests(){
subsystemId=$1
SUBSYSTEM_TYPE=$2
MYROLE=$3
- prefix=$subsystemId
- ca_instance_created="False"
+ rlPhaseStartSetup "pki_ca_user_cli_ca_user_add-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=$subsystemId
- ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS)
+ prefix=$CA_INST
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
elif [ "$MYROLE" = "MASTER" ] ; then
- if [[ $subsystemId == SUBCA* ]]; then
- prefix=$subsystemId
- ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS)
+ if [[ $CA_INST == SUBCA* ]]; then
+ prefix=$CA_INST
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
else
prefix=ROOTCA
- ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
fi
else
prefix=$MYROLE
- ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS)
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
fi
-
if [ "$ca_instance_created" = "TRUE" ] ; then
SUBSYSTEM_HOST=$(eval echo \$${MYROLE})
untrusted_cert_nickname=role_user_UTCA
@@ -85,11 +90,6 @@ run_pki-ca-user-cli-ca-user-membership-find_tests(){
groupid13="Enterprise RA Administrators"
groupid14="Enterprise TPS Administrators"
- rlPhaseStartTest "pki_ca_user_cli_ca_user_membership-find-001: Create temporary directory"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
rlPhaseStartTest "pki_ca_user_cli_ca_user_membership-find-002: pki ca-user-membership-find --help configuration test"
rlRun "pki ca-user-membership-find --help > $TmpDir/pki_user_membership_find_cfg.out 2>&1" \
0 \
@@ -566,7 +566,7 @@ run_pki-ca-user-cli-ca-user-membership-find_tests(){
rlPhaseEnd
rlPhaseStartTest "pki_ca_user_cli_ca_user_membership-find-029: Should not be able to ca-user-membership-find using CA_adminUTCA cert"
- command="pki -d $UNTRUSTED_CERT_DB_LOCATION -n $untrusted_cert_nickname -c $UNTRUSTED_CERT_DB_PASSWORD ca-user-membership-find userall --start=0 --size=5"
+ command="pki -d $UNTRUSTED_CERT_DB_LOCATION -h $SUBSYSTEM_HOST -p $(eval echo \$${subsystemId}_UNSECURE_PORT) -n $untrusted_cert_nickname -c $UNTRUSTED_CERT_DB_PASSWORD ca-user-membership-find userall --start=0 --size=5"
rlLog "Executing $command"
errmsg="PKIException: Unauthorized"
errorcode=255
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 24bc249e2..ec852def6 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
@@ -48,37 +48,37 @@
########################################################################
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)
+ subsystemId=$1
+ SUBSYSTEM_TYPE=$2
+ MYROLE=$3
+
+ #####Create temporary dir to save the output files #####
+ rlPhaseStartSetup "pki_ca_user_cli_ca_user_mod-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
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"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
user1=ca_agent2
user1fullname="Test ca agent"
user2=abcdefghijklmnopqrstuvwxyx12345678
@@ -580,7 +580,8 @@ rlPhaseStartTest "pki_ca_user_cli_ca_user_mod-017:--phone with maximum length an
-h $CA_HOST \
-p $CA_PORT \
ca-user-add --fullName=test usr1"
- command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $CA_HOST -p $CA_PORT ca-user-mod --phone='$randsym' usr1"
+ special_symbols="*$#"
+ command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $CA_HOST -p $CA_PORT ca-user-mod --phone='$randsym$special_symbols' usr1"
errmsg="PKIException: LDAP error (21): error result"
errorcode=255
rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Cannot modify user using CA_adminV with maximum length --phone with character symbols in it"
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 1aab02361..62ddf1f18 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
@@ -45,44 +45,44 @@
########################################################################
run_pki-ca-user-cli-ca-user-show_tests(){
- #local variables
- user1=ca_agent2
- user1fullname="Test ca_agent"
- user2=abcdefghijklmnopqrstuvwxyx12345678
- user3=abc#
- user4=abc$
- user5=abc@
- user6=abc?
- user7=0
subsystemId=$1
SUBSYSTEM_TYPE=$2
MYROLE=$3
- prefix=$subsystemId
- ca_instance_created="False"
+ rlPhaseStartSetup "pki_ca_user_cli_user_show-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=$subsystemId
- ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS)
+ prefix=$CA_INST
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
elif [ "$MYROLE" = "MASTER" ] ; then
- if [[ $subsystemId == SUBCA* ]]; then
- prefix=$subsystemId
- ca_instance_created=$(eval echo \$${subsystemId}_INSTANCE_CREATED_STATUS)
+ if [[ $CA_INST == SUBCA* ]]; then
+ prefix=$CA_INST
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
else
prefix=ROOTCA
- ca_instance_created=$ROOTCA_INSTANCE_CREATED_STATUS
+ ca_instance_created=$(eval echo \$${CA_INST}_INSTANCE_CREATED_STATUS)
fi
else
prefix=$MYROLE
- ca_instance_created=$(eval echo \$${MYROLE}_INSTANCE_CREATED_STATUS)
+ 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"
+ user2=abcdefghijklmnopqrstuvwxyx12345678
+ user3=abc#
+ user4=abc$
+ user5=abc@
+ user6=abc?
+ user7=0
SUBSYSTEM_HOST=$(eval echo \$${MYROLE})
untrusted_cert_nickname=role_user_UTCA
- rlPhaseStartSetup "pki_ca_user_cli_user_show-startup: Create temporary directory"
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlPhaseEnd
-
rlPhaseStartTest "pki_ca_user_show-configtest: pki ca-user-show configuration test"
rlRun "pki ca-user-show --help > $TmpDir/pki_ca_user_show_cfg.out 2>&1" \
0 \