diff options
Diffstat (limited to 'tests/aaf/certservice/resources')
| -rw-r--r-- | tests/aaf/certservice/resources/cert-service-keywords.robot | 4 | ||||
| -rw-r--r-- | tests/aaf/certservice/resources/cert-service-properties.robot | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/aaf/certservice/resources/cert-service-keywords.robot b/tests/aaf/certservice/resources/cert-service-keywords.robot index e8576dd2..c70cfcf4 100644 --- a/tests/aaf/certservice/resources/cert-service-keywords.robot +++ b/tests/aaf/certservice/resources/cert-service-keywords.robot @@ -86,7 +86,7 @@ Send Post Request And Validate Response Run Cert Service Client And Validate JKS File Creation And Client Exit Code [Documentation] Run Cert Service Client Container And Validate Exit Code [Arguments] ${env_file} ${expected_exit_code} - ${exit_code}= Run Client Container ${DOCKER_CLIENT_IMAGE} ${CLIENT_CONTAINER_NAME} ${env_file} ${CERT_ADDRESS} ${CERT_SERVICE_NETWORK} + ${exit_code}= Run Client Container ${DOCKER_CLIENT_IMAGE} ${CLIENT_CONTAINER_NAME} ${env_file} ${CERT_SERVICE_ADDRESS}${CERT_SERVICE_ENDPOINT} ${CERT_SERVICE_NETWORK} ${can_open}= Can Open Keystore And Truststore With Pass ${CLIENT_CONTAINER_NAME} Remove Client Container And Save Logs ${CLIENT_CONTAINER_NAME} positive_path Should Be Equal As Strings ${exit_code} ${expected_exit_code} Client return: ${exitcode} exit code, but expected: ${expected_exit_code} @@ -95,7 +95,7 @@ Run Cert Service Client And Validate JKS File Creation And Client Exit Code Run Cert Service Client And Validate Http Response Code And Client Exit Code [Documentation] Run Cert Service Client Container And Validate Exit Code [Arguments] ${env_file} ${expected_api_response_code} ${expected_exit_code} - ${exit_code}= Run Client Container ${DOCKER_CLIENT_IMAGE} ${CLIENT_CONTAINER_NAME} ${env_file} ${CERT_ADDRESS} ${CERT_SERVICE_NETWORK} + ${exit_code}= Run Client Container ${DOCKER_CLIENT_IMAGE} ${CLIENT_CONTAINER_NAME} ${env_file} ${CERT_SERVICE_ADDRESS}${CERT_SERVICE_ENDPOINT} ${CERT_SERVICE_NETWORK} ${can_find_API_response}= Can Find Api Response In Logs ${CLIENT_CONTAINER_NAME} ${api_response_code}= Get Api Response From Logs ${CLIENT_CONTAINER_NAME} Remove Client Container And Save Logs ${CLIENT_CONTAINER_NAME} negative_path diff --git a/tests/aaf/certservice/resources/cert-service-properties.robot b/tests/aaf/certservice/resources/cert-service-properties.robot index 292ac37f..5fd2d8af 100644 --- a/tests/aaf/certservice/resources/cert-service-properties.robot +++ b/tests/aaf/certservice/resources/cert-service-properties.robot @@ -1,9 +1,10 @@ *** Variables *** -${AAFCERT_URL} http://%{AAFCERT_IP}:8080 +${CERT_SERVICE_PORT} 8080 +${AAFCERT_URL} http://localhost:${cert_service_port} ${CLIENT_CA_NAME} Client ${RA_CA_NAME} RA -${CERT_SERVICE_ENDPOINT} /v1/certificate +${CERT_SERVICE_ENDPOINT} /v1/certificate/ ${VALID_CLIENT_CSR_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid_client.csr ${VALID_CLIENT_PK_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid_client.pk ${VALID_RA_CSR_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid_ra.csr @@ -12,7 +13,7 @@ ${INVALID_CSR_FILE} %{WORKSPACE}/tests/aaf/certservice/asse ${INVALID_PK_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/invalid.key -${CERT_ADDRESS} ${AAFCERT_URL}/v1/certificate/ +${CERT_SERVICE_ADDRESS} http://%{AAFCERT_IP}:${cert_service_port} ${VALID_ENV_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid_client_docker.env ${INVALID_ENV_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/invalid_client_docker.env ${DOCKER_CLIENT_IMAGE} nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:latest |