Merge "Enhacement AAF-CerService CSIT"

diff --combined tests/aaf/certservice/cert-service-test.robot
index 36c1522,b3b57b5..863d295
--- 1/tests/aaf/certservice/cert-service-test.robot
--- 2/tests/aaf/certservice/cert-service-test.robot
+++ b/tests/aaf/certservice/cert-service-test.robot
@@@ -18,11 -18,6 +18,11 @@@ Reload Configuratio
      [Documentation]   Configuration was changed
      Send Get Request And Validate Response  /reload  200
  
 +Check if application is ready
 +    [Tags]      AAF-CERT-SERVICE
 +    [Documentation]   Send request to /ready endpoint and expect 200
 +    Send Get Request And Validate Response  /ready  200
 +
  Generate Certificate In RA Mode For CA Name
      [Tags]      AAF-CERT-SERVICE
      [Documentation]  Send request to ${CERT_SERVICE_ENDPOINT}/${RA_CA_NAME} endpoint and expect 200
@@@ -48,13 -43,13 +48,13 @@@ Report Bad Request Error When PK Is No
      [Documentation]  Send request to ${CERT_SERVICE_ENDPOINT}/${CLIENT_CA_NAME} endpoint and expect 400
      Send Get Request with Header And Expect Error  ${CERT_SERVICE_ENDPOINT}/${CLIENT_CA_NAME}  ${VALID_CLIENT_CSR_FILE}  ${INVALID_PK_FILE}  400
  
- Cert Service Client successful create keystore and trust store
+ Cert Service Client successfully creates keystore and truststore
      [Tags]      AAF-CERT-SERVICE
      [Documentation]  Run with correct env and expected exit code 0
-     Run Cert Service Client Container And Validate Exit Code  ${VALID_ENV_FILE}  0
+     Run Cert Service Client And Validate JKS File Creation And Client Exit Code  ${VALID_ENV_FILE}  0
  
- Creation of keystore and trustore unsuccesful, incorrect client configuration
+ Run Cert Service Client Container And Validate Exit Code And API Response
      [Tags]      AAF-CERT-SERVICE
      [Documentation]  Run with invalid CaName env and expected exit code 5
-     Run Cert Service Client Container And Validate Exit Code  ${INVALID_ENV_FILE}  5
+     Run Cert Service Client And Validate Http Response Code And Client Exit Code  ${INVALID_ENV_FILE}  404  5