From c996c56ce5510957e93df391a43534a5a1efd6e4 Mon Sep 17 00:00:00 2001
From: Mohamed Abukar <abukar.mohamed@nokia.com>
Date: Thu, 7 May 2020 07:40:37 +0300
Subject: [PATCH] Fix docker image generation issue

Change-Id: If1ddce656c9ec0f291ecb26b71f89e10d3761a8c
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>
---
 Dockerfile                            | 14 +++++---------
 agent/yang/o-ran-sc-ric-alarm-v1.yang |  6 +++---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a7a9157..b90c2fd 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
 #   limitations under the License.
 
 #----------------------------------------------------------
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng AS o1mediator-build
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 AS o1mediator-build
 
 RUN apt-get update -y && apt-get install -y jq \
       git \
@@ -90,21 +90,17 @@ RUN \
 RUN \
       cd /opt/dev && \
       git clone https://github.com/CESNET/Netopeer2.git && \
-      cd Netopeer2/server && mkdir build && cd build && \
+      cd Netopeer2 && mkdir build && cd build && \
       cmake -DCMAKE_BUILD_TYPE:String="Release" -DNP2SRV_DATA_CHANGE_TIMEOUT=30000 -DNP2SRV_DATA_CHANGE_WAIT=ON .. && \
       make -j2 && \
-      make install && \
-      cd ../../cli && mkdir build && cd build && \
-      cmake -DCMAKE_BUILD_TYPE:String="Release" .. && \
-      make -j2 && \
       make install
       
 # ======================================================================
 
 # RMR
-ARG RMRVERSION=3.6.3
-ARG RMRLIBURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb
-ARG RMRDEVURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb
+ARG RMRVERSION=4.0.2
+ARG RMRLIBURL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb
+ARG RMRDEVURL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb
 
 RUN wget --content-disposition ${RMRLIBURL} && dpkg -i rmr_${RMRVERSION}_amd64.deb
 RUN wget --content-disposition ${RMRDEVURL} && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb
diff --git a/agent/yang/o-ran-sc-ric-alarm-v1.yang b/agent/yang/o-ran-sc-ric-alarm-v1.yang
index 13bbb04..fa279ac 100755
--- a/agent/yang/o-ran-sc-ric-alarm-v1.yang
+++ b/agent/yang/o-ran-sc-ric-alarm-v1.yang
@@ -43,17 +43,17 @@ module o-ran-sc-ric-alarm-v1 {
                 "The detailed text of the alarm";
         }
         leaf severity {
-            type health-status;
+            type string;
             description
                 "The severity of the alarm";
         }
         leaf status {
-            type health-status;
+            type string;
             description
                 "The status of the alarm";
         }
         leaf additional-info {
-            type health-status;
+            type string;
             description
                 "Additional info about the alarm";
         }
-- 
2.16.6