X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ntsimulator%2Fdocker-compose.yaml;h=cf155864c8a93925b67089599540d597068d3ccf;hb=2268793472bf9674290758d8b811d2de8a552627;hp=ecec6b6da71ad24dcb67cbb12b7c5c1618e117d0;hpb=f379349d310d61b27d2c0bf7334d2268cc8f42e2;p=sim%2Fo1-interface.git diff --git a/ntsimulator/docker-compose.yaml b/ntsimulator/docker-compose.yaml index ecec6b6..cf15586 100644 --- a/ntsimulator/docker-compose.yaml +++ b/ntsimulator/docker-compose.yaml @@ -21,7 +21,7 @@ services: IPv6_ENABLED: ${IPv6_ENABLED} SSH_CONNECTIONS: ${SSH_CONNECTIONS} TLS_CONNECTIONS: ${TLS_CONNECTIONS} - + SDN_CONTROLLER_PROTOCOL: ${SDN_CONTROLLER_PROTOCOL} SDN_CONTROLLER_IP: ${SDN_CONTROLLER_IP} SDN_CONTROLLER_PORT: ${SDN_CONTROLLER_PORT} @@ -37,8 +37,9 @@ services: VES_ENDPOINT_AUTH_METHOD: ${VES_ENDPOINT_AUTH_METHOD} VES_ENDPOINT_USERNAME: ${VES_ENDPOINT_USERNAME} VES_ENDPOINT_PASSWORD: ${VES_ENDPOINT_PASSWORD} - # networks: - # app_net: + + CURL_CONNECT_TIMEOUT: ${CURL_CONNECT_TIMEOUT} + CURL_OPERATION_TIMEOUT: ${CURL_OPERATION_TIMEOUT} ntsim-ng-o-ru: image: "${DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}" @@ -79,8 +80,8 @@ services: VES_ENDPOINT_USERNAME: ${VES_ENDPOINT_USERNAME} VES_ENDPOINT_PASSWORD: ${VES_ENDPOINT_PASSWORD} - # networks: - # app_net: + CURL_CONNECT_TIMEOUT: ${CURL_CONNECT_TIMEOUT} + CURL_OPERATION_TIMEOUT: ${CURL_OPERATION_TIMEOUT} ntsim-ng-o-du: image: "${DOCKER_REPO}nts-ng-o-ran-du:${NTS_BUILD_VERSION}" @@ -104,7 +105,7 @@ services: NTS_HOST_NETCONF_TLS_BASE_PORT: ${NTS_HOST_NETCONF_TLS_BASE_PORT} NTS_HOST_TRANSFER_FTP_BASE_PORT: ${NTS_HOST_TRANSFER_FTP_BASE_PORT} NTS_HOST_TRANSFER_SFTP_BASE_PORT: ${NTS_HOST_TRANSFER_SFTP_BASE_PORT} - + SDN_CONTROLLER_PROTOCOL: ${SDN_CONTROLLER_PROTOCOL} SDN_CONTROLLER_IP: ${SDN_CONTROLLER_IP} SDN_CONTROLLER_PORT: ${SDN_CONTROLLER_PORT} @@ -120,17 +121,22 @@ services: VES_ENDPOINT_AUTH_METHOD: ${VES_ENDPOINT_AUTH_METHOD} VES_ENDPOINT_USERNAME: ${VES_ENDPOINT_USERNAME} VES_ENDPOINT_PASSWORD: ${VES_ENDPOINT_PASSWORD} - # networks: - # app_net: - -# networks: -# app_net: -# driver: bridge -# ipam: -# driver: default - -# We can attach to any other docker network, like in the example below + + CURL_CONNECT_TIMEOUT: ${CURL_CONNECT_TIMEOUT} + CURL_OPERATION_TIMEOUT: ${CURL_OPERATION_TIMEOUT} + + o-ran-sc-topology-service: + image: "${DOCKER_REPO}o-ran-sc-topology-service:${NTS_BUILD_VERSION}" + stop_grace_period: 5m + hostname: "o-ran-sc-topology-service" + ports: + - ":::58181:8181" + volumes: + - ./deploy/smo-nts-ng-topology-server/data/tapi-common-operational.json:/opt/dev/deploy/data/tapi-common-operational.json + - ./deploy/smo-nts-ng-topology-server/data/tapi-common-running.json:/opt/dev/deploy/data/tapi-common-running.json + +# We can attach to any other docker network, like in the example below networks: default: external: - name: smo_integration \ No newline at end of file + name: smo_integration