From 1a885d87ef8e57b392fc4df961c063127bbdb162 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Wed, 9 Jun 2021 12:58:38 +0200 Subject: [PATCH] Change fault-ID for oruclosedlooprecovery usecase Change in script version. Issue-ID: NONRTRIC-495 Signed-off-by: elinuxhenrik Change-Id: Ib065ffed9079e26d633ee44e53a16c0e01718738 --- test/usecases/oruclosedlooprecovery/scriptversion/app/main.py | 5 +++-- .../scriptversion/simulators/message_generator.py | 7 +++++-- .../scriptversion/simulators/sdnr_simulator.py | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/app/main.py b/test/usecases/oruclosedlooprecovery/scriptversion/app/main.py index 63839d0e..efd45e7d 100644 --- a/test/usecases/oruclosedlooprecovery/scriptversion/app/main.py +++ b/test/usecases/oruclosedlooprecovery/scriptversion/app/main.py @@ -25,6 +25,7 @@ import time MR_PATH = "/events/[TOPIC]/users/test/" SDNR_PATH = "/rests/data/network-topology:network-topology/topology=topology-netconf/node=[O-DU-ID]/yang-ext:mount/o-ran-sc-du-hello-world:network-function/du-to-ru-connection=[O-RU-ID]" +FAUILT_ID = "28" UNLOCK_MESSAGE = { "o-ran-sc-du-hello-world:du-to-ru-connection": [ @@ -43,7 +44,7 @@ def is_message_new_link_failure(message): link_failure = False if (event_headers["domain"] == "fault"): fault_fields = msg_as_json["event"]["faultFields"] - link_failure = fault_fields["alarmCondition"] == "30" and fault_fields["eventSeverity"] != "NORMAL" + link_failure = fault_fields["alarmCondition"] == FAUILT_ID and fault_fields["eventSeverity"] != "NORMAL" return link_failure @@ -55,7 +56,7 @@ def is_message_clear_link_failure(message): link_failure_clear = False if (event_headers["domain"] == "fault"): fault_fields = msg_as_json["event"]["faultFields"] - link_failure_clear = fault_fields["alarmCondition"] == "30" and fault_fields["eventSeverity"] == "NORMAL" + link_failure_clear = fault_fields["alarmCondition"] == FAUILT_ID and fault_fields["eventSeverity"] == "NORMAL" return link_failure_clear diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/simulators/message_generator.py b/test/usecases/oruclosedlooprecovery/scriptversion/simulators/message_generator.py index 9c2ee085..85501333 100644 --- a/test/usecases/oruclosedlooprecovery/scriptversion/simulators/message_generator.py +++ b/test/usecases/oruclosedlooprecovery/scriptversion/simulators/message_generator.py @@ -29,6 +29,7 @@ import time mr_host = "http://localhost" mr_port = "3904" MR_PATH = "/events/unauthenticated.SEC_FAULT_OUTPUT" +FAULT_ID = "28" linkFailureMessage = { "event": { @@ -53,7 +54,7 @@ linkFailureMessage = { }, "faultFields": { "faultFieldsVersion": "4.0", - "alarmCondition": "30", + "alarmCondition": FAULT_ID, "alarmInterfaceA": "o-ran-fm:alarm-notif/fault-source", "eventSourceType": "ietf-hardware (RFC8348) /hardware/component[not(parent)][1]/mfg-model or \"O-RU\"", "specificProblem": "", @@ -90,7 +91,8 @@ heartBeatMessage = { } } -def sendPostRequest(url ,msg): + +def sendPostRequest(url, msg): try: requests.post(url, json=msg) except Exception as e: @@ -98,6 +100,7 @@ def sendPostRequest(url ,msg): print(e.args) print(e) + if __name__ == "__main__": if os.getenv("MR-HOST") is not None: mr_host = os.getenv("MR-HOST") diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/simulators/sdnr_simulator.py b/test/usecases/oruclosedlooprecovery/scriptversion/simulators/sdnr_simulator.py index fa40f2c4..888fad69 100644 --- a/test/usecases/oruclosedlooprecovery/scriptversion/simulators/sdnr_simulator.py +++ b/test/usecases/oruclosedlooprecovery/scriptversion/simulators/sdnr_simulator.py @@ -39,6 +39,8 @@ HOST_IP = "::" HOST_PORT = 9990 APP_URL = "/rests/data/network-topology:network-topology/topology=topology-netconf/node=/yang-ext:mount/o-ran-sc-du-hello-world:network-function/du-to-ru-connection=" +FAULT_ID = "28" + linkFailureMessage = { "event": { "commonEventHeader": { @@ -62,7 +64,7 @@ linkFailureMessage = { }, "faultFields": { "faultFieldsVersion": "4.0", - "alarmCondition": "30", + "alarmCondition": FAULT_ID, "alarmInterfaceA": "o-ran-fm:alarm-notif/fault-source", "eventSourceType": "ietf-hardware (RFC8348) /hardware/component[not(parent)][1]/mfg-model or \"O-RU\"", "specificProblem": "", -- 2.16.6