Integration of link monitor.

- container "message-generator" removed - function is done by O1-Sim
- volume created for topology mapping

Issue-ID: OAM-220
Change-Id: Ic2a78b8a54a3d40d5ea00d0d2a09c3f4b277a82d
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>

diff --git a/solution/integration/smo/non-rt-ric/config/oru-app/o-ru-to-o-du-map.txt b/solution/integration/smo/non-rt-ric/config/oru-app/o-ru-to-o-du-map.txt
new file mode 100644 (file)
index 0000000..0d55bd6
--- /dev/null
+++ b/solution/integration/smo/non-rt-ric/config/oru-app/o-ru-to-o-du-map.txt
@@ -0,0 +1,11 @@
+{
+    "highstreet-O-RU-11221": "highstreet-O-DU-1122",
+    "highstreet-O-RU-11222": "highstreet-O-DU-1122",
+    "highstreet-O-RU-11223": "highstreet-O-DU-1122",
+    "ERICSSON-O-RU-11221": "HCL-O-DU-1122",
+    "ERICSSON-O-RU-11222": "HCL-O-DU-1122",
+    "ERICSSON-O-RU-11223": "HCL-O-DU-1122",
+    "HIGHSTREET-O-RU-12121": "ERICSSON-O-DU-1212",
+    "HIGHSTREET-O-RU-12122": "ERICSSON-O-DU-1212",
+    "HIGHSTREET-O-RU-12123": "ERICSSON-O-DU-1212" 
+}

diff --git a/solution/integration/smo/non-rt-ric/docker-compose.yml b/solution/integration/smo/non-rt-ric/docker-compose.yml
index 45c7978..df88b75 100644 (file)
--- a/solution/integration/smo/non-rt-ric/docker-compose.yml
+++ b/solution/integration/smo/non-rt-ric/docker-compose.yml
@@ -134,17 +134,6 @@ services:
     ports:
       - 8088:80
 
-  message-generator:
-    image: quay.io/yanhuanwang/message-generator
-    container_name: message-generator
-    networks:
-      - default
-      - smo
-      - oam
-    environment:
-      - MR-HOST=http://onap-dmaap
-      - MR-PORT=3904
-
   oru-app:
     image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-o-ru-closed-loop-recovery:1.0.0
     container_name: oru-app
@@ -158,6 +147,8 @@ services:
       - SDNR-HOST=http://sdnr
       - SDNR-PORT=8181
       - VERBOSE=on
+    volumes:
+      - ./config/oru-app/o-ru-to-o-du-map.txt:/usr/src/app/o-ru-to-o-du-map.txt:ro
 
   db:
     image: mysql/mysql-server:5.6