Commit 7fa5a659 authored by garciadeblas's avatar garciadeblas
Browse files

Changes to import dynamically modules in ovim.py 



Change-Id: Iccea5d9ab6c87423d37fa0cb345d8f97cd0f30c9
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent 49f2e859

Makefile

+3 −6
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ prepare_lite: 
	sed -i "s/from osm_openvim/from lib_osm_openvim/g" 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/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

	sed -i "s/__import__(\"osm_openvim\.\"/__import__(\"lib_osm_openvim\.\"/g" build/lib_osm_openvim/ovim.py





prepare:

prepare:

	pip install --user --upgrade setuptools

	pip install --user --upgrade setuptools
@@ -91,15 +92,11 @@ snap: 
	echo "Nothing to be done yet"

	echo "Nothing to be done yet"





install: clean build

install: clean build

	#cd build/dist; pip install --user osm_openvim*

	cd build/dist; pip install osm_openvim*

	cd build/dist; pip install osm_openvim*





install_lite: clean build_lite

install_lite: clean build_lite

	#cd build/dist; pip install --user lib_osm_openvim-*

	cd build/dist; pip install lib_osm_openvim-*

	cd build/dist; pip install lib_osm_openvim-*

osm_openvim/ovim.py

+6 −13
Original line number Original line Diff line number Diff line
@@ -378,19 +378,12 @@ class ovim(): 
                module = temp_dict['of_controller']

                module = temp_dict['of_controller']





            if module not in ovim.of_module:

            if module not in ovim.of_module:

                for base in ("", "osm_openvim.", "lib_osm_openvim."):

                try:

                try:

                        pkg = __import__(base + module)

                    pkg = __import__("osm_openvim." + module)

                        if base:

                    of_conn_module = getattr(pkg, module)

                    of_conn_module = getattr(pkg, module)

                        else:

                            of_conn_module = pkg

                    ovim.of_module[module] = of_conn_module

                    ovim.of_module[module] = of_conn_module

                        self.logger.debug("Module load from {}".format(base + module))

                    self.logger.debug("Module load from {}".format("osm_openvim." + module))

                        break

                except Exception as e:

                except Exception as e:

                        self.logger.warning("Module {} not found {}".format(base + module, e))

                else:

                    self.logger.error("Cannot open openflow controller module of type '%s'", module)

                    self.logger.error("Cannot open openflow controller module of type '%s'", module)

                    raise ovimException("Cannot open openflow controller of type module '{}'"

                    raise ovimException("Cannot open openflow controller of type module '{}'"

                                        "Revise it is installed".format(module),

                                        "Revise it is installed".format(module),