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

Merge remote-tracking branch 'origin/CI_UE_ID_fix' into integration_2022_wk40

Browse Source
This commit is contained in:
Robert Schmidt
2022-10-05 15:32:00 +02:00
parent e0d9c0a901 9112b8fbc4
commit 5c33a982b4
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/main.py
+2 -2
View File
@@ -414,10 +414,10 @@ def GetParametersFromXML(action):
CONTAINERS.nb_healthy[0] = int(string_field) CONTAINERS.nb_healthy[0] = int(string_field)
string_field=test.findtext('d_retx_th') string_field=test.findtext('d_retx_th')
if (string_field is not None): 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') string_field=test.findtext('u_retx_th')
if (string_field is not None): 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': elif action == 'PingFromContainer':
string_field = test.findtext('container_name') string_field = test.findtext('container_name')
ci-scripts/ran.py
+14 -21
View File
@@ -975,29 +975,24 @@ class RANManagement():
if result is not None: if result is not None:
mbmsRequestMsg += 1 mbmsRequestMsg += 1
#FR1 NSA test : add new markers to make sure gNB is used #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: if result is not None:
NSA_RAPROC_PUSCH_check = 1 NSA_RAPROC_PUSCH_check = 1
#dlsch and ulsch statistics
#keys below are the markers we are loooking for, loop over this keys list # Collect information on UE DLSCH and ULSCH statistics
#everytime these markers are found in the log file, the previous ones are overwritten in the dict keys = {'dlsch_rounds','dlsch_total_bytes','ulsch_rounds','ulsch_total_bytes_scheduled'}
#eventually we record and print only the last occurence
keys = {'UE ID','dlsch_rounds','dlsch_total_bytes','ulsch_rounds','ulsch_total_bytes_scheduled'}
for k in keys: for k in keys:
result = re.search(k, line) result = re.search(k, line)
if result is not None: if result is None:
ue_prefix = 'ue0' continue
ue_res = re.search('UE ID 1|UE 1:', line) result = re.search('UE (?:RNTI )?([0-9a-f]{4})', line)
if ue_res is not None: if result is None:
ue_prefix = 'ue1' logging.error(f'did not find RNTI while matching key {k}')
ue_res = re.search('UE ID 2|UE 2:', line) continue
if ue_res is not None: rnti = result.group(1)
ue_prefix = 'ue2'
ue_res = re.search('UE ID 3|UE 3:', line) #remove 1- all useless char before relevant info (ulsch or dlsch) 2- trailing char
if ue_res is not None: dlsch_ulsch_stats[rnti+k]=re.sub(r'^.*\]\s+', r'' , line.rstrip())
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())
result = re.search('Received NR_RRCReconfigurationComplete from UE', str(line)) result = re.search('Received NR_RRCReconfigurationComplete from UE', str(line))
if result is not None: if result is not None:
@@ -1155,12 +1150,10 @@ class RANManagement():
#checker #checker
if (len(dlsch_ulsch_stats)!=0) and (len(checkers)!=0): if (len(dlsch_ulsch_stats)!=0) and (len(checkers)!=0):
if 'd_retx_th' in checkers: 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 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 % d_perc_retx = list(0 for i in checkers['d_retx_th'])#results in %
if 'u_retx_th' in checkers: 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']) ulsch_checker_status = list(0 for i in checkers['u_retx_th'])
u_perc_retx = list(0 for i in checkers['u_retx_th']) u_perc_retx = list(0 for i in checkers['u_retx_th'])