minor fixes in pki-cert-show automation

use generate_new_cert function to generate cert

1 files changed, 112 insertions, 112 deletions

diff --git a/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-show.sh b/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-show.sh
index 7897dc4f2..12471eb4e 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-show.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-show.sh
@@ -49,7 +49,19 @@ run_pki-cert-show-ca_tests()
 	local crmf_reqstatus
 	local crmf_requestid
 	local decimal_valid_serialNumber
-
+	local i18n_ret_requestid
+	local i18n_req_subject
+	local 18n_ret_req_status
+	local i18n_user1_fullname="Örjan Äke"
+        local i18n_user1="Örjan_Äke"
+	local i18n_user2_fullname="Éric Têko"
+        local i18n_user2="Éric_Têko"
+        local i18n_user3_fullname="éénentwintig dvidešimt"
+        local i18n_user3="éénentwintig_dvidešimt"
+	local i18n_user4_fullname="kakskümmend üks"
+	local i18n_user4="kakskümmend_üks"
+	local i18n_user5_fullname="двадцять один тридцять"
+	local i18n_user5="двадцять_один_тридцять"
 	local rand=$(cat /dev/urandom | tr -dc '0-9' | fold -w 5 | head -n 1)
 	local junk="axb124?$5@@_%^$#$@\!(_)043112321412321"
 	local cert_req_info="$TmpDir/cert_req_info.out"
@@ -59,37 +71,34 @@ run_pki-cert-show-ca_tests()
         rlPhaseStartSetup "pki cert-show Temporary Directory"
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"
+	local TEMP_NSS_DB="$TmpDir/nssdb"
+        local TEMP_NSS_DB_PWD="redhat"
+        local temp_out="$TmpDir/cert-show.out"
+	local cert_info="$TmpDir/cert_info"
         rlPhaseEnd
 	
 	# Create a Temporary NSS DB Directory and generate Certificate
 
 	rlPhaseStartSetup "Generating temporary Cert to be used pki cert-show automation Tests"
-        local TEMP_NSS_DB="$TmpDir/nssdb"
-	local temp_out="$TmpDir/cert-show.out"
-        rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 "--" "--" "--" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
-	local pkcs10_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2) 
-        rlRun "pki -d $CERTDB_DIR -c $CERTDB_DIR_PASSWORD -n \"$CA_agentV_user\" ca-cert-request-review $pkcs10_requestid --action approve 1> $TmpDir/pki-pkcs10-approve-out" 0 "As $CA_agentV_user Approve Certificate Request"
-	rlAssertGrep "Approved certificate request $pkcs10_requestid" "$TmpDir/pki-pkcs10-approve-out"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat crmf rsa 2048 "--" "--" "--" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
-	local crmf_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
-	rlRun "pki -d $CERTDB_DIR \
-			-c $CERTDB_DIR_PASSWORD \
-			-n \"$CA_agentV_user\" \
-			ca-cert-request-review $crmf_requestid \
-			--action approve 1> $TmpDir/pki-crmf-approve-out"
-	rlAssertGrep "Approved certificate request $crmf_requestid" "$TmpDir/pki-crmf-approve-out"
-	local valid_pkcs10_serialNumber=$(pki cert-request-show $pkcs10_requestid | grep "Certificate ID" | sed 's/ //g' | cut -d: -f2)
-	local valid_crmf_serialNumber=$(pki cert-request-show $crmf_requestid | grep "Certificate ID" | sed 's/ //g' | cut -d: -f2)
-	STRIP_HEX_PKCS10=$(echo $valid_pkcs10_serialNumber | cut -dx -f2)
-	STRIP_HEX_CRMF=$(echo $valid_crmf_serialNumber | cut -dx -f2)
+        rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PWD myreq_type:pkcs10 \
+	algo:rsa key_size:2048 subject_cn: subject_uid: subject_email: subject_ou: org: country: archive:false \
+        req_profile: target_host: protocol: port: cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \
+	certdb_nick:\"$CA_agentV_user\" cert_info:$cert_info" 0 "Generate certificate based on pkcs10 request"
+        local valid_pkcs10_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2)
+        rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PWD myreq_type:crmf \
+	algo:rsa key_size:2048 subject_cn: subject_uid: subject_email: subject_ou: org: country: archive:false \
+        req_profile: target_host: protocol: port: cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \
+	certdb_nick:\"$CA_agentV_user\" cert_info:$cert_info" 0 "Generate certificate based on crmf request"
+        local valid_crmf_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2)
+        STRIP_HEX_PKCS10=$(echo $valid_pkcs10_serialNumber | cut -dx -f2)
+        STRIP_HEX_CRMF=$(echo $valid_crmf_serialNumber | cut -dx -f2)
         CONV_UPP_VAL_PKCS10=${STRIP_HEX_PKCS10^^}
-	CONV_UPP_VAL_CRMF=${STRIP_HEX_CRMF^^}
-	decimal_valid_serialNumber_pkcs10=$(echo "ibase=16;$CONV_UPP_VAL_PKCS10"|bc)
-	decimal_valid_serialNumber_crmf=$(echo "ibase=16;$CONV_UPP_VAL_CRMF"|bc)
+        CONV_UPP_VAL_CRMF=${STRIP_HEX_CRMF^^}
+        decimal_valid_serialNumber_pkcs10=$(echo "ibase=16;$CONV_UPP_VAL_PKCS10"|bc)
+        decimal_valid_serialNumber_crmf=$(echo "ibase=16;$CONV_UPP_VAL_CRMF"|bc)
         rlPhaseEnd
 
 	# pki cert cli config test
-
 	rlPhaseStartTest "pki_cert_cli-configtest: pki cert-show --help configuration test"
 	rlRun "pki cert-show --help > $TmpDir/cert-show.out 2>&1" 0 "pki cert-show --help"
 	rlAssertGrep "usage:" "$TmpDir/cert-show.out"
@@ -99,10 +108,8 @@ run_pki-cert-show-ca_tests()
 	rlAssertNotGrep "Error: Unrecognized option: --help" "$TmpDir/cert-show.out"
 	rlLog "FAIL :: https://engineering.redhat.com/trac/pki-tests/ticket/490"
 	rlPhaseEnd
-
-
+	
 	#Run pki cert-show with valid serial number in HexaDecimal
-
 	rlPhaseStartTest "pki_cert_show-001: pki cert-show < valid serialNumber(HexaDecimal) >  should show Certificate Details"
 	rlRun "pki cert-show $valid_pkcs10_serialNumber > $temp_out" 0 "Executing pki cert-show $valid_pkcs10_serialNumber"
 	rlAssertGrep "Certificate \"$valid_pkcs10_serialNumber\"" "$temp_out"
@@ -111,16 +118,14 @@ run_pki-cert-show-ca_tests()
 	rlAssertGrep "Subject: $pkcs10_requestdn" "$temp_out"
 	rlAssertGrep "Status: VALID" "$temp_out"
 	rlPhaseEnd
-
+	
 	#Run pki cert-show with No serial Number 
-
 	rlPhaseStartTest "pki_cert_show-002: pki cert-show should show usage details when no serial Number is given"
 	rlRun "pki cert-show  > $temp_out" 1,255 "pki cert-show without any serial number fails"
 	rlAssertGrep "usage: cert-show" "$temp_out"
 	rlPhaseEnd
 	
 	# Run pki cert-show with Invalid Serial Number in decimal
-
 	rlPhaseStartTest "pki_cert_show-003: pki cert-show < invalid serialNumber(Decimal) > should Fail"
 	rlRun "pki cert-show $invalid_serialNumber 2> $temp_out" 1,255 "command pki cert-show $invalid_serialNumber"
 	rlAssertGrep "CertNotFoundException" "$temp_out"
@@ -138,39 +143,34 @@ run_pki-cert-show-ca_tests()
 	rlPhaseEnd
 
 	#Run pki cert-show with invalid serialNumber given in Hexadecimal
-	
 	rlPhaseStartTest "pki_cert_show-005: pki cert-show < invalid serialNumber(hexadecimal) > should fail"
 	rlRun "pki cert-show $invalid_hex_serialNumber 2> $temp_out" 1,255 "Executing pki cert-show $invalid_hex_serialNumber"
 	rlAssertGrep "CertNotFoundException" "$temp_out"
 	rlPhaseEnd
 
 	# Run pki cert-show with Junk Characters
-
 	rlPhaseStartTest "pki_cert_show-006: pki cert-show < junk characters > should fail to show any certificate Details"
 	rlRun "pki cert-show \"$junk\" 2> $temp_out" 1,255 "Executing pki cert-show $junk"
 	rlAssertGrep "NumberFormatException: For input string" "$temp_out"
 	rlPhaseEnd	
 	
 	# Run pki cert-show <valid serialNumber> --encoded to produce a valid pem output
-
 	rlPhaseStartTest "pki_cert_show-007: pki cert-show <valid SerialNumber>  --encoded should produce a valid pem output"
 	rlLog "Running pki cert-show $valid_pkcs10_serialNumber"
         rlRun "pki cert-show $valid_pkcs10_serialNumber --encoded > $temp_out" 0 "command pki cert-show $valid_pkcs10_serialNumber --encoded"
         rlLog "Get the Subject Name of the Certificate with $valid_pkcs10_serialNumber"
         rlLog "$(cat $temp_out | grep Subject | awk -F":" '{print $2}')"
 	rlRun "openssl x509 -in $temp_out -noout -serial 1> $temp_out-openssl" 0 "Run openssl to verify PEM output"
-	rlAssertGrep "serial=$CONV_UPP_VAL_PKCS10" "$temp_out-openssl"
+	rlAssertGrep "serial=0$CONV_UPP_VAL_PKCS10" "$temp_out-openssl"
 	rlPhaseEnd
-	
+		
 	#Run pki cert-show --encoded with No serial Number
-
 	rlPhaseStartTest "pki_cert_show-008: pki cert-show <No SerialNumber> --encoded should fail"
 	rlRun "pki cert-show --encoded 1> $temp_out" 1,255 "Running pki cert-show <No-serial-Number> --encoded"
 	rlAssertGrep "usage: cert-show" "$temp_out"
 	rlPhaseEnd
 	
 	# Run pki cert-show --encoded with Invalid Serial Number
-	
 	rlPhaseStartTest "pki_cert_show-009: pki cert-show <In-Valid SerialNumber> --encoded should fail"
 	rlLog "Running pki cer-show <invalid-serial-Number> --encoded"
 	rlRun "pki cert-show $invalid_serialNumber --encoded 2> $temp_out" 1,255 "pki cert-show $serialNumber"
@@ -180,27 +180,24 @@ run_pki-cert-show-ca_tests()
 	rlPhaseEnd
 	
 	# Run pki cert-show <valid serialNumber> --output <filename>(pkcs10)
-
 	rlPhaseStartTest "pki_cert_show-0010: pki cert-show <valid SerialNumber(Hexadecimal)> --output <filename> should save the Certificate in File"
 	rlRun "pki cert-show $valid_pkcs10_serialNumber --output $temp_out" 0 "Executing pki cert-show $valid_pkcs10_serialNumber --output <file-name>"
 	rlAssertGrep "-----BEGIN CERTIFICATE-----" "$temp_out"
 	rlAssertGrep "\-----END CERTIFICATE-----" "$temp_out"
 	rlRun "openssl x509 -in $temp_out -noout -serial 1> $temp_out-openssl" 0 "Run openssl x509 on the output file"
-	rlAssertGrep "serial=$CONV_UPP_VAL_PKCS10" "$temp_out-openssl"
+	rlAssertGrep "serial=0$CONV_UPP_VAL_PKCS10" "$temp_out-openssl"
 	rlPhaseEnd
 
 	#Run pki cert-show <valid serialNumber> --output <filename> (crmf)
-
 	rlPhaseStartTest "pki_cert_show-0011: pki cert-show <valid SerialNumber(Hexadecimal)> (crmf) --output <filename> should save the Certificate in File"
 	rlRun "pki cert-show $valid_crmf_serialNumber --output $temp_out" 0 "Executing pki cert-show $valid_crmf_serialNumber --output <file-name>"
 	rlAssertGrep "-----BEGIN CERTIFICATE-----" "$temp_out"
 	rlAssertGrep "\-----END CERTIFICATE-----" "$temp_out"
 	rlRun "openssl x509 -in $temp_out -noout -serial 1> $temp_out-openssl" 0 "Run openssl x509 on the output file"
-	rlAssertGrep "serial=$CONV_UPP_VAL_CRMF" "$temp_out-openssl"
+	rlAssertGrep "serial=0$CONV_UPP_VAL_CRMF" "$temp_out-openssl"
 	rlPhaseEnd
 	
 	# Run pki cert-show <invalid-serial-number> --output 
-
 	rlPhaseStartTest "pki_cert_show-0012: pki cert-show <invalid-serial-Number> --output <filename> should not create any file"
 	rlLog "Running pki cert-show <invalid-serialNumber> --output <filename>"
 	rlRun "pki cert-show $invalid_serialNumber --output $temp_out" 1,255 "pki cert-show <invalid-serial-number> --output <file>"
@@ -208,21 +205,19 @@ run_pki-cert-show-ca_tests()
 	rlPhaseEnd
 
 	# Run pki cert-show <No serial number> --output <filename>
-
 	rlPhaseStartTest "pki_cert_show-0013: pki cert-show <No serialNumber> --output <filename> should fail"
 	local temp_out13=$TmpDir/cert-show13.out
 	local temp_out13_err=$TmpDir/cert-err13.out
 	rlLog "Running pki cert-show --output $temp_out13 0> $temp_out13_err" 
-	rlRun "pki cert-show --output $temp_ou13 1> $temp_out13_err" 1,255
+	rlRun "pki cert-show --output $temp_out13 >> $temp_out13_err 2>&1" 1,255
+	rlAssertGrep "Error: Missing Serial Number" "$temp_out13_err"
 	rlAssertGrep "usage:" "$temp_out13_err"  	
 	rlAssertGrep "--encoded         Base-64 encoded" "$temp_out13_err"
 	rlAssertGrep "--output <file>   Output file" "$temp_out13_err"
 	rlAssertGrep "--pretty          Pretty print" "$temp_out13_err"	
-	rlPhaseEnd	
-	
-	
+	rlPhaseEnd
+		
 	# Run pki cert-show <valid-serial-number> --pretty 
-
         rlPhaseStartTest "pki_cert_show-0014: pki cert-show <valid SerialNumber(decimal)> --pretty <filename> should show PrettyPrint output of cert and save the the Cert in File."
         rlLog "Running pki cert-show $valid_pkcs10_serialNumber --pretty"
         rlRun "pki cert-show $valid_pkcs10_serialNumber --pretty > $temp_out" 0
@@ -232,7 +227,6 @@ run_pki-cert-show-ca_tests()
         rlPhaseEnd
 
 	 # Run pki cert-show <in-valid-serial-number> --pretty 
-
 	rlPhaseStartTest "pki_cert_show-0015: pki cert-show < $invalid_serialNumber > --pretty <filename> should fail to produce any PrettyPrint output"
 	local temp_out1="$TmpDir/cert-show1.out"
 	rlRun "pki cert-show $invalid_hex_serialNumber --pretty 2> $temp_out1" 1,255 "Executing pki cert-show $invalid_hex_serialNumber --pretty"
@@ -240,7 +234,6 @@ run_pki-cert-show-ca_tests()
 	rlPhaseEnd
 
 	# Run pki cert-show <No serial Number> --pretty
-
 	rlPhaseStartTest "pki_cert_show-0016: pki cert-show <No serialNumber> --pretty <filename> should fail to produce any PrettyPrint output"
 	rlLog "Running pki cert-show --pretty" 1
 	rlRun "pki cert-show --pretty 1> $temp_out" 1,255
@@ -251,83 +244,90 @@ run_pki-cert-show-ca_tests()
 	rlPhaseEnd
 
 	# Run pki cert-show with i18n characters 
-	
 	rlPhaseStartTest "pki_cert_show-0017: Test-1 Verify pki cert-show with i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"Örjan Äke\" \"Örjan Äke\" \"test@example.org\" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
-	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
-	rlRun "pki -d $CERTDB_DIR \
-		-c $CERTDB_DIR_PASSWORD \
-		-n \"$CA_agentV_user\" \
-		ca-cert-request-review $i18n_ret_requestid \
-		--action approve 1> $TmpDir/i18n-pkcs10-approve-out" 0 "As $CA_agentV_user Approve Certificate Request"
-	rlAssertGrep "Approved certificate request $i18n_ret_requestid" "$TmpDir/i18n-pkcs10-approve-out"
-	rlRun "valid_i18n_pkcs10_serialNumber=\$(pki cert-request-show $i18n_ret_requestid | grep \"Certificate ID\" | sed 's/ //g' | cut -d: -f2)"
-	rlRun "pki cert-show $valid_i18n_pkcs10_serialNumber 1> $temp_out" 0 "Executing pki cert-show $valid_i18n_valid_pkcs10_serialNumber"
-	rlAssertGrep "CN=Örjan Äke" "$temp_out"
-	rlAssertGrep "UID=Örjan Äke" "$temp_out"
+	rlLog "Generate cert request for $i18n_user1_fullname"
+        rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PWD request_type:pkcs10 \
+	algo:rsa key_size:2048 subject_cn:\"$i18n_user1_fullname\" subject_uid:$i18n_user1 subject_email:i18nuser@example.org \
+	organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \
+	target_host:$(hostname) protocol: port:8080 cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \
+	certdb_nick:\"$CA_agentV_user\" cert_info:$cert_info" 
+	local i18n_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2)
+	local i18n_requestdn=$(cat $cert_info | grep Request_DN | cut -d- -f2)
+	rlRun "pki cert-show $i18n_serialNumber 1> $temp_out" 0 "Executing pki cert-show $i18n_serialNumber"
+	rlAssertGrep "Certificate \"$i18n_serialNumber\"" "$temp_out"
+        rlAssertGrep "Serial Number: $i18n_serialNumber" "$temp_out"
+        rlAssertGrep "Issuer: CN=CA Signing Certificate,O=$CA_DOMAIN" "$temp_out"
+        rlAssertGrep "Subject: $i18n_requestdn" "$temp_out"
+        rlAssertGrep "Status: VALID" "$temp_out"
 	rlPhaseEnd
 	
 	rlPhaseStartTest "pki_cert_show-0018: Test-2 Verify pki cert-show with i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"Éric Têko\" \"Éric Têko\" \"test@example.org\" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
-	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
-	rlRun "pki -d $CERTDB_DIR \
-		-c $CERTDB_DIR_PASSWORD \
-		-n \"$CA_agentV_user\" \
-		ca-cert-request-review $i18n_ret_requestid \
-		--action approve 1> $TmpDir/i18n-pkcs10-approve-out" 0 "As $CA_agentV_user Approve Certificate Request"
-	rlAssertGrep "Approved certificate request $i18n_ret_requestid" "$TmpDir/i18n-pkcs10-approve-out"
-	rlRun "valid_i18n_pkcs10_serialNumber=\$(pki cert-request-show $i18n_ret_requestid | grep \"Certificate ID\" | sed 's/ //g' | cut -d: -f2)"
-	rlRun "pki cert-show $valid_i18n_pkcs10_serialNumber 1> $temp_out" 0 "Executing pki cert-show $valid_i18n_valid_pkcs10_serialNumber"
-	rlAssertGrep "CN=Éric Têko" "$temp_out"
-	rlAssertGrep "UID=Éric Têko" "$temp_out"
+	rlLog "Generate cert request for $i18n_user2_fullname"
+        rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PWD request_type:pkcs10 \
+        algo:rsa key_size:2048 subject_cn:\"$i18n_user2_fullname\" subject_uid:$i18n_user2 subject_email:i18nuser@example.org \
+        organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \
+        target_host:$(hostname) protocol: port:8080 cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \
+        certdb_nick:\"$CA_agentV_user\" cert_info:$cert_info"
+        local i18n_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2)
+        local i18n_requestdn=$(cat $cert_info | grep Request_DN | cut -d- -f2)
+        rlRun "pki cert-show $i18n_serialNumber 1> $temp_out" 0 "Executing pki cert-show $i18n_serialNumber"
+        rlAssertGrep "Certificate \"$i18n_serialNumber\"" "$temp_out"
+        rlAssertGrep "Serial Number: $i18n_serialNumber" "$temp_out"
+        rlAssertGrep "Issuer: CN=CA Signing Certificate,O=$CA_DOMAIN" "$temp_out"
+        rlAssertGrep "Subject: $i18n_requestdn" "$temp_out"
+        rlAssertGrep "Status: VALID" "$temp_out"
 	rlPhaseEnd 
 
-
 	rlPhaseStartTest "pki_cert_show-0019: Test-3 Verify pki cert-show with i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"éénentwintig dvidešimt\" \"éénentwintig dvidešimt\" \"test@example.org\" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
-	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
-	rlRun "pki -d $CERTDB_DIR \
-		-c $CERTDB_DIR_PASSWORD \
-		-n \"$CA_agentV_user\" \
-		ca-cert-request-review $i18n_ret_requestid \
-		--action approve 1> $TmpDir/i18n-pkcs10-approve-out" 0 "As $CA_agentV_user Approve Certificate Request"
-	rlAssertGrep "Approved certificate request $i18n_ret_requestid" "$TmpDir/i18n-pkcs10-approve-out"
-	rlRun "valid_i18n_pkcs10_serialNumber=\$(pki cert-request-show $i18n_ret_requestid | grep \"Certificate ID\" | sed 's/ //g' | cut -d: -f2)"
-	rlRun "pki cert-show $valid_i18n_pkcs10_serialNumber 1> $temp_out" 0 "Executing pki cert-show $valid_i18n_valid_pkcs10_serialNumber"
-	rlAssertGrep "CN=éénentwintig dvidešimt" "$temp_out"
-	rlAssertGrep "UID=éénentwintig dvidešimt" "$temp_out"
+        rlLog "Generate cert request for $i18n_user3_fullname"
+        rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PWD request_type:pkcs10 \
+        algo:rsa key_size:2048 subject_cn:\"$i18n_user3_fullname\" subject_uid:$i18n_user3 subject_email:i18nuser@example.org \
+        organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \
+        target_host:$(hostname) protocol: port:8080 cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \
+        certdb_nick:\"$CA_agentV_user\" cert_info:$cert_info"
+        local i18n_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2)
+        local i18n_requestdn=$(cat $cert_info | grep Request_DN | cut -d- -f2)
+        rlRun "pki cert-show $i18n_serialNumber 1> $temp_out" 0 "Executing pki cert-show $i18n_serialNumber"
+        rlAssertGrep "Certificate \"$i18n_serialNumber\"" "$temp_out"
+        rlAssertGrep "Serial Number: $i18n_serialNumber" "$temp_out"
+        rlAssertGrep "Issuer: CN=CA Signing Certificate,O=$CA_DOMAIN" "$temp_out"
+        rlAssertGrep "Subject: $i18n_requestdn" "$temp_out"
+        rlAssertGrep "Status: VALID" "$temp_out"
 	rlPhaseEnd 
 
 
 	rlPhaseStartTest "pki_cert_show-0020: Test-4 Verify pki cert-show with i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"kakskümmend üks\" \"kakskümmend üks\" \"test@example.org\" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
-	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
-	rlRun "pki -d $CERTDB_DIR \
-		-c $CERTDB_DIR_PASSWORD \
-		-n \"$CA_agentV_user\" \
-		ca-cert-request-review $i18n_ret_requestid \
-		--action approve 1> $TmpDir/i18n-pkcs10-approve-out" 0 "As $CA_agentV_user Approve Certificate Request"
-	rlAssertGrep "Approved certificate request $i18n_ret_requestid" "$TmpDir/i18n-pkcs10-approve-out"
-	rlRun "valid_i18n_pkcs10_serialNumber=\$(pki cert-request-show $i18n_ret_requestid | grep \"Certificate ID\" | sed 's/ //g' | cut -d: -f2)"
-	rlRun "pki cert-show $valid_i18n_pkcs10_serialNumber 1> $temp_out" 0 "Executing pki cert-show $valid_i18n_valid_pkcs10_serialNumber"
-	rlAssertGrep "CN=kakskümmend üks" "$temp_out"
-	rlAssertGrep "UID=kakskümmend üks" "$temp_out"
+        rlLog "Generate cert request for $i18n_user4_fullname"
+        rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PWD request_type:pkcs10 \
+        algo:rsa key_size:2048 subject_cn:\"$i18n_user4_fullname\" subject_uid:$i18n_user4 subject_email:i18nuser@example.org \
+        organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \
+        target_host:$(hostname) protocol: port:8080 cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \
+        certdb_nick:\"$CA_agentV_user\" cert_info:$cert_info"
+        local i18n_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2)
+        local i18n_requestdn=$(cat $cert_info | grep Request_DN | cut -d- -f2)
+        rlRun "pki cert-show $i18n_serialNumber 1> $temp_out" 0 "Executing pki cert-show $i18n_serialNumber"
+        rlAssertGrep "Certificate \"$i18n_serialNumber\"" "$temp_out"
+        rlAssertGrep "Serial Number: $i18n_serialNumber" "$temp_out"
+        rlAssertGrep "Issuer: CN=CA Signing Certificate,O=$CA_DOMAIN" "$temp_out"
+        rlAssertGrep "Subject: $i18n_requestdn" "$temp_out"
+        rlAssertGrep "Status: VALID" "$temp_out"
 	rlPhaseEnd 
 	
 	rlPhaseStartTest "pki_cert_show-0021: Test-5 Verify pki cert-show with i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"двадцять один тридцять\" \"двадцять один тридцять\" \"test@example.org\" \
-	"--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
-	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
-	rlRun "pki -d $CERTDB_DIR \
-		-c $CERTDB_DIR_PASSWORD \
-		-n \"$CA_agentV_user\" \
-		ca-cert-request-review $i18n_ret_requestid \
-		--action approve 1> $TmpDir/i18n-pkcs10-approve-out" 0 "As $CA_agentV_user Approve Certificate Request"
-	rlAssertGrep "Approved certificate request $i18n_ret_requestid" "$TmpDir/i18n-pkcs10-approve-out"
-	local valid_i18n_pkcs10_serialNumber=$(pki cert-request-show $i18n_ret_requestid | grep "Certificate ID" | sed 's/ //g' | cut -d: -f2)
-	rlRun "pki cert-show $valid_i18n_pkcs10_serialNumber 1> $temp_out" 0 "Executing pki cert-show $valid_i18n_valid_pkcs10_serialNumber"
-	rlAssertGrep "CN=двадцять один тридцять" "$temp_out"
-	rlAssertGrep "UID=двадцять один тридцять" "$temp_out"
+        rlLog "Generate cert request for $i18n_user5_fullname"
+        rlRun "generate_new_cert tmp_nss_db:$TEMP_NSS_DB tmp_nss_db_pwd:$TEMP_NSS_DB_PWD request_type:pkcs10 \
+        algo:rsa key_size:2048 subject_cn:\"$i18n_user5_fullname\" subject_uid:$i18n_user5 subject_email:i18nuser@example.org \
+        organizationalunit:Engineering organization:Example.Inc country:US archive:false req_profile:caUserCert \
+        target_host:$(hostname) protocol: port:8080 cert_db_dir:$CERTDB_DIR cert_db_pwd:$CERTDB_DIR_PASSWORD \
+        certdb_nick:\"$CA_agentV_user\" cert_info:$cert_info"
+        local i18n_serialNumber=$(cat $cert_info| grep cert_serialNumber | cut -d- -f2)
+        local i18n_requestdn=$(cat $cert_info | grep Request_DN | cut -d- -f2)
+        rlRun "pki cert-show $i18n_serialNumber 1> $temp_out" 0 "Executing pki cert-show $i18n_serialNumber"
+        rlAssertGrep "Certificate \"$i18n_serialNumber\"" "$temp_out"
+        rlAssertGrep "Serial Number: $i18n_serialNumber" "$temp_out"
+        rlAssertGrep "Issuer: CN=CA Signing Certificate,O=$CA_DOMAIN" "$temp_out"
+        rlAssertGrep "Subject: $i18n_requestdn" "$temp_out"
+        rlAssertGrep "Status: VALID" "$temp_out"
 	rlPhaseEnd 
 
 	rlPhaseStartCleanup "pki cert-show cleanup: Delete temp dir"