Merge branch 'packaging'
Change-Id: I58a236852dab90f025d8300bbbf508d368d799c0
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..48790d4
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,8 @@
+#include MANIFEST.in
+#include requirements.txt
+include README.rst
+include RO_VERSION
+include openmano
+include openmanod
+recursive-include osm_ro *
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..b5f6ac5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,73 @@
+SHELL := /bin/bash
+all: package install
+
+prepare:
+ pip install setuptools
+ mkdir -p build/
+ VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
+ VER2=$(shell git describe | cut -d- -f2); \
+ VER3=$(shell git describe | cut -d- -f3); \
+ echo "$$VER1.dev$$VER2+$$VER3" > build/RO_VERSION
+ cp MANIFEST.in build/
+ cp requirements.txt build/
+ cp README.rst build/
+ cp setup.py build/
+ cp stdeb.cfg build/
+ cp -r osm_ro build/
+ cp openmano build/
+ cp openmanod build/
+ cp -r vnfs build/osm_ro
+ cp -r scenarios build/osm_ro
+ cp -r instance-scenarios build/osm_ro
+ cp -r scripts build/osm_ro
+ cp -r database_utils build/osm_ro
+
+connectors: prepare
+ # python-novaclient is required for that
+ rm -f build/osm_ro/openmanolinkervimconn.py
+ cd build/osm_ro; for i in `ls vimconn_*.py |sed "s/\.py//"` ; do echo "import $$i" >> openmanolinkervimconn.py; done
+ python build/osm_ro/openmanolinkervimconn.py
+ rm -f build/osm_ro/openmanolinkervimconn.py
+
+build: connectors prepare
+ python -m py_compile build/osm_ro/*.py
+
+pip: prepare
+ cd build && ./setup.py sdist
+
+package: prepare
+ #apt-get install -y python-stdeb
+ cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True
+ cd build && cp osm_ro/scripts/python-osm-ro.postinst deb_dist/osm-ro*/debian/
+ cd build/deb_dist/osm-ro* && dpkg-buildpackage -rfakeroot -uc -us
+
+snap:
+ echo "Nothing to be done yet"
+
+install:
+ DEBIAN_FRONTEND=noninteractive apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip && \
+ pip install --upgrade pip && \
+ dpkg -i build/deb_dist/*.deb
+
+develop: prepare
+ #pip install -r requirements.txt
+ cd build && ./setup.py develop
+
+test:
+ ./test/basictest.sh --force --insert-bashrc --install-openvim --init-openvim
+
+build-docker-from-source:
+ docker build -t osm/openmano -f docker/Dockerfile-local .
+
+run-docker:
+ docker-compose -f docker/openmano-compose.yml up
+
+stop-docker:
+ docker-compose -f docker/openmano-compose.yml down
+
+clean:
+ rm -rf build
+ find osm_ro -name '*.pyc' -delete
+ find osm_ro -name '*.pyo' -delete
+
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..3a2be88
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,8 @@
+===========
+osm-ro
+===========
+
+osm-ro is the Resource Orchestrator for OSM, dealing with resource operations
+against different VIMs such as Openstack, VMware's vCloud Director, openvim
+and AWS.
+
diff --git a/database_utils/install-db-server.sh b/database_utils/install-db-server.sh
new file mode 100755
index 0000000..9ada1af
--- /dev/null
+++ b/database_utils/install-db-server.sh
@@ -0,0 +1,188 @@
+#!/bin/bash
+
+function usage(){
+ echo -e "usage: sudo $0 [OPTIONS]"
+ echo -e "Install openmano database server"
+ echo -e "On a Ubuntu 16.04 it configures openmano as a service"
+ echo -e " OPTIONS"
+ echo -e " -u USER: database admin user. 'root' by default. Prompts if needed"
+ echo -e " -p PASS: database admin password to be used or installed. Prompts if needed"
+ echo -e " -q --quiet: install in unattended mode"
+ echo -e " -h --help: show this help"
+ echo -e " --forcedb: reinstall mano_db DB, deleting previous database if exists and creating a new one"
+ echo -e " --no-install-packages: use this option to skip updating and installing the requires packages. This avoid wasting time if you are sure requires packages are present e.g. because of a previous installation"
+}
+
+function install_packages(){
+ [ -x /usr/bin/apt-get ] && apt-get install -y $*
+ [ -x /usr/bin/yum ] && yum install -y $*
+
+ #check properly installed
+ for PACKAGE in $*
+ do
+ PACKAGE_INSTALLED="no"
+ [ -x /usr/bin/apt-get ] && dpkg -l $PACKAGE &>> /dev/null && PACKAGE_INSTALLED="yes"
+ [ -x /usr/bin/yum ] && yum list installed $PACKAGE &>> /dev/null && PACKAGE_INSTALLED="yes"
+ if [ "$PACKAGE_INSTALLED" = "no" ]
+ then
+ echo "failed to install package '$PACKAGE'. Revise network connectivity and try again" >&2
+ exit 1
+ fi
+ done
+}
+
+function db_exists() {
+ RESULT=`mysqlshow --defaults-extra-file="$2" | grep -v Wildcard | grep -o $1`
+ if [ "$RESULT" == "$1" ]; then
+ echo " DB $1 exists"
+ return 0
+ fi
+ echo " DB $1 does not exist"
+ return 1
+}
+
+
+DBUSER="root"
+DBPASSWD=""
+DBPASSWD_PARAM=""
+QUIET_MODE=""
+FORCEDB=""
+NO_PACKAGES=""
+while getopts ":u:p:hiq-:" o; do
+ case "${o}" in
+ u)
+ export DBUSER="$OPTARG"
+ ;;
+ p)
+ export DBPASSWD="$OPTARG"
+ export DBPASSWD_PARAM="-p$OPTARG"
+ ;;
+ q)
+ export QUIET_MODE=yes
+ export DEBIAN_FRONTEND=noninteractive
+ ;;
+ h)
+ usage && exit 0
+ ;;
+ -)
+ [ "${OPTARG}" == "help" ] && usage && exit 0
+ [ "${OPTARG}" == "forcedb" ] && FORCEDB="y" && continue
+ [ "${OPTARG}" == "quiet" ] && export QUIET_MODE=yes && export DEBIAN_FRONTEND=noninteractive && continue
+ [ "${OPTARG}" == "no-install-packages" ] && export NO_PACKAGES=yes && continue
+ echo -e "Invalid option: '--$OPTARG'\nTry $0 --help for more information" >&2
+ exit 1
+ ;;
+ \?)
+ echo -e "Invalid option: '-$OPTARG'\nTry $0 --help for more information" >&2
+ exit 1
+ ;;
+ :)
+ echo -e "Option '-$OPTARG' requires an argument\nTry $0 --help for more information" >&2
+ exit 1
+ ;;
+ *)
+ usage >&2
+ exit 1
+ ;;
+ esac
+done
+
+HERE=$(realpath $(dirname $0))
+OPENMANO_BASEFOLDER=$(dirname $HERE)
+
+#Discover Linux distribution
+#try redhat type
+[ -f /etc/redhat-release ] && _DISTRO=$(cat /etc/redhat-release 2>/dev/null | cut -d" " -f1)
+#if not assuming ubuntu type
+[ -f /etc/redhat-release ] || _DISTRO=$(lsb_release -is 2>/dev/null)
+
+if [[ -z "$NO_PACKAGES" ]]
+then
+ echo '
+#################################################################
+##### INSTALL REQUIRED PACKAGES #####
+#################################################################'
+ [ "$_DISTRO" == "Ubuntu" ] && install_packages "mysql-server"
+ [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "mariadb mariadb-server"
+
+ if [[ "$_DISTRO" == "Ubuntu" ]]
+ then
+ #start services. By default CentOS does not start services
+ service mysql start >> /dev/null
+ # try to set admin password, ignore if fails
+ [[ -n $DBPASSWD ]] && mysqladmin -u $DBUSER -s password $DBPASSWD
+ fi
+
+ if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]
+ then
+ #start services. By default CentOS does not start services
+ service mariadb start
+ service httpd start
+ systemctl enable mariadb
+ systemctl enable httpd
+ read -e -p "Do you want to configure mariadb (recommended if not done before) (Y/n)" KK
+ [ "$KK" != "n" -a "$KK" != "no" ] && mysql_secure_installation
+
+ read -e -p "Do you want to set firewall to grant web access port 80,443 (Y/n)" KK
+ [ "$KK" != "n" -a "$KK" != "no" ] &&
+ firewall-cmd --permanent --zone=public --add-service=http &&
+ firewall-cmd --permanent --zone=public --add-service=https &&
+ firewall-cmd --reload
+ fi
+fi #[[ -z "$NO_PACKAGES" ]]
+
+#check and ask for database user password. Must be done after database installation
+if [[ -n $QUIET_MODE ]]
+then
+ echo -e "\nCheking database connection and ask for credentials"
+ while ! mysqladmin -s -u$DBUSER $DBPASSWD_PARAM status >/dev/null
+ do
+ [ -n "$logintry" ] && echo -e "\nInvalid database credentials!!!. Try again (Ctrl+c to abort)"
+ [ -z "$logintry" ] && echo -e "\nProvide database credentials"
+ read -e -p "database user? ($DBUSER) " DBUSER_
+ [ -n "$DBUSER_" ] && DBUSER=$DBUSER_
+ read -e -s -p "database password? (Enter for not using password) " DBPASSWD_
+ [ -n "$DBPASSWD_" ] && DBPASSWD="$DBPASSWD_" && DBPASSWD_PARAM="-p$DBPASSWD_"
+ [ -z "$DBPASSWD_" ] && DBPASSWD="" && DBPASSWD_PARAM=""
+ logintry="yes"
+ done
+fi
+
+echo '
+#################################################################
+##### CREATE DATABASE #####
+#################################################################'
+echo -e "\nCreating temporary file for MYSQL installation and initialization"
+TEMPFILE="$(mktemp -q --tmpdir "installopenmano.XXXXXX")"
+trap 'rm -f "$TEMPFILE"' EXIT
+chmod 0600 "$TEMPFILE"
+echo -e "[client]\n user='$DBUSER'\n password='$DBPASSWD'">"$TEMPFILE"
+
+if db_exists "mano_db" $TEMPFILE ; then
+ if [[ -n $FORCEDB ]]; then
+ echo " Deleting previous database mano_db"
+ DBDELETEPARAM=""
+ [[ -n $QUIET_MODE ]] && DBDELETEPARAM="-f"
+ mysqladmin --defaults-extra-file=$TEMPFILE -s drop mano_db $DBDELETEPARAM || ! echo "Could not delete mano_db database" || exit 1
+ #echo "REVOKE ALL PRIVILEGES ON mano_db.* FROM 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
+ #echo "DELETE USER 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
+ mysqladmin --defaults-extra-file=$TEMPFILE -s create mano_db || ! echo "Error creating mano_db database" || exit 1
+ echo "CREATE USER 'mano'@'localhost' identified by 'manopw';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database"
+ echo "GRANT ALL PRIVILEGES ON mano_db.* TO 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
+ echo " Database 'mano_db' created, user 'mano' password 'manopw'"
+ else
+ echo "Database exists. Use option '--forcedb' to force the deletion of the existing one" && exit 1
+ fi
+else
+ mysqladmin -u$DBUSER $DBPASSWD_PARAM -s create mano_db || ! echo "Error creating mano_db database" || exit 1
+ echo "CREATE USER 'mano'@'localhost' identified by 'manopw';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
+ echo "GRANT ALL PRIVILEGES ON mano_db.* TO 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
+ echo " Database 'mano_db' created, user 'mano' password 'manopw'"
+fi
+
+
+echo '
+#################################################################
+##### INIT DATABASE #####
+#################################################################'
+su $SUDO_USER -c "${OPENMANO_BASEFOLDER}/database_utils/init_mano_db.sh -u mano -p manopw -d mano_db" || ! echo "Failed while initializing database" || exit 1
diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local
new file mode 100644
index 0000000..3eaa281
--- /dev/null
+++ b/docker/Dockerfile-local
@@ -0,0 +1,50 @@
+from ubuntu:xenial
+
+MAINTAINER Gennadiy Dubina <gennadiy.dubina@dataat.com>
+
+# script uses it
+ENV USER=root
+
+#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
+
+#generate lsb_release stub
+RUN echo 'if [ "$1" == "-is" ]; then echo "Ubuntu"; else if [ "$1" == "-rs" ]; then echo "16.04"; fi fi' > /usr/bin/lsb_release && chmod +x /usr/bin/lsb_release
+
+COPY . /usr/local/src/openmano
+
+RUN apt update && \
+ DEBIAN_FRONTEND=noninteractive apt install -fqy software-properties-common make gcc git python python-dev python-pip sudo wget && \
+ pip install --upgrade pip && \
+ cd /usr/local/src/openmano && \
+ make build && \
+ cd build && \
+ ./scripts/install-openmano.sh -q --noclone --no-db && \
+ cd / && \
+ rm -rf /usr/local/src/openmano && \
+ rm -rf /usr/include/* && \
+ rm -rf /root/.cache && \
+ apt purge -y make gcc git curl wget python-dev python-pip && \
+ apt autoremove -y && \
+ apt clean && \
+ rm -rf /var/lib/apt/lists/*
+
+COPY docker/scripts/ /opt/openmano-docker
+
+VOLUME /opt/openmano/logs
+EXPOSE 9090
+
+env DB_USER='' DB_PSWD='' DB_HOST='' DB_PORT=3306 DB_NAME=mano_db
+
+CMD /opt/openmano-docker/start.sh
diff --git a/docker/openmano-compose.yml b/docker/openmano-compose.yml
new file mode 100644
index 0000000..253e957
--- /dev/null
+++ b/docker/openmano-compose.yml
@@ -0,0 +1,31 @@
+version: '2'
+services:
+ osm-ro-db:
+ image: mysql
+ 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:
+ build:
+ context: ../
+ dockerfile: docker/Dockerfile-local
+ image: osm/openmano
+ container_name: osm-ro
+ restart: always
+ environment:
+ - DB_USER=mano
+ - DB_PSWD=manopw
+ - DB_NAME=mano_db
+ - DB_HOST=osm-ro-db
+ ports:
+ - "9090:9090"
+ volumes:
+ - /var/log/osm/openmano/logs:/opt/openmano/logs
+ depends_on:
+ - osm-ro-db
+ links:
+ - osm-ro-db
\ No newline at end of file
diff --git a/docker/scripts/configure.sh b/docker/scripts/configure.sh
new file mode 100755
index 0000000..da7cbba
--- /dev/null
+++ b/docker/scripts/configure.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#Database parameters
+#db_host: localhost
+#db_user: mano
+#db_passwd: manopw
+#db_name: mano_db
+
+sed -i "s/^db_host:.*/db_host: $DB_HOST/" /opt/openmano/openmanod.cfg
+sed -i "s/^db_user:.*/db_user: $DB_USER/" /opt/openmano/openmanod.cfg
+sed -i "s/^db_passwd:.*/db_passwd: $DB_PSWD/" /opt/openmano/openmanod.cfg
+sed -i "s/^db_name:.*/db_name: $DB_NAME/" /opt/openmano/openmanod.cfg
\ No newline at end of file
diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh
new file mode 100755
index 0000000..3d70c3f
--- /dev/null
+++ b/docker/scripts/start.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+function is_db_created() {
+ db_host=$1
+ db_port=$2
+ db_user=$3
+ db_pswd=$4
+ db_name=$5
+
+ RESULT=`mysqlshow -h"$db_host" -P"$db_port" -u"$db_user" -p"$db_pswd" | grep -v Wildcard | grep -o $db_name`
+ if [ "$RESULT" == "$db_name" ]; then
+
+ RESULT=`mysqlshow -h"$db_host" -P"$db_port" -u"$db_user" -p"$db_pswd" "$db_name" | grep -v Wildcard | grep schema_version`
+ #TODO validate version
+ if [ -n "$RESULT" ]; then
+ echo " DB $db_name exists and inited"
+ return 0
+ else
+ echo " DB $db_name exists BUT not inited"
+ return 1
+ fi
+ fi
+ echo " DB $db_name does not exist"
+ return 1
+}
+
+echo "1/4 Apply config"
+/opt/openmano-docker/configure.sh
+[ $? -ne 0 ] && exit 1
+echo "2/4 Wait for db"
+
+/opt/openmano-docker/wait_db.sh
+[ $? -ne 0 ] && exit 1
+
+echo "3/4 Init database" && \
+is_db_created "$DB_HOST" "$DB_PORT" "$DB_USER" "$DB_PSWD" "$DB_NAME"
+if [ $? -ne 0 ]; then
+ /opt/openmano/database_utils/init_mano_db.sh -u $DB_USER -p $DB_PSWD -h $DB_HOST -P $DB_PORT -d $DB_NAME
+ [ $? -ne 0 ] && exit 1
+else
+ echo " migrage database version"
+ /opt/openmano/database_utils/migrate_mano_db.sh -u $DB_USER -p $DB_PSWD -h $DB_HOST -P $DB_PORT -d $DB_NAME
+fi
+
+echo "4/4 Try to start"
+/opt/openmano/openmanod.py -c /opt/openmano/openmanod.cfg --log-file=/opt/openmano/logs/openmano.log
\ No newline at end of file
diff --git a/docker/scripts/wait_db.sh b/docker/scripts/wait_db.sh
new file mode 100755
index 0000000..f083d76
--- /dev/null
+++ b/docker/scripts/wait_db.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+attempt=0
+max_attempts=120
+while ! mysqladmin ping -h"$DB_HOST" -P"$DB_PORT" --silent; do
+ #wait 120 sec
+ if [ $attempt -ge $max_attempts ]; then
+ echo "Can not connect to database during $max_attempts sec"
+ exit 1
+ fi
+ attempt=$[$attempt+1]
+ echo "Wait for MySQL Server ${DB_HOST}:${DB_PORT} [attempt $attempt/$max_attempts]"
+ sleep 1
+done
\ No newline at end of file
diff --git a/openmanod.py b/openmanod
similarity index 97%
rename from openmanod.py
rename to openmanod
index 55c7e8c..a63a1f0 100755
--- a/openmanod.py
+++ b/openmanod
@@ -37,19 +37,18 @@
version_date="Mar 2017"
database_version="0.20" #expected database schema version
-import httpserver
import time
import sys
import getopt
import yaml
-import nfvo_db
from jsonschema import validate as js_v, exceptions as js_e
-from openmano_schemas import config_schema
-from db_base import db_base_Exception
-import nfvo
import logging
import logging.handlers as log_handlers
import socket
+from osm_ro import httpserver, nfvo, nfvo_db
+from osm_ro.openmano_schemas import config_schema
+from osm_ro.db_base import db_base_Exception
+import osm_ro
global global_config
global logger
@@ -154,7 +153,7 @@
opts, args = getopt.getopt(sys.argv[1:], "hvc:V:p:P:", ["config=", "help", "version", "port=", "vnf-repository=", "adminport=", "log-socket-host=", "log-socket-port=", "log-file="])
port=None
port_admin = None
- config_file = 'openmanod.cfg'
+ config_file = 'osm_ro/openmanod.cfg'
vnf_repository = None
log_file = None
log_socket_host = None
@@ -268,8 +267,8 @@
r = mydb.get_db_version()
if r[1] != database_version:
logger.critical("DATABASE wrong version '%s'. \
- Try to upgrade/downgrade to version '%s' with './database_utils/migrate_mano_db.sh'",
- r[1], database_version)
+ Try to upgrade/downgrade to version '%s' with '%s/database_utils/migrate_mano_db.sh'",
+ r[1], database_version, osm_ro.__path__[0])
exit(-1)
except db_base_Exception as e:
logger.critical("DATABASE is not a MANO one or it is a '0.0' version. Try to upgrade to version '%s' with \
diff --git a/osm_ro/__init__.py b/osm_ro/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/osm_ro/__init__.py
diff --git a/console_proxy_thread.py b/osm_ro/console_proxy_thread.py
similarity index 100%
rename from console_proxy_thread.py
rename to osm_ro/console_proxy_thread.py
diff --git a/db_base.py b/osm_ro/db_base.py
similarity index 100%
rename from db_base.py
rename to osm_ro/db_base.py
diff --git a/httpserver.py b/osm_ro/httpserver.py
similarity index 100%
rename from httpserver.py
rename to osm_ro/httpserver.py
diff --git a/nfvo.py b/osm_ro/nfvo.py
similarity index 100%
rename from nfvo.py
rename to osm_ro/nfvo.py
diff --git a/nfvo_db.py b/osm_ro/nfvo_db.py
similarity index 100%
rename from nfvo_db.py
rename to osm_ro/nfvo_db.py
diff --git a/openmano_schemas.py b/osm_ro/openmano_schemas.py
similarity index 100%
rename from openmano_schemas.py
rename to osm_ro/openmano_schemas.py
diff --git a/openmanoclient.py b/osm_ro/openmanoclient.py
similarity index 100%
rename from openmanoclient.py
rename to osm_ro/openmanoclient.py
diff --git a/openmanod.cfg b/osm_ro/openmanod.cfg
similarity index 100%
rename from openmanod.cfg
rename to osm_ro/openmanod.cfg
diff --git a/osm_ro/osm-ro.service b/osm_ro/osm-ro.service
new file mode 100644
index 0000000..cc8966c
--- /dev/null
+++ b/osm_ro/osm-ro.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=openmano server (OSM RO)
+
+[Service]
+User=${USER_OWNER}
+ExecStart=openmanod -c /etc/osm/openmanod.cfg --log-file=/var/log/osm/openmano.log
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/utils.py b/osm_ro/utils.py
similarity index 100%
rename from utils.py
rename to osm_ro/utils.py
diff --git a/vim_thread.py b/osm_ro/vim_thread.py
similarity index 100%
rename from vim_thread.py
rename to osm_ro/vim_thread.py
diff --git a/vimconn.py b/osm_ro/vimconn.py
similarity index 100%
rename from vimconn.py
rename to osm_ro/vimconn.py
diff --git a/vimconn_openstack.py b/osm_ro/vimconn_openstack.py
similarity index 100%
rename from vimconn_openstack.py
rename to osm_ro/vimconn_openstack.py
diff --git a/vimconn_openvim.py b/osm_ro/vimconn_openvim.py
similarity index 100%
rename from vimconn_openvim.py
rename to osm_ro/vimconn_openvim.py
diff --git a/vimconn_vmware.py b/osm_ro/vimconn_vmware.py
similarity index 100%
rename from vimconn_vmware.py
rename to osm_ro/vimconn_vmware.py
diff --git a/vmwarecli.py b/osm_ro/vmwarecli.py
similarity index 100%
rename from vmwarecli.py
rename to osm_ro/vmwarecli.py
diff --git a/vmwarerecli.py b/osm_ro/vmwarerecli.py
similarity index 100%
rename from vmwarerecli.py
rename to osm_ro/vmwarerecli.py
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..eb92478
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,19 @@
+PyYAML
+bottle
+MySQL-python
+jsonschema
+paramiko
+argcomplete
+requests
+logutils
+python-novaclient
+python-keystoneclient
+python-glanceclient
+python-neutronclient
+python-cinderclient
+pyvcloud
+pyvmomi
+progressbar
+prettytable
+boto
+
diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index e40b570..9eda047 100755
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -39,6 +39,7 @@
echo -e " --force: makes idenpotent, delete previous installations folders if needed"
echo -e " --noclone: assumes that openmano was cloned previously and that this script is run from the local repo"
echo -e " --no-install-packages: use this option to skip updating and installing the requires packages. This avoid wasting time if you are sure requires packages are present e.g. because of a previous installation"
+ echo -e " --no-db: do not install mysql server"
}
function install_packages(){
@@ -59,16 +60,6 @@
done
}
-function db_exists() {
- RESULT=`mysqlshow --defaults-extra-file="$2" | grep -v Wildcard | grep -o $1`
- if [ "$RESULT" == "$1" ]; then
- echo " DB $1 exists"
- return 0
- fi
- echo " DB $1 does not exist"
- return 1
-}
-
GIT_URL=https://osm.etsi.org/gerrit/osm/RO.git
GIT_OVIM_URL=https://osm.etsi.org/gerrit/osm/openvim.git
DBUSER="root"
@@ -80,6 +71,7 @@
FORCE=""
NOCLONE=""
NO_PACKAGES=""
+NO_DB=""
while getopts ":u:p:hiq-:" o; do
case "${o}" in
u)
@@ -104,6 +96,7 @@
[ "${OPTARG}" == "noclone" ] && NOCLONE="y" && continue
[ "${OPTARG}" == "quiet" ] && export QUIET_MODE=yes && export DEBIAN_FRONTEND=noninteractive && continue
[ "${OPTARG}" == "no-install-packages" ] && export NO_PACKAGES=yes && continue
+ [ "${OPTARG}" == "no-db" ] && NO_DB="y" && continue
echo -e "Invalid option: '--$OPTARG'\nTry $0 --help for more information" >&2
exit 1
;;
@@ -208,51 +201,10 @@
#################################################################
##### INSTALL REQUIRED PACKAGES #####
#################################################################'
-[ "$_DISTRO" == "Ubuntu" ] && install_packages "git make screen wget mysql-server"
-[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git make screen wget mariadb mariadb-server"
+[ "$_DISTRO" == "Ubuntu" ] && install_packages "git make screen wget mysql-client"
+[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git make screen wget mariadb-client"
-if [[ "$_DISTRO" == "Ubuntu" ]]
-then
- #start services. By default CentOS does not start services
- service mysql start >> /dev/null
- # try to set admin password, ignore if fails
- [[ -n $DBPASSWD ]] && mysqladmin -u $DBUSER -s password $DBPASSWD
-fi
-if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]
-then
- #start services. By default CentOS does not start services
- service mariadb start
- service httpd start
- systemctl enable mariadb
- systemctl enable httpd
- read -e -p "Do you want to configure mariadb (recommended if not done before) (Y/n)" KK
- [ "$KK" != "n" -a "$KK" != "no" ] && mysql_secure_installation
-
- read -e -p "Do you want to set firewall to grant web access port 80,443 (Y/n)" KK
- [ "$KK" != "n" -a "$KK" != "no" ] &&
- firewall-cmd --permanent --zone=public --add-service=http &&
- firewall-cmd --permanent --zone=public --add-service=https &&
- firewall-cmd --reload
-fi
-fi #[[ -z "$NO_PACKAGES" ]]
-
-#check and ask for database user password. Must be done after database installation
-if [[ -n $QUIET_MODE ]]
-then
- echo -e "\nCheking database connection and ask for credentials"
- while ! mysqladmin -s -u$DBUSER $DBPASSWD_PARAM status >/dev/null
- do
- [ -n "$logintry" ] && echo -e "\nInvalid database credentials!!!. Try again (Ctrl+c to abort)"
- [ -z "$logintry" ] && echo -e "\nProvide database credentials"
- read -e -p "database user? ($DBUSER) " DBUSER_
- [ -n "$DBUSER_" ] && DBUSER=$DBUSER_
- read -e -s -p "database password? (Enter for not using password) " DBPASSWD_
- [ -n "$DBPASSWD_" ] && DBPASSWD="$DBPASSWD_" && DBPASSWD_PARAM="-p$DBPASSWD_"
- [ -z "$DBPASSWD_" ] && DBPASSWD="" && DBPASSWD_PARAM=""
- logintry="yes"
- done
-fi
if [[ -z "$NO_PACKAGES" ]]
then
@@ -302,52 +254,7 @@
#[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git"
make -C ${OPENMANO_BASEFOLDER}/openvim lite
-echo '
-#################################################################
-##### CREATE DATABASE #####
-#################################################################'
-echo -e "\nCreating temporary file form MYSQL installation and initialization"
-TEMPFILE="$(mktemp -q --tmpdir "installopenmano.XXXXXX")"
-trap 'rm -f "$TEMPFILE"' EXIT
-chmod 0600 "$TEMPFILE"
-echo -e "[client]\n user='$DBUSER'\n password='$DBPASSWD'">"$TEMPFILE"
-if db_exists "mano_db" $TEMPFILE ; then
- if [[ -n $FORCEDB ]]; then
- echo " Deleting previous database mano_db"
- DBDELETEPARAM=""
- [[ -n $QUIET_MODE ]] && DBDELETEPARAM="-f"
- mysqladmin --defaults-extra-file=$TEMPFILE -s drop mano_db $DBDELETEPARAM || ! echo "Could not delete mano_db database" || exit 1
- #echo "REVOKE ALL PRIVILEGES ON mano_db.* FROM 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- #echo "DELETE USER 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- mysqladmin --defaults-extra-file=$TEMPFILE -s create mano_db || ! echo "Error creating mano_db database" || exit 1
- echo "DROP USER 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo "CREATE USER 'mano'@'localhost' identified by 'manopw';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo "GRANT ALL PRIVILEGES ON mano_db.* TO 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo " Database 'mano_db' created, user 'mano' password 'manopw'"
- else
- echo "Database exists. Use option '--forcedb' to force the deletion of the existing one" && exit 1
- fi
-else
- mysqladmin -u$DBUSER $DBPASSWD_PARAM -s create mano_db || ! echo "Error creating mano_db database" || exit 1
- echo "CREATE USER 'mano'@'localhost' identified by 'manopw';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo "GRANT ALL PRIVILEGES ON mano_db.* TO 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo " Database 'mano_db' created, user 'mano' password 'manopw'"
-fi
-
-
-echo '
-#################################################################
-##### INIT DATABASE #####
-#################################################################'
-su $SUDO_USER -c "${OPENMANO_BASEFOLDER}/database_utils/init_mano_db.sh -u mano -p manopw -d mano_db" || ! echo "Failed while initializing main database" || exit 1
-
-echo '
-#################################################################
-##### CREATE AND INIT MANO_VIM DATABASE #####
-#################################################################'
-# Install mano_vim_db after setup
-su $SUDO_USER -c "${OPENMANO_BASEFOLDER}/openvim/database_utils/install-db-server.sh -U $DBUSER ${DBPASSWD_PARAM/p/P} -u mano -p manopw -d mano_vim_db" || ! echo "Failed while installing ovim database" || exit 1
if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]
then
@@ -422,8 +329,27 @@
su $SUDO_USER -c 'echo ". ${HOME}/.bash_completion.d/python-argcomplete.sh" >> ~/.bashrc'
fi
+if [ -z "$NO_DB" ]; then
+echo '
+#################################################################
+##### INSTALL DATABASE SERVER #####
+#################################################################'
+ if [ -n "$QUIET_MODE" ]; then
+ DB_QUIET='-q'
+ fi
+ if [ -n "$FORCEDB" ]; then
+ DB_FORCE='--forcedb'
+ fi
+ ${OPENMANO_BASEFOLDER}/database_utils/install-db-server.sh -u $DBUSER $DBPASSWD_PARAM $DB_QUIET $DB_FORCE || exit 1
+echo '
+#################################################################
+##### CREATE AND INIT MANO_VIM DATABASE #####
+#################################################################'
+# Install mano_vim_db after setup
+ ${OPENMANO_BASEFOLDER}/openvim/database_utils/install-db-server.sh -U $DBUSER ${DBPASSWD_PARAM/p/P} -u mano -p manopw -d mano_vim_db || exit 1
+fi
if [[ -n "$INSTALL_AS_A_SERVICE" ]]
then
@@ -450,5 +376,3 @@
fi
-
-
diff --git a/scripts/openmano-report.sh b/scripts/openmano-report
similarity index 65%
rename from scripts/openmano-report.sh
rename to scripts/openmano-report
index 9402fac..13c941a 100755
--- a/scripts/openmano-report.sh
+++ b/scripts/openmano-report
@@ -25,8 +25,7 @@
DIRNAME=$(readlink -f ${BASH_SOURCE[0]})
DIRNAME=$(dirname $DIRNAME )
-OMCLIENT=$DIRNAME/../openmano/openmano
-OVCLIENT=$DIRNAME/../openvim/openvim
+OMCLIENT=openmano
#get screen log files at the beginning
echo
@@ -36,14 +35,8 @@
echo "-------------------------------"
echo "OPENMANO"
echo "-------------------------------"
-echo "cat $DIRNAME/../logs/openmano.log*"
-cat $DIRNAME/../logs/openmano.log*
-echo
-echo "-------------------------------"
-echo "OPENVIM"
-echo "-------------------------------"
-echo "cat $DIRNAME/../logs/openvim.?"
-cat $DIRNAME/../logs/openvim.?
+echo "cat /var/log/osm/openmano.log*"
+cat /var/log/osm/openmano.log*
echo
echo "-------------------------------"
echo
@@ -56,14 +49,8 @@
echo "-------------------------------"
echo "OPENMANO"
echo "-------------------------------"
-echo "cat $DIRNAME/../openmano/openmanod.py|grep ^__version__"
-cat $DIRNAME/../openmano/openmanod.py|grep ^__version__
-echo
-echo "-------------------------------"
-echo "OPENVIM"
-echo "-------------------------------"
-echo "cat $DIRNAME/../openvim/openvimd.py|grep ^__version__"
-cat $DIRNAME/../openvim/openvimd.py|grep ^__version__
+echo "openmanod --version"
+openmanod --version
echo
echo "-------------------------------"
echo
@@ -75,13 +62,8 @@
echo "-------------------------------"
echo "OPENMANO"
echo "-------------------------------"
-echo "cat $DIRNAME/../openmano/openmanod.cfg"
-cat $DIRNAME/../openmano/openmanod.cfg
-echo "-------------------------------"
-echo "OPENVIM"
-echo "-------------------------------"
-echo "cat $DIRNAME/../openvim/openvimd.cfg"
-cat $DIRNAME/../openvim/openvimd.cfg
+echo "cat /etc/osm/openmanod.cfg"
+cat /etc/osm/openmanod.cfg
echo "-------------------------------"
echo
@@ -137,34 +119,6 @@
echo "-------------------------------"
done
echo
- echo "-------------------------------"
- echo "OPENVIM$verbose"
- echo "-------------------------------"
- echo "$OVCLIENT config"
- $OVCLIENT config
- echo "-------------------------------"
- echo "$OVCLIENT tenant-list $verbose"
- $OVCLIENT tenant-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT host-list $verbose"
- $OVCLIENT host-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT net-list $verbose"
- $OVCLIENT net-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT port-list $verbose"
- $OVCLIENT port-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT flavor-list $verbose"
- $OVCLIENT flavor-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT image-list $verbose"
- $OVCLIENT image-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT vm-list $verbose"
- $OVCLIENT vm-list $verbose
- echo "-------------------------------"
- echo
done
echo
diff --git a/scripts/python-osm-ro.postinst b/scripts/python-osm-ro.postinst
new file mode 100755
index 0000000..f04a94c
--- /dev/null
+++ b/scripts/python-osm-ro.postinst
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+##
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: OSM_TECH@list.etsi.org
+##
+
+echo "POST INSTALL OSM-RO"
+OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'`
+#OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'`
+
+#Pip packages required for vmware connector
+pip install --upgrade pip
+pip install pyvcloud
+pip install progressbar
+pip install prettytable
+pip install pyvmomi
+
+systemctl enable osm-ro.service
+
+#Creation of log folder
+mkdir -p /var/log/osm
+
+#configure arg-autocomplete for this user
+su $SUDO_USER -c 'activate-global-python-argcomplete --user'
+if ! su $SUDO_USER -c 'grep -q bash_completion.d/python-argcomplete.sh ${HOME}/.bashrc'
+then
+ echo " inserting .bash_completion.d/python-argcomplete.sh execution at .bashrc"
+ su $SUDO_USER -c 'echo ". ${HOME}/.bash_completion.d/python-argcomplete.sh" >> ~/.bashrc'
+fi
+
+echo '
+To make OSM RO work, you have to install mysql and a database, and finally start openmano service'
+echo " ${OSMRO_PATH}/database_utils/install-db-server.sh # -h for help"
+echo ' service openmano start'
+
+
diff --git a/scripts/service-openmano.sh b/scripts/service-openmano
similarity index 95%
rename from scripts/service-openmano.sh
rename to scripts/service-openmano
index 1a48d4a..0224d20 100755
--- a/scripts/service-openmano.sh
+++ b/scripts/service-openmano
@@ -116,7 +116,7 @@
running=y
done
#if installed as a service and it is not provided a screen name call service
- [[ -f /etc/systemd/system/openmano.service ]] && [[ -z $option_screen_name ]] && running=y #&& service openmano status
+ [[ -f /etc/systemd/system/osm-ro.service ]] && [[ -z $option_screen_name ]] && running=y #&& service osm-ro status
if [ -z "$running" ]
then
echo -n " $om_name not running" && [[ -n "$option_screen_name" ]] && echo " on screen '$option_screen_name'" || echo
@@ -124,7 +124,7 @@
fi
#if installed as a service and it is not provided a screen name call service
- [[ -f /etc/systemd/system/openmano.service ]] && [[ -z $option_screen_name ]] && service openmano $om_action && ( [[ $om_action == status ]] || sleep 5 ) && exit $?
+ [[ -f /etc/systemd/system/osm-ro.service ]] && [[ -z $option_screen_name ]] && service osm-ro $om_action && ( [[ $om_action == status ]] || sleep 5 ) && exit $?
#stop
diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..5f1382d
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+
+#from distutils.core import setup
+#from distutils.command.install_data import install_data
+from setuptools import setup
+from os import system
+#import glob
+
+_name = 'osm_ro'
+_version = open('RO_VERSION').read().strip()
+_description = 'OSM Resource Orchestrator'
+_author = 'ETSI OSM'
+_author_email = 'alfonso.tiernosepulveda@telefonica.com'
+_maintainer = 'garciadeblas'
+_maintainer_email = 'gerardo.garciadeblas@telefonica.com'
+_license = 'Apache 2.0'
+_url = 'https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary'
+_requirements = [
+ "PyYAML",
+ "bottle",
+ "MySQL-python",
+ "jsonschema",
+ "paramiko",
+ "argcomplete",
+ "requests",
+ "logutils",
+ "python-novaclient",
+ "python-keystoneclient",
+ "python-glanceclient",
+ "python-neutronclient",
+ "python-cinderclient",
+ "pyvcloud",
+ "progressbar",
+ "prettytable",
+ "pyvmomi",
+ "boto",
+]
+
+setup(name=_name,
+ version = _version,
+ description = _description,
+ long_description = open('README.rst').read(),
+ author = _author,
+ author_email = _author_email,
+ maintainer = _maintainer,
+ maintainer_email = _maintainer_email,
+ url = _url,
+ license = _license,
+ packages = [_name],
+ #packages = ['osm_ro', 'osm_roclient'],
+ package_dir = {_name: _name},
+ package_data = {_name: ['vnfs/*.yaml', 'vnfs/examples/*.yaml',
+ 'scenarios/*.yaml', 'scenarios/examples/*.yaml',
+ 'instance-scenarios/examples/*.yaml', 'database_utils/*',
+ 'scripts/*']},
+ data_files = [('/etc/osm/', ['osm_ro/openmanod.cfg']),
+ ('/etc/systemd/system/', ['osm_ro/osm-ro.service']),
+ ],
+ scripts=['openmanod', 'openmano', 'osm_ro/scripts/service-openmano', 'osm_ro/scripts/openmano-report',],
+ install_requires=_requirements,
+ include_package_data=True,
+ )
+
diff --git a/stdeb.cfg b/stdeb.cfg
new file mode 100644
index 0000000..0978737
--- /dev/null
+++ b/stdeb.cfg
@@ -0,0 +1,6 @@
+[DEFAULT]
+Suite: xenial
+XS-Python-Version: >= 2.7
+Maintainer: Gerardo Garcia <gerardo.garciadeblas@telefonica.com>
+Depends: python-pip, libmysqlclient-dev, libssl-dev, libffi-dev, python-argcomplete, python-boto, python-bottle, python-jsonschema, python-logutils, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-mysqldb, mysql-server
+