diff options
| author |   eHanan <eoin.hanan@est.tech> | 2019-08-13 15:44:16 +0000 |
|---|---|---|
| committer | Eoin Hanan <eoin.hanan@est.tech> | 2019-08-13 15:46:12 +0000 |
| commit | 75c1171a3a0d0fbfe8a71b8b9fe308356f45c35d (patch) | |
| tree | 3f86f42541cea44aac60e1c1231536287df32550 /plans/so | |
| parent | dd4052610fab6da25d3c47c4ea3265daa2139df4 (diff) | |
Create basic Test case to invoke ETSI flow
Change-Id: I6786ec0a97789965825f4d0b390a44c5a3aa5d64
Issue-ID: SO-2144
Signed-off-by: eHanan <eoin.hanan@est.tech>
Diffstat (limited to 'plans/so')
3 files changed, 39 insertions, 3 deletions
diff --git a/plans/so/integration-etsi-testing/config/override-files/so-monitoring/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/so-monitoring/onapheat/override.yaml new file mode 100644 index 00000000..7e61c7d0 --- /dev/null +++ b/plans/so/integration-etsi-testing/config/override-files/so-monitoring/onapheat/override.yaml @@ -0,0 +1,24 @@ +server: + port: 30224 + tomcat: + max-threads: 4 +ssl-enable: false +camunda: + rest: + api: + url: http://bpmn-infra:8081/sobpmnengine/engine/ + engine: default + auth: Basic YXBpaEJwbW46cGFzc3dvcmQxJA== +mso: + database: + rest: + api: + url: http://request-db-adapter:8083/infraActiveRequests/ + auth: Basic YnBlbDpwYXNzd29yZDEk +spring: + security: + usercredentials: + - + username: gui + password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' + role: GUI-Client diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml index 69fb6857..e5e56d6c 100644 --- a/plans/so/integration-etsi-testing/docker-compose.yml +++ b/plans/so/integration-etsi-testing/docker-compose.yml @@ -231,7 +231,7 @@ services: so-monitoring: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG} ports: - - "30224:9091" + - "30224:30224" volumes: - ${TEST_LAB_DIR}/volumes/so/config/api-handler-infra/onapheat:/app/config environment: diff --git a/plans/so/integration-etsi-testing/setup.sh b/plans/so/integration-etsi-testing/setup.sh index a3eb784c..6f0c0106 100755 --- a/plans/so/integration-etsi-testing/setup.sh +++ b/plans/so/integration-etsi-testing/setup.sh @@ -41,6 +41,7 @@ MVN_CLEAN_INSTALL="$MVN clean install" SIMULATOR_MAVEN_PROJECT_POM="$SCRIPT_HOME/so-simulators/pom.xml" WAIT_FOR_WORKAROUND_SCRIPT=$CONFIG_DIR/"wait-for-workaround-job.sh" WAIT_FOR_POPULATE_AAI_SCRIPT=$CONFIG_DIR/"wait-for-aai-config-job.sh" +WAIT_FOR_CONTAINER_SCRIPT=$CONFIG_DIR/"wait-for-container.sh" echo "Running $SCRIPT_HOME/$SCRIPT_NAME ..." @@ -137,7 +138,7 @@ $WAIT_FOR_WORKAROUND_SCRIPT if [ $? -ne 0 ]; then echo "ERROR: $WAIT_FOR_WORKAROUND_SCRIPT failed" echo "Will stop running docker containers . . ." - docker-compose -f $DOCKER_COMPOSE_FILE_PATH down + docker-compose -f $DOCKER_COMPOSE_FILE_PATH -p $PROJECT_NAME down exit 1 fi @@ -147,7 +148,18 @@ $WAIT_FOR_POPULATE_AAI_SCRIPT if [ $? -ne 0 ]; then echo "ERROR: $WAIT_FOR_POPULATE_AAI_SCRIPT failed" echo "Will stop running docker containers . . ." - docker-compose -f $DOCKER_COMPOSE_FILE_PATH down + docker-compose -f $DOCKER_COMPOSE_FILE_PATH -p $PROJECT_NAME down + exit 1 +fi + +API_INFRA_CONTAINER_NAME="api-handler-infra" +echo "Will execute $WAIT_FOR_CONTAINER_SCRIPT to wait for $API_INFRA_CONTAINER_NAME container to start up" +$WAIT_FOR_CONTAINER_SCRIPT -n "$API_INFRA_CONTAINER_NAME" -t "300" -p "${PROJECT_NAME}_default" + +if [ $? -ne 0 ]; then + echo "ERROR: $WAIT_FOR_CONTAINER_SCRIPT failed" + echo "Will stop running docker containers . . ." + docker-compose -f $DOCKER_COMPOSE_FILE_PATH -p $PROJECT_NAME down exit 1 fi |