maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve error handling in Iperf_analyzeV3BIDIRJson()

Browse Source
This commit is contained in:
Jaroslava Fiedlerova
2024-08-01 13:53:49 +02:00
parent 5f684d7f05
commit 9acf60a339
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_oaicitest.py
+17 -20
View File
@@ -118,26 +118,23 @@ def Iperf_analyzeV3TCPJson(filename, iperf_tcp_rate_target):
return (False, f'While parsing Iperf3 results: generic exception: {e}') return (False, f'While parsing Iperf3 results: generic exception: {e}')
def Iperf_analyzeV3BIDIRJson(filename): def Iperf_analyzeV3BIDIRJson(filename):
if (not os.path.isfile(filename)): try:
return (False, 'Iperf3 Bidir TCP: Log file not present') with open(filename) as f:
if (os.path.getsize(filename)==0): results = json.load(f)
return (False, 'Iperf3 Bidir TCP: Log file is empty') sender_bitrate_ul = round(results['end']['streams'][0]['sender']['bits_per_second'] / 1000000, 2)
receiver_bitrate_ul = round(results['end']['streams'][0]['receiver']['bits_per_second'] / 1000000, 2)
with open(filename) as file: sender_bitrate_dl = round(results['end']['streams'][1]['sender']['bits_per_second'] / 1000000, 2)
filename = json.load(file) receiver_bitrate_dl = round(results['end']['streams'][1]['receiver']['bits_per_second'] / 1000000, 2)
try: msg = f'Sender Bitrate DL : {sender_bitrate_dl} Mbps\n'
sender_bitrate_ul = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2) msg += f'Receiver Bitrate DL : {receiver_bitrate_dl} Mbps\n'
receiver_bitrate_ul = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2) msg += f'Sender Bitrate UL : {sender_bitrate_ul} Mbps\n'
sender_bitrate_dl = round(filename['end']['streams'][1]['sender']['bits_per_second']/1000000,2) msg += f'Receiver Bitrate UL : {receiver_bitrate_ul} Mbps\n'
receiver_bitrate_dl = round(filename['end']['streams'][1]['receiver']['bits_per_second']/1000000,2) return (True, msg)
except Exception as e: except KeyError as e:
return (False, 'Could not compute BIDIR bitrate!') e_msg = results.get('error', f'error report not found in {filename}')
return (False, f'While parsing Iperf3 results: missing key {e}, {e_msg}')
msg = f'Sender Bitrate DL : {sender_bitrate_dl} Mbps\n' except Exception as e:
msg += f'Receiver Bitrate DL : {receiver_bitrate_dl} Mbps\n' return (False, f'While parsing Iperf3 results: generic exception: {e}')
msg += f'Sender Bitrate UL : {sender_bitrate_ul} Mbps\n'
msg += f'Receiver Bitrate UL : {receiver_bitrate_ul} Mbps\n'
return (True, msg)
def Iperf_analyzeV3UDP(filename, iperf_bitrate_threshold, iperf_packetloss_threshold, target_bitrate): def Iperf_analyzeV3UDP(filename, iperf_bitrate_threshold, iperf_packetloss_threshold, target_bitrate):
if (not os.path.isfile(filename)): if (not os.path.isfile(filename)):