From e61eacb12cf7ce0f2f54b059c3fd8bcaaa66d938 Mon Sep 17 00:00:00 2001 From: ecaiyanlinux Date: Wed, 15 Dec 2021 11:33:50 +0100 Subject: [PATCH] Add nonrtric-o-du-slice-assurance to integration including a minor fix of ICS tag version Signed-off-by: ecaiyanlinux Issue-ID: NONRTRIC-691 Change-Id: I473acdcdb0505655e222eecfd7a040c2045ba513 --- solution/integration/smo/non-rt-ric/.env | 10 +++++++--- solution/integration/smo/non-rt-ric/docker-compose.yml | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/solution/integration/smo/non-rt-ric/.env b/solution/integration/smo/non-rt-ric/.env index fb58a4a..ee2b2f8 100644 --- a/solution/integration/smo/non-rt-ric/.env +++ b/solution/integration/smo/non-rt-ric/.env @@ -37,7 +37,7 @@ NONRTRIC_GATEWAY_IMAGE_TAG="1.0.0" #ICS ICS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-information-coordinator-service" -ICS_IMAGE_TAG="1.1.0" +ICS_IMAGE_TAG="1.2.0" #PRODUCER PRODUCER_IMAGE_BASE="eexit/mirror-http-server" @@ -47,9 +47,13 @@ PRODUCER_IMAGE_TAG="latest" ORU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-o-ru-closed-loop-recovery" ORU_APP_IMAGE_TAG="1.0.0" +#ODU +ODU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-o-du-slice-assurance" +ODU_APP_IMAGE_TAG="1.0.0" + #DB -DB_IMAGE_BASE="mysql/mysql-server" -DB_IMAGE_TAG="5.6" +DB_IMAGE_BASE="mariadb" +DB_IMAGE_TAG="10.5" #A1CONTROLLER A1CONTROLLER_IMAGE_BASE="nexus3.onap.org:10002/onap/sdnc-image" diff --git a/solution/integration/smo/non-rt-ric/docker-compose.yml b/solution/integration/smo/non-rt-ric/docker-compose.yml index a367eff..654bf93 100644 --- a/solution/integration/smo/non-rt-ric/docker-compose.yml +++ b/solution/integration/smo/non-rt-ric/docker-compose.yml @@ -150,6 +150,22 @@ services: volumes: - ./config/oru-app/o-ru-to-o-du-map.txt:/usr/src/app/o-ru-to-o-du-map.txt:ro + odu-app: + image: "${ODU_APP_IMAGE_BASE}:${ODU_APP_IMAGE_TAG}" + container_name: odu-app + networks: + - default + - oam + - smo + environment: + - MR_HOST=http://onap-dmaap + - MR_PORT=3904 + - SDNR_ADDRESS=http://sdnr:8181 + - SDNR_USER=admin + - SDNR_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + - LOG_LEVEL=Info + - POLLTIME=10 + db: image: "${DB_IMAGE_BASE}:${DB_IMAGE_TAG}" container_name: sdncdb -- 2.16.6