Switch to SI95

Issue-ID: RIC-228
Change-Id: I806ad3f88eec550338ffba7812a6bd1e1ee3016f
Signed-off-by: Tommy Carpenter <tc677g@att.com>

diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test
index e19c08a..8dbfeb6 100644 (file)
--- a/Dockerfile-Unit-Test
+++ b/Dockerfile-Unit-Test
@@ -20,8 +20,7 @@ FROM python:3.8-alpine
 RUN apk update && apk add gcc musl-dev
 
 # copy rmr .sos from the builder image
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
+COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:3-rmr-si95-nng-3.6.1 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so
 
 # Upgrade pip, install tox
 RUN pip install --upgrade pip && pip install tox

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index a5d0c8b..c3d358f 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -14,6 +14,13 @@ and this project adheres to `Semantic Versioning <http://semver.org/>`__.
    :depth: 3
    :local:
 
+[0.6.0] - 3/23/2020
+-------------------
+::
+
+    * Switch to SI95 for rmr
+
+
 
 [0.5.0] - 3/18/2020
 -------------------

diff --git a/examples/Dockerfile-Ping b/examples/Dockerfile-Ping
index eac90a9..52ed2fb 100644 (file)
--- a/examples/Dockerfile-Ping
+++ b/examples/Dockerfile-Ping
@@ -19,8 +19,7 @@ FROM python:3.8-alpine
 # RMR setup
 RUN mkdir -p /opt/route/
 COPY test_route.rt /opt/route/test_route.rt
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
+COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:3-rmr-si95-nng-3.6.1 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so
 ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64
 ENV RMR_SEED_RT /opt/route/test_route.rt
 
@@ -28,7 +27,7 @@ ENV RMR_SEED_RT /opt/route/test_route.rt
 RUN apk update && apk add gcc musl-dev bash
 
 # Install
-RUN pip install ricxappframe==0.5.0
+RUN pip install ricxappframe==0.6.0
 COPY ping_xapp.py .
 
 # Run

diff --git a/examples/Dockerfile-Pong b/examples/Dockerfile-Pong
index e595d40..6cae078 100644 (file)
--- a/examples/Dockerfile-Pong
+++ b/examples/Dockerfile-Pong
@@ -19,8 +19,7 @@ FROM python:3.8-alpine
 # RMR setup
 RUN mkdir -p /opt/route/
 COPY test_route.rt /opt/route/test_route.rt
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
+COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:3-rmr-si95-nng-3.6.1 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so
 ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64
 ENV RMR_SEED_RT /opt/route/test_route.rt
 
@@ -28,7 +27,7 @@ ENV RMR_SEED_RT /opt/route/test_route.rt
 RUN apk update && apk add gcc musl-dev bash
 
 # Install
-RUN pip install ricxappframe==0.5.0
+RUN pip install ricxappframe==0.6.0
 COPY pong_xapp.py .
 
 # Run

diff --git a/rmr-version.yaml b/rmr-version.yaml
index 5808bc4..07573f1 100644 (file)
--- a/rmr-version.yaml
+++ b/rmr-version.yaml
@@ -1,3 +1,3 @@
 # CI script installs RMR from PackageCloud using this version
 ---
-version: 1.13.1
+version: 3.6.1

diff --git a/setup.py b/setup.py
index edbbf29..56f9e7e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -32,12 +32,12 @@ def _long_descr():
 
 setup(
     name="ricxappframe",
-    version="0.5.0",
+    version="0.6.0",
     packages=find_packages(exclude=["tests.*", "tests"]),
     author="Tommy Carpenter",
     description="Xapp framework for python",
     url="https://gerrit.o-ran-sc.org/r/admin/repos/ric-plt/xapp-frame-py",
-    install_requires=["msgpack", "rmr>=2.2.1, <3.0.0", "mdclogpy", "ricsdl>=2.0.3,<3.0.0"],
+    install_requires=["msgpack", "rmr>=4.0.0, <5.0.0", "mdclogpy", "ricsdl>=2.0.3,<3.0.0"],
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Telecommunications Industry",