From: tierno Date: Wed, 26 Apr 2017 12:32:14 +0000 (+0200) Subject: Merge branch 'v2.0' X-Git-Tag: v2.0.1~25 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=6df137c25d9e3d4ee3037df15c1c140660fbd9b3;hp=557e2f6e274d27d0d70d1577298c44cdc62507b5;p=osm%2FRO.git Merge branch 'v2.0' Signed-off-by: tierno --- diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..84144a8c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM ubuntu:16.04 + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install git build-essential && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install python python-dev python-all python-stdeb fakeroot pypi2deb && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install python-pip libmysqlclient-dev libssl-dev libffi-dev && \ + DEBIAN_FRONTEND=noninteractive pip install --upgrade pip && \ + DEBIAN_FRONTEND=noninteractive pip install --upgrade setuptools && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-boto python-bottle python-jsonschema python-logutils python-cinderclient python-glanceclient python-keystoneclient python-neutronclient python-novaclient python-mysqldb + diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..0964de55 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,38 @@ +pipeline { + agent { + label "pipeline" + } + stages { + stage("Build") { + agent { + dockerfile true + } + steps { + sh 'make package' + stash name: "deb-files", includes: ".build/*.deb" + } + } + stage("Unittest") { + agent { + dockerfile true + } + steps { + sh 'echo "UNITTEST"' + } + } + stage("Repo Component") { + agent any + steps { + unstash "deb-files" + sh ''' + mkdir -p pool/RO + mv .build/*.deb pool/RO/ + mkdir -p dists/ReleaseOne/unstable/RO/binary-amd64/ + apt-ftparchive packages pool/RO > dists/ReleaseOne/unstable/RO/binary-amd64/Packages + gzip -9fk dists/ReleaseOne/unstable/RO/binary-amd64/Packages + ''' + archiveArtifacts artifacts: "dists/**,pool/RO/*.deb" + } + } + } +} diff --git a/Makefile b/Makefile index b5f6ac59..41b265a7 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,15 @@ SHELL := /bin/bash all: package install +clean_deb: + rm -rf .build + +clean: + rm -rf build + find osm_ro -name '*.pyc' -delete + find osm_ro -name '*.pyo' -delete prepare: - pip install setuptools + pip install --user --upgrade setuptools mkdir -p build/ VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \ VER2=$(shell git describe | cut -d- -f2); \ @@ -29,17 +36,19 @@ connectors: prepare python build/osm_ro/openmanolinkervimconn.py rm -f build/osm_ro/openmanolinkervimconn.py -build: connectors prepare +build: clean connectors prepare python -m py_compile build/osm_ro/*.py pip: prepare cd build && ./setup.py sdist -package: prepare +package: clean clean_deb 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 + mkdir -p .build + cp build/deb_dist/python-*.deb .build/ snap: echo "Nothing to be done yet" @@ -48,7 +57,7 @@ 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 + dpkg -i .build/*.deb develop: prepare #pip install -r requirements.txt @@ -66,8 +75,4 @@ run-docker: 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/database_utils/install-db-server.sh b/database_utils/install-db-server.sh index 9ada1afa..5f1c5633 100755 --- a/database_utils/install-db-server.sh +++ b/database_utils/install-db-server.sh @@ -1,16 +1,37 @@ -#!/bin/bash +#!/usr/bin/env bash + +DB_NAME='mano_db' +DB_ADMIN_USER="root" +DB_USER="mano" +DB_PASS="manopw" +DB_ADMIN_PASSWD="" +DB_PORT="3306" +DB_HOST="" +DB_HOST_PARAM="" +QUIET_MODE="" +FORCEDB="" +UPDATEDB="" +NO_PACKAGES="" +UNINSTALL="" + 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 "Install openmano database server and the needed packages" 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 " -U USER: database admin user. '$DB_ADMIN_USER' by default. Prompts if needed" + echo -e " -P PASS: database admin password to be used or installed. Prompts if needed" + echo -e " -d: database name, '$DB_NAME' by default" + echo -e " -u: database user, '$DB_USER' by default" + echo -e " -p: database pass, '$DB_PASS' by default" + echo -e " -H: HOST database host. 'localhost' by default" + echo -e " -T: PORT database port. '$DB_PORT' by default" 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 " --forcedb: if database exists, it is dropped and a new one is created" + echo -e " --updatedb: if database exists, it preserves the content and it is updated to the needed version" 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 " --unistall: delete database" } function install_packages(){ @@ -31,31 +52,129 @@ function install_packages(){ done } -function db_exists() { +function _install_mysql_package(){ + echo ' + ################################################################# + ##### INSTALL REQUIRED PACKAGES ##### + #################################################################' + [ "$_DISTRO" == "Ubuntu" ] && ! install_packages "mysql-server" && exit 1 + [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && ! install_packages "mariadb mariadb-server" && exit 1 + + 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 $DB_ADMIN_USER -s password $DB_ADMIN_PASSWD + 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 +} + +function _create_db(){ + echo ' + ################################################################# + ##### CREATE AND INIT DATABASE ##### + #################################################################' + echo "mysqladmin --defaults-extra-file="$TEMPFILE" -s create ${DB_NAME}" + mysqladmin --defaults-extra-file="$TEMPFILE" -s create ${DB_NAME} \ + || ! echo "Error creating ${DB_NAME} database" >&2 \ + || exit 1 + echo "CREATE USER $DB_USER@'localhost' IDENTIFIED BY '$DB_PASS';" | mysql --defaults-extra-file="$TEMPFILE" -s 2>/dev/null \ + || echo "Warning: User '$DB_USER' cannot be created at database. Probably exist" >&2 + echo "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '$DB_USER'@'localhost';" | mysql --defaults-extra-file="$TEMPFILE" -s \ + || ! echo "Error: Granting privileges to user '$DB_USER' at database" >&2 \ + || exit 1 + echo " Database '${DB_NAME}' created, user '$DB_USER' password '$DB_PASS'" + DIRNAME=$(dirname $(readlink -f ${BASH_SOURCE[0]})) + ${DIRNAME}/init_mano_db.sh -u"$DB_USER" -p"$DB_PASS" -d"$DB_NAME" -P"$DB_PORT" $DB_HOST_PARAM \ + || ! echo "Error initializing database '$DB_NAME'" >&2 \ + || exit 1 +} + +function _delete_db(){ + mysqladmin --defaults-extra-file="$TEMPFILE" -s drop "${DB_NAME}" $DBDELETEPARAM \ + || ! echo "Error: Could not delete '${DB_NAME}' database" >&2 \ + || exit 1 +} + +function _update_db(){ + echo ' + ################################################################# + ##### UPDATE DATABASE ##### + #################################################################' + echo "CREATE USER $DB_USER@'localhost' IDENTIFIED BY '$DB_PASS';" | mysql --defaults-extra-file="$TEMPFILE" -s 2>/dev/null \ + || echo "Warning: User '$DB_USER' cannot be created at database. Probably exist" >&2 + echo "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '$DB_USER'@'localhost';" | mysql --defaults-extra-file="$TEMPFILE" -s \ + || ! echo "Error: Granting privileges to user '$DB_USER' at database" >&2 \ + || exit 1 + echo " Granted privileges to user '$DB_USER' password '$DB_PASS' to existing database '${DB_NAME}'" + DIRNAME=$(dirname $(readlink -f ${BASH_SOURCE[0]})) + ${DIRNAME}/migrate_mano_db.sh -u"$DB_USER" -p"$DB_PASS" -d"$DB_NAME" -P"$DB_PORT" $DB_HOST_PARAM \ + || ! echo "Error updating database '$DB_NAME'" >&2 \ + || exit 1 +} + +function _uninstall_db(){ +echo ' + ################################################################# + ##### DELETE DATABASE ##### + #################################################################' + DBDELETEPARAM="" + [[ -n $QUIET_MODE ]] && DBDELETEPARAM="-f" + _delete_db +} + +function db_exists(){ # (db_name, credential_file) + # check credentials + mysqlshow --defaults-extra-file="$2" >/dev/null || exit 1 RESULT=`mysqlshow --defaults-extra-file="$2" | grep -v Wildcard | grep -o $1` if [ "$RESULT" == "$1" ]; then - echo " DB $1 exists" + # echo " DB $1 exists" return 0 fi - echo " DB $1 does not exist" + # 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 +while getopts ":U:P:d:u:p:H:T:hiq-:" o; do case "${o}" in + U) + export DB_ADMIN_USER="$OPTARG" + ;; + P) + export DB_ADMIN_PASSWD="$OPTARG" + ;; + d) + export DB_NAME="$OPTARG" + ;; u) - export DBUSER="$OPTARG" + export DB_USER="$OPTARG" ;; p) - export DBPASSWD="$OPTARG" - export DBPASSWD_PARAM="-p$OPTARG" + export DB_PASS="$OPTARG" + ;; + H) + export DB_HOST="$OPTARG" + export DB_HOST_PARAM="-h$DB_HOST" + ;; + T) + export DB_PORT="$OPTARG" ;; q) export QUIET_MODE=yes @@ -67,11 +186,13 @@ while getopts ":u:p:hiq-:" o; do -) [ "${OPTARG}" == "help" ] && usage && exit 0 [ "${OPTARG}" == "forcedb" ] && FORCEDB="y" && continue + [ "${OPTARG}" == "updatedb" ] && UPDATEDB="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 + [ "${OPTARG}" == "uninstall" ] && UNINSTALL="y" && 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 @@ -86,103 +207,78 @@ while getopts ":u:p:hiq-:" o; do ;; esac done +if [ -n "$FORCEDB" ] && [ -n "$UPDATEDB" ] ; then + echo "Error: options --forcedb and --updatedb are mutually exclusive" >&2 + exit 1 +fi -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 +# 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 [ "$_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" ]] +# Creating temporary file for MYSQL installation and initialization" +TEMPFILE="$(mktemp -q --tmpdir "installdb.XXXXXX")" +trap 'rm -f "$TEMPFILE"' EXIT +chmod 0600 "$TEMPFILE" +echo -e "[client]\n user='${DB_ADMIN_USER}'\n password='$DB_ADMIN_PASSWD'\n host='$DB_HOST'\n port='$DB_PORT'" > "$TEMPFILE" #check and ask for database user password. Must be done after database installation -if [[ -n $QUIET_MODE ]] -then +if [[ -z $QUIET_MODE ]] +then echo -e "\nCheking database connection and ask for credentials" - while ! mysqladmin -s -u$DBUSER $DBPASSWD_PARAM status >/dev/null + # echo "mysqladmin --defaults-extra-file=$TEMPFILE -s status >/dev/null" + while ! mysqladmin --defaults-extra-file="$TEMPFILE" -s 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="" + read -e -p "database admin user? ($DB_ADMIN_USER) " DBUSER_ + [ -n "$DBUSER_" ] && DB_ADMIN_USER=$DBUSER_ + read -e -s -p "database admin password? (Enter for not using password) " DBPASSWD_ + [ -n "$DBPASSWD_" ] && DB_ADMIN_PASSWD="$DBPASSWD_" + [ -z "$DBPASSWD_" ] && DB_ADMIN_PASSWD="" + echo -e "[client]\n user='${DB_ADMIN_USER}'\n password='$DB_ADMIN_PASSWD'\n host='$DB_HOST'\n port='$DB_PORT'" > "$TEMPFILE" 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'" +if [[ ! -z "$UNINSTALL" ]] +then + _uninstall_db + exit +fi + +if [[ -z "$NO_PACKAGES" ]] +then + [ "$USER" != "root" ] && echo "Needed root privileges" >&2 && exit 1 + _install_mysql_package || exit 1 +fi + +# Create or update database +if db_exists $DB_NAME $TEMPFILE ; then + if [[ -n $FORCEDB ]] ; then + # DBDELETEPARAM="" + # [[ -n $QUIET_MODE ]] && DBDELETEPARAM="-f" + DBDELETEPARAM="-f" + _delete_db + _create_db + elif [[ -n $UPDATEDB ]] ; then + _update_db + elif [[ -z $QUIET_MODE ]] ; then + echo "database '$DB_NAME' exist. Reinstall it?" + read -e -p "Type 'y' to drop and reinstall exiting database (content will be lost), Type 'n' to update existing database (y/N)? " KK_ + if [ "$KK_" == "yes" ] || [ "$KK_" != "y" ] ; then + _delete_db + _create_db + else + _update_db + fi else - echo "Database exists. Use option '--forcedb' to force the deletion of the existing one" && exit 1 + echo "Database '$DB_NAME' exists. Use option '--forcedb' to force the deletion of the existing one, or '--updatedb' to use existing one and update it" + 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'" + _create_db 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/openmanod b/openmanod index a63a1f07..8ad0af7f 100755 --- a/openmanod +++ b/openmanod @@ -22,7 +22,7 @@ # contact with: nfvlabs@tid.es ## -''' +""" openmano server. Main program that implements a reference NFVO (Network Functions Virtualisation Orchestrator). It interfaces with an NFV VIM through its API and offers a northbound interface, based on REST (openmano API), @@ -30,12 +30,7 @@ where NFV services are offered including the creation and deletion of VNF templa network service templates and network service instances. It loads the configuration file and launches the http_server thread that will listen requests using openmano API. -''' -__author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes" -__date__ ="$26-aug-2014 11:09:29$" -__version__="0.5.9-r519" -version_date="Mar 2017" -database_version="0.20" #expected database schema version +""" import time import sys @@ -50,6 +45,12 @@ from osm_ro.openmano_schemas import config_schema from osm_ro.db_base import db_base_Exception import osm_ro +__author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes" +__date__ ="$26-aug-2014 11:09:29$" +__version__="0.5.11-r521" +version_date="Apr 2017" +database_version="0.20" #expected database schema version + global global_config global logger diff --git a/osm_ro/nfvo.py b/osm_ro/nfvo.py index 624be51b..06af5379 100644 --- a/osm_ro/nfvo.py +++ b/osm_ro/nfvo.py @@ -27,8 +27,8 @@ NFVO engine, implementing all the methods for the creation, deletion and managem __author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ ="$16-sep-2014 22:05:01$" -import imp -#import json +# import imp +# import json import yaml import utils import vim_thread @@ -148,13 +148,15 @@ def start_service(mydb): module_info=None try: module = "vimconn_" + vim["type"] - module_info = imp.find_module(module) - vim_conn = imp.load_module(vim["type"], *module_info) + pkg = __import__("osm_ro." + module) + vim_conn = getattr(pkg, module) + # module_info = imp.find_module(module, [__file__[:__file__.rfind("/")]]) + # vim_conn = imp.load_module(vim["type"], *module_info) vimconn_imported[vim["type"]] = vim_conn except (IOError, ImportError) as e: - if module_info and module_info[0]: - file.close(module_info[0]) - raise NfvoException("Unknown vim type '{}'. Can not open file '{}.py'; {}: {}".format( + # if module_info and module_info[0]: + # file.close(module_info[0]) + raise NfvoException("Unknown vim type '{}'. Cannot open file '{}.py'; {}: {}".format( vim["type"], module, type(e).__name__, str(e)), HTTP_Bad_Request) thread_id = vim['datacenter_tenant_id'] @@ -270,12 +272,14 @@ def get_vim(mydb, nfvo_tenant=None, datacenter_id=None, datacenter_name=None, da module_info=None try: module = "vimconn_" + vim["type"] - module_info = imp.find_module(module) - vim_conn = imp.load_module(vim["type"], *module_info) + pkg = __import__("osm_ro." + module) + vim_conn = getattr(pkg, module) + # module_info = imp.find_module(module, [__file__[:__file__.rfind("/")]]) + # vim_conn = imp.load_module(vim["type"], *module_info) vimconn_imported[vim["type"]] = vim_conn except (IOError, ImportError) as e: - if module_info and module_info[0]: - file.close(module_info[0]) + # if module_info and module_info[0]: + # file.close(module_info[0]) raise NfvoException("Unknown vim type '{}'. Can not open file '{}.py'; {}: {}".format( vim["type"], module, type(e).__name__, str(e)), HTTP_Bad_Request) @@ -2751,10 +2755,12 @@ def new_datacenter(mydb, datacenter_descriptor): module_info = None try: module = "vimconn_" + datacenter_type - module_info = imp.find_module(module) + pkg = __import__("osm_ro." + module) + vim_conn = getattr(pkg, module) + # module_info = imp.find_module(module, [__file__[:__file__.rfind("/")]]) except (IOError, ImportError): - if module_info and module_info[0]: - file.close(module_info[0]) + # if module_info and module_info[0]: + # file.close(module_info[0]) raise NfvoException("Incorrect datacenter type '{}'. Plugin '{}'.py not installed".format(datacenter_type, module), HTTP_Bad_Request) datacenter_id = mydb.new_row("datacenters", datacenter_descriptor, add_uuid=True) @@ -2855,18 +2861,22 @@ def associate_datacenter_to_tenant(mydb, nfvo_tenant, datacenter, vim_tenant_id= datacenter_tenants_dict["uuid"] = id_ #fill tenants_datacenters table - tenants_datacenter_dict["datacenter_tenant_id"]=datacenter_tenants_dict["uuid"] + datacenter_tenant_id = datacenter_tenants_dict["uuid"] + tenants_datacenter_dict["datacenter_tenant_id"] = datacenter_tenant_id mydb.new_row('tenants_datacenters', tenants_datacenter_dict) # create thread datacenter_id, myvim = get_datacenter_by_name_uuid(mydb, tenant_dict['uuid'], datacenter_id) # reload data thread_name = get_non_used_vim_name(datacenter_name, datacenter_id, tenant_dict['name'], tenant_dict['uuid']) - new_thread = vim_thread.vim_thread(myvim, task_lock, thread_name, datacenter_name, db=db, db_lock=db_lock, ovim=ovim) + new_thread = vim_thread.vim_thread(myvim, task_lock, thread_name, datacenter_name, datacenter_tenant_id, + db=db, db_lock=db_lock, ovim=ovim) new_thread.start() thread_id = datacenter_tenants_dict["uuid"] vim_threads["running"][thread_id] = new_thread return datacenter_id -def edit_datacenter_to_tenant(mydb, nfvo_tenant, datacenter_id, vim_tenant_id=None, vim_tenant_name=None, vim_username=None, vim_password=None, config=None): + +def edit_datacenter_to_tenant(mydb, nfvo_tenant, datacenter_id, vim_tenant_id=None, vim_tenant_name=None, + vim_username=None, vim_password=None, config=None): #Obtain the data of this datacenter_tenant_id vim_data = mydb.get_rows( SELECT=("datacenter_tenants.vim_tenant_name", "datacenter_tenants.vim_tenant_id", "datacenter_tenants.user", diff --git a/osm_ro/vim_thread.py b/osm_ro/vim_thread.py index a56dd641..373fe7bf 100644 --- a/osm_ro/vim_thread.py +++ b/osm_ro/vim_thread.py @@ -21,12 +21,10 @@ # contact with: nfvlabs@tid.es ## -''' +"""" This is thread that interact with the host and the libvirt to manage VM One thread will be launched per host -''' -__author__ = "Alfonso Tierno, Pablo Montes" -__date__ = "$10-feb-2017 12:07:15$" +""" import threading import time @@ -36,18 +34,21 @@ import vimconn from db_base import db_base_Exception from lib_osm_openvim.ovim import ovimException +__author__ = "Alfonso Tierno, Pablo Montes" +__date__ = "$10-feb-2017 12:07:15$" # from logging import Logger # import auxiliary_functions as af -def is_task_id(id): - return True if id[:5] == "TASK." else False +def is_task_id(task_id): + return True if task_id[:5] == "TASK." else False class vim_thread(threading.Thread): - def __init__(self, vimconn, task_lock, name=None, datacenter_name=None, datacenter_tenant_id=None, db=None, db_lock=None, ovim=None): + def __init__(self, vimconn, task_lock, name=None, datacenter_name=None, datacenter_tenant_id=None, + db=None, db_lock=None, ovim=None): """Init a thread. Arguments: 'id' number of thead @@ -147,7 +148,7 @@ class vim_thread(threading.Thread): self.logger.error("ovimException deleting external_port={} ".format( task_interface["sdn_port_id"]) + str(e), exc_info=True) # TODO Set error_msg at instance_nets - vim_net_id = interface.pop("vim_net_id") + vim_net_id = interface["vim_net_id"] sdn_net_id = None sdn_port_name = None with self.db_lock: @@ -195,10 +196,11 @@ class vim_thread(threading.Thread): exc_info=True) # TODO Set error_msg at instance_nets with self.db_lock: + vim_net_id = interface.pop("vim_net_id") self.db.update_rows('instance_interfaces', UPDATE=interface, WHERE={'uuid': db_iface["iface_id"]}) + interface["vim_net_id"] = vim_net_id # TODO insert instance_id - interface["vim_net_id"] = vim_net_id task["vim_info"] = vim_info if task["vim_info"]["status"] == "BUILD": diff --git a/scripts/install-openmano-service.sh b/scripts/install-openmano-service.sh index cc8e9986..a909dd16 100755 --- a/scripts/install-openmano-service.sh +++ b/scripts/install-openmano-service.sh @@ -37,8 +37,10 @@ function usage(){ function uninstall(){ echo "systemctl disable openmano.service " && systemctl disable openmano.service 2>/dev/null || echo " Already done" + echo "systemctl disable osm-ro.service " && systemctl disable osm-ro.service 2>/dev/null || echo " Already done" echo "service openmano stop " && service openmano stop 2>/dev/null || echo " Already done" - for file in /opt/openmano /etc/default/openmanod.cfg /etc/osm/openmanod.cfg /var/log/openmano /var/log/osm/openmano* /etc/systemd/system/openmano.service /usr/bin/openmano /usr/sbin/service-openmano /usr/bin/openmano-report + echo "service osm-ro stop " && service osm-ro stop 2>/dev/null || echo " Already done" + for file in /opt/openmano /etc/default/openmanod.cfg /etc/osm/openmanod.cfg /var/log/openmano /var/log/osm/openmano* /etc/systemd/system/openmano.service /etc/systemd/system/osm-ro.service /usr/bin/openmano /usr/sbin/service-openmano /usr/bin/openmano-report do echo rm $file rm -rf $file || ! echo "Can not delete '$file'. Needed root privileges?" >&2 || exit 1 @@ -133,13 +135,13 @@ cp /opt/openmano/osm_ro/openmanod.cfg /etc/osm/openmanod.cfg || echo "warning c mkdir -p /var/log/osm || echo "warning cannot create log folder '/var/log/osm'" #makes links ln -s -v /opt/openmano/openmano /usr/bin/openmano -ln -s -v /opt/openmano/scripts/service-openmano.sh /usr/sbin/service-openmano -ln -s -v /opt/openmano/scripts/openmano-report.sh /usr/bin/openmano-report +ln -s -v /opt/openmano/scripts/service-openmano /usr/sbin/service-openmano +ln -s -v /opt/openmano/scripts/openmano-report /usr/bin/openmano-report chown -R $SUDO_USER /opt/openmano mkdir -p /etc/systemd/system/ -cat > /etc/systemd/system/openmano.service << EOF +cat > /etc/systemd/system/osm-ro.service << EOF [Unit] Description=openmano server @@ -154,8 +156,8 @@ EOF [[ -n $DELETE ]] && rm -rf ${FILE} -service openmano start -systemctl enable openmano.service +service osm-ro start +systemctl enable osm-ro.service echo Done exit diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh index 3492bcd2..ae4dd3c5 100755 --- a/scripts/install-openmano.sh +++ b/scripts/install-openmano.sh @@ -36,7 +36,8 @@ function usage(){ echo -e " -h --help: show this help" echo -e " --develop: install last version for developers, and do not configure as a service" echo -e " --forcedb: reinstall mano_db DB, deleting previous database if exists and creating a new one" - echo -e " --force: makes idenpotent, delete previous installations folders if needed" + echo -e " --updatedb: do not reinstall mano_db DB if exist, just update database" + echo -e " --force: makes idenpotent, delete previous installations folders if needed. It assumes --updatedb if --forcedb option is not provided" 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" @@ -67,7 +68,8 @@ DBPASSWD="" DBPASSWD_PARAM="" QUIET_MODE="" DEVELOP="" -FORCEDB="" +DB_FORCE_UPDATE="" +UPDATEDB="" FORCE="" NOCLONE="" NO_PACKAGES="" @@ -91,8 +93,9 @@ while getopts ":u:p:hiq-:" o; do -) [ "${OPTARG}" == "help" ] && usage && exit 0 [ "${OPTARG}" == "develop" ] && DEVELOP="y" && continue - [ "${OPTARG}" == "forcedb" ] && FORCEDB="y" && continue - [ "${OPTARG}" == "force" ] && FORCEDB="y" && FORCE="y" && continue + [ "${OPTARG}" == "forcedb" ] && DB_FORCE_UPDATE="${DB_FORCE_UPDATE}--forcedb" && continue + [ "${OPTARG}" == "updatedb" ] && DB_FORCE_UPDATE="${DB_FORCE_UPDATE}--updatedb" && continue + [ "${OPTARG}" == "force" ] && FORCE="y" && continue [ "${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 @@ -115,6 +118,13 @@ while getopts ":u:p:hiq-:" o; do esac done +if [ "$DB_FORCE_UPDATE" == "--forcedb--updatedb" ] || [ "$DB_FORCE_UPDATE" == "--updatedb--forcedb" ] ; then + echo "Error: options --forcedb and --updatedb are mutually exclusive" >&2 + exit 1 +elif [ -n "$FORCE" ] && [ -z "$DB_FORCE_UPDATE" ] ; then + DB_FORCE_UPDATE="--updatedb" +fi + #check root privileges and non a root user behind [ "$USER" != "root" ] && echo "Needed root privileges" >&2 && exit 1 if [[ -z "$SUDO_USER" ]] || [[ "$SUDO_USER" = "root" ]] @@ -238,7 +248,7 @@ if [[ -z $NOCLONE ]]; then #################################################################' su $SUDO_USER -c "git clone ${GIT_URL} ${OPENMANO_BASEFOLDER}" su $SUDO_USER -c "cp ${OPENMANO_BASEFOLDER}/.gitignore-common ${OPENMANO_BASEFOLDER}/.gitignore" - [[ -z $DEVELOP ]] && su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER} checkout tags/v1.1.0" + [[ -z $DEVELOP ]] && su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER} checkout v2.0" fi echo ' @@ -246,11 +256,13 @@ echo ' ##### INSTALLING OVIM LIBRARY ##### #################################################################' su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER} clone ${GIT_OVIM_URL} openvim" -[[ -z $DEVELOP ]] && su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER}/openvim checkout master" +[[ -z $DEVELOP ]] && su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER}/openvim checkout v2.0" + # Install debian dependencies before setup.py [ "$_DISTRO" == "Ubuntu" ] && install_packages "libmysqlclient-dev" [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "libmysqlclient-dev" #TODO check if that's the name in CentOS and RedHat make -C ${OPENMANO_BASEFOLDER}/openvim lite +rm -rf "${OPENMANO_BASEFOLDER}/openvim" OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] @@ -297,7 +309,7 @@ then su $SUDO_USER -c 'rm -f ${HOME}/bin/service-openmano' su $SUDO_USER -c "ln -s '${OPENMANO_BASEFOLDER}/openmano' "'${HOME}/bin/openmano' su $SUDO_USER -c "ln -s '${OPENMANO_BASEFOLDER}/scripts/openmano-report.sh' "'${HOME}/bin/openmano-report' - su $SUDO_USER -c "ln -s '${OPENMANO_BASEFOLDER}/scripts/service-openmano.sh' "'${HOME}/bin/service-openmano' + su $SUDO_USER -c "ln -s '${OPENMANO_BASEFOLDER}/scripts/service-openmano' "'${HOME}/bin/service-openmano' #insert /home//bin in the PATH #skiped because normally this is done authomatically when ~/bin exist @@ -335,16 +347,13 @@ echo ' 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 + ${OPENMANO_BASEFOLDER}/database_utils/install-db-server.sh -U $DBUSER ${DBPASSWD_PARAM/p/P} $DB_QUIET $DB_FORCE_UPDATE || exit 1 echo ' ################################################################# ##### CREATE AND INIT MANO_VIM DATABASE ##### #################################################################' # Install mano_vim_db after setup - ${OSMLIBOVIM_PATH}/database_utils/install-db-server.sh -U $DBUSER ${DBPASSWD_PARAM/p/P} -u mano -p manopw -d mano_vim_db || exit 1 + ${OSMLIBOVIM_PATH}/database_utils/install-db-server.sh -U $DBUSER ${DBPASSWD_PARAM/p/P} -u mano -p manopw -d mano_vim_db $DB_QUIET $DB_FORCE_UPDATE || exit 1 fi @@ -362,14 +371,14 @@ echo ' echo echo "Done! installed at /opt/openmano" - echo " Manage server with 'sudo service openmano start|stop|status|...' " + echo " Manage server with 'sudo service osm-ro start|stop|status|...' " else echo echo "Done! you may need to logout and login again for loading client configuration" - echo " Run './${OPENMANO_BASEFOLDER}/scripts/service-openmano.sh start' for starting openmano in a screen" + echo " Run './${OPENMANO_BASEFOLDER}/scripts/service-openmano start' for starting openmano in a screen" fi diff --git a/test/basictest.sh b/test/basictest.sh index b15269a6..2308377b 100755 --- a/test/basictest.sh +++ b/test/basictest.sh @@ -133,11 +133,11 @@ then [[ $force_ != y ]] && [[ $force_ != yes ]] && echo "aborted!" && $_exit echo "Stopping openmano" - $DIRscript/service-openmano.sh mano stop${screen_mano_param} + $DIRscript/service-openmano mano stop${screen_mano_param} echo "Initializing openmano database" $DIRmano/database_utils/init_mano_db.sh -u mano -p manopw --createdb echo "Starting openmano" - $DIRscript/service-openmano.sh mano start${screen_mano_param} + $DIRscript/service-openmano mano start${screen_mano_param} echo elif [[ $action == "delete" ]] diff --git a/test/test-multivim.sh b/test/test-multivim.sh index d08ceb93..6505091f 100755 --- a/test/test-multivim.sh +++ b/test/test-multivim.sh @@ -65,14 +65,14 @@ echo "deleting deployed vm" openvim vm-delete -f | grep -q deleted && sleep 10 #give some time to get virtual machines deleted echo "Stopping openmano" -$DIRscripts/service-openmano.sh stop +$DIRscripts/service-openmano stop echo "Initializing databases" $DIRvim/database_utils/init_vim_db.sh -u vim -p vimpw $DIRmano/database_utils/init_mano_db.sh -u mano -p manopw echo "Starting openmano" -$DIRscripts/service-openmano.sh start +$DIRscripts/service-openmano start echo "Creating openmano tenant 'mytenant'" nfvotenant=`openmano tenant-create mytenant --description=mytenant |gawk '{print $1}'` diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh index 7542d6c2..1933251d 100755 --- a/test/test_vimconn.sh +++ b/test/test_vimconn.sh @@ -108,11 +108,11 @@ then [[ $force != y ]] && [[ $force != yes ]] && echo "aborted!" && $_exit echo "Stopping openmano" - $DIRscript/service-openmano.sh mano stop + $DIRscript/service-openmano mano stop echo "Initializing openmano database" $DIRmano/database_utils/init_mano_db.sh -u mano -p manopw --createdb echo "Starting openmano" - $DIRscript/service-openmano.sh mano start + $DIRscript/service-openmano mano start elif [[ $action == "delete" ]] then