From f3ab4456d15d9e80931509d95c87ea99e166d02b Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 22 Apr 2020 11:25:22 -0400 Subject: [PATCH] Upgrade to RMR version 3.8.2 Copy RMR files from builder image in release registry. Bump version to 1.0.2. Signed-off-by: Lott, Christopher (cl778h) Change-Id: I48b29fb6aea3ebc2ff5a2aaeafa940000fde4bb7 --- Dockerfile | 6 ++++-- docs/developers-guide.rst | 7 +++---- docs/release-notes.rst | 5 +++++ setup.py | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 18fbe32..ab5518b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,10 @@ FROM python:3.8-alpine # RMR setup RUN mkdir -p /opt/route/ -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 /usr/local/bin/health_ck /usr/local/bin/health_ck +# copy rmr files from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.2 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so +# rmr_probe replaced health_ck +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.2 /usr/local/bin/rmr_probe /usr/local/bin/rmr_probe ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64 COPY tests/fixtures/local.rt /opt/route/local.rt ENV RMR_SEED_RT /opt/route/local.rt diff --git a/docs/developers-guide.rst b/docs/developers-guide.rst index 705c9c8..bc8afd0 100755 --- a/docs/developers-guide.rst +++ b/docs/developers-guide.rst @@ -12,12 +12,11 @@ Developers Guide Testing RMR Healthcheck ----------------------- -The following instructions should deploy the QP Driver container in bare docker, and allow you to test that the rmr healthcheck is working +The following instructions should deploy the QP Driver container in bare docker, and allow you +to test that the rmr healthcheck is working. :: docker build -t qpd:latest -f Dockerfile . docker run -d --net=host -e USE_FAKE_SDL=1 qpd:latest - docker exec -it CONTAINER_ID /usr/local/bin/health_ck -h 127.0.0.1:4562 - - + docker exec -it CONTAINER_ID /usr/local/bin/rmr_probe -h 127.0.0.1:4562 diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 7992284..9260783 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -15,6 +15,11 @@ and this project adheres to `Semantic Versioning `__. :local: +[1.0.3] - 2020-04-22 +-------------------- + +* Upgrade to RMR version 3.8.2 + [1.0.2] - 4/8/2020 ------------------ :: diff --git a/setup.py b/setup.py index 866905a..1f0c501 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ from setuptools import setup, find_packages setup( name="qpdriver", - version="1.0.2", + version="1.0.3", packages=find_packages(exclude=["tests.*", "tests"]), author="Tommy Carpenter", description="QP Driver Xapp for traffic steering", -- 2.16.6