Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ao gleen
OpenXG-RAN
Commits
a296a4eb
Commit
a296a4eb
authored
3 years ago
by
hardy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve BIDIR if client log is present yet empty
parent
9f30ff6c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
7 deletions
+24
-7
ci-scripts/cls_oaicitest.py
ci-scripts/cls_oaicitest.py
+24
-7
No files found.
ci-scripts/cls_oaicitest.py
View file @
a296a4eb
...
...
@@ -2047,13 +2047,30 @@ class OaiCiTest():
def
Iperf_analyzeV2BIDIR
(
self
,
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
server_filename
,
client_filename
):
#server file is unused for the moment
if
(
not
os
.
path
.
isfile
(
client_filename
)):
self
.
ping_iperf_wrong_exit
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
'Bidir TCP : Could not analyze from client log'
)
#check the 2 files are here
if
(
not
os
.
path
.
isfile
(
client_filename
))
or
(
not
os
.
path
.
isfile
(
server_filename
)):
self
.
ping_iperf_wrong_exit
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
'Bidir TCP : Client or Server Log File not present'
)
return
#check the 2 files size
if
(
os
.
path
.
getsize
(
client_filename
)
==
0
)
and
(
os
.
path
.
getsize
(
server_filename
)
==
0
):
self
.
ping_iperf_wrong_exit
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
'Bidir TCP : Client and Server Log File are empty'
)
return
report
=
[]
report_msg
=
'Client Report:
\n
'
with
open
(
client_filename
,
'r'
)
as
f_client
:
report_msg
=
'TCP BIDIR Report:
\n
'
#if client is not empty, all the info is in, otherwise we ll use the server file to get some partial info
client_filesize
=
os
.
path
.
getsize
(
client_filename
)
if
client_filesize
==
0
:
report_msg
+=
"Client file (UE) present but !!! EMPTY !!!
\n
"
report_msg
+=
"Partial report from server file
\n
"
filename
=
server_filename
else
:
report_msg
+=
"Report from client file (UE)
\n
"
filename
=
client_filename
report
=
[]
#used to check if relevant lines were found
with
open
(
filename
,
'r'
)
as
f_client
:
for
line
in
f_client
.
readlines
():
result
=
re
.
search
(
rf'^\[\s+\d+\](?P<direction>\[.+\]).*\s+(?P<bitrate>[0-9\.]+ [KMG]bits\/sec).*\s+(?P<role>\bsender|receiver\b)'
,
str
(
line
))
if
result
is
not
None
:
...
...
@@ -2070,7 +2087,7 @@ class OaiCiTest():
logging
.
debug
(
'
\u001B
[1;35m '
+
report_msg
+
'
\u001B
[0m'
)
lock
.
release
()
else
:
self
.
ping_iperf_wrong_exit
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
'Bidir TCP : Could not analyze from
client log
'
)
self
.
ping_iperf_wrong_exit
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
'Bidir TCP : Could not analyze from
Log file
'
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment