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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG-RAN
Commits
1c77b36a
Commit
1c77b36a
authored
4 years ago
by
hardy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reverted eNB auto terminate fix (not working)
parent
ef04e7e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
13 deletions
+8
-13
ci-scripts/main.py
ci-scripts/main.py
+2
-5
ci-scripts/ran.py
ci-scripts/ran.py
+6
-8
No files found.
ci-scripts/main.py
View file @
1c77b36a
...
...
@@ -2847,11 +2847,8 @@ class OaiCiTest():
self
.
desc
=
'Automatic Termination of eNB'
HTML
.
desc
=
'Automatic Termination of eNB'
self
.
ShowTestID
()
#Terminate all instances on all servers, eNB, eNB1, eNB2
#RAN.eNB_instance=0
RAN
.
TerminateeNB
(
0
)
RAN
.
TerminateeNB
(
1
)
RAN
.
TermintateeNB
(
2
)
RAN
.
eNB_instance
=
0
RAN
.
TerminateeNB
()
if
RAN
.
flexranCtrlInstalled
and
RAN
.
flexranCtrlStarted
:
self
.
testCase_id
=
'AUTO-KILL-flexran-ctl'
HTML
.
testCase_id
=
self
.
testCase_id
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/ran.py
View file @
1c77b36a
...
...
@@ -546,27 +546,25 @@ class RANManagement():
except
:
os
.
kill
(
os
.
getppid
(),
signal
.
SIGUSR1
)
def
TerminateeNB
(
self
,
eNB_serverId
):
if
eNB_serverId
==
'0'
:
def
TerminateeNB
(
self
):
if
self
.
eNB_serverId
==
'0'
:
lIpAddr
=
self
.
eNBIPAddress
lUserName
=
self
.
eNBUserName
lPassWord
=
self
.
eNBPassword
lSourcePath
=
self
.
eNBSourceCodePath
elif
eNB_serverId
==
'1'
:
elif
self
.
eNB_serverId
==
'1'
:
lIpAddr
=
self
.
eNB1IPAddress
lUserName
=
self
.
eNB1UserName
lPassWord
=
self
.
eNB1Password
lSourcePath
=
self
.
eNB1SourceCodePath
elif
eNB_serverId
==
'2'
:
elif
self
.
eNB_serverId
==
'2'
:
lIpAddr
=
self
.
eNB2IPAddress
lUserName
=
self
.
eNB2UserName
lPassWord
=
self
.
eNB2Password
lSourcePath
=
self
.
eNB2SourceCodePath
if
lIpAddr
==
''
or
lUserName
==
''
or
lPassWord
==
''
or
lSourcePath
==
''
:
#HELP.GenericHelp(CONST.Version)
#sys.exit('Insufficient Parameter')
logging
.
debug
(
'ATTENTION Cannot clean eNB_serverID='
+
eNB_serverID
+
' '
+
'@'
+
lIpAddr
+
' path:'
+
lSourcePath
+
' : No parameters'
)
return
HELP
.
GenericHelp
(
CONST
.
Version
)
sys
.
exit
(
'Insufficient Parameter'
)
mySSH
=
SSH
.
SSHConnection
()
mySSH
.
open
(
lIpAddr
,
lUserName
,
lPassWord
)
mySSH
.
command
(
'cd '
+
lSourcePath
+
'/cmake_targets'
,
'\$'
,
5
)
...
...
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