commit 0d0e80fee489a88cfa13e55d040748bec9a98c60
author Dario Faccin <dario.faccin@canonical.com> Wed May 24 16:58:47 2023 +0200
committer Dario Faccin <dario.faccin@canonical.com> Wed May 24 16:58:58 2023 +0200
tree 3289cfe39361d99201572d1d78397d5c49b527f8
parent 8b70083b76488d8ecb79543876b38f8864eab2eb

Update from master

Squashed commit of the following:

commit 7cedba14204492f7373db6e3362d04181658fc1b
Author: Mark Beierl <mark.beierl@canonical.com>
Date:   Wed May 10 21:35:27 2023 -0400

    Update to Python 3.10 and Ubuntu 22.04

    Removal of deprecated event loop
    Updated pip requirements

    Change-Id: I0eeba1b700187ec87197f5b28e6e20fd15bd945b
    Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

commit d1dfd8b598a2852cc6400d323b29c405816f36a6
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date:   Tue Apr 18 18:25:13 2023 +0200

    Set autoescape to True in Jinja2 environment

    Change-Id: I2af8d9e30f610bb18928b4c85b16ecd6754129b8
    Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

commit 2da4c43fa6e13582ffb79e852c47e986bf4a1384
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date:   Tue Apr 18 14:40:48 2023 +0200

    Clean stage-archive.sh

    Change-Id: Ie0a1c29cd15f4b9510bdbf8e14a051df93b24edd
    Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

commit 9bd1ee2d3893c1450b3650ead9e71b5e01d0883f
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date:   Tue Mar 28 13:45:28 2023 +0200

    Fix black and cover errors

    Change-Id: I5525e17a4536686091967ceb3ac2900bce47d9e2
    Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

Change-Id: I1f150e4b0bbe8c537940a2445c94bdf8da4c7e60
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>

osm_pla/server/server.py

diff --git a/osm_pla/server/server.py b/osm_pla/server/server.py
index d2476ec..ede6f86 100644
--- a/osm_pla/server/server.py
+++ b/osm_pla/server/server.py
@@ -33,12 +33,11 @@
     pil_price_list_file = Path("/placement/pil_price_list.yaml")
     vnf_price_list_file = Path("/placement/vnf_price_list.yaml")
 
-    def __init__(self, config: Config, loop=None):
+    def __init__(self, config: Config):
         self.log = logging.getLogger("pla.server")
         self.db = None
         self.msgBus = None
         self.config = config
-        self.loop = loop or asyncio.get_event_loop()
 
         try:
             if config.get("database", "driver") == "mongo":
@@ -64,7 +63,6 @@
                         config.get("message", "driver")
                     )
                 )
-            self.msgBus.loop = loop
             self.msgBus.connect(config.get("message"))
 
         except Exception as e:
@@ -259,21 +257,19 @@
         self.log.info("Kafka msg arrived: {} {} {}".format(topic, command, params))
         if topic == "pla" and command == "get_placement":
             nslcmop_id = params.get("nslcmopId")
-            self.loop.create_task(self.get_placement(nslcmop_id))
+            asyncio.create_task(self.get_placement(nslcmop_id))
 
     async def kafka_read(self):
         self.log.info("Task kafka_read start")
         while True:
             try:
                 topics = "pla"
-                await self.msgBus.aioread(topics, self.loop, self.handle_kafka_command)
+                await self.msgBus.aioread(topics, self.handle_kafka_command)
             except Exception as e:
                 self.log.error("kafka read error. Exception: {}".format(e))
-                await asyncio.sleep(5, loop=self.loop)
+                await asyncio.sleep(5)
 
     def run(self):
-        self.loop.run_until_complete(self.kafka_read())
-        self.loop.close()
-        self.loop = None
+        asyncio.run(self.kafka_read())
         if self.msgBus:
             self.msgBus.disconnect()