commit 7e0e9c65bbe47c3c4dc784c7b33eac90bc2fde91
author Pablo Montes Moreno <pablo.montesmoreno@telefonica.com> Mon Mar 27 12:42:32 2017 +0200
committer Pablo Montes Moreno <pablo.montesmoreno@telefonica.com> Mon Mar 27 12:42:32 2017 +0200
tree 07c4e63b82c157e2fed2da105f316025945129f1
parent c5651795c9b7fc6782fa666a27351c2aae52c08f

Re-enabled SDN functionality

Change-Id: Ice8af9e0f7c98045afa654b4fd443b790338e211
Signed-off-by: Pablo Montes Moreno <pablo.montesmoreno@telefonica.com>

vim_thread.py

diff --git a/vim_thread.py b/vim_thread.py
index 676ba20..eb740b4 100644
--- a/vim_thread.py
+++ b/vim_thread.py
@@ -34,7 +34,7 @@
 import logging
 import vimconn
 from db_base import db_base_Exception
-#from openvim.ovim import ovimException
+from openvim.ovim import ovimException
 
 
 # from logging import Logger
@@ -159,8 +159,7 @@
             net_type = params[1]
 
             network = None
-            #sdn_controller = self.vim.config.get('sdn-controller')
-            sdn_controller = None
+            sdn_controller = self.vim.config.get('sdn-controller')
             if sdn_controller and (net_type == "data" or net_type == "ptp"):
                 network = {"name": net_name, "type": net_type}
 
@@ -190,9 +189,9 @@
             except db_base_Exception as e:
                 self.logger.error("Error updating database %s", str(e))
             return False, str(e)
-        # except ovimException as e:
-        #     self.logger.error("Error creating NET in ovim, task=%s: %s", str(task_id), str(e))
-        #     return False, str(e)
+        except ovimException as e:
+            self.logger.error("Error creating NET in ovim, task=%s: %s", str(task_id), str(e))
+            return False, str(e)
 
     def new_vm(self, task):
         try:
@@ -253,8 +252,7 @@
 
     def del_net(self, task):
         net_id = task["params"][0]
-        #sdn_net_id = task["params"][1]
-        sdn_net_id = None
+        sdn_net_id = task["params"][1]
         if is_task_id(net_id):
             try:
                 task_create = task["depends"][net_id]
@@ -274,7 +272,8 @@
             return True, result
         except vimconn.vimconnException as e:
             return False, str(e)
-        # except ovimException as e:
-        #     logging.error("Error deleting network from ovim. net_id: {}, sdn_net_id: {}".format(net_id, sdn_net_id))
-        #     return False, str(e)
+        except ovimException as e:
+            logging.error("Error deleting network from ovim. net_id: {}, sdn_net_id: {}".format(net_id, sdn_net_id))
+            return False, str(e)
+