aboutsummaryrefslogtreecommitdiffstats
path: root/tests/oom-platform-cert-service/postprocessor/resources
diff options
context:
space:
mode:
authorJan Malkiewicz <jan.malkiewicz@nokia.com>2020-09-25 07:02:24 +0200
committerJan Malkiewicz <jan.malkiewicz@nokia.com>2020-09-25 07:57:02 +0200
commit334a204a6e0ce7e7a28de8ac3f8fb008bcc5683a (patch)
tree684ac654ad18ec72ba97abae4f656b1e32fcca53 /tests/oom-platform-cert-service/postprocessor/resources
parentacec2db0967b0a78ecbe163549119f709beb4058 (diff)
[OOM-CMPv2] Refator names in oom-certservice-post-processor tests.
Issue-ID: DCAEGEN2-2253 Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com> Change-Id: I6aa0bc0428724860b5538dc3e2d698e2023074e2
Diffstat (limited to 'tests/oom-platform-cert-service/postprocessor/resources')
-rw-r--r--tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot34
-rw-r--r--tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot4
2 files changed, 19 insertions, 19 deletions
diff --git a/tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot b/tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot
index 514e2391..404ec0ae 100644
--- a/tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot
+++ b/tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot
@@ -2,43 +2,43 @@
Resource ../../../common.robot
Resource ./test-properties.robot
-Library ../libraries/TrustMergerManager.py ${MOUNT_PATH} ${TRUSTSTORES_PATH}
+Library ../libraries/PostProcessorDockerContainerUtils.py ${MOUNT_PATH} ${TRUSTSTORES_PATH}
Library ../libraries/JksValidator.py
Library ../libraries/PemTruststoreValidator.py
*** Keywords ***
-Run Trust Merger And Expect Error
- [Documentation] Run Truststore Merger Container And Validate Exit Code
+Run Cert Service Post Processor And Expect Error
+ [Documentation] Run Cert Service Post Processor Container And Validate Exit Code
[Arguments] ${env_file} ${expected_exit_code}
- ${exit_code}= Run Merger Container ${DOCKER_MERGER_IMAGE} ${MERGER_CONTAINER_NAME} ${env_file}
- Remove Merger Container And Save Logs ${MERGER_CONTAINER_NAME} negative_path
+ ${exit_code}= Run Container ${CERT_POST_PROCESSOR_DOCKER_IMAGE} ${CERT_POST_PROCESSOR_CONTAINER_NAME} ${env_file}
+ Remove Container And Save Logs ${CERT_POST_PROCESSOR_CONTAINER_NAME} negative_path
Should Be Equal As Strings ${exit_code} ${expected_exit_code} Client return unexpected exit code return: ${exitcode} , but expected: ${expected_exit_code}
-Run Trust Merger And Merge Truststore Files To Jks
- [Documentation] Run Truststore Merger Container And Validate Exit Code And Provided Truststore Files
+Run Cert Service Post Processor And Merge Truststore Files To Jks
+ [Documentation] Run Cert Service Post Processor Container And Validate Exit Code And Provided Truststore Files
[Arguments] ${env_file} ${expected_exit_code} ${jks_path} ${jks_password} ${expected_jks_path}
- ${exit_code}= Run Merger Container ${DOCKER_MERGER_IMAGE} ${MERGER_CONTAINER_NAME} ${env_file}
+ ${exit_code}= Run Container ${CERT_POST_PROCESSOR_DOCKER_IMAGE} ${CERT_POST_PROCESSOR_CONTAINER_NAME} ${env_file}
${files_equal}= Assert Jks Truststores Equal ${jks_path} ${jks_password} ${expected_jks_path}
- Remove Merger Container And Save Logs ${MERGER_CONTAINER_NAME} positive_path
+ Remove Container And Save Logs ${CERT_POST_PROCESSOR_CONTAINER_NAME} positive_path
Should Be Equal As Strings ${exit_code} ${expected_exit_code} Client return unexpected exit code return: ${exitcode} , but expected: ${expected_exit_code}
Should Be True ${files_equal}
-Run Trust Merger And Check Copied Keystore Files
- [Documentation] Run Truststore Merger Container And Validate Exit Code And Provided Keystore Files
+Run Cert Service Post Processor And Check Copied Keystore Files
+ [Documentation] Run Cert Service Post Processor Container And Validate Exit Code And Provided Keystore Files
[Arguments] ${env_file} ${expected_exit_code} ${jks_path} ${jks_password} ${expected_jks_path}
- ${exit_code}= Run Merger Container ${DOCKER_MERGER_IMAGE} ${MERGER_CONTAINER_NAME} ${env_file}
+ ${exit_code}= Run Container ${CERT_POST_PROCESSOR_DOCKER_IMAGE} ${CERT_POST_PROCESSOR_CONTAINER_NAME} ${env_file}
${files_equal}= Assert Jks Keystores Equal ${jks_path} ${jks_password} ${expected_jks_path}
- Remove Merger Container And Save Logs ${MERGER_CONTAINER_NAME} positive_path
+ Remove Container And Save Logs ${CERT_POST_PROCESSOR_CONTAINER_NAME} positive_path
Should Be Equal As Strings ${exit_code} ${expected_exit_code} Client return unexpected exit code return: ${exitcode} , but expected: ${expected_exit_code}
Should Be True ${files_equal}
-Run Trust Merger And Merge Truststore Files To Pem
- [Documentation] Run Truststore Merger Container And Validate Exit Code And Files
+Run Cert Service Post Processor And Merge Truststore Files To Pem
+ [Documentation] Run Cert Service Post Processor Container And Validate Exit Code And Files
[Arguments] ${env_file} ${expected_exit_code} ${pem_path} ${expected_pem_path}
- ${exit_code}= Run Merger Container ${DOCKER_MERGER_IMAGE} ${MERGER_CONTAINER_NAME} ${env_file}
+ ${exit_code}= Run Container ${CERT_POST_PROCESSOR_DOCKER_IMAGE} ${CERT_POST_PROCESSOR_CONTAINER_NAME} ${env_file}
${files_equal}= Assert Pem Truststores Equal ${pem_path} ${expected_pem_path}
- Remove Merger Container And Save Logs ${MERGER_CONTAINER_NAME} positive_path
+ Remove Container And Save Logs ${CERT_POST_PROCESSOR_CONTAINER_NAME} positive_path
Should Be Equal As Strings ${exit_code} ${expected_exit_code} Client return unexpected exit code return: ${exitcode} , but expected: ${expected_exit_code}
Should Be True ${files_equal}
diff --git a/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot b/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot
index ab4c18ba..80fc06af 100644
--- a/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot
+++ b/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot
@@ -1,7 +1,7 @@
*** Variables ***
-${DOCKER_MERGER_IMAGE} nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest
-${MERGER_CONTAINER_NAME} %{CertServicePostProcessorContainerName}
+${CERT_POST_PROCESSOR_DOCKER_IMAGE} nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest
+${CERT_POST_PROCESSOR_CONTAINER_NAME} %{CertServicePostProcessorContainerName}
${BASE_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/postprocessor
${MOUNT_PATH} ${BASE_PATH}/tmp
${TRUSTSTORES_PATH} ${BASE_PATH}/assets/truststores