Adapt to O-RU use case spec

[nonrtric.git] / test / usecases / linkfailure / app / main.py

diff --git a/test/usecases/linkfailure/app/main.py b/test/usecases/linkfailure/app/main.py
index 3629ea8..517e4df 100644 (file)
--- a/test/usecases/linkfailure/app/main.py
+++ b/test/usecases/linkfailure/app/main.py
@@ -22,7 +22,8 @@ import requests
 import json
 import time
 
-SDNR_PATH = "/rests/data/network-topology:network-topology/topology=topology-netconf/node=O-RAN-DU-01/yang-ext:mount/o-ran-sc-du-hello-world:network-function/du-to-ru-connection="
+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]"
 
 UNLOCK_MESSAGE = {
     "o-ran-sc-du-hello-world:du-to-ru-connection": [
@@ -41,7 +42,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["specificProblem"] == "CUS Link Failure" and fault_fields["eventSeverity"] == "CRITICAL"
+        link_failure = fault_fields["alarmCondition"] == "30" and fault_fields["eventSeverity"] != "NORMAL"
 
     return link_failure
 
@@ -53,7 +54,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["specificProblem"] == "CUS Link Failure" and fault_fields["eventSeverity"] == "NORMAL"
+        link_failure_clear = fault_fields["alarmCondition"] == "30" and fault_fields["eventSeverity"] == "NORMAL"
 
     return link_failure_clear
 
@@ -62,20 +63,20 @@ def handle_link_failure(message, o_ru_to_o_du_map, sdnr_address):
     verboseprint("Got a link failure: ")
     alarm_msg_as_json = json.loads(message)
     event_headers = alarm_msg_as_json["event"]["commonEventHeader"]
-    o_ru_id = event_headers["reportingEntityId"]
+    o_ru_id = event_headers["sourceName"]
     verboseprint("O-RU ID: " + o_ru_id)
     o_du_id = o_ru_to_o_du_map[o_ru_id]
     verboseprint("O-DU ID: " + o_du_id)
     unlock_msg = json.loads(json.dumps(UNLOCK_MESSAGE))
-    unlock_msg["o-ran-sc-du-hello-world:du-to-ru-connection"][0]["name"] = o_du_id
-    response = requests.post(sdnr_address + SDNR_PATH + o_du_id, json=unlock_msg)
-    print(response)
+    unlock_msg["o-ran-sc-du-hello-world:du-to-ru-connection"][0]["name"] = o_ru_id
+    send_path = SDNR_PATH.replace("[O-DU-ID]", o_du_id).replace("[O-RU-ID]", o_ru_id)
+    requests.post(sdnr_address + send_path, json=unlock_msg)
 
 
 def handle_clear_link_failure(message):
     msg_as_json = json.loads(message)
     event_headers = msg_as_json["event"]["commonEventHeader"]
-    o_ru_id = event_headers["reportingEntityId"]
+    o_ru_id = event_headers["sourceName"]
     verboseprint("Cleared Link Failure for O-RU ID: " + o_ru_id)
 
 
@@ -91,7 +92,7 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(prog='PROG')
     parser.add_argument('--mrHost', help='The URL of the MR host', default="http://message-router.onap")
     parser.add_argument('--mrPort', help='The port of the MR host', type=int, default=3904)
-    parser.add_argument('--mrTopic', help='The topic to poll messages from', default="ALARMS-WRITE")
+    parser.add_argument('--mrTopic', help='The topic to poll messages from', default="unauthenticated.SEC_FAULT_OUTPUT")
     parser.add_argument('--sdnrHost', help='The URL of the SNDR host', default="http://localhost")
     parser.add_argument('--sdnrPort', help='The port of the SDNR host', type=int, default=9990)
     parser.add_argument('--oRuTooDuMapFile', help='A file with the mapping between O-RU ID and O-DU ID as a dictionary', default="o-ru-to-o-du-map.txt")
@@ -118,7 +119,7 @@ if __name__ == '__main__':
     verboseprint("Using MR address: " + mr_host + ":" + str(mr_port) + " and topic: " + mr_topic)
     verboseprint("Using SDNR address: " + sdnr_host + ":" + str(sdnr_port))
     verboseprint("Starting with " + str(pollTime) + " seconds between polls")
-    mr_address = mr_host + ":" + str(mr_port) + "/events/" + mr_topic + "/users/test/"
+    mr_address = mr_host + ":" + str(mr_port) + MR_PATH.replace("[TOPIC]", mr_topic)
     sdnr_address = sdnr_host + ":" + str(sdnr_port)
 
     while True: