From f7116a3354417e2038c856a0694100bb5e061c7e Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 18 Aug 2022 14:38:30 +0200 Subject: [PATCH 1/3] check for msg3 in CI fixed --- ci-scripts/ran.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index b9e7eb476e..5afb6031f3 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -975,7 +975,7 @@ class RANManagement(): if result is not None: mbmsRequestMsg += 1 #FR1 NSA test : add new markers to make sure gNB is used - result = re.search('\[gNB [0-9]+\]\[RAPROC\] PUSCH with TC_RNTI 0x[0-9a-fA-F]+ received correctly, adding UE MAC Context UE_id [0-9]+\/RNTI 0x[0-9a-fA-F]+', str(line)) + result = re.search('\[gNB [0-9]+\]\[RAPROC\] PUSCH with TC_RNTI 0x[0-9a-fA-F]+ received correctly, adding UE MAC Context RNTI 0x[0-9a-fA-F]+', str(line)) if result is not None: NSA_RAPROC_PUSCH_check = 1 #dlsch and ulsch statistics From 81deaaa0ba9f1281c38b4383744a077dc892783e Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 4 Oct 2022 17:12:24 +0200 Subject: [PATCH 2/3] CI: Transform string to float list when reading configuration --- ci-scripts/main.py | 4 ++-- ci-scripts/ran.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index b5d0ef2d97..eb9e60a83e 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -414,10 +414,10 @@ def GetParametersFromXML(action): CONTAINERS.nb_healthy[0] = int(string_field) string_field=test.findtext('d_retx_th') if (string_field is not None): - CONTAINERS.ran_checkers['d_retx_th']= string_field + CONTAINERS.ran_checkers['d_retx_th'] = [float(x) for x in string_field.split(',')] string_field=test.findtext('u_retx_th') if (string_field is not None): - CONTAINERS.ran_checkers['u_retx_th']= string_field + CONTAINERS.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')] elif action == 'PingFromContainer': string_field = test.findtext('container_name') diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index 5afb6031f3..e6bb4d1530 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -1155,12 +1155,10 @@ class RANManagement(): #checker if (len(dlsch_ulsch_stats)!=0) and (len(checkers)!=0): if 'd_retx_th' in checkers: - checkers['d_retx_th'] = [float(x) for x in checkers['d_retx_th'].split(',')] dlsch_checker_status = list(0 for i in checkers['d_retx_th'])#status 0 / -1 d_perc_retx = list(0 for i in checkers['d_retx_th'])#results in % if 'u_retx_th' in checkers: - checkers['u_retx_th'] = [float(x) for x in checkers['u_retx_th'].split(',')] ulsch_checker_status = list(0 for i in checkers['u_retx_th']) u_perc_retx = list(0 for i in checkers['u_retx_th']) From 9112b8fbc4556c074f2aee9beb3a9570d7173966 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 24 Jun 2022 11:57:45 +0200 Subject: [PATCH 3/3] CI: Match arbitrary number of UEs for HARQ stats --- ci-scripts/ran.py | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index e6bb4d1530..1d81862647 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -978,26 +978,21 @@ class RANManagement(): result = re.search('\[gNB [0-9]+\]\[RAPROC\] PUSCH with TC_RNTI 0x[0-9a-fA-F]+ received correctly, adding UE MAC Context RNTI 0x[0-9a-fA-F]+', str(line)) if result is not None: NSA_RAPROC_PUSCH_check = 1 - #dlsch and ulsch statistics - #keys below are the markers we are loooking for, loop over this keys list - #everytime these markers are found in the log file, the previous ones are overwritten in the dict - #eventually we record and print only the last occurence - keys = {'UE ID','dlsch_rounds','dlsch_total_bytes','ulsch_rounds','ulsch_total_bytes_scheduled'} + + # Collect information on UE DLSCH and ULSCH statistics + keys = {'dlsch_rounds','dlsch_total_bytes','ulsch_rounds','ulsch_total_bytes_scheduled'} for k in keys: result = re.search(k, line) - if result is not None: - ue_prefix = 'ue0' - ue_res = re.search('UE ID 1|UE 1:', line) - if ue_res is not None: - ue_prefix = 'ue1' - ue_res = re.search('UE ID 2|UE 2:', line) - if ue_res is not None: - ue_prefix = 'ue2' - ue_res = re.search('UE ID 3|UE 3:', line) - if ue_res is not None: - ue_prefix = 'ue3' - #remove 1- all useless char before relevant info (ulsch or dlsch) 2- trailing char - dlsch_ulsch_stats[ue_prefix+k]=re.sub(r'^.*\]\s+', r'' , line.rstrip()) + if result is None: + continue + result = re.search('UE (?:RNTI )?([0-9a-f]{4})', line) + if result is None: + logging.error(f'did not find RNTI while matching key {k}') + continue + rnti = result.group(1) + + #remove 1- all useless char before relevant info (ulsch or dlsch) 2- trailing char + dlsch_ulsch_stats[rnti+k]=re.sub(r'^.*\]\s+', r'' , line.rstrip()) result = re.search('Received NR_RRCReconfigurationComplete from UE', str(line)) if result is not None: