From e0da464c1b8bfe7ceb1f16879a2c550e7348fe18 Mon Sep 17 00:00:00 2001 From: Jan Malkiewicz Date: Tue, 22 Sep 2020 08:04:23 +0200 Subject: [PATCH] [OOM-CMPv2] Rename truststoremerger->postprocessor Issue-ID: DCAEGEN2-2253 Signed-off-by: Jan Malkiewicz Change-Id: I6c7fa3378c86dee4e1fe23e4840046b979d942ea --- .gitignore | 1 + .../{truststoremerger => postprocessor}/setup.sh | 2 +- .../teardown.sh | 2 +- .../testplan.txt | 2 +- .../assets/expected_keystores/keystore.jks | Bin .../assets/expected_keystores/keystore.jks.bak | Bin .../expected_truststores/jksAndPemAndP12.jks | Bin .../assets/expected_truststores/pemAndP12.pem | 0 .../assets/invalid_different_lists_size.env | 0 .../assets/invalid_duplicated_aliases.env | 0 .../assets/invalid_empty_certs.env | 0 .../assets/invalid_empty_file.env | 0 .../invalid_empty_keystore_destination_path.env | 0 .../assets/invalid_empty_passwords.env | 0 .../assets/invalid_extension.env | 0 .../assets/invalid_file_password_pair.env | 0 .../assets/invalid_keystore_source_paths.env | 0 .../assets/invalid_password_path.env | 0 .../assets/invalid_truststore_paths.env | 0 .../assets/truststores/empty.pem | 0 .../assets/truststores/external/keystore.jks | Bin .../assets/truststores/external/keystore.pass | 0 .../assets/truststores/truststore.jks | Bin .../assets/truststores/truststore.p12 | Bin .../assets/truststores/truststore.pem | 0 .../assets/truststores/truststoreJks.pass | 0 .../assets/truststores/truststoreP12.pass | 0 .../assets/valid_envs_and_extra_optional.env | 0 .../assets/valid_jks_pem_p12.env | 0 .../assets/valid_pem_p12.env | 0 .../assets/valid_single_truststore.env | 0 .../certservice-postprocessor-test.robot} | 6 +- .../libraries/EnvsReader.py | 0 .../libraries/JksValidator.py | 0 .../libraries/PemTruststoreValidator.py | 0 .../libraries/TrustMergerManager.py | 0 .../resources/test-keywords.robot} | 2 +- .../postprocessor/resources/test-properties.robot | 62 +++++++++++++++++++++ .../resources/trust-merger-properties.robot | 61 -------------------- 39 files changed, 70 insertions(+), 68 deletions(-) rename plans/oom-platform-cert-service/{truststoremerger => postprocessor}/setup.sh (92%) rename plans/oom-platform-cert-service/{truststoremerger => postprocessor}/teardown.sh (91%) rename plans/oom-platform-cert-service/{truststoremerger => postprocessor}/testplan.txt (70%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/expected_keystores/keystore.jks (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/expected_keystores/keystore.jks.bak (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/expected_truststores/jksAndPemAndP12.jks (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/expected_truststores/pemAndP12.pem (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_different_lists_size.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_duplicated_aliases.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_empty_certs.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_empty_file.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_empty_keystore_destination_path.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_empty_passwords.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_extension.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_file_password_pair.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_keystore_source_paths.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_password_path.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/invalid_truststore_paths.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/truststores/empty.pem (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/truststores/external/keystore.jks (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/truststores/external/keystore.pass (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/truststores/truststore.jks (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/truststores/truststore.p12 (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/truststores/truststore.pem (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/truststores/truststoreJks.pass (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/truststores/truststoreP12.pass (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/valid_envs_and_extra_optional.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/valid_jks_pem_p12.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/valid_pem_p12.env (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/assets/valid_single_truststore.env (100%) rename tests/oom-platform-cert-service/{truststoremerger/trust-merger-test.robot => postprocessor/certservice-postprocessor-test.robot} (97%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/libraries/EnvsReader.py (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/libraries/JksValidator.py (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/libraries/PemTruststoreValidator.py (100%) rename tests/oom-platform-cert-service/{truststoremerger => postprocessor}/libraries/TrustMergerManager.py (100%) rename tests/oom-platform-cert-service/{truststoremerger/resources/trust-merger-keywords.robot => postprocessor/resources/test-keywords.robot} (98%) create mode 100644 tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot delete mode 100644 tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot diff --git a/.gitignore b/.gitignore index 5eb35781..aeff7fff 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ env.properties /venv/* /tests/aaf/certservice/tmp/* +/tests/oom-platform-cert-service/postprocessor/tmp/* diff --git a/plans/oom-platform-cert-service/truststoremerger/setup.sh b/plans/oom-platform-cert-service/postprocessor/setup.sh similarity index 92% rename from plans/oom-platform-cert-service/truststoremerger/setup.sh rename to plans/oom-platform-cert-service/postprocessor/setup.sh index 9f618406..2df82f76 100644 --- a/plans/oom-platform-cert-service/truststoremerger/setup.sh +++ b/plans/oom-platform-cert-service/postprocessor/setup.sh @@ -16,7 +16,7 @@ # #export container name -export MergerContainerName=TrustStoreMerger +export CertServicePostProcessorContainerName=CertServicePostProcessor #install docker sdk echo "Uninstall docker-py and reinstall docker." diff --git a/plans/oom-platform-cert-service/truststoremerger/teardown.sh b/plans/oom-platform-cert-service/postprocessor/teardown.sh similarity index 91% rename from plans/oom-platform-cert-service/truststoremerger/teardown.sh rename to plans/oom-platform-cert-service/postprocessor/teardown.sh index a0ee4d26..22744162 100644 --- a/plans/oom-platform-cert-service/truststoremerger/teardown.sh +++ b/plans/oom-platform-cert-service/postprocessor/teardown.sh @@ -15,4 +15,4 @@ # limitations under the License. # -kill-instance.sh ${MergerContainerName} +kill-instance.sh ${CertServicePostProcessorContainerName} diff --git a/plans/oom-platform-cert-service/truststoremerger/testplan.txt b/plans/oom-platform-cert-service/postprocessor/testplan.txt similarity index 70% rename from plans/oom-platform-cert-service/truststoremerger/testplan.txt rename to plans/oom-platform-cert-service/postprocessor/testplan.txt index 11e00832..edbd11cc 100755 --- a/plans/oom-platform-cert-service/truststoremerger/testplan.txt +++ b/plans/oom-platform-cert-service/postprocessor/testplan.txt @@ -1,3 +1,3 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. -oom-platform-cert-service/truststoremerger +oom-platform-cert-service/postprocessor diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks b/tests/oom-platform-cert-service/postprocessor/assets/expected_keystores/keystore.jks similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks rename to tests/oom-platform-cert-service/postprocessor/assets/expected_keystores/keystore.jks diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks.bak b/tests/oom-platform-cert-service/postprocessor/assets/expected_keystores/keystore.jks.bak similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks.bak rename to tests/oom-platform-cert-service/postprocessor/assets/expected_keystores/keystore.jks.bak diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/jksAndPemAndP12.jks b/tests/oom-platform-cert-service/postprocessor/assets/expected_truststores/jksAndPemAndP12.jks similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/jksAndPemAndP12.jks rename to tests/oom-platform-cert-service/postprocessor/assets/expected_truststores/jksAndPemAndP12.jks diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/pemAndP12.pem b/tests/oom-platform-cert-service/postprocessor/assets/expected_truststores/pemAndP12.pem similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/pemAndP12.pem rename to tests/oom-platform-cert-service/postprocessor/assets/expected_truststores/pemAndP12.pem diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_different_lists_size.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_different_lists_size.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_different_lists_size.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_different_lists_size.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_duplicated_aliases.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_duplicated_aliases.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_duplicated_aliases.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_duplicated_aliases.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_certs.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_certs.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_certs.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_certs.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_file.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_file.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_file.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_file.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_keystore_destination_path.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_keystore_destination_path.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_keystore_destination_path.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_keystore_destination_path.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_passwords.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_passwords.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_passwords.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_passwords.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_extension.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_extension.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_extension.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_extension.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_file_password_pair.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_file_password_pair.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_file_password_pair.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_file_password_pair.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_keystore_source_paths.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_keystore_source_paths.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_keystore_source_paths.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_keystore_source_paths.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_password_path.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_password_path.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_password_path.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_password_path.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_truststore_paths.env b/tests/oom-platform-cert-service/postprocessor/assets/invalid_truststore_paths.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/invalid_truststore_paths.env rename to tests/oom-platform-cert-service/postprocessor/assets/invalid_truststore_paths.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/empty.pem b/tests/oom-platform-cert-service/postprocessor/assets/truststores/empty.pem similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/truststores/empty.pem rename to tests/oom-platform-cert-service/postprocessor/assets/truststores/empty.pem diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.jks b/tests/oom-platform-cert-service/postprocessor/assets/truststores/external/keystore.jks similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.jks rename to tests/oom-platform-cert-service/postprocessor/assets/truststores/external/keystore.jks diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.pass b/tests/oom-platform-cert-service/postprocessor/assets/truststores/external/keystore.pass similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.pass rename to tests/oom-platform-cert-service/postprocessor/assets/truststores/external/keystore.pass diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.jks b/tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.jks similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.jks rename to tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.jks diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.p12 b/tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.p12 similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.p12 rename to tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.p12 diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.pem b/tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.pem similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.pem rename to tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.pem diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreJks.pass b/tests/oom-platform-cert-service/postprocessor/assets/truststores/truststoreJks.pass similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreJks.pass rename to tests/oom-platform-cert-service/postprocessor/assets/truststores/truststoreJks.pass diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreP12.pass b/tests/oom-platform-cert-service/postprocessor/assets/truststores/truststoreP12.pass similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreP12.pass rename to tests/oom-platform-cert-service/postprocessor/assets/truststores/truststoreP12.pass diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/valid_envs_and_extra_optional.env b/tests/oom-platform-cert-service/postprocessor/assets/valid_envs_and_extra_optional.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/valid_envs_and_extra_optional.env rename to tests/oom-platform-cert-service/postprocessor/assets/valid_envs_and_extra_optional.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/valid_jks_pem_p12.env b/tests/oom-platform-cert-service/postprocessor/assets/valid_jks_pem_p12.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/valid_jks_pem_p12.env rename to tests/oom-platform-cert-service/postprocessor/assets/valid_jks_pem_p12.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/valid_pem_p12.env b/tests/oom-platform-cert-service/postprocessor/assets/valid_pem_p12.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/valid_pem_p12.env rename to tests/oom-platform-cert-service/postprocessor/assets/valid_pem_p12.env diff --git a/tests/oom-platform-cert-service/truststoremerger/assets/valid_single_truststore.env b/tests/oom-platform-cert-service/postprocessor/assets/valid_single_truststore.env similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/assets/valid_single_truststore.env rename to tests/oom-platform-cert-service/postprocessor/assets/valid_single_truststore.env diff --git a/tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot b/tests/oom-platform-cert-service/postprocessor/certservice-postprocessor-test.robot similarity index 97% rename from tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot rename to tests/oom-platform-cert-service/postprocessor/certservice-postprocessor-test.robot index 41e55cf5..67d1af60 100644 --- a/tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot +++ b/tests/oom-platform-cert-service/postprocessor/certservice-postprocessor-test.robot @@ -1,8 +1,8 @@ *** Settings *** -Documentation Truststore merger test case scenarios -Library RequestsLibrary -Resource ./resources/trust-merger-keywords.robot +Documentation Certifcate Post Processors test case scenarios +Library RequestsLibrary +Resource ./resources/test-keywords.robot *** Test Cases *** diff --git a/tests/oom-platform-cert-service/truststoremerger/libraries/EnvsReader.py b/tests/oom-platform-cert-service/postprocessor/libraries/EnvsReader.py similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/libraries/EnvsReader.py rename to tests/oom-platform-cert-service/postprocessor/libraries/EnvsReader.py diff --git a/tests/oom-platform-cert-service/truststoremerger/libraries/JksValidator.py b/tests/oom-platform-cert-service/postprocessor/libraries/JksValidator.py similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/libraries/JksValidator.py rename to tests/oom-platform-cert-service/postprocessor/libraries/JksValidator.py diff --git a/tests/oom-platform-cert-service/truststoremerger/libraries/PemTruststoreValidator.py b/tests/oom-platform-cert-service/postprocessor/libraries/PemTruststoreValidator.py similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/libraries/PemTruststoreValidator.py rename to tests/oom-platform-cert-service/postprocessor/libraries/PemTruststoreValidator.py diff --git a/tests/oom-platform-cert-service/truststoremerger/libraries/TrustMergerManager.py b/tests/oom-platform-cert-service/postprocessor/libraries/TrustMergerManager.py similarity index 100% rename from tests/oom-platform-cert-service/truststoremerger/libraries/TrustMergerManager.py rename to tests/oom-platform-cert-service/postprocessor/libraries/TrustMergerManager.py diff --git a/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot b/tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot similarity index 98% rename from tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot rename to tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot index 416ce610..514e2391 100644 --- a/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot +++ b/tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot @@ -1,7 +1,7 @@ *** Settings *** Resource ../../../common.robot -Resource ./trust-merger-properties.robot +Resource ./test-properties.robot Library ../libraries/TrustMergerManager.py ${MOUNT_PATH} ${TRUSTSTORES_PATH} Library ../libraries/JksValidator.py Library ../libraries/PemTruststoreValidator.py diff --git a/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot b/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot new file mode 100644 index 00000000..ab4c18ba --- /dev/null +++ b/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot @@ -0,0 +1,62 @@ +*** Variables *** + +${DOCKER_MERGER_IMAGE} nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest +${MERGER_CONTAINER_NAME} %{CertServicePostProcessorContainerName} +${BASE_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/postprocessor +${MOUNT_PATH} ${BASE_PATH}/tmp +${TRUSTSTORES_PATH} ${BASE_PATH}/assets/truststores +${EXPECTED_TRUSTSTORES_PATH} ${BASE_PATH}/assets/expected_truststores + +${JKS_TRUSTSTORE_MOUNT_PATH} ${BASE_PATH}/tmp/truststore.jks +${JKS_PASSWORD_MOUNT_PATH} ${BASE_PATH}/tmp/truststoreJks.pass +${P12_TRUSTSTORE_MOUNT_PATH} ${BASE_PATH}/tmp/truststore.p12 +${P12_PASSWORD_MOUNT_PATH} ${BASE_PATH}/tmp/truststoreP12.pass +${PEM_TRUSTSTORE_MOUNT_PATH} ${BASE_PATH}/tmp/truststore.pem +${JKS_KEYSTORE_MOUNT_PATH} ${BASE_PATH}/tmp/external/keystore.jks + +${JKS_TRUSTSTORE_EXPECTED_PATH} ${BASE_PATH}/assets/expected_truststores/jksAndPemAndP12.jks +${PEM_TRUSTSTORE_EXPECTED_PATH} ${BASE_PATH}/assets/expected_truststores/pemAndP12.pem +${JKSBAK_KEYSTORE_EXPECTED_PATH} ${BASE_PATH}/assets/expected_keystores/keystore.jks.bak +${JKS_KEYSTORE_EXPECTED_PATH} ${BASE_PATH}/assets/expected_keystores/keystore.jks + +${ENV_FILE_EMPTY} ${BASE_PATH}/assets/invalid_empty_file.env +${ENV_FILE_INVALID_FILE_LIST_SIZE} ${BASE_PATH}/assets/invalid_different_lists_size.env +${ENV_FILE_EMPTY_PASSWORDS} ${BASE_PATH}/assets/invalid_empty_passwords.env +${ENV_FILE_INVALID_PASSWORD_PATHS} ${BASE_PATH}/assets/invalid_password_path.env +${ENV_FILE_INVALID_TRUSTSTORE_PATHS} ${BASE_PATH}/assets/invalid_truststore_paths.env +${ENV_FILE_INVALID_PASSWORD} ${BASE_PATH}/assets/invalid_file_password_pair.env +${ENV_FILE_INVALID_FILE_EXTENSION} ${BASE_PATH}/assets/invalid_extension.env +${ENV_FILE_DUPLICATED_ALIASES} ${BASE_PATH}/assets/invalid_duplicated_aliases.env +${ENV_FILE_EMPTY_CERTS} ${BASE_PATH}/assets/invalid_empty_certs.env +${ENV_FILE_JKS_PEM_P12} ${BASE_PATH}/assets/valid_jks_pem_p12.env +${ENV_FILE_PEM_P12} ${BASE_PATH}/assets/valid_pem_p12.env +${ENV_FILE_SINGLE_TRUSTSTORE} ${BASE_PATH}/assets/valid_single_truststore.env +${ENV_FILE_INVALID_KEYSTORE_SOURCE_PATHS} ${BASE_PATH}/assets/invalid_keystore_source_paths.env +${ENV_FILE_EMPTY_KEYSTORE_DESTINATION_PATH} ${BASE_PATH}/assets/invalid_empty_keystore_destination_path.env +${ENV_FILE_EXTRA_OPTIONAL_ENVS} ${BASE_PATH}/assets/valid_envs_and_extra_optional.env + +${KEYSTORE_JKS} ${BASE_PATH}/assets/truststores/external/keystore.jks +${KEYSTORE_JKS_PASS} ${BASE_PATH}/assets/truststores/external/keystore.pass +${TRUSTSTORE_JKS} ${BASE_PATH}/assets/truststores/truststore.jks +${TRUSTSTORE_JKS_PASS} ${BASE_PATH}/assets/truststores/truststoreJks.pass +${TRUSTSTORE_P12} ${BASE_PATH}/assets/truststores/truststore.p12 +${TRUSTSTORE_P12_PASS} ${BASE_PATH}/assets/truststores/truststore.pass +${TRUSTSTORE_PEM} ${BASE_PATH}/assets/truststores/truststore.pem + +${EXITCODE_SUCCESS} 0 +${EXITCODE_CERTIFICATES_PATHS_VALIDATION_EXCEPTION} 1 +${EXITCODE_CONFIGURATION_EXCEPTION} 2 +${EXITCODE_TRUSTSTORE_FILE_FACTORY_EXCEPTION} 3 +${EXITCODE_PASSWORD_READER_EXCEPTION} 4 +${EXITCODE_CREATE_BACKUP_EXCEPTION} 5 +${EXITCODE_KEYSTORE_INSTANCE_EXCEPTION} 6 +${EXITCODE_TRUSTSTORE_LOAD_FILE_EXCEPTION} 7 +${EXITCODE_TRUSTSTORE_DATA_OPERATION_EXCEPTION} 8 +${EXITCODE_MISSING_TRUSTSTORE_EXCEPTIONSUCCESS} 9 +${EXITCODE_ALIAS_CONFLICT_EXCEPTION} 10 +${EXITCODE_WRITE_TRUSTSTORE_FILE_EXCEPTION} 11 +${EXITCODE_KEYSTORE_FILE_COPY_EXCEPTION} 12 +${EXITCODE_KEYSTORE_NOT_EXIST_EXCEPTION} 13 +${EXITCODE_UNEXPECTED_EXCEPTION} 99 + + diff --git a/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot b/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot deleted file mode 100644 index c773735c..00000000 --- a/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot +++ /dev/null @@ -1,61 +0,0 @@ -*** Variables *** - -${DOCKER_MERGER_IMAGE} nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-truststore-merger:latest -${MERGER_CONTAINER_NAME} %{MergerContainerName} -${MOUNT_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/tmp -${TRUSTSTORES_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores -${EXPECTED_TRUSTSTORES_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores - -${JKS_TRUSTSTORE_MOUNT_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/tmp/truststore.jks -${JKS_PASSWORD_MOUNT_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/tmp/truststoreJks.pass -${P12_TRUSTSTORE_MOUNT_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/tmp/truststore.p12 -${P12_PASSWORD_MOUNT_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/tmp/truststoreP12.pass -${PEM_TRUSTSTORE_MOUNT_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/tmp/truststore.pem -${JKS_KEYSTORE_MOUNT_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/tmp/external/keystore.jks - -${JKS_TRUSTSTORE_EXPECTED_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/jksAndPemAndP12.jks -${PEM_TRUSTSTORE_EXPECTED_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/pemAndP12.pem -${JKSBAK_KEYSTORE_EXPECTED_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks.bak -${JKS_KEYSTORE_EXPECTED_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks - -${ENV_FILE_EMPTY} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_file.env -${ENV_FILE_INVALID_FILE_LIST_SIZE} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_different_lists_size.env -${ENV_FILE_EMPTY_PASSWORDS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_passwords.env -${ENV_FILE_INVALID_PASSWORD_PATHS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_password_path.env -${ENV_FILE_INVALID_TRUSTSTORE_PATHS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_truststore_paths.env -${ENV_FILE_INVALID_PASSWORD} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_file_password_pair.env -${ENV_FILE_INVALID_FILE_EXTENSION} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_extension.env -${ENV_FILE_DUPLICATED_ALIASES} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_duplicated_aliases.env -${ENV_FILE_EMPTY_CERTS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_certs.env -${ENV_FILE_JKS_PEM_P12} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_jks_pem_p12.env -${ENV_FILE_PEM_P12} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_pem_p12.env -${ENV_FILE_SINGLE_TRUSTSTORE} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_single_truststore.env -${ENV_FILE_INVALID_KEYSTORE_SOURCE_PATHS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_keystore_source_paths.env -${ENV_FILE_EMPTY_KEYSTORE_DESTINATION_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_keystore_destination_path.env -${ENV_FILE_EXTRA_OPTIONAL_ENVS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_envs_and_extra_optional.env - -${KEYSTORE_JKS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.jks -${KEYSTORE_JKS_PASS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.pass -${TRUSTSTORE_JKS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.jks -${TRUSTSTORE_JKS_PASS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreJks.pass -${TRUSTSTORE_P12} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.p12 -${TRUSTSTORE_P12_PASS} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.pass -${TRUSTSTORE_PEM} %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.pem - -${EXITCODE_SUCCESS} 0 -${EXITCODE_CERTIFICATES_PATHS_VALIDATION_EXCEPTION} 1 -${EXITCODE_CONFIGURATION_EXCEPTION} 2 -${EXITCODE_TRUSTSTORE_FILE_FACTORY_EXCEPTION} 3 -${EXITCODE_PASSWORD_READER_EXCEPTION} 4 -${EXITCODE_CREATE_BACKUP_EXCEPTION} 5 -${EXITCODE_KEYSTORE_INSTANCE_EXCEPTION} 6 -${EXITCODE_TRUSTSTORE_LOAD_FILE_EXCEPTION} 7 -${EXITCODE_TRUSTSTORE_DATA_OPERATION_EXCEPTION} 8 -${EXITCODE_MISSING_TRUSTSTORE_EXCEPTIONSUCCESS} 9 -${EXITCODE_ALIAS_CONFLICT_EXCEPTION} 10 -${EXITCODE_WRITE_TRUSTSTORE_FILE_EXCEPTION} 11 -${EXITCODE_KEYSTORE_FILE_COPY_EXCEPTION} 12 -${EXITCODE_KEYSTORE_NOT_EXIST_EXCEPTION} 13 -${EXITCODE_UNEXPECTED_EXCEPTION} 99 - - -- 2.16.6