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, 9 insertions, 10 deletions

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
 }