adding capability to set log level at vimconnectors

[osm/RO.git] / RO / osm_ro / vim_thread.py

diff --git a/RO/osm_ro/vim_thread.py b/RO/osm_ro/vim_thread.py
index 75ab863..7174fe6 100644 (file)
--- a/RO/osm_ro/vim_thread.py
+++ b/RO/osm_ro/vim_thread.py
@@ -224,9 +224,9 @@ class vim_thread(threading.Thread):
                     self.wim_account_id, self.plugin_name))
             except Exception as e:
                 self.logger.error("Cannot load sdn connector for wim_account={}, plugin={}: {}".format(
-                    self.wim_account_id, self.plugin_name, e))
+                    self.wim_account_id, self.plugin_name, e), exc_info=True)
                 self.sdnconnector = None
-                self.error_status = "Error loading sdn connector: {}".format(e)
+                self.error_status = self._format_vim_error_msg("Error loading sdn connector: {}".format(e))
 
     def _get_db_task(self):
         """
@@ -723,7 +723,8 @@ class vim_thread(threading.Thread):
                 self.logger.error("Error executing task={}: {}".format(task_id, e), exc_info=True)
             task["error_msg"] = str(e)
             task["status"] = "FAILED"
-            database_update = {"status": "VIM_ERROR", "error_msg": task["error_msg"]}
+            database_update = {"status": "VIM_ERROR" if task["item"] != "instance_wim_nets" else "WIM_ERROR",
+                               "error_msg": task["error_msg"]}
             # if task["item"] == 'instance_vms':
             #     database_update["vim_vm_id"] = None
             # elif task["item"] == 'instance_nets':
@@ -810,10 +811,9 @@ class vim_thread(threading.Thread):
                 return False
 
     def run(self):
-        self.logger.debug("Starting")
+        self.logger.info("Starting")
         while True:
             self.get_vim_sdn_connector()
-            self.logger.debug("Vimconnector loaded")
             reload_thread = False
 
             while True:
@@ -1114,7 +1114,7 @@ class vim_thread(threading.Thread):
         connected_ports = task["extra"].get("connected_ports", [])
         new_connected_ports = []
         last_update = task["extra"].get("last_update", 0)
-        sdn_status = "BUILD"
+        sdn_status = task["extra"].get("vim_status", "BUILD")
         sdn_info = None
 
         task_id = task["instance_action_id"] + "." + str(task["task_index"])
@@ -1212,18 +1212,21 @@ class vim_thread(threading.Thread):
 
             # if there are more ports to connect or they have been modified, call create/update
             try:
-                if (set(connected_ports) != set(new_connected_ports) or sdn_need_update) and len(sdn_ports) >= 2:
+                if set(connected_ports) != set(new_connected_ports) or sdn_need_update:
                     last_update = time.time()
                     if not wimconn_net_id:
-                        if params[0] == "data":
-                            net_type = "ELAN"
-                        elif params[0] == "ptp":
-                            net_type = "ELINE"
+                        if len(sdn_ports) < 2:
+                            if not pending_ports:
+                                sdn_status = "ACTIVE"
                         else:
-                            net_type = "L3"
-
-                        wimconn_net_id, created_items = self.sdnconnector.create_connectivity_service(
-                            net_type, sdn_ports)
+                            if params[0] == "data":
+                                net_type = "ELAN"
+                            elif params[0] == "ptp":
+                                net_type = "ELINE"
+                            else:
+                                net_type = "L3"
+                            wimconn_net_id, created_items = self.sdnconnector.create_connectivity_service(
+                                net_type, sdn_ports)
                     else:
                         created_items = self.sdnconnector.edit_connectivity_service(
                             wimconn_net_id, conn_info=created_items, connection_points=sdn_ports)