Bug 1068 fixed for auth_url in keystone

[osm/NBI.git] / osm_nbi / subscriptions.py

diff --git a/osm_nbi/subscriptions.py b/osm_nbi/subscriptions.py
index 39eed76..711455e 100644 (file)
--- a/osm_nbi/subscriptions.py
+++ b/osm_nbi/subscriptions.py
@@ -55,7 +55,8 @@ class SubscriptionThread(threading.Thread):
         self.engine = engine
         self.loop = None
         self.logger = logging.getLogger("nbi.subscriptions")
-        self.aiomain_task = None  # asyncio task for receiving kafka bus
+        self.aiomain_task_admin = None  # asyncio task for receiving admin actions from kafka bus
+        self.aiomain_task = None  # asyncio task for receiving normal actions from kafka bus
         self.internal_session = {  # used for a session to the engine methods
             "project_id": (),
             "set_project": (),
@@ -79,11 +80,32 @@ class SubscriptionThread(threading.Thread):
                 if not kafka_working:
                     self.logger.critical("kafka is working again")
                     kafka_working = True
-                await asyncio.sleep(10, loop=self.loop)
-                self.aiomain_task = asyncio.ensure_future(self.msg.aioread(("ns", "nsi"), loop=self.loop,
-                                                                           callback=self._msg_callback),
-                                                          loop=self.loop)
-                await asyncio.wait_for(self.aiomain_task, timeout=None, loop=self.loop)
+                if not self.aiomain_task_admin:
+                    await asyncio.sleep(10, loop=self.loop)
+                    self.logger.debug("Starting admin subscription task")
+                    self.aiomain_task_admin = asyncio.ensure_future(self.msg.aioread(("admin",), loop=self.loop,
+                                                                                     group_id=False,
+                                                                                     aiocallback=self._msg_callback),
+                                                                    loop=self.loop)
+                if not self.aiomain_task:
+                    await asyncio.sleep(10, loop=self.loop)
+                    self.logger.debug("Starting non-admin subscription task")
+                    self.aiomain_task = asyncio.ensure_future(self.msg.aioread(("ns", "nsi"), loop=self.loop,
+                                                                               aiocallback=self._msg_callback),
+                                                              loop=self.loop)
+                done, _ = await asyncio.wait([self.aiomain_task, self.aiomain_task_admin],
+                                             timeout=None, loop=self.loop, return_when=asyncio.FIRST_COMPLETED)
+                try:
+                    if self.aiomain_task_admin in done:
+                        exc = self.aiomain_task_admin.exception()
+                        self.logger.error("admin subscription task exception: {}".format(exc))
+                        self.aiomain_task_admin = None
+                    if self.aiomain_task in done:
+                        exc = self.aiomain_task.exception()
+                        self.logger.error("non-admin subscription task exception: {}".format(exc))
+                        self.aiomain_task = None
+                except asyncio.CancelledError:
+                    pass
             except Exception as e:
                 if self.to_terminate:
                     return
@@ -141,7 +163,7 @@ class SubscriptionThread(threading.Thread):
         self._stop()
         self.loop.close()
 
-    def _msg_callback(self, topic, command, params):
+    async def _msg_callback(self, topic, command, params):
         """
         Callback to process a received message from kafka
         :param topic:  topic received
@@ -149,21 +171,44 @@ class SubscriptionThread(threading.Thread):
         :param params: rest of parameters
         :return: None
         """
+        msg_to_send = []
         try:
             if topic == "ns":
                 if command == "terminated" and params["operationState"] in ("COMPLETED", "PARTIALLY_COMPLETED"):
                     self.logger.debug("received ns terminated {}".format(params))
                     if params.get("autoremove"):
-                        self.engine.del_item(self.internal_session, "nsrs", _id=params["nsr_id"])
+                        self.engine.del_item(self.internal_session, "nsrs", _id=params["nsr_id"],
+                                             not_send_msg=msg_to_send)
                         self.logger.debug("ns={} deleted from database".format(params["nsr_id"]))
-                    return
-            if topic == "nsi":
+            elif topic == "nsi":
                 if command == "terminated" and params["operationState"] in ("COMPLETED", "PARTIALLY_COMPLETED"):
                     self.logger.debug("received nsi terminated {}".format(params))
                     if params.get("autoremove"):
-                        self.engine.del_item(self.internal_session, "nsis", _id=params["nsir_id"])
+                        self.engine.del_item(self.internal_session, "nsis", _id=params["nsir_id"],
+                                             not_send_msg=msg_to_send)
                         self.logger.debug("nsis={} deleted from database".format(params["nsir_id"]))
-                    return
+            elif topic == "admin":
+                self.logger.debug("received {} {} {}".format(topic, command, params))
+                if command in ["echo", "ping"]:   # ignored commands
+                    pass
+                elif command == "revoke_token":
+                    if params:
+                        if isinstance(params, dict) and "_id" in params:
+                            tid = params.get("_id")
+                            self.engine.authenticator.tokens_cache.pop(tid, None)
+                            self.logger.debug("token '{}' removed from token_cache".format(tid))
+                        else:
+                            self.logger.debug("unrecognized params in command '{} {}': {}"
+                                              .format(topic, command, params))
+                    else:
+                        self.engine.authenticator.tokens_cache.clear()
+                        self.logger.debug("token_cache cleared")
+                else:
+                    self.logger.debug("unrecognized command '{} {}'".format(topic, command))
+            # writing to kafka must be done with our own loop. For this reason it is not allowed Engine to do that,
+            # but content to be written is stored at msg_to_send
+            for msg in msg_to_send:
+                await self.msg.aiowrite(*msg, loop=self.loop)
         except (EngineException, DbException, MsgException) as e:
             self.logger.error("Error while processing topic={} command={}: {}".format(topic, command, e))
         except Exception as e:
@@ -192,3 +237,5 @@ class SubscriptionThread(threading.Thread):
         self.to_terminate = True
         if self.aiomain_task:
             self.loop.call_soon_threadsafe(self.aiomain_task.cancel)
+        if self.aiomain_task_admin:
+            self.loop.call_soon_threadsafe(self.aiomain_task_admin.cancel)