projects
/
osm
/
POL.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates for Python 3.10 and Ubuntu 22.04
[osm/POL.git]
/
osm_policy_module
/
common
/
mon_client.py
diff --git
a/osm_policy_module/common/mon_client.py
b/osm_policy_module/common/mon_client.py
index
f9a51cd
..
d5e8dfc
100644
(file)
--- a/
osm_policy_module/common/mon_client.py
+++ b/
osm_policy_module/common/mon_client.py
@@
-21,7
+21,6
@@
# For those usages not covered by the Apache License, Version 2.0 please
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
# For those usages not covered by the Apache License, Version 2.0 please
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
-import asyncio
import json
import logging
import random
import json
import logging
import random
@@
-36,13
+35,10
@@
log = logging.getLogger(__name__)
class MonClient:
class MonClient:
- def __init__(self, config: Config
, loop=None
):
+ def __init__(self, config: Config):
self.kafka_server = "{}:{}".format(
config.get("message", "host"), config.get("message", "port")
)
self.kafka_server = "{}:{}".format(
config.get("message", "host"), config.get("message", "port")
)
- if not loop:
- loop = asyncio.get_event_loop()
- self.loop = loop
async def create_alarm(
self,
async def create_alarm(
self,
@@
-69,7
+65,6
@@
class MonClient:
)
log.debug("Sending create_alarm_request %s", msg)
producer = AIOKafkaProducer(
)
log.debug("Sending create_alarm_request %s", msg)
producer = AIOKafkaProducer(
- loop=self.loop,
bootstrap_servers=self.kafka_server,
key_serializer=str.encode,
value_serializer=str.encode,
bootstrap_servers=self.kafka_server,
key_serializer=str.encode,
value_serializer=str.encode,
@@
-84,7
+79,6
@@
class MonClient:
log.debug("Waiting for create_alarm_response...")
consumer = AIOKafkaConsumer(
"alarm_response_" + str(cor_id),
log.debug("Waiting for create_alarm_response...")
consumer = AIOKafkaConsumer(
"alarm_response_" + str(cor_id),
- loop=self.loop,
bootstrap_servers=self.kafka_server,
key_deserializer=bytes.decode,
value_deserializer=bytes.decode,
bootstrap_servers=self.kafka_server,
key_deserializer=bytes.decode,
value_deserializer=bytes.decode,
@@
-119,7
+113,6
@@
class MonClient:
)
log.debug("Sending delete_alarm_request %s", msg)
producer = AIOKafkaProducer(
)
log.debug("Sending delete_alarm_request %s", msg)
producer = AIOKafkaProducer(
- loop=self.loop,
bootstrap_servers=self.kafka_server,
key_serializer=str.encode,
value_serializer=str.encode,
bootstrap_servers=self.kafka_server,
key_serializer=str.encode,
value_serializer=str.encode,
@@
-134,7
+127,6
@@
class MonClient:
log.debug("Waiting for delete_alarm_response...")
consumer = AIOKafkaConsumer(
"alarm_response_" + str(cor_id),
log.debug("Waiting for delete_alarm_response...")
consumer = AIOKafkaConsumer(
"alarm_response_" + str(cor_id),
- loop=self.loop,
bootstrap_servers=self.kafka_server,
key_deserializer=bytes.decode,
value_deserializer=bytes.decode,
bootstrap_servers=self.kafka_server,
key_deserializer=bytes.decode,
value_deserializer=bytes.decode,