Added script to keep subsystem installed status

written to env.sh and CA pki user clis check for
CA install status before execution.

1 files changed, 13 insertions, 4 deletions

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
 }