From 1df90949ab61bf06685baf4491a07236eeb28c64 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Mon, 7 Jun 2021 15:56:51 +0200 Subject: [PATCH] Refactor O-RU use case script Issue-ID: NONRTRIC-535 Signed-off-by: elinuxhenrik Change-Id: Ie8beda421eb7f21a1018167759cbcc67c4d9d4f9 --- .../scriptversion/app/main.py | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/app/main.py b/test/usecases/oruclosedlooprecovery/scriptversion/app/main.py index 30541d4c..63839d0e 100644 --- a/test/usecases/oruclosedlooprecovery/scriptversion/app/main.py +++ b/test/usecases/oruclosedlooprecovery/scriptversion/app/main.py @@ -89,6 +89,23 @@ def read_o_ru_to_o_du_map_from_file(map_file): return dictionary +def poll_and_handle_messages(mr_address, sdnr_address): + while True: + try: + verboseprint("Polling") + response = requests.get(mr_address) + messages = response.json() + for message in messages: + if (is_message_new_link_failure(message)): + handle_link_failure(message, o_ru_to_o_du_map, sdnr_address) + elif (is_message_clear_link_failure(message)): + handle_clear_link_failure(message) + except Exception as inst: + print(inst) + + time.sleep(pollTime) + + if __name__ == '__main__': parser = argparse.ArgumentParser(prog='PROG') parser.add_argument('--mrHost', help='The URL of the MR host (default: %(default)s)', default="http://message-router.onap") @@ -135,17 +152,4 @@ if __name__ == '__main__': mr_address = mr_host + ":" + str(mr_port) + MR_PATH.replace("[TOPIC]", mr_topic) sdnr_address = sdnr_host + ":" + str(sdnr_port) - while True: - try: - verboseprint("Polling") - response = requests.get(mr_address) - messages = response.json() - for message in messages: - if (is_message_new_link_failure(message)): - handle_link_failure(message, o_ru_to_o_du_map, sdnr_address) - elif (is_message_clear_link_failure(message)): - handle_clear_link_failure(message) - except Exception as inst: - print(inst) - - time.sleep(pollTime) + poll_and_handle_messages(mr_address, sdnr_address) -- 2.16.6