[OOM-CMPv2] Rename truststoremerger->postprocessor 61/112961/3
authorJan Malkiewicz <jan.malkiewicz@nokia.com>
Tue, 22 Sep 2020 06:04:23 +0000 (08:04 +0200)
committerJan Malkiewicz <jan.malkiewicz@nokia.com>
Tue, 22 Sep 2020 18:01:03 +0000 (20:01 +0200)
Issue-ID: DCAEGEN2-2253
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: I6c7fa3378c86dee4e1fe23e4840046b979d942ea

39 files changed:
.gitignore
plans/oom-platform-cert-service/postprocessor/setup.sh [moved from plans/oom-platform-cert-service/truststoremerger/setup.sh with 92% similarity]
plans/oom-platform-cert-service/postprocessor/teardown.sh [moved from plans/oom-platform-cert-service/truststoremerger/teardown.sh with 91% similarity]
plans/oom-platform-cert-service/postprocessor/testplan.txt [moved from plans/oom-platform-cert-service/truststoremerger/testplan.txt with 70% similarity]
tests/oom-platform-cert-service/postprocessor/assets/expected_keystores/keystore.jks [moved from tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/expected_keystores/keystore.jks.bak [moved from tests/oom-platform-cert-service/truststoremerger/assets/expected_keystores/keystore.jks.bak with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/expected_truststores/jksAndPemAndP12.jks [moved from tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/jksAndPemAndP12.jks with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/expected_truststores/pemAndP12.pem [moved from tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/pemAndP12.pem with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_different_lists_size.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_different_lists_size.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_duplicated_aliases.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_duplicated_aliases.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_certs.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_certs.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_file.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_file.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_keystore_destination_path.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_keystore_destination_path.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_empty_passwords.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_passwords.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_extension.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_extension.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_file_password_pair.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_file_password_pair.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_keystore_source_paths.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_keystore_source_paths.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_password_path.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_password_path.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/invalid_truststore_paths.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/invalid_truststore_paths.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/truststores/empty.pem [moved from tests/oom-platform-cert-service/truststoremerger/assets/truststores/empty.pem with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/truststores/external/keystore.jks [moved from tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.jks with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/truststores/external/keystore.pass [moved from tests/oom-platform-cert-service/truststoremerger/assets/truststores/external/keystore.pass with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.jks [moved from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.jks with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.p12 [moved from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.p12 with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/truststores/truststore.pem [moved from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.pem with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/truststores/truststoreJks.pass [moved from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreJks.pass with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/truststores/truststoreP12.pass [moved from tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreP12.pass with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/valid_envs_and_extra_optional.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/valid_envs_and_extra_optional.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/valid_jks_pem_p12.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/valid_jks_pem_p12.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/valid_pem_p12.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/valid_pem_p12.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/assets/valid_single_truststore.env [moved from tests/oom-platform-cert-service/truststoremerger/assets/valid_single_truststore.env with 100% similarity]
tests/oom-platform-cert-service/postprocessor/certservice-postprocessor-test.robot [moved from tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot with 97% similarity]
tests/oom-platform-cert-service/postprocessor/libraries/EnvsReader.py [moved from tests/oom-platform-cert-service/truststoremerger/libraries/EnvsReader.py with 100% similarity]
tests/oom-platform-cert-service/postprocessor/libraries/JksValidator.py [moved from tests/oom-platform-cert-service/truststoremerger/libraries/JksValidator.py with 100% similarity]
tests/oom-platform-cert-service/postprocessor/libraries/PemTruststoreValidator.py [moved from tests/oom-platform-cert-service/truststoremerger/libraries/PemTruststoreValidator.py with 100% similarity]
tests/oom-platform-cert-service/postprocessor/libraries/TrustMergerManager.py [moved from tests/oom-platform-cert-service/truststoremerger/libraries/TrustMergerManager.py with 100% similarity]
tests/oom-platform-cert-service/postprocessor/resources/test-keywords.robot [moved from tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot with 98% similarity]
tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot [new file with mode: 0644]
tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot [deleted file]

index 5eb3578..aeff7ff 100644 (file)
@@ -29,3 +29,4 @@ env.properties
 /venv/*
 
 /tests/aaf/certservice/tmp/*
+/tests/oom-platform-cert-service/postprocessor/tmp/*
@@ -16,7 +16,7 @@
 #
 
 #export container name
-export MergerContainerName=TrustStoreMerger
+export CertServicePostProcessorContainerName=CertServicePostProcessor
 
 #install docker sdk
 echo "Uninstall docker-py and reinstall docker."
@@ -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
@@ -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 ***
 
@@ -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 (file)
index 0000000..ab4c18b
--- /dev/null
@@ -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 (file)
index c773735..0000000
+++ /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
-
-