X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fsimulator-group%2Fsdnc%2Fdocker-compose.yml;h=505a54cc850a8c06138b49cefc596756d2561b16;hb=3deeefa87a81f8724520ce0e3a55d88a5d328204;hp=2c8a29ad6cf55dbe95afcc5a895ba0a569005fd9;hpb=70e878f1b5a558baaaa5ab5885a039ed96c9f8d5;p=nonrtric.git

diff --git a/test/simulator-group/sdnc/docker-compose.yml b/test/simulator-group/sdnc/docker-compose.yml
index 2c8a29ad..505a54cc 100644
--- a/test/simulator-group/sdnc/docker-compose.yml
+++ b/test/simulator-group/sdnc/docker-compose.yml
@@ -13,13 +13,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # ==================================================================================
-version: '2.1'
+version: '3'
 
 networks:
   default:
-    driver: bridge
+    external: true
     name: ${DOCKER_SIM_NWNAME}
-
 services:
   db:
     image: ${SDNC_DB_IMAGE}
@@ -36,8 +35,11 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
+    labels:
+      - "nrttest_app=SDNC"
+      - "nrttest_dp=SDNC DB"
 
-  a1-controller:
+  a1controller:
     image: ${SDNC_A1_CONTROLLER_IMAGE}
     depends_on :
       - db
@@ -54,13 +56,16 @@ services:
       - db:sdnctldb02
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
+      - SDNC_DB_INIT=true
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
-    dns:
-      - ${DNS_IP_ADDR-10.0.100.1}
+      - A1_TRUSTSTORE_PASSWORD=${SDNC_A1_TRUSTSTORE_PASSWORD}
+      - ODL_ADMIN_USERNAME=${SDNC_USER}
+      - ODL_ADMIN_PASSWORD=${SDNC_PWD}
     logging:
       driver:   "json-file"
       options:
         max-size: "30m"
         max-file: "5"
-    extra_hosts:
-        aaf.osaaf.org: 10.12.6.214
+    labels:
+      - "nrttest_app=SDNC"
+      - "nrttest_dp=${SDNC_DISPLAY_NAME}"