X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fusecases%2Flinkfailure%2Fapp%2Fmain.py;h=30541d4c51097c926f321bb4a99b61bc8f6da516;hb=c675b454a3434d690695a7336700f78a51579400;hp=517e4dfa23d018b235a2f0e4b4dbe8a68e173c45;hpb=3dd1d42dc4ab1abb0766b5d84805e2cb8d18f1e2;p=nonrtric.git

diff --git a/test/usecases/linkfailure/app/main.py b/test/usecases/linkfailure/app/main.py
index 517e4dfa..30541d4c 100644
--- a/test/usecases/linkfailure/app/main.py
+++ b/test/usecases/linkfailure/app/main.py
@@ -18,8 +18,9 @@
 
 import argparse
 import ast
-import requests
 import json
+import os
+import requests
 import time
 
 MR_PATH = "/events/[TOPIC]/users/test/"
@@ -90,25 +91,37 @@ def read_o_ru_to_o_du_map_from_file(map_file):
 
 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="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")
-    parser.add_argument('--pollTime', help='The time between polls', type=int, default=10)
+    parser.add_argument('--mrHost', help='The URL of the MR host (default: %(default)s)', default="http://message-router.onap")
+    parser.add_argument('--mrPort', help='The port of the MR host (default: %(default)d)', type=int, default=3904)
+    parser.add_argument('--mrTopic', help='The topic to poll messages from (default: %(default)s)', default="unauthenticated.SEC_FAULT_OUTPUT")
+    parser.add_argument('--sdnrHost', help='The URL of the SNDR host (default: %(default)s)', default="http://localhost")
+    parser.add_argument('--sdnrPort', help='The port of the SDNR host (default: %(default)d)', 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: %(default)s)', default="o-ru-to-o-du-map.txt")
+    parser.add_argument('--pollTime', help='The time between polls (default: %(default)d)', type=int, default=10)
     parser.add_argument('-v', '--verbose', action='store_true', help='Turn on verbose printing')
     parser.add_argument('--version', action='version', version='%(prog)s 1.0')
     args = vars(parser.parse_args())
     mr_host = args["mrHost"]
+    if os.getenv("MR-HOST") is not None:
+        mr_host = os.getenv("MR-HOST")
+        print("Using MR Host from os: " + mr_host)
     mr_port = args["mrPort"]
+    if os.getenv("MR-PORT") is not None:
+        mr_port = os.getenv("MR-PORT")
+        print("Using MR Port from os: " + mr_port)
     mr_topic = args["mrTopic"]
     sdnr_host = args["sdnrHost"]
+    if os.getenv("SDNR-HOST") is not None:
+        sdnr_host = os.getenv("SDNR-HOST")
+        print("Using SNDR Host from os: " + sdnr_host)
     sdnr_port = args["sdnrPort"]
+    if os.getenv("SDNR-PORT") is not None:
+        sdnr_port = os.getenv("SDNR-PORT")
+        print("Using SNDR Host from os: " + sdnr_port)
     o_ru_to_o_du_map = read_o_ru_to_o_du_map_from_file(args["oRuTooDuMapFile"])
     pollTime = args["pollTime"]
 
-    if args["verbose"]:
+    if os.getenv("VERBOSE") is not None or args["verbose"]:
 
         def verboseprint(*args, **kwargs):
             print(*args, **kwargs)
@@ -123,13 +136,16 @@ if __name__ == '__main__':
     sdnr_address = sdnr_host + ":" + str(sdnr_port)
 
     while True:
-        response = requests.get(mr_address)
-        verboseprint("Polling")
-        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)
+        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)