X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fso%2Fintegration-etsi-testing%2Fdocker-compose.yml;h=a79ee20dfd241243bab66948ace8d01a574023dd;hb=refs%2Fchanges%2F44%2F127144%2F2;hp=b40a8579e87cc864d42e165f9af50f3c4bcd90bd;hpb=da61def8bfefd1000a882e7108f3f1943392f914;p=integration%2Fcsit.git diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml index b40a8579..a79ee20d 100644 --- a/plans/so/integration-etsi-testing/docker-compose.yml +++ b/plans/so/integration-etsi-testing/docker-compose.yml @@ -2,14 +2,18 @@ version: '3' services: ################################################################################ mariadb: - image: ${NEXUS_DOCKER_REPO_MSO}/mariadb:10.1.11 + image: ${NEXUS_DOCKER_REPO_MSO}/mariadb:${MARIADB_VERSION} ports: - "3306:3306" volumes: + - /var/lib/mysql - ${TEST_LAB_DIR}/volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d - ${TEST_LAB_DIR}/volumes/mariadb/conf.d:/etc/mysql/conf.d environment: - MYSQL_ROOT_PASSWORD=password + - MYSQL_USER=etsicatalog + - MYSQL_PASSWORD=etsicatalog + - MYSQL_DATABASE=etsicatalog hostname: mariadb.so.testlab.onap.org logging: @@ -75,15 +79,15 @@ services: user: root entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" catalog-db-adapter:8082 -- "/app/start-app.sh"' ################################################################################ - sdnc-adapter: - image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdnc-adapter:${TAG} + openstack-adapter: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/openstack-adapter:${TAG} ports: - - "8086:8086" + - "8087:8087" volumes: - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - - ${TEST_LAB_DIR}/volumes/so/config/sdnc-adapter/onapheat:/app/config + - ${CONFIG_DIR_PATH}/override-files/openstack-adapter/onapheat:/app/config environment: - - APP=sdnc-adapter + - APP=openstack-adapter - JVM_ARGS=-Xms64m -Xmx512m - DB_HOST=mariadb - DB_PORT=3306 @@ -92,7 +96,7 @@ services: - DB_ADMIN_USERNAME=so_admin - DB_ADMIN_PASSWORD=so_Admin123 hostname: - sdnc-adapter.so.testlab.onap.org + openstack-adapter.so.testlab.onap.org depends_on: - mariadb - catalog-db-adapter @@ -111,7 +115,7 @@ services: - "8085:8085" volumes: - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - - ${CONFIG_DIR_PATH}/distribution-test-zip/zipped_sdc_csar.tar.gz:/distribution-test-zip/zipped_sdc_csar.tar.gz + - ${CONFIG_DIR_PATH}/distribution-test-zip:/distribution-test-zip - ${CONFIG_DIR_PATH}/override-files/sdc-controller/onapheat:/app/config environment: - APP=sdc-controller @@ -134,16 +138,16 @@ services: max-size: "30m" max-file: "5" user: root - entrypoint: /bin/sh -c 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && chmod 777 -R /distribution-test-zip/ && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"' + entrypoint: /bin/sh -c 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/macro_zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && chmod 777 -R /distribution-test-zip/ && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"' ################################################################################ bpmn-infra: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/bpmn-infra:${TAG} ports: - "8081:8081" volumes: - - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - ${CONFIG_DIR_PATH}/override-files/bpmn-infra/onapheat:/app/config - - ${CONFIG_DIR_PATH}/certificates/aai-certificate/aai.crt:/app/ca-certificates/aai.crt + - ${CONFIG_DIR_PATH}/certificates/bpmn-infra-certs:/app/bpmn-infra-certs + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt environment: - APP=bpmn-infra - JVM_ARGS=-Xms64m -Xmx512m @@ -155,6 +159,8 @@ services: - DB_ADMIN_PASSWORD=so_Admin123 hostname: bpmn-infra.so.testlab.onap.org + links: + - "so-etsi-sol003-adapter:so-etsi-sol003-adapter.onap" depends_on: - mariadb - catalog-db-adapter @@ -166,14 +172,45 @@ services: max-file: "5" user: root entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"' +################################################################################ + sdnc-adapter: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdnc-adapter:${TAG} + ports: + - "8086:8086" + volumes: + - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ${CONFIG_DIR_PATH}/override-files/sdnc-adapter/onapheat:/app/config + environment: + - APP=sdnc-adapter + - 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: + sdnc-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + - bpmn-infra + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + user: root + entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" bpmn-infra:8081 -- "/app/start-app.sh"' ################################################################################ api-handler-infra: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/api-handler-infra:${TAG} ports: - "8080:8080" volumes: - - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - ${CONFIG_DIR_PATH}/override-files/api-handler-infra/onapheat:/app/config + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt environment: - APP=api-handler-infra - JVM_ARGS=-Xms64m -Xmx512m @@ -189,42 +226,44 @@ services: - mariadb - catalog-db-adapter - request-db-adapter + - bpmn-infra logging: driver: "json-file" options: max-size: "30m" max-file: "5" user: root - entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"' + entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" bpmn-infra:8081 -- "/app/start-app.sh"' ############################################################################# - so-monitoring: - image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG} + so-admin-cockpit: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-admin-cockpit:${SO_ADMIN_COCKPIT_IMAGE_VERSION} ports: - "30224:30224" volumes: - ${CONFIG_DIR_PATH}/override-files/so-monitoring/onapheat:/app/config environment: - - APP=so-monitoring + - APP=so-admin-cockpit - JVM_ARGS=-Xms64m -Xmx512m hostname: - so-monitoring.so.testlab.onap.org + so-admin-cockpit.so.testlab.onap.org depends_on: - mariadb - catalog-db-adapter - request-db-adapter ################################################################################ - so-vnfm-adapter: - image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${TAG} + so-etsi-sol003-adapter: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-etsi-sol003-adapter:${SOL_003_ADAPTER_IMAGE_VERSION} ports: - "9092:9092" volumes: - - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - ${CONFIG_DIR_PATH}/override-files/so-vnfm-adapter/onapheat:/app/config + - ${CONFIG_DIR_PATH}/certificates/so-vnfm-adapter-certs:/app/so-vnfm-adapter-certs + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt environment: - - APP=so-vnfm-adapter + - APP=so-etsi-sol003-adapter - JVM_ARGS=-Xms64m -Xmx512m hostname: - so-vnfm-adapter + so-etsi-sol003-adapter depends_on: - request-db-adapter logging: @@ -246,7 +285,7 @@ services: sdc-simulator depends_on: - mariadb - - so-vnfm-adapter + - so-etsi-sol003-adapter logging: driver: "json-file" options: @@ -264,7 +303,7 @@ services: aai-simulator depends_on: - mariadb - - so-vnfm-adapter + - so-etsi-sol003-adapter logging: driver: "json-file" options: @@ -276,16 +315,18 @@ services: ports: - "9093:9093" volumes: - - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - ${CONFIG_DIR_PATH}/override-files/vnfm-simulator/onapheat:/app/config + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt environment: - APP=VNFM-SIMULATOR - JVM_ARGS=-Xms64m -Xmx512m hostname: so-vnfm-simulator + links: + - "so-etsi-sol003-adapter:so-etsi-sol003-adapter.onap" depends_on: - mariadb - - so-vnfm-adapter + - so-etsi-sol003-adapter logging: driver: "json-file" options: @@ -305,7 +346,7 @@ services: - CATALOG_DB=catalogdb depends_on: - mariadb - - so-vnfm-adapter + - so-etsi-sol003-adapter command: - "/config/apply-workarounds.sh" ################################################################################# @@ -320,7 +361,25 @@ services: sdnc-simulator depends_on: - mariadb - - so-vnfm-adapter + - so-etsi-sol003-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" +################################################################################# + multicloud-simulator: + image: simulators/multicloud-simulator:latest + ports: + - "9996:9996" + environment: + - APP=MULTICLOUD-SIMULATOR + - JVM_ARGS=-Xms64m -Xmx512m + hostname: + multicloud-simulator + depends_on: + - mariadb + - so-etsi-sol003-adapter logging: driver: "json-file" options: @@ -344,27 +403,54 @@ services: command: - "/config/populate-aai-simulator.sh" ################################################################################ - ve-vnfm-adapter: - image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/ve-vnfm-adapter:${TAG} + modeling-etsicatalog: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION} ports: - - "9098:9098" + - "8806:8806" volumes: - - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - - ${CONFIG_DIR_PATH}/override-files/ve-vnfm-adapter/onapheat:/app/config + - /var/lib/mysql + - ${CONFIG_DIR_PATH}/wait-for.sh:/service/wait-for.sh environment: - - APP=ve-vnfm-adapter - - JVM_ARGS=-Xms64m -Xmx512m - - DB_HOST=mariadb + - DB_IP=mariadb + - SDC_ADDR=http://sdc-simulator:9991 hostname: - ve-vnfm-adapter + modeling-etsicatalog + links: + - "so-etsi-sol003-adapter:so-etsi-sol003-adapter.onap" depends_on: - - request-db-adapter - - aai-simulator + - mariadb + - sdc-simulator logging: driver: "json-file" options: max-size: "30m" max-file: "5" + entrypoint: /bin/sh -c '/service/wait-for.sh -t 300 -h mariadb -p 3306 && /service/modeling/etsicatalog/docker/docker-entrypoint.sh' +############################################################################### + so-etsi-nfvo-ns-lcm: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-etsi-nfvo-ns-lcm:${ETSI_NFVO_NS_LCM_IMAGE_VERSION} + ports: + - "9095:9095" + volumes: + - ${CONFIG_DIR_PATH}/override-files/so-etsi-nfvo-ns-lcm/onapheat:/app/config + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt + - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates + environment: + - APP=so-etsi-nfvo-ns-lcm + - 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: + etsi.nfvo.ns.lcm + depends_on: + - mariadb + - aai-simulator + - sdc-simulator + - modeling-etsicatalog + - so-etsi-sol003-adapter user: root - entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"' -################################################################################ + entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" mariadb:3306 -- "/app/start-app.sh"'