Added pki user KRA, OCSP, TKS and TPS tests.

Modified user CA test scripts to check for subsystem installed status.

1 files changed, 29 insertions, 29 deletions

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