X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ntsimulator%2Fdocker-compose.yaml;h=cf155864c8a93925b67089599540d597068d3ccf;hb=2268793472bf9674290758d8b811d2de8a552627;hp=7de1e0b7ccba36b245469d8bdce2c52b6ff5e89c;hpb=c7e43513c1c4c3569d5079db0a9a31c124274e6c;p=sim%2Fo1-interface.git

diff --git a/ntsimulator/docker-compose.yaml b/ntsimulator/docker-compose.yaml
index 7de1e0b..cf15586 100644
--- a/ntsimulator/docker-compose.yaml
+++ b/ntsimulator/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   ntsim-ng:
-    image: "${DOCKER_REPO}ntsim-ng-manager:${NTS_BUILD_VERSION}"
+    image: "${DOCKER_REPO}nts-ng-manager:${NTS_BUILD_VERSION}"
     container_name: nts-ng-manager
     stop_grace_period: 5m
     ports:
@@ -21,10 +21,11 @@ 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}
+      SDN_CONTROLLER_CALLHOME_IP: ${SDN_CONTROLLER_CALLHOME_IP}
       SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_PORT}
       SDN_CONTROLLER_USERNAME: ${SDN_CONTROLLER_USERNAME}
       SDN_CONTROLLER_PASSWORD: ${SDN_CONTROLLER_PASSWORD}
@@ -36,17 +37,19 @@ 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}"
     cap_add:
       - SYS_ADMIN
+      - NET_ADMIN
     stop_grace_period: 5m
     hostname: "O-RAN-O-RU-1"
     ports:
-     - "::18300:830"
+     - ":::18300:830"
     environment:
       IPv6_ENABLED: ${IPv6_ENABLED}
       SSH_CONNECTIONS: ${SSH_CONNECTIONS}
@@ -64,6 +67,7 @@ services:
       SDN_CONTROLLER_PROTOCOL: ${SDN_CONTROLLER_PROTOCOL}
       SDN_CONTROLLER_IP: ${SDN_CONTROLLER_IP}
       SDN_CONTROLLER_PORT: ${SDN_CONTROLLER_PORT}
+      SDN_CONTROLLER_CALLHOME_IP: ${SDN_CONTROLLER_CALLHOME_IP}
       SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_PORT}
       SDN_CONTROLLER_USERNAME: ${SDN_CONTROLLER_USERNAME}
       SDN_CONTROLLER_PASSWORD: ${SDN_CONTROLLER_PASSWORD}
@@ -76,17 +80,18 @@ 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}"
     cap_add:
       - SYS_ADMIN
+      - NET_ADMIN
     stop_grace_period: 5m
     hostname: "O-RAN-O-DU-1"
     ports:
-     - "::18301:830"
+     - ":::18301:830"
     environment:
       IPv6_ENABLED: ${IPv6_ENABLED}
       SSH_CONNECTIONS: ${SSH_CONNECTIONS}
@@ -101,10 +106,10 @@ services:
       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}
+      SDN_CONTROLLER_CALLHOME_IP: ${SDN_CONTROLLER_CALLHOME_IP}
       SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_PORT}
       SDN_CONTROLLER_USERNAME: ${SDN_CONTROLLER_USERNAME}
       SDN_CONTROLLER_PASSWORD: ${SDN_CONTROLLER_PASSWORD}
@@ -116,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:
-  
+
+      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:
-  app_net:
-    driver: bridge
-    ipam:
-      driver: default
-
-# 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
+  default:
+    external:
+      name: smo_integration