aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authorGary Wu <gary.wu@gmail.com>2019-07-25 19:24:28 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-25 19:24:28 +0000
commit928b97d048078dd7e419d6338f8708321f00fbc8 (patch)
tree59b1d5ca9bf26424a25947bea10711dc1982292a /plans
parent0f5d5ba0cff865f7e0536df5e02fa3da3ad6030e (diff)
parent1537edfe63b65e6755f7a7f7f26da4cb1879c05a (diff)
Merge "Simulate Service Distribution of SDC Service in Catalog DB"
Diffstat (limited to 'plans')
-rw-r--r--plans/so/integration-etsi-testing/config/distribution-test-zip/distributionTestZip.zipbin0 -> 148872 bytes
-rw-r--r--plans/so/integration-etsi-testing/docker-compose.yml33
-rw-r--r--plans/so/integration-etsi-testing/testplan.txt1
3 files changed, 34 insertions, 0 deletions
diff --git a/plans/so/integration-etsi-testing/config/distribution-test-zip/distributionTestZip.zip b/plans/so/integration-etsi-testing/config/distribution-test-zip/distributionTestZip.zip
new file mode 100644
index 00000000..ac96bd94
--- /dev/null
+++ b/plans/so/integration-etsi-testing/config/distribution-test-zip/distributionTestZip.zip
Binary files differ
diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index 2286c9a9..148b6dcd 100644
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -167,4 +167,37 @@ services:
- vnfm-adapter
command:
- "/config/apply-workarounds.sh"
+#################################################################################
+ sdc-controller:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdc-controller:${TAG}
+ ports:
+ - "8085:8085"
+ volumes:
+ - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ${TEST_LAB_DIR}/volumes/so/config/sdc-controller/onapheat:/app/config
+ - ${CONFIG_DIR_PATH}/distribution-test-zip/distributionTestZip.zip:/distribution-test-zip/distributionTestZip.zip
+ environment:
+ - APP=sdc-controller
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+ - DB_PORT=3306
+ - DB_USERNAME=so_user
+ - DB_PASSWORD=so_User123
+ - DB_ADMIN_USERNAME=so_admin
+ - DB_ADMIN_PASSWORD=so_Admin123
+ hostname:
+ sdc-controller.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ - catalog-db-adapter
+ - request-db-adapter
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /bin/sh
+ - -c
+ - 'mkdir -p /distribution-test-zip/unzipped && unzip /distribution-test-zip/distributionTestZip.zip -d /distribution-test-zip/unzipped && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
################################################################################
diff --git a/plans/so/integration-etsi-testing/testplan.txt b/plans/so/integration-etsi-testing/testplan.txt
index 94b5442d..c68e4fb1 100644
--- a/plans/so/integration-etsi-testing/testplan.txt
+++ b/plans/so/integration-etsi-testing/testplan.txt
@@ -1,2 +1,3 @@
# Test suites are relative paths under [integration/csit.git]/tests/.
# Place the suites in run order.
+so/etsi/etsi_tests.robot