HA for vim, wim and sdn

[osm/LCM.git] / osm_lcm / lcm.py

diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py
index 8f66055..57e8173 100644 (file)
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@ -71,8 +71,6 @@ class Lcm:
         self.consecutive_errors = 0
         self.first_start = False
 
-        # contains created tasks/futures to be able to cancel
-        self.lcm_tasks = TaskRegistry()
         # logging
         self.logger = logging.getLogger('lcm')
         # get id
@@ -174,6 +172,9 @@ class Lcm:
             self.logger.critical(str(e), exc_info=True)
             raise LcmException(str(e))
 
+        # contains created tasks/futures to be able to cancel
+        self.lcm_tasks = TaskRegistry(self.worker_id, self.db, self.logger)
+
         self.ns = ns.NsLcm(self.db, self.msg, self.fs, self.lcm_tasks, self.ro_config, self.vca_config, self.loop)
         self.netslice = netslice.NetsliceLcm(self.db, self.msg, self.fs, self.lcm_tasks, self.ro_config, 
                                              self.vca_config, self.loop)
@@ -358,7 +359,7 @@ class Lcm:
                 return
             elif command == "delete":
                 self.lcm_tasks.cancel(topic, vim_id)
-                task = asyncio.ensure_future(self.vim.delete(vim_id, order_id))
+                task = asyncio.ensure_future(self.vim.delete(params, order_id))
                 self.lcm_tasks.register("vim_account", vim_id, order_id, "vim_delete", task)
                 return
             elif command == "show":
@@ -377,7 +378,7 @@ class Lcm:
                 return
             elif command == "delete":
                 self.lcm_tasks.cancel(topic, wim_id)
-                task = asyncio.ensure_future(self.wim.delete(wim_id, order_id))
+                task = asyncio.ensure_future(self.wim.delete(params, order_id))
                 self.lcm_tasks.register("wim_account", wim_id, order_id, "wim_delete", task)
                 return
             elif command == "show":
@@ -396,7 +397,7 @@ class Lcm:
                 return
             elif command == "delete":
                 self.lcm_tasks.cancel(topic, _sdn_id)
-                task = asyncio.ensure_future(self.sdn.delete(_sdn_id, order_id))
+                task = asyncio.ensure_future(self.sdn.delete(params, order_id))
                 self.lcm_tasks.register("sdn", _sdn_id, order_id, "sdn_delete", task)
                 return
             elif command == "edit":