Switch to SI95.

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

diff --git a/src/bindings/rmr-python/Dockerfile-Unit-Test b/src/bindings/rmr-python/Dockerfile-Unit-Test
deleted file mode 100644 (file)
index 3f0a4f4..0000000
--- a/src/bindings/rmr-python/Dockerfile-Unit-Test
+++ /dev/null
@@ -1,36 +0,0 @@
-# ==================================================================================
-#       Copyright (c) 2019 Nokia
-#       Copyright (c) 2018-2019 AT&T Intellectual Property.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#          http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-# ==================================================================================
-# install a well known working rmr
-FROM python:3.7-alpine
-RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git
-RUN git clone --branch 1.10.2 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \
-    && cd rmr \
-    && mkdir build \
-    && cd build \
-    && cmake .. -DPACK_EXTERNALS=1 \
-    && make install
-
-COPY rmr/ /tmp/rmr
-COPY tests/ /tmp/tests
-COPY setup.py tox.ini LICENSE.txt /tmp/
-WORKDIR /tmp
-
-# Upgrade pip, install tox
-RUN pip install --upgrade pip && pip install tox
-
-# Run the unit tests
-RUN tox

diff --git a/src/bindings/rmr-python/docs/release-notes.rst b/src/bindings/rmr-python/docs/release-notes.rst
index 79ea500..7017d44 100644 (file)
--- a/src/bindings/rmr-python/docs/release-notes.rst
+++ b/src/bindings/rmr-python/docs/release-notes.rst
@@ -7,6 +7,14 @@ The format is based on `Keep a Changelog <http://keepachangelog.com/>`__
 and this project adheres to `Semantic
 Versioning <http://semver.org/>`__.
 
+[4.0.0] - 3/18/2020
+-------------------
+
+::
+
+    * Switch to SI95 instead of NNG. This is a breaking change. SI95 rmr users cannot talk to NNG rmr users.
+    * The version bump from 2 to 4 is due to the "roommate" issue in the rmr repo.
+
 
 [2.2.1] - 3/3/2020
 --------------------

diff --git a/src/bindings/rmr-python/rmr-version.yaml b/src/bindings/rmr-python/rmr-version.yaml
index 5808bc4..07573f1 100644 (file)
--- a/src/bindings/rmr-python/rmr-version.yaml
+++ b/src/bindings/rmr-python/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/src/bindings/rmr-python/rmr/rmr.py b/src/bindings/rmr-python/rmr/rmr.py
index 03799d7..413d8dc 100644 (file)
--- a/src/bindings/rmr-python/rmr/rmr.py
+++ b/src/bindings/rmr-python/rmr/rmr.py
@@ -27,8 +27,7 @@ from rmr.exceptions import BadBufferAllocation, MeidSizeOutOfRange, InitFailed
 # make sure you do a set -x LD_LIBRARY_PATH /usr/local/lib/;
 
 # even though we don't use these directly, they contain symbols we need
-_ = CDLL("libnng.so", mode=RTLD_GLOBAL)
-rmr_c_lib = CDLL("librmr_nng.so", mode=RTLD_GLOBAL)
+rmr_c_lib = CDLL("librmr_si.so", mode=RTLD_GLOBAL)
 
 
 # Internal Helpers (not a part of public api)

diff --git a/src/bindings/rmr-python/setup.py b/src/bindings/rmr-python/setup.py
index 472196e..0171edb 100644 (file)
--- a/src/bindings/rmr-python/setup.py
+++ b/src/bindings/rmr-python/setup.py
@@ -1,6 +1,6 @@
 # ==================================================================================
-#       Copyright (c) 2019 Nokia
-#       Copyright (c) 2018-2019 AT&T Intellectual Property.
+#       Copyright (c) 2020 Nokia
+#       Copyright (c) 2018-2020 AT&T Intellectual Property.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ def _long_descr():
 
 setup(
     name="rmr",
-    version="2.2.1",
+    version="4.0.0",
     packages=find_packages(),
     author="Tommy Carpenter, E. Scott Daniels",
     description="Python wrapper for RIC RMR",

diff --git a/src/bindings/rmr-python/tox.ini b/src/bindings/rmr-python/tox.ini
index 41e6da6..1aec1b2 100644 (file)
--- a/src/bindings/rmr-python/tox.ini
+++ b/src/bindings/rmr-python/tox.ini
@@ -1,6 +1,6 @@
 # ==================================================================================
-#       Copyright (c) 2019 Nokia
-#       Copyright (c) 2018-2019 AT&T Intellectual Property.
+#       Copyright (c) 2020 Nokia
+#       Copyright (c) 2018-2020 AT&T Intellectual Property.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 #   limitations under the License.
 # ==================================================================================
 [tox]
-envlist = py37,flake8
+envlist = py37,py38,flake8
 
 [testenv]
 deps=