Adds vdu_id to message bus models
LB Dockerfile now uses Python3
Removes obsolete parameters from models
Refactors and fixes kafka integration tests
Refactors deprecated log warnings
Adds DATABASE env var to set MON database url
Fixes indentation and dependency issues in AWS plugin
Use open from io package for Python 2 and 3 compatibility
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
Change-Id: I70af22d2fbc2cb1bfd5d9632d9daa80e9d7f6b62
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ad00631..b07f781 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,16 +25,16 @@
LABEL authors="Guillermo Calvino"
RUN apt-get --yes update \
- && apt-get --yes install git python python-pip sudo libmysqlclient-dev \
+ && apt-get --yes install git python python-pip python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \
&& pip install pip==9.0.3
COPY requirements.txt /mon/requirements.txt
-RUN pip install -r /mon/requirements.txt
+RUN pip3 install -r /mon/requirements.txt
COPY . /mon
-RUN pip install /mon
+RUN pip3 install /mon
# These ENV must be provided
# ENV BROKER_URI=kafka:9092
diff --git a/docker/scripts/runInstall.sh b/docker/scripts/runInstall.sh
index 87954ed..611bbe8 100755
--- a/docker/scripts/runInstall.sh
+++ b/docker/scripts/runInstall.sh
@@ -21,6 +21,6 @@
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
/bin/bash /mon/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
-nohup python /mon/osm_mon/plugins/OpenStack/Aodh/notifier.py &
-python /mon/osm_mon/core/message_bus/common_consumer.py
+nohup python3 /mon/osm_mon/plugins/OpenStack/Aodh/notifier.py &
+python3 /mon/osm_mon/core/message_bus/common_consumer.py