diff options
author | Jan Malkiewicz <jan.malkiewicz@nokia.com> | 2020-09-22 08:04:23 +0200 |
---|---|---|
committer | Jan Malkiewicz <jan.malkiewicz@nokia.com> | 2020-09-22 20:01:03 +0200 |
commit | e0da464c1b8bfe7ceb1f16879a2c550e7348fe18 (patch) | |
tree | dbf127607c7e8708776514ab3fbfc67196e7add6 /tests | |
parent | 97c946e21835cbc213f9974ed0df05ef702f4b88 (diff) |
[OOM-CMPv2] Rename truststoremerger->postprocessor
Issue-ID: DCAEGEN2-2253
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: I6c7fa3378c86dee4e1fe23e4840046b979d942ea
Diffstat (limited to 'tests')
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/expected_keystores/keystore.jks (renamed from tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks) | bin | 2560 -> 2560 bytes | |||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/expected_keystores/keystore.jks.bak (renamed from tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks.bak) | bin | 2560 -> 2560 bytes | |||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/expected_truststores/jksAndPemAndP12.jks (renamed from tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/jksAndPemAndP12.jks) | bin | 3923 -> 3923 bytes | |||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/expected_truststores/pemAndP12.pem (renamed from tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/pemAndP12.pem) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_different_lists_size.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_different_lists_size.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_duplicated_aliases.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_duplicated_aliases.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_certs.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_certs.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_file.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_file.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_keystore_destination_path.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_keystore_destination_path.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_passwords.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_passwords.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_extension.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_extension.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_file_password_pair.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_file_password_pair.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_keystore_source_paths.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_keystore_source_paths.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_password_path.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_password_path.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/invalid_truststore_paths.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/invalid_truststore_paths.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/truststores/empty.pem (renamed from tests/oom-platform-cert-service/truststoremerger/assets/truststores/empty.pem) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/truststores/external/keystore.jks (renamed from tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.jks) | bin | 2560 -> 2560 bytes | |||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/truststores/external/keystore.pass (renamed from tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.pass) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.jks (renamed from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.jks) | bin | 1413 -> 1413 bytes | |||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.p12 (renamed from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.p12) | bin | 1530 -> 1530 bytes | |||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.pem (renamed from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.pem) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/truststores/truststoreJks.pass (renamed from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreJks.pass) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/truststores/truststoreP12.pass (renamed from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreP12.pass) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/valid_envs_and_extra_optional.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/valid_envs_and_extra_optional.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/valid_jks_pem_p12.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/valid_jks_pem_p12.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/valid_pem_p12.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/valid_pem_p12.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/assets/valid_single_truststore.env (renamed from tests/oom-platform-cert-service/truststoremerger/assets/valid_single_truststore.env) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/certservice-postprocessor-test.robot (renamed from tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot) | 6 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/libraries/EnvsReader.py (renamed from tests/oom-platform-cert-service/truststoremerger/libraries/EnvsReader.py) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/libraries/JksValidator.py (renamed from tests/oom-platform-cert-service/truststoremerger/libraries/JksValidator.py) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/libraries/PemTruststoreValidator.py (renamed from tests/oom-platform-cert-service/truststoremerger/libraries/PemTruststoreValidator.py) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/libraries/TrustMergerManager.py (renamed from tests/oom-platform-cert-service/truststoremerger/libraries/TrustMergerManager.py) | 0 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot (renamed from tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot) | 2 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot | 62 | ||||
-rw-r--r-- | tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot | 61 |
35 files changed, 66 insertions, 65 deletions
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 Binary files differindex 390f2410..390f2410 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks +++ b/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 Binary files differindex 390f2410..390f2410 100644 --- 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 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 Binary files differindex 1c9f111a..1c9f111a 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/jksAndPemAndP12.jks +++ b/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 index 978e682d..978e682d 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/pemAndP12.pem +++ b/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 index 9edfaa41..9edfaa41 100644 --- 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 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 index f98b3366..f98b3366 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_duplicated_aliases.env +++ b/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 index 95c00fc2..95c00fc2 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_certs.env +++ b/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 index e69de29b..e69de29b 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_file.env +++ b/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 index 526357b0..526357b0 100644 --- 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 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 index 840728bb..840728bb 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_passwords.env +++ b/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 index 5b971616..5b971616 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_extension.env +++ b/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 index 1a195116..1a195116 100644 --- 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 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 index 7090151c..7090151c 100644 --- 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 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 index b397f9ac..b397f9ac 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_password_path.env +++ b/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 index 52fa88c6..52fa88c6 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/invalid_truststore_paths.env +++ b/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 index e69de29b..e69de29b 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/empty.pem +++ b/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 Binary files differindex 390f2410..390f2410 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.jks +++ b/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 index 8b11c5b6..8b11c5b6 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.pass +++ b/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 Binary files differindex 3bd85a06..3bd85a06 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.jks +++ b/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 Binary files differindex 3a98c4a2..3a98c4a2 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.p12 +++ b/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 index 8815d6cb..8815d6cb 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.pem +++ b/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 index 817b6194..817b6194 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreJks.pass +++ b/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 index 48036abd..48036abd 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreP12.pass +++ b/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 index 928bf637..928bf637 100644 --- 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 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 index 4afa1a27..4afa1a27 100644 --- 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 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 index e0240a74..e0240a74 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/valid_pem_p12.env +++ b/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 index 66b6f66f..66b6f66f 100644 --- a/tests/oom-platform-cert-service/truststoremerger/assets/valid_single_truststore.env +++ b/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 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 index cc60eed6..cc60eed6 100644 --- a/tests/oom-platform-cert-service/truststoremerger/libraries/EnvsReader.py +++ b/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 index 983f66bb..983f66bb 100644 --- a/tests/oom-platform-cert-service/truststoremerger/libraries/JksValidator.py +++ b/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 index 8dc9623d..8dc9623d 100644 --- a/tests/oom-platform-cert-service/truststoremerger/libraries/PemTruststoreValidator.py +++ b/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 index f7a493c4..f7a493c4 100644 --- a/tests/oom-platform-cert-service/truststoremerger/libraries/TrustMergerManager.py +++ b/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 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 - - |