X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=solution%2Fintegration%2Fsmo%2Foam%2Fdocker-compose.yml;h=4155e3210a6bb19da7c7e6e163770b55c907eff7;hb=8cced5dbda015e382bfa92ccee303f2fd274bb4f;hp=c73471af5f03f0a67a7c8c46139f4b849b5e2711;hpb=f0a2808bb98fd539203b8032c75b8a922324d092;p=oam.git

diff --git a/solution/integration/smo/oam/docker-compose.yml b/solution/integration/smo/oam/docker-compose.yml
index c73471a..4155e32 100755
--- a/solution/integration/smo/oam/docker-compose.yml
+++ b/solution/integration/smo/oam/docker-compose.yml
@@ -18,9 +18,9 @@ services:
   sdnc-web:
     image: ${SDNC_WEB_IMAGE}
     container_name: sdnc-web
-    ports: 
+    ports:
       - ${SDNC_WEB_PORT}:${SDNC_WEB_PORT}
-    environment: 
+    environment:
       - ENABLE_OAUTH=true
       - WEBPROTOCOL=HTTPS
       - WEBPORT=${SDNC_WEB_PORT}
@@ -30,8 +30,6 @@ services:
       - SSL_CERT_DIR=/opt/app/osaaf/local/certs
       - SSL_CERTIFICATE=cert.pem
       - SSL_CERTIFICATE_KEY=key.pem
-      - TOPOURL=http://topology:3001
-      - TILEURL=https://tile.openstreetmap.org
     volumes:
       - ./sdnc-web:/opt/app/osaaf/local/certs
     networks:
@@ -43,13 +41,14 @@ services:
     container_name: sdnr
     ports:
       - ${SDNC_REST_PORT}:8181
-      - 8101:8101
       - 6666:6666
       - 4335:4335
     environment:
-      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
-      - ODL_CERT_DIR=${SDNC_CERT_DIR}
       - ENABLE_ODL_CLUSTER=false
+      - ENABLE_OAUTH=true
+      - ODL_CERT_DIR=${SDNC_CERT_DIR}
+      - ODL_ADMIN_PASSWORD=${ADMIN_PASSWORD}
+      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
       - SDNC_REPLICAS=0
       - CCSDK_REPLICAS=0
       - DOMAIN=""
@@ -58,14 +57,23 @@ services:
       - SDNRINIT=true
       - SDNRDM=true
       - SDNRDBURL=http://persistence:9200
-      - A1_ADAPTER_NORTHBOUND=false
-      - ODL_ADMIN_PASSWORD=${ADMIN_PASSWORD}
-      - ENABLE_OAUTH=true
       - SDNR_NETCONF_CALLHOME_ENABLED=true
+      - A1_ADAPTER_NORTHBOUND=false
       - JAVA_OPTS=-Xms256m -Xmx4g
       - IDENTITY_PROVIDER_URL=${IDENTITY_PROVIDER_URL}
       - SDNC_WEB_URL=https://sdnc-web:${SDNC_WEB_PORT}
+      - SDNR_VES_COLLECTOR_ENABLED=true
+      - SDNR_VES_COLLECTOR_TLS_ENABLED=true
+      - SDNR_VES_COLLECTOR_TRUST_ALL_CERTS=true
+      - SDNR_VES_COLLECTOR_IP=ves-collector
+      - SDNR_VES_COLLECTOR_PORT=$VES_COLLECTOR_PORT
+      - SDNR_VES_COLLECTOR_VERSION=v7
+      - SDNR_VES_COLLECTOR_REPORTING_ENTITY_NAME=ONAP SDN-R
+      - SDNR_VES_COLLECTOR_EVENTLOG_MSG_DETAIL=LONG
+      - SDNR_VES_COLLECTOR_USERNAME=${VES_COLLECTOR_USERNAME}
+      - SDNR_VES_COLLECTOR_PASSWORD=${VES_COLLECTOR_PASSWORD}
     volumes:
+      - ./sdnr/oauth-aaa-app-config.xml:/opt/onap/sdnc/data/oauth-aaa-app-config.xml
       - ./sdnr/oauth-provider.config.json:/opt/opendaylight/etc/oauth-provider.config.json
       - ./sdnr/devicemanager.properties:/opt/opendaylight/etc/devicemanager.properties
       - ./sdnr/mountpoint-registrar.properties:/opt/opendaylight/etc/mountpoint-registrar.properties
@@ -83,7 +91,6 @@ services:
     environment:
       DMAAPHOST: onap-dmaap
     ports:
-      - 8080:8080
       - 8443:8443
     volumes:
       - ./ves-collector/collector.properties:/opt/app/VESCollector/etc/collector.properties