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
常顺宇
OpenXG-RAN
Commits
1e6e780a
Commit
1e6e780a
authored
4 years ago
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: final fixes for noS1 ping operations and LTE-M
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
6eb5d8c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
13 deletions
+19
-13
ci-scripts/main.py
ci-scripts/main.py
+12
-13
ci-scripts/sshconnection.py
ci-scripts/sshconnection.py
+7
-0
No files found.
ci-scripts/main.py
View file @
1e6e780a
...
@@ -86,7 +86,6 @@ class OaiCiTest():
...
@@ -86,7 +86,6 @@ class OaiCiTest():
self.CatMDevices = []
self.CatMDevices = []
self.UEIPAddresses = []
self.UEIPAddresses = []
self.htmlUEConnected = -1
self.htmlUEConnected = -1
self.picocom_closure = False
self.idle_sleep_time = 0
self.idle_sleep_time = 0
self.x2_ho_options = 'network'
self.x2_ho_options = 'network'
self.x2NbENBs = 0
self.x2NbENBs = 0
...
@@ -452,7 +451,7 @@ class OaiCiTest():
...
@@ -452,7 +451,7 @@ class OaiCiTest():
logging.error('\u001B[1m oaitun_ue1 interface is either NOT mounted or NOT configured\u001B[0m')
logging.error('\u001B[1m oaitun_ue1 interface is either NOT mounted or NOT configured\u001B[0m')
tunnelInterfaceStatus = False
tunnelInterfaceStatus = False
if RAN.GeteNBmbmsEnable(0):
if RAN.GeteNBmbmsEnable(0):
self
.command('ifconfig oaitun_uem1', '\$', 4)
SSH
.command('ifconfig oaitun_uem1', '\$', 4)
result = re.search('inet addr', SSH.getBefore())
result = re.search('inet addr', SSH.getBefore())
if result is not None:
if result is not None:
logging.debug('\u001B[1m oaitun_uem1 interface is mounted and configured\u001B[0m')
logging.debug('\u001B[1m oaitun_uem1 interface is mounted and configured\u001B[0m')
...
@@ -504,7 +503,7 @@ class OaiCiTest():
...
@@ -504,7 +503,7 @@ class OaiCiTest():
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
GenericHelp(Version)
GenericHelp(Version)
sys.exit('Insufficient Parameter')
sys.exit('Insufficient Parameter')
self.picocom_closure = True
SSH.enablePicocomClosure()
SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
...
@@ -514,10 +513,10 @@ class OaiCiTest():
...
@@ -514,10 +513,10 @@ class OaiCiTest():
SSH.command('AT', 'OK|ERROR', 5)
SSH.command('AT', 'OK|ERROR', 5)
SSH.command('AT', 'OK', 5)
SSH.command('AT', 'OK', 5)
# Doing a power cycle
# Doing a power cycle
self
.command('AT^RESET', 'SIMSTORE,READY', 15)
SSH
.command('AT^RESET', 'SIMSTORE,READY', 15)
self
.command('AT', 'OK|ERROR', 5)
SSH
.command('AT', 'OK|ERROR', 5)
self
.command('AT', 'OK', 5)
SSH
.command('AT', 'OK', 5)
self
.command('ATE1', 'OK', 5)
SSH
.command('ATE1', 'OK', 5)
# Disabling the Radio
# Disabling the Radio
SSH.command('AT+CFUN=0', 'OK', 5)
SSH.command('AT+CFUN=0', 'OK', 5)
logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
...
@@ -535,7 +534,7 @@ class OaiCiTest():
...
@@ -535,7 +534,7 @@ class OaiCiTest():
logging.debug('\u001B[1;37;41m Could not check Auto-Attach! \u001B[0m')
logging.debug('\u001B[1;37;41m Could not check Auto-Attach! \u001B[0m')
# Force closure of picocom but device might still be locked
# Force closure of picocom but device might still be locked
SSH.close()
SSH.close()
self.picocom_closure = False
SSH.disablePicocomClosure()
HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
self.checkDevTTYisUnlocked()
self.checkDevTTYisUnlocked()
...
@@ -543,7 +542,7 @@ class OaiCiTest():
...
@@ -543,7 +542,7 @@ class OaiCiTest():
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
GenericHelp(Version)
GenericHelp(Version)
sys.exit('Insufficient Parameter')
sys.exit('Insufficient Parameter')
self.picocom_closure = True
SSH.enablePicocomClosure()
SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
...
@@ -556,7 +555,7 @@ class OaiCiTest():
...
@@ -556,7 +555,7 @@ class OaiCiTest():
SSH.command('AT+CFUN=0', 'OK', 5)
SSH.command('AT+CFUN=0', 'OK', 5)
logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
SSH.close()
SSH.close()
self.picocom_closure = False
SSH.disablePicocomClosure()
HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
self.checkDevTTYisUnlocked()
self.checkDevTTYisUnlocked()
...
@@ -564,7 +563,7 @@ class OaiCiTest():
...
@@ -564,7 +563,7 @@ class OaiCiTest():
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
GenericHelp(Version)
GenericHelp(Version)
sys.exit('Insufficient Parameter')
sys.exit('Insufficient Parameter')
self.picocom_closure = True
SSH.enablePicocomClosure()
SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
...
@@ -615,7 +614,7 @@ class OaiCiTest():
...
@@ -615,7 +614,7 @@ class OaiCiTest():
logging.debug(' RSRQ = ' + str(-20+(nRSRQ/2)) + ' dB')
logging.debug(' RSRQ = ' + str(-20+(nRSRQ/2)) + ' dB')
logging.debug(' RSRP = ' + str(-140+nRSRP) + ' dBm')
logging.debug(' RSRP = ' + str(-140+nRSRP) + ' dBm')
SSH.close()
SSH.close()
self.picocom_closure = False
SSH.disablePicocomClosure()
html_queue = SimpleQueue()
html_queue = SimpleQueue()
self.checkDevTTYisUnlocked()
self.checkDevTTYisUnlocked()
if attach_status:
if attach_status:
...
@@ -1382,7 +1381,7 @@ class OaiCiTest():
...
@@ -1382,7 +1381,7 @@ class OaiCiTest():
sys.exit('Insufficient Parameter')
sys.exit('Insufficient Parameter')
try:
try:
if ping_from_eNB is not None:
if ping_from_eNB is not None:
SSH.open(RAN.GeteNBIPAddress
, RAN.GeteNBUserName, RAN.GeteNBPassword
)
SSH.open(RAN.GeteNBIPAddress
(), RAN.GeteNBUserName(), RAN.GeteNBPassword()
)
SSH.command('cd ' + RAN.GeteNBSourceCodePath() + '/cmake_targets/', '\$', 5)
SSH.command('cd ' + RAN.GeteNBSourceCodePath() + '/cmake_targets/', '\$', 5)
else:
else:
SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/sshconnection.py
View file @
1e6e780a
...
@@ -42,6 +42,13 @@ import re
...
@@ -42,6 +42,13 @@ import re
class
SSHConnection
():
class
SSHConnection
():
def
__init__
(
self
):
def
__init__
(
self
):
self
.
ssh
=
''
self
.
ssh
=
''
self
.
picocom_closure
=
False
def
disablePicocomClosure
(
self
):
self
.
picocom_closure
=
False
def
enablePicocomClosure
(
self
):
self
.
picocom_closure
=
True
def
open
(
self
,
ipaddress
,
username
,
password
):
def
open
(
self
,
ipaddress
,
username
,
password
):
count
=
0
count
=
0
...
...
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