Merge branch 'master' into v2.0

diff --git a/Makefile b/Makefile
index 189cb21..8a16ee1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,15 @@ SHELL := /bin/bash
 all: clean build pip install
 lite: clean build_lite pip_lite install_lite
 
+clean_deb:
+       rm -rf .build
 clean:
        rm -rf build
        find osm_openvim -name '*.pyc' -delete
        find osm_openvim -name '*.pyo' -delete
 
 prepare_lite:
-       pip install setuptools
+       pip install --upgrade setuptools
        mkdir -p build
        VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
        VER2=$(shell git describe | cut -d- -f2); \
@@ -18,10 +20,10 @@ prepare_lite:
        echo "$$VER1.dev$$VER2+$$VER3" > build/OVIM_VERSION
        cp MANIFEST.in build/
        sed -i "s/include OPENVIM_VERSION/include OVIM_VERSION/g" build/MANIFEST.in
-       sed -i "s/recursive-include osm_openvim */recursive-include lib_osm_openvim */g" build/MANIFEST.in
+       sed -i "s/recursive-include osm_openvim/recursive-include lib_osm_openvim/g" build/MANIFEST.in
        sed -i "s/include openflow/include openflow-lib/g" build/MANIFEST.in
-       sed '/include openvimd/d' build/MANIFEST.in
-       sed '/include openvim/d' build/MANIFEST.in
+       sed -i '/include openvimd/d' build/MANIFEST.in
+       sed -i '/include openvim/d' build/MANIFEST.in
        cp README_lite.rst build/README.rst
        cp setup_lite.py build/setup.py
        cp stdeb_lite.cfg build/stdeb.cfg
@@ -33,10 +35,10 @@ prepare_lite:
        cp openflow build/openflow-lib
        sed -i "s/from osm_openvim/from lib_osm_openvim/g" build/openflow-lib
        sed -i "s/import osm_openvim/import lib_osm_openvim/g" build/openflow-lib
-       sed -i "s/import osm_openvim; print osm_openvim.__path__[0]/import lib_osm_openvim; print lib_osm_openvim.__path__[0]/g" build/lib_osm_openvim/database_utils/migrate_vim_db.sh
+       sed -i "s/import osm_openvim; print osm_openvim\.__path__\[0\]/import lib_osm_openvim; print lib_osm_openvim\.__path__\[0\]/g" build/lib_osm_openvim/database_utils/migrate_vim_db.sh
 
 prepare:
-       pip install setuptools
+       pip install --upgrade setuptools
        mkdir -p build
        VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
        VER2=$(shell git describe | cut -d- -f2); \
@@ -63,30 +65,36 @@ build_lite: prepare_lite
        python -m py_compile build/lib_osm_openvim/*.py
 
 pip: clean build
-       cd build; ./setup.py sdist
+       cd build && ./setup.py sdist
 
 pip_lite: clean build_lite
-       cd build; ./setup.py sdist
+       cd build && ./setup.py sdist
 
-package: clean prepare
+package_openvim: clean 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_openvim/scripts/python-osm-openvim.postinst deb_dist/osm-openvim*/debian/
        cd build/deb_dist/osm-openvim* && dpkg-buildpackage -rfakeroot -uc -us
+       mkdir -p .build
+       cp build/deb_dist/python-*.deb ./build/
 
-package_lite: clean prepare_lite
+package_lib: clean prepare_lite
        #apt-get install -y python-stdeb
        cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True
        cd build/deb_dist/lib-osm-openvim* && dpkg-buildpackage -rfakeroot -uc -us
+       mkdir -p .build
+       cp build/deb_dist/python-*.deb ./build/
+
+package: clean_deb package_openvim package_lib
 
 snap:
        echo "Nothing to be done yet"
 
 install: clean build
-       cd build/dist; pip  install osm_openvim*
+       cd build/dist; pip install osm_openvim*
 
 install_lite: clean build_lite
-       cd build/dist; pip  install  lib_osm_openvim-*
+       cd build/dist; pip install lib_osm_openvim-*
 
 
 

diff --git a/database_utils/install-db-server.sh b/database_utils/install-db-server.sh
index 4d816a5..5a9b9ab 100755 (executable)
--- a/database_utils/install-db-server.sh
+++ b/database_utils/install-db-server.sh
@@ -23,7 +23,7 @@ function _create_db(){
     #################################################################
     #####               CREATE DATABASE                         #####
     #################################################################'
-    echo -e "\nCreating temporary file form MYSQL installation and initialization"
+    echo -e "\nCreating temporary file for MYSQL installation and initialization"
     TEMPFILE="$(mktemp -q --tmpdir "installopenvim.XXXXXX")"
     trap 'rm -f "$TEMPFILE"' EXIT
     chmod 0600 "$TEMPFILE"
@@ -35,8 +35,8 @@ function _create_db(){
             [[ -n $QUIET_MODE ]] && DBDELETEPARAM="-f"
             mysqladmin  --defaults-extra-file=$TEMPFILE -s drop ${DB_NAME} $DBDELETEPARAM || ! echo "Could not delete ${DB_NAME} database" || exit 1
             mysqladmin  --defaults-extra-file=$TEMPFILE -s create ${DB_NAME} || ! echo "1 Error creating ${DB_NAME} database" || exit 1
-            echo "CREATE USER $DB_USER@'localhost' IDENTIFIED BY '$DB_PASS';"   | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "2 Failed while creating user vim at database"
-            echo "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO $DB_USER@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "3 Failed while creating user vim at database" || exit 1
+            echo "CREATE USER $DB_USER@'localhost' IDENTIFIED BY '$DB_PASS';"   | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "2 Failed while creating user ${DB_USER}"
+            echo "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO $DB_USER@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "3 Failed while granting privileges to user ${DB_USER} at database ${DB_NAME}" || exit 1
             echo " Database '${DB_NAME}' created, user $DB_USER password '$DB_PASS'"
         else
             echo "Database exists. Use option '--forcedb' to force the deletion of the existing one" && exit 1

diff --git a/database_utils/migrate_vim_db.sh b/database_utils/migrate_vim_db.sh
index 6318769..a2c116c 100755 (executable)
--- a/database_utils/migrate_vim_db.sh
+++ b/database_utils/migrate_vim_db.sh
@@ -36,6 +36,7 @@ MYSQL=$(which mysql)
 AWK=$(which awk)
 GREP=$(which grep)
 DIRNAME=`dirname $0`
+HERE=$(realpath $(dirname $0))
 
 function usage(){
     echo -e "Usage: $0 OPTIONS  [{openvim_version}]"
@@ -93,7 +94,7 @@ shift $((OPTIND-1))
 OPENVIM_VER="$1"
 if [ -z "$OPENVIM_VER" ]
 then
-    OVIM_PATH=`python -c 'import osm_openvim; print osm_openvim.__path__[0]' 2> /dev/null`
+    OVIM_PATH=$(dirname $HERE)
     OPENVIM_VER=`python ${OVIM_PATH}/ovim.py -v 2> /dev/null`
     OPENVIM_VER=${OPENVIM_VER%%-r*}
     OPENVIM_VER=${OPENVIM_VER##*version }

diff --git a/osm_openvim/ovim.py b/osm_openvim/ovim.py
index a47b460..a4108b6 100755 (executable)
--- a/osm_openvim/ovim.py
+++ b/osm_openvim/ovim.py
@@ -34,16 +34,16 @@ version_date = "Apr 2017"
 database_version = "0.17"      #expected database schema version
 
 import threading
-import osm_openvim.vim_db as vim_db
+import vim_db
 import logging
 import imp
 import argparse
 from netaddr import IPNetwork
 from jsonschema import validate as js_v, exceptions as js_e
-import osm_openvim.host_thread as ht
-import osm_openvim.dhcp_thread as dt
-import osm_openvim.openflow_thread as oft
-import osm_openvim.openflow_conn as openflow_conn
+import host_thread as ht
+import dhcp_thread as dt
+import openflow_thread as oft
+import openflow_conn
 
 
 HTTP_Bad_Request =          400