Revert "Removing deprecated/unused/outdated code"
This reverts commit 9f40121f66e644ddf700720d8d4bdf464f6dd414.
Change-Id: I3a414c4f253285c87b662af89ec418b762c0c44b
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>
diff --git a/docker/Dockerfile-fromdeb b/docker/Dockerfile-fromdeb
new file mode 100644
index 0000000..73adb2b
--- /dev/null
+++ b/docker/Dockerfile-fromdeb
@@ -0,0 +1,56 @@
+from ubuntu:xenial
+
+MAINTAINER Gennadiy Dubina <gennadiy.dubina@dataat.com>; Alfonso Tierno <alfonso.tiernosepulveda@telefoncia.com>
+
+#avoid extra information from packages
+RUN echo 'path-exclude /usr/share/doc/*\n\
+path-include /usr/share/doc/*/copyright\n\
+path-exclude /usr/share/man/*\n\
+path-exclude /usr/share/groff/*\n\
+path-exclude /usr/share/info/*\n\
+path-exclude /usr/share/lintian/*\n\
+path-exclude /usr/share/linda/*\n'\
+> /etc/dpkg/dpkg.cfg.d/01_nodoc && \
+ echo 'APT::Install-Recommends "false";\n\
+APT::AutoRemove::RecommendsImportant "false";\n\
+APT::AutoRemove::SuggestsImportant "false";\n'\
+> /etc/apt/apt.conf.d/99_norecommends
+
+
+RUN apt-get update && apt-get install -y curl mysql-client software-properties-common \
+ && add-apt-repository -y "deb http://osm-download.etsi.org/repository/osm/debian/ReleaseTHREE stable SO UI RO IM osmclient openvim" \
+ && curl "http://osm-download.etsi.org/repository/osm/debian/ReleaseTHREE/OSM%20ETSI%20Release%20Key.gpg" | apt-key add - \
+ && apt-get update \
+ && apt-get install -y python-osm-ro \
+ && rm -rf /var/lib/apt/lists/* \
+ && mkdir -p /bin/RO
+
+
+VOLUME /opt/openmano/logs
+
+EXPOSE 9090
+
+# Two mysql databases are needed (DB and DB_OVIM). Can be hosted on same or separated containers
+# These ENV must be provided
+ENV RO_DB_HOST=""
+ENV RO_DB_OVIM_HOST=""
+ # if empty RO_DB_HOST is assumed
+
+# These ENV should be provided first time for creating database. It will create and init only if empty!
+ENV RO_DB_ROOT_PASSWORD=""
+ENV RO_DB_OVIM_ROOT_PASSWORD=""
+ # if empty RO_DB_ROOT_PASSWORD is assumed
+
+# These ENV can be provided, but default values are ok
+ENV RO_DB_USER=mano
+ENV RO_DB_OVIM_USER=mano
+ENV RO_DB_PASSWORD=manopw
+ENV RO_DB_OVIM_PASSWORD=manopw
+ENV RO_DB_PORT=3306
+ENV RO_DB_OVIM_PORT=3306
+ENV RO_DB_NAME=mano_db
+ENV RO_DB_OVIM_NAME=mano_vim_db
+
+
+CMD RO-start.sh
+
diff --git a/docker/docker-compose-3c.yml b/docker/docker-compose-3c.yml
new file mode 100644
index 0000000..bd96fb4
--- /dev/null
+++ b/docker/docker-compose-3c.yml
@@ -0,0 +1,46 @@
+version: '3'
+services:
+ osm-ro-db:
+ image: mysql:5
+ container_name: osm-ro-db
+ restart: always
+ environment:
+ - MYSQL_RANDOM_ROOT_PASSWORD=true
+ - MYSQL_DATABASE=mano_db
+ - MYSQL_USER=mano
+ - MYSQL_PASSWORD=manopw
+ osm-ro-ovim-db:
+ image: mysql:5
+ container_name: osm-ro-ovim-db
+ restart: always
+ environment:
+ - MYSQL_RANDOM_ROOT_PASSWORD=true
+ - MYSQL_DATABASE=mano_vim_db
+ - MYSQL_USER=mano
+ - MYSQL_PASSWORD=manopw
+ osm-ro:
+ build:
+ context: ../
+ dockerfile: docker/Dockerfile-local
+ image: osm/ro
+ container_name: osm-ro
+ restart: always
+ environment:
+ - RO_DB_USER=mano
+ - RO_DB_PASSWORD=manopw
+ - RO_DB_NAME=mano_db
+ - RO_DB_HOST=osm-ro-db
+ - RO_DB_OVIM_USER=mano
+ - RO_DB_OVIM_PASSWORD=manopw
+ - RO_DB_OVIM_NAME=mano_vim_db
+ - RO_DB_OVIM_HOST=osm-ro-ovim-db
+ ports:
+ - "9090:9090"
+ volumes:
+ - /var/log/osm/openmano/logs:/var/log/osm/openmano/logs
+ depends_on:
+ - osm-ro-db
+ - osm-ro-ovim-db
+ links:
+ - osm-ro-db
+ - osm-ro-ovim-db
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
new file mode 100644
index 0000000..da1d16e
--- /dev/null
+++ b/docker/docker-compose.yaml
@@ -0,0 +1,27 @@
+version: '2'
+services:
+ osm-ro-db:
+ image: mysql:5
+ container_name: osm-ro-db
+ restart: always
+ environment:
+ - MYSQL_ROOT_PASSWORD=osm4u
+ osm-ro:
+ build:
+ context: ../
+ dockerfile: docker/Dockerfile-local
+ image: osm/ro
+ container_name: osm-ro
+ restart: always
+ environment:
+ - RO_DB_ROOT_PASSWORD=osm4u
+ - DB_HOST=osm-ro-db
+ ports:
+ - "9090:9090"
+ volumes:
+ - /var/log/osm/openmano/logs:/var/log/osm
+ depends_on:
+ - osm-ro-db
+ links:
+ - osm-ro-db
+
diff --git a/docker/tests.dockerfile b/docker/tests.dockerfile
new file mode 100644
index 0000000..fd5a45c
--- /dev/null
+++ b/docker/tests.dockerfile
@@ -0,0 +1,13 @@
+from ubuntu:xenial
+
+VOLUME /opt/openmano
+VOLUME /var/log/osm
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+
+RUN apt-get update && \
+ apt-get -y install python python-pip mysql-client libmysqlclient-dev && \
+ pip install tox
+
+ENTRYPOINT ["tox"]
diff --git a/docker/tests.yml b/docker/tests.yml
new file mode 100644
index 0000000..a33f0d4
--- /dev/null
+++ b/docker/tests.yml
@@ -0,0 +1,37 @@
+# This file is intended to be used by the developer in the local machine
+# in order to run the tests in isolation
+# To do so, cd into osm_ro and run:
+# docker-compose -f ../docker/tests.yml run --rm tox -c <folder to be tested, eg. wim>
+version: '2'
+services:
+ test-db:
+ image: mysql:5
+ container_name: test-db
+ restart: always
+ environment:
+ - MYSQL_ROOT_PASSWORD=osm4u
+ - MYSQL_USER=mano
+ - MYSQL_PASSWORD=manopw
+ - MYSQL_DATABASE=mano_db
+ tox:
+ container_name: tox
+ depends_on:
+ - test-db
+ build:
+ context: ../
+ dockerfile: docker/tests.dockerfile
+ restart: always
+ environment:
+ - RO_DB_ROOT_PASSWORD=osm4u
+ - TEST_DB_HOST=test-db
+ - TEST_DB_USER=mano
+ - TEST_DB_PASSWORD=manopw
+ - TEST_DB_DATABASE=mano_db
+ ports:
+ - "9090:9090"
+ volumes:
+ - ..:/opt/openmano
+ - /tmp/osm/openmano/logs:/var/log/osm
+ entrypoint:
+ - tox
+ working_dir: /opt/openmano/osm_ro