# ==================================================================================
openapi: 3.0.0
info:
- version: 0.10.0
+ version: 0.10.3
title: RIC A1
paths:
'/a1-p/healthcheck':
# The Jenkins job uses this string for the tag in the image name
# for example nexus3.o-ran-sc.org:10004/my-image-name:my-tag
---
-tag: 0.10.2
+tag: 0.10.3
7) in the it/dep repo that contains a1 helm chart, ``values.yaml``, ``Chart.yml``
+Version bumping rmr-python
+==========================
+rmr-python is a critial dependency of A1. Bumping the rmr version dependency requires changes in:
+
+1) ``setup.py``
+
+2) ``Dockerfile``
+
+3) ``integration_tests/Dockerfile``
+
+Run the integration tests after attempting this.
+
Unit Testing
============
Note, before this will work, for the first time on the machine running the tests, run ``./install_deps.sh``. This is only needed once on the machine.
cd integration_tests
docker build --no-cache -t testreceiver:latest .
-You do not need the "bombarder" image as they are not currently used in the integration tests (that is more for load testing).
-
Finally, run all the tests from the root (this requires the python packages ``tox``, ``pytest``, and ``tavern``).
::
1. Before this will work, for the first time on that machine, run ``./install_deps.sh``
-2. It also requires rmr-python >= 0.10.1 installed. (The dockerfile also
- does this)
+2. It also requires rmr-python installed. (The dockerfile does this)
3. Create a ``local.rt`` file and copy it into ``/opt/route/local.rt``.
Note, the example one in ``integration_tests`` will need to be modified for
curl -v -X PUT -H "Content-Type: application/json" -d '{ "enforce":true, "window_length":10, "blocking_rate":20, "trigger_threshold":10 }' localhost:10000/ric/policies/admission_control_policy
curl -v localhost:10000/ric/policies/admission_control_policy
curl -v localhost:10000/a1-p/healthcheck
-
-Finally, there is a test “bombarder” that will flood A1 with messages
-with good message types but bad transaction IDs, to test A1’s resilience
-against queue-overflow attacks
-
-::
-
- set -x LD_LIBRARY_PATH /usr/local/lib/; set -x RMR_SEED_RT /opt/route/local.rt ; python bombard.py
The format is based on `Keep a Changelog <http://keepachangelog.com/>`__
and this project adheres to `Semantic Versioning <http://semver.org/>`__.
+[0.10.3] - 8/20/2019
+
+::
+
+ * Update to later rmr-python
+ * Add docs about upgrading rmr
+ * remove bombarder since tavern runs apache bench
+
+
[0.10.2] - 8/14/2019
::
# limitations under the License.
# ==================================================================================
# TODO: switch to alpine once rmr apk available
-FROM python:3.7
+FROM python:3.7-alpine
COPY receiver.py /
-# copy NNG out of the CI builder nng
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-debian-python-nng:2-py3.7-nng1.1.1 /usr/local/lib/libnng.so /usr/local/lib/libnng.so
-
-# Installs RMr using debian package hosted at packagecloud.io
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr_1.0.36_amd64.deb/download.deb
-RUN dpkg -i rmr_1.0.36_amd64.deb
+# copy NNG and rmr out of the CI builder nng
+COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:3-a3.9 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
+COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:3-a3.9 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
# Install RMr python bindings
RUN pip install --upgrade pip
-RUN pip install rmr==0.10.1
+RUN pip install rmr==0.10.8
# rmr setups
RUN mkdir -p /opt/route/
-ENV LD_LIBRARY_PATH /usr/local/lib
+ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64
ENV RMR_SEED_RT /opt/route/local.rt
WORKDIR /
apiVersion: v1
description: A1 Helm chart for Kubernetes
name: a1mediator
-version: 0.10.2
+version: 0.10.3
setup(
name="a1",
- version="0.10.2",
+ version="0.10.3",
packages=find_packages(exclude=["tests.*", "tests"]),
author="Tommy Carpenter",
description="RIC A1 Mediator for policy/intent changes",
url="https://gerrit.o-ran-sc.org/r/admin/repos/ric-plt/a1",
entry_points={"console_scripts": ["run.py=a1.run:main"]},
# we require jsonschema, should be in that list, but connexion already requires a specific version of it
- # rmr 0.10.4 has a bugfix required on alpine
- install_requires=["requests", "Flask", "connexion[swagger-ui]", "gevent", "rmr>=0.10.7"],
+ install_requires=["requests", "Flask", "connexion[swagger-ui]", "gevent", "rmr>=0.10.8"],
package_data={"a1": ["openapi.yaml"]},
)