commit e7bedebdf51c347e44e0b709e8d3086f491b7967
author tierno <alfonso.tiernosepulveda@telefonica.com> Wed Dec 07 16:22:53 2016 +0100
committer tierno <alfonso.tiernosepulveda@telefonica.com> Mon Dec 12 15:25:12 2016 +0100
tree b3555f22194f0fbe88fa906addacc29fa77e667a
parent 92c96c67fa491bcc44b0a2da8398a5c55a48200b

allow openvim in test mode to run without python-libvirt package installed

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

httpserver.py

diff --git a/httpserver.py b/httpserver.py
index 9f26737..ecf878c 100644
--- a/httpserver.py
+++ b/httpserver.py
@@ -37,7 +37,8 @@
 import datetime
 import hashlib
 import os
-import RADclass
+import imp
+#import only if needed because not needed in test mode. To allow an easier installation   import RADclass
 from jsonschema import validate as js_v, exceptions as js_e
 import host_thread as ht
 from vim_schema import host_new_schema, host_edit_schema, tenant_new_schema, \
@@ -50,6 +51,8 @@
 global my
 global url_base
 global config_dic
+global RADclass_module
+RADclass=None  #RADclass module is charged only if not in test mode
 
 url_base="/openvim"
 
@@ -535,9 +538,14 @@
         ip_name=host['ip_name']
         user=host['user']
         password=host.get('password', None)
+        if not RADclass_module:
+            try:
+                RADclass_module = imp.find_module("RADclass")
+            except (IOError, ImportError) as e:
+                raise ImportError("Cannot import RADclass.py Openvim not properly installed" +str(e))
 
         #fill rad info
-        rad = RADclass.RADclass()
+        rad = RADclass_module.RADclass()
         (return_status, code) = rad.obtain_RAD(user, password, ip_name)
         
         #return