X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Foom-platform-cert-service%2Fpostprocessor%2Fresources%2Ftest-keywords.robot;h=404ec0ae8662eda8a85b34ccf0278b93c0ba7fc6;hb=refs%2Fchanges%2F46%2F113146%2F3;hp=514e239171657b992601a2060c42aa845d2077e0;hpb=acec2db0967b0a78ecbe163549119f709beb4058;p=integration%2Fcsit.git

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}