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
promise
OpenXG-RAN
Commits
b9d98b00
Commit
b9d98b00
authored
Sep 22, 2020
by
hardy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed SSH call without instanciation (temp : by passing obj as parameter)
parent
e95e5ac7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
ci-scripts/cls_oaicitest.py
ci-scripts/cls_oaicitest.py
+8
-8
No files found.
ci-scripts/cls_oaicitest.py
View file @
b9d98b00
...
...
@@ -1663,8 +1663,8 @@ class OaiCiTest():
SSH
.
close
()
return
0
def
Iperf_analyzeV2Output
(
self
,
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
iperf_real_options
,
EPC
):
SSH
=
sshconnection
.
SSHConnection
()
def
Iperf_analyzeV2Output
(
self
,
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
iperf_real_options
,
EPC
,
SSH
):
result
=
re
.
search
(
'-u'
,
str
(
iperf_real_options
))
if
result
is
None
:
logging
.
debug
(
'Into Iperf_analyzeV2TCPOutput client'
)
...
...
@@ -1848,8 +1848,8 @@ class OaiCiTest():
server_file
.
close
()
def
Iperf_analyzeV3Output
(
self
,
lock
,
UE_IPAddress
,
device_id
,
statusQueue
):
SSH
=
sshconnection
.
SSHConnection
()
def
Iperf_analyzeV3Output
(
self
,
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
SSH
):
result
=
re
.
search
(
'(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)
\\\\
r
\\\\
n(?:|\[ *\d+\] Sent \d+ datagrams)
\\\\
r
\\\\
niperf Done\.'
,
SSH
.
getBefore
())
if
result
is
None
:
result
=
re
.
search
(
'(?P<error>iperf: error - [a-zA-Z0-9 :]+)'
,
SSH
.
getBefore
())
...
...
@@ -1968,7 +1968,7 @@ class OaiCiTest():
SSH
.
close
()
self
.
ping_iperf_wrong_exit
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
message
)
return
clientStatus
=
self
.
Iperf_analyzeV2Output
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
modified_options
,
EPC
)
clientStatus
=
self
.
Iperf_analyzeV2Output
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
modified_options
,
EPC
,
SSH
)
SSH
.
close
()
# Kill iperf server on EPC side
...
...
@@ -2113,7 +2113,7 @@ class OaiCiTest():
SSH
.
command
(
'stdbuf -o0 iperf3 -c '
+
UE_IPAddress
+
' '
+
modified_options
+
' 2>&1 | stdbuf -o0 tee iperf_'
+
self
.
testCase_id
+
'_'
+
device_id
+
'.log'
,
'\$'
,
int
(
iperf_time
)
*
5.0
)
clientStatus
=
0
self
.
Iperf_analyzeV3Output
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
)
self
.
Iperf_analyzeV3Output
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
SSH
)
else
:
if
launchFromEpc
:
iperf_status
=
SSH
.
command
(
'stdbuf -o0 iperf -c '
+
UE_IPAddress
+
' '
+
modified_options
+
' 2>&1 | stdbuf -o0 tee iperf_'
+
self
.
testCase_id
+
'_'
+
device_id
+
'.log'
,
'\$'
,
int
(
iperf_time
)
*
5.0
)
...
...
@@ -2140,7 +2140,7 @@ class OaiCiTest():
self
.
ping_iperf_wrong_exit
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
message
)
return
logging
.
debug
(
'Into Iperf_analyzeV2Output client'
)
clientStatus
=
self
.
Iperf_analyzeV2Output
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
modified_options
,
EPC
)
clientStatus
=
self
.
Iperf_analyzeV2Output
(
lock
,
UE_IPAddress
,
device_id
,
statusQueue
,
modified_options
,
EPC
,
SSH
)
logging
.
debug
(
'Iperf_analyzeV2Output clientStatus returned value = '
+
str
(
clientStatus
))
SSH
.
close
()
...
...
@@ -2248,7 +2248,7 @@ class OaiCiTest():
status_queue
.
put
(
'10.0.1.2'
)
status_queue
.
put
(
'Sink Test : no check'
)
else
:
clientStatus
=
self
.
Iperf_analyzeV2Output
(
lock
,
'10.0.1.2'
,
'OAI-UE'
,
status_queue
,
modified_options
,
EPC
)
clientStatus
=
self
.
Iperf_analyzeV2Output
(
lock
,
'10.0.1.2'
,
'OAI-UE'
,
status_queue
,
modified_options
,
EPC
,
SSH
)
SSH
.
close
()
# Stopping the iperf server
...
...
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