From: Bartek Grzybowski Date: Tue, 3 Mar 2020 14:22:22 +0000 (+0000) Subject: Merge "Update certs for pmmapper in Bulkpm usecase" X-Git-Tag: 6.0.0-ONAP~58 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7230b715f5a943b883afd2b9f5fb59ebc50aa387;hp=744ed22cf73e9f1ecd3afa78b0485db3ed6cf11e;p=integration%2Fcsit.git Merge "Update certs for pmmapper in Bulkpm usecase" --- diff --git a/plans/aaf/certservice/docker-compose.yml b/plans/aaf/certservice/docker-compose.yml new file mode 100644 index 00000000..84da7353 --- /dev/null +++ b/plans/aaf/certservice/docker-compose.yml @@ -0,0 +1,33 @@ +version: "2.1" + +services: + ejbca: + image: primekey/ejbca-ce + hostname: cahostname + container_name: aafcert-ejbca + ports: + - "80:8080" + - "443:8443" + volumes: + - $SCRIPTS_PATH:/opt/primekey/scripts + command: bash -c " + ./scripts/ejbca-configuration.sh & + /opt/primekey/bin/start.sh + " + healthcheck: + test: ["CMD-SHELL", "curl -kI https://localhost:8443/ejbca/publicweb/healthcheck/ejbcahealth"] + interval: 10s + timeout: 3s + retries: 9 + + certservice: + image: nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-api:latest + volumes: + - $CONFIGURATION_PATH:/etc/onap/aaf/certservice/cmpServers.json + container_name: aafcert + ports: + - "8080:8080" + depends_on: + ejbca: + condition: service_healthy + diff --git a/plans/aaf/certservice/scripts/ejbca-configuration.sh b/plans/aaf/certservice/scripts/ejbca-configuration.sh new file mode 100755 index 00000000..cdff77de --- /dev/null +++ b/plans/aaf/certservice/scripts/ejbca-configuration.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +waitForEjbcaStartUp() { + sleep $1 +} + +configureEjbca() { + ejbca.sh config cmp addalias --alias cmpRA + ejbca.sh config cmp updatealias --alias cmpRA --key operationmode --value ra + ejbca.sh ca editca --caname ManagementCA --field cmpRaAuthSecret --value mypassword + ejbca.sh config cmp dumpalias --alias cmpRA + ejbca.sh config cmp addalias --alias cmp + ejbca.sh config cmp updatealias --alias cmp --key allowautomatickeyupdate --value true + ejbca.sh ra addendentity --username Node123 --dn "CN=Node123" --caname ManagementCA --password mypassword --type 1 --token USERGENERATED + ejbca.sh ra setclearpwd --username Node123 --password mypassword + ejbca.sh config cmp updatealias --alias cmp --key extractusernamecomponent --value CN + ejbca.sh config cmp dumpalias --alias cmp + ejbca.sh ca getcacert --caname ManagementCA -f /dev/stdout > cacert.pem +} + +waitForEjbcaStartUp 30 +configureEjbca diff --git a/plans/aaf/certservice/setup.sh b/plans/aaf/certservice/setup.sh index 1bf57470..4911e475 100644 --- a/plans/aaf/certservice/setup.sh +++ b/plans/aaf/certservice/setup.sh @@ -15,16 +15,20 @@ # limitations under the License. # -AAFCERT_IMAGE=nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-api:latest - -echo AAFCERT_IMAGE=${AAFCERT_IMAGE} - # ------------------------------------ -# Resolve path to cmp servers configuration +# Resolve path to script's folder and cmp servers configuration SCRIPT=`realpath $0` CURRENT_WORKDIR_PATH=`dirname $SCRIPT` +SCRIPTS_DIRECTORY="scripts" +if test -d "$CURRENT_WORKDIR_PATH/plans/aaf/certservice/$SCRIPTS_DIRECTORY"; then + SCRIPTS_PATH="$CURRENT_WORKDIR_PATH/plans/aaf/certservice/$SCRIPTS_DIRECTORY" +else test -f "$CURRENT_WORKDIR_PATH/$SCRIPTS_DIRECTORY"; + SCRIPTS_PATH=$CURRENT_WORKDIR_PATH/$SCRIPTS_DIRECTORY +fi +echo "Use scripts from: $SCRIPTS_PATH" + CONFIGURATION_FILE="cmpServers.json" if test -f "$CURRENT_WORKDIR_PATH/plans/aaf/certservice/$CONFIGURATION_FILE"; then CONFIGURATION_PATH="$CURRENT_WORKDIR_PATH/plans/aaf/certservice/$CONFIGURATION_FILE" @@ -32,14 +36,17 @@ else test -f "$CURRENT_WORKDIR_PATH/$CONFIGURATION_FILE"; CONFIGURATION_PATH=$CURRENT_WORKDIR_PATH/$CONFIGURATION_FILE fi echo "Use configuration from: $CONFIGURATION_PATH" + # ------------------------------------- -# Start AAF Cert Srevice -docker run -p 8080:8080 -d --mount type=bind,source=${CONFIGURATION_PATH},target=/etc/onap/aaf/certservice/cmpServers.json --name aafcert ${AAFCERT_IMAGE} +export CONFIGURATION_PATH=${CONFIGURATION_PATH} +export SCRIPTS_PATH=${SCRIPTS_PATH} + +docker-compose up -d AAFCERT_IP=`get-instance-ip.sh aafcert` export AAFCERT_IP=${AAFCERT_IP} # Wait container ready -sleep 5 +sleep 10 diff --git a/plans/aaf/certservice/teardown.sh b/plans/aaf/certservice/teardown.sh index a613944d..3f10eaeb 100644 --- a/plans/aaf/certservice/teardown.sh +++ b/plans/aaf/certservice/teardown.sh @@ -15,4 +15,5 @@ # limitations under the License. # -kill-instance.sh aafcert \ No newline at end of file +kill-instance.sh aafcert +kill-instance.sh aafcert-ejbca \ No newline at end of file diff --git a/plans/dcaegen2-services-bbs-event-processor/bbs-testsuites/setup.sh b/plans/dcaegen2-services-bbs-event-processor/bbs-testsuites/setup.sh index 9551ce43..2d631cc9 100644 --- a/plans/dcaegen2-services-bbs-event-processor/bbs-testsuites/setup.sh +++ b/plans/dcaegen2-services-bbs-event-processor/bbs-testsuites/setup.sh @@ -7,7 +7,7 @@ export BBS_SERVICE="bbs" export DMAAP_SIMULATOR="dmaap_simulator" export AAI_SIMULATOR="aai_simulator" -cd ${WORKSPACE}/tests/dcaegen2/bbs-testcases/resources/ +cd ${WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/ pip uninstall -y docker-py pip uninstall -y docker diff --git a/plans/dcaegen2-services-bbs-event-processor/bbs-testsuites/testplan.txt b/plans/dcaegen2-services-bbs-event-processor/bbs-testsuites/testplan.txt index 9f1794bd..2d774a6e 100644 --- a/plans/dcaegen2-services-bbs-event-processor/bbs-testsuites/testplan.txt +++ b/plans/dcaegen2-services-bbs-event-processor/bbs-testsuites/testplan.txt @@ -1,3 +1,3 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. -dcaegen2/bbs-testcases +dcaegen2-services-bbs-event-processor/bbs-testcases diff --git a/tests/dcaegen2/bbs-testcases/__init__.robot b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/__init__.robot similarity index 100% rename from tests/dcaegen2/bbs-testcases/__init__.robot rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/__init__.robot diff --git a/tests/dcaegen2/bbs-testcases/assets/aai_records/aai_pnf_not_found.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_pnf_not_found.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/aai_records/aai_pnf_not_found.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_pnf_not_found.json diff --git a/tests/dcaegen2/bbs-testcases/assets/aai_records/aai_pnfs.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_pnfs.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/aai_records/aai_pnfs.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_pnfs.json diff --git a/tests/dcaegen2/bbs-testcases/assets/aai_records/aai_services.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_services.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/aai_records/aai_services.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_services.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_all_fields.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_all_fields.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_all_fields.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_all_fields.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_new_old_state.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_new_old_state.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_new_old_state.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_new_old_state.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_rgmac.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_rgmac.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_rgmac.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_rgmac.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_sourceName.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_sourceName.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_sourceName.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_sourceName.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_wrong_sourceName.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_wrong_sourceName.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_wrong_sourceName.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_wrong_sourceName.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_without_swversion.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_without_swversion.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_without_swversion.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_without_swversion.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/auth_not_json_format.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_not_json_format.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/auth_not_json_format.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_not_json_format.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/auth_policy_with_all_fields.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_policy_with_all_fields.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/auth_policy_with_all_fields.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_policy_with_all_fields.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_all_fields.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_all_fields.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_all_fields.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_all_fields.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_missing_attachment.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_missing_attachment.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_missing_attachment.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_missing_attachment.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_missing_correlation.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_missing_correlation.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_missing_correlation.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_missing_correlation.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_wrong_correlation.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_wrong_correlation.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_wrong_correlation.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_wrong_correlation.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/update_not_json_format.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_not_json_format.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/update_not_json_format.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_not_json_format.json diff --git a/tests/dcaegen2/bbs-testcases/assets/json_events/update_policy_with_all_fields.json b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_policy_with_all_fields.json similarity index 100% rename from tests/dcaegen2/bbs-testcases/assets/json_events/update_policy_with_all_fields.json rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_policy_with_all_fields.json diff --git a/tests/dcaegen2/bbs-testcases/bbs_tests.robot b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/bbs_tests.robot similarity index 74% rename from tests/dcaegen2/bbs-testcases/bbs_tests.robot rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/bbs_tests.robot index 4721e425..a0db4b2f 100644 --- a/tests/dcaegen2/bbs-testcases/bbs_tests.robot +++ b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/bbs_tests.robot @@ -11,23 +11,23 @@ Test Teardown Reset Simulators *** Variables *** ${DMAAP_SIMULATOR_SETUP_URL} http://${DMAAP_SIMULATOR_SETUP} ${AAI_SIMULATOR_SETUP_URL} http://${AAI_SIMULATOR_SETUP} -${AUTH_EVENT_WITH_ALL_VALID_REQUIRED_FIELDS} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_all_fields.json -${AUTH_EVENT_WITH_WRONG_SOURCENAME} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_wrong_sourceName.json -${AUTH_EVENT_WITHOUT_SWVERSION} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_without_swversion.json -${AUTH_EVENT_WITH_MISSING_RGMAC} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_rgmac.json -${AUTH_EVENT_WITH_MISSING_STATE} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_new_old_state.json -${AUTH_EVENT_WITH_MISSING_SOURCENAME} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/auth_event_with_missing_sourceName.json -${AUTH_NOT_JSON_FORMAT} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/auth_not_json_format.json -${AUTH_POLICY} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/auth_policy_with_all_fields.json -${UPDATE_EVENT_WITH_ALL_VALID_REQUIRED_FIELDS} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_all_fields.json -${UPDATE_EVENT_WITH_WRONG_CORRELATION} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_wrong_correlation.json -${UPDATE_EVENT_WITH_MISSING_ATTACHMENT} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_missing_attachment.json -${UPDATE_EVENT_WITH_MISSING_CORRELATION} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/update_event_with_missing_correlation.json -${UPDATE_NOT_JSON_FORMAT} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/update_not_json_format.json -${UPDATE_POLICY} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/json_events/update_policy_with_all_fields.json -${AAI_PNFS} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/aai_records/aai_pnfs.json -${AAI_SERVICES} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/aai_records/aai_services.json -${AAI_PNF_NOT_FOUND} %{WORKSPACE}/tests/dcaegen2/bbs-testcases/assets/aai_records/aai_pnf_not_found.json +${AUTH_EVENT_WITH_ALL_VALID_REQUIRED_FIELDS} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_all_fields.json +${AUTH_EVENT_WITH_WRONG_SOURCENAME} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_wrong_sourceName.json +${AUTH_EVENT_WITHOUT_SWVERSION} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_without_swversion.json +${AUTH_EVENT_WITH_MISSING_RGMAC} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_rgmac.json +${AUTH_EVENT_WITH_MISSING_STATE} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_new_old_state.json +${AUTH_EVENT_WITH_MISSING_SOURCENAME} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_event_with_missing_sourceName.json +${AUTH_NOT_JSON_FORMAT} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_not_json_format.json +${AUTH_POLICY} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/auth_policy_with_all_fields.json +${UPDATE_EVENT_WITH_ALL_VALID_REQUIRED_FIELDS} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_all_fields.json +${UPDATE_EVENT_WITH_WRONG_CORRELATION} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_wrong_correlation.json +${UPDATE_EVENT_WITH_MISSING_ATTACHMENT} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_missing_attachment.json +${UPDATE_EVENT_WITH_MISSING_CORRELATION} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_event_with_missing_correlation.json +${UPDATE_NOT_JSON_FORMAT} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_not_json_format.json +${UPDATE_POLICY} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/json_events/update_policy_with_all_fields.json +${AAI_PNFS} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_pnfs.json +${AAI_SERVICES} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_services.json +${AAI_PNF_NOT_FOUND} %{WORKSPACE}/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/assets/aai_records/aai_pnf_not_found.json *** Test Cases *** Valid DMaaP CPE_AUTHENTICATION event can trigger Policy diff --git a/tests/dcaegen2/bbs-testcases/resources/BbsLibrary.py b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/BbsLibrary.py similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/BbsLibrary.py rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/BbsLibrary.py diff --git a/tests/dcaegen2/bbs-testcases/resources/bbs_library.robot b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/bbs_library.robot similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/bbs_library.robot rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/bbs_library.robot diff --git a/tests/dcaegen2/bbs-testcases/resources/docker-compose.yml b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/docker-compose.yml similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/docker-compose.yml rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/docker-compose.yml diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/AAI.py b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/AAI.py similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/AAI.py rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/AAI.py diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/AAI_simulator b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/AAI_simulator similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/AAI_simulator rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/AAI_simulator diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/DMaaP.py b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/DMaaP.py similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/DMaaP.py rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/DMaaP.py diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/DMaaP_simulator b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/DMaaP_simulator similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/DMaaP_simulator rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/DMaaP_simulator diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/aai_aai.onap.org.cer b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/aai_aai.onap.org.cer similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/aai_aai.onap.org.cer rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/aai_aai.onap.org.cer diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/ca_local_0.cer b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/ca_local_0.cer similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/ca_local_0.cer rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/ca_local_0.cer diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/keystore.password b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/keystore.password similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/keystore.password rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/keystore.password diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/org.onap.aai.key b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/org.onap.aai.key similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/org.onap.aai.key rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/org.onap.aai.key diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/org.onap.dcae.jks b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/org.onap.dcae.jks similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/org.onap.dcae.jks rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/org.onap.dcae.jks diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/org.onap.dcae.trust.jks b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/org.onap.dcae.trust.jks similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/org.onap.dcae.trust.jks rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/org.onap.dcae.trust.jks diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/org.onap.dmaap-bc.key b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/org.onap.dmaap-bc.key similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/org.onap.dmaap-bc.key rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/org.onap.dmaap-bc.key diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/certs/truststore.password b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/truststore.password similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/certs/truststore.password rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/certs/truststore.password diff --git a/tests/dcaegen2/bbs-testcases/resources/simulator/httpServerLib.py b/tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/httpServerLib.py similarity index 100% rename from tests/dcaegen2/bbs-testcases/resources/simulator/httpServerLib.py rename to tests/dcaegen2-services-bbs-event-processor/bbs-testcases/resources/simulator/httpServerLib.py